From 8173382c4ba1adb3646be52923b0839b4cf7c1f4 Mon Sep 17 00:00:00 2001 From: Peter Bacon Darwin Date: Mon, 15 Sep 2014 14:57:07 +0100 Subject: [PATCH] chore(docs): remove excess indentation from code blocks dgeni-packages 0.10.0-rc.5 has a fix for this problem, so this commit updates to that version. Adds a new e2e test to prove this is fixed. Closes #8963 --- docs/app/e2e/api-docs/api-pages.scenario.js | 10 +++++ npm-shrinkwrap.json | 43 +++------------------ 2 files changed, 15 insertions(+), 38 deletions(-) diff --git a/docs/app/e2e/api-docs/api-pages.scenario.js b/docs/app/e2e/api-docs/api-pages.scenario.js index 76ee7a1165f3..2695971ca483 100644 --- a/docs/app/e2e/api-docs/api-pages.scenario.js +++ b/docs/app/e2e/api-docs/api-pages.scenario.js @@ -37,5 +37,15 @@ describe("doc.angularjs.org", function() { var code = element.all(by.css('tt')).first(); expect(code.getText()).toContain('guest!!!'); }); + + it("should trim indentation from code blocks", function() { + browser.get('index-debug.html#!/api/ng/type/$rootScope.Scope'); + + var codeBlocks = element.all(by.css('pre > code.lang-js')); + codeBlocks.each(function(codeBlock) { + var firstSpan = codeBlock.all(by.css('span')).first(); + expect(firstSpan.getText()).not.toMatch(/^\W+$/); + }); + }); }); }); \ No newline at end of file diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index c089cb66fad4..d8c7b05d5ab5 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1142,7 +1142,7 @@ } }, "dgeni-packages": { - "version": "0.10.0-rc.3", + "version": "0.10.0-rc.5", "dependencies": { "catharsis": { "version": "0.7.1" @@ -1197,42 +1197,12 @@ } } }, - "dgeni": { - "version": "0.4.0-rc.2", - "dependencies": { - "dependency-graph": { - "version": "0.1.0", - "dependencies": { - "underscore": { - "version": "1.4.4" - } - } - }, - "di": { - "version": "0.0.1" - }, - "optimist": { - "version": "0.6.1", - "dependencies": { - "wordwrap": { - "version": "0.0.2" - }, - "minimist": { - "version": "0.0.10" - } - } - }, - "q": { - "version": "0.9.7" - }, - "validate.js": { - "version": "0.2.0" - } - } - }, "esprima": { "version": "1.2.2" }, + "estraverse": { + "version": "1.5.1" + }, "glob": { "version": "3.2.11", "dependencies": { @@ -1244,9 +1214,6 @@ "lodash": { "version": "2.4.1" }, - "marked": { - "version": "0.2.10" - }, "minimatch": { "version": "0.3.0", "dependencies": { @@ -1725,7 +1692,7 @@ }, "grunt-jasmine-node": { "version": "0.1.0", - "from": "grunt-jasmine-node@git://github.com/vojtajina/grunt-jasmine-node.git#fix-grunt-exit-code", + "from": "grunt-jasmine-node@git://github.com/vojtajina/grunt-jasmine-node.git#ced17cbe52c1412b2ada53160432a5b681f37cd7", "resolved": "git://github.com/vojtajina/grunt-jasmine-node.git#ced17cbe52c1412b2ada53160432a5b681f37cd7" }, "grunt-jscs-checker": {