1.2 update

docs/app/e2e/.jshintrc

@@ -0,0 +1,42 @@
+{
+  "extends": "../../../.jshintrc-base",
+
+  "globals": {
+
+    /* jasmine / karma */
+    "it": false,
+    "iit": false,
+    "describe": false,
+    "ddescribe": false,
+    "beforeEach": false,
+    "afterEach": false,
+    "expect": false,
+    "jasmine": false,
+    "spyOn": false,
+    "waits": false,
+    "waitsFor": false,
+    "runs": false,
+    "dump": false,
+
+    /* e2e */
+    "browser": false,
+    "element": false,
+    "by": false,
+
+    /* testabilityPatch / matchers */
+    "inject": false,
+    "module": false,
+    "dealoc": false,
+    "_jQuery": false,
+    "_jqLiteMode": false,
+    "sortedHtml": false,
+    "childrenTagsOf": false,
+    "assertHidden": false,
+    "assertVisible": false,
+    "provideLog": false,
+    "spyOnlyCallsWithArgs": false,
+    "createMockStyleSheet": false,
+    "browserTrigger": false,
+    "jqLiteCacheSize": false
+  }
+}

docs/app/e2e/api-docs/api-pages.scenario.js

@@ -0,0 +1,51 @@
+'use strict';
+
+describe("doc.angularjs.org", function() {
+
+  describe("API pages", function() {
+
+    it("should display links to code on GitHub", function() {
+      browser.get('index-debug.html#!/api/ng/service/$http');
+      expect(element(by.css('.improve-docs')).getAttribute('href')).toMatch(/https?:\/\/github\.com\/angular\/angular\.js\/edit\/.+\/src\/ng\/http\.js/);
+
+      browser.get('index-debug.html#!/api/ng/service/$http');
+      expect(element(by.css('.view-source')).getAttribute('href')).toMatch(/https?:\/\/github\.com\/angular\/angular\.js\/tree\/.+\/src\/ng\/http\.js#L\d+/);
+    });
+
+    it('should change the page content when clicking a link to a service', function () {
+      browser.get('');
+
+      var ngBindLink = element(by.css('.definition-table td a[href="api/ng/directive/ngClick"]'));
+      ngBindLink.click();
+
+      var pageBody = element(by.css('h1'));
+      expect(pageBody.getText()).toEqual('ngClick');
+    });
+
+
+    it('should show the functioning input directive example', function () {
+      browser.get('index-debug.html#!/api/ng/directive/input');
+
+      // Ensure that the page is loaded before trying to switch frames.
+      browser.waitForAngular();
+
+      browser.switchTo().frame('example-input-directive');
+
+      var nameInput = element(by.model('user.name'));
+      nameInput.sendKeys('!!!');
+
+      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+$/);
+      });
+    });
+  });
+});

docs/app/e2e/api-docs/provider-pages.scenario.js

@@ -0,0 +1,12 @@
+'use strict';
+
+describe("provider pages", function() {
+
+  it("should show the related service", function() {
+    browser.get('index-debug.html#!/api/ng/provider/$compileProvider');
+    var serviceLink = element.all(by.css('ol.api-profile-header-structure li a')).first();
+    expect(serviceLink.getText()).toEqual('- $compile');
+    expect(serviceLink.getAttribute('href')).toMatch(/api\/ng\/service\/\$compile/);
+  });
+
+});

docs/app/e2e/api-docs/service-pages.scenario.js

@@ -0,0 +1,22 @@
+'use strict';
+
+describe("service pages", function() {
+
+  it("should show the related provider if there is one", function() {
+    browser.get('index-debug.html#!/api/ng/service/$compile');
+    var providerLink = element.all(by.css('ol.api-profile-header-structure li a')).first();
+    expect(providerLink.getText()).toEqual('- $compileProvider');
+    expect(providerLink.getAttribute('href')).toMatch(/api\/ng\/provider\/\$compileProvider/);
+
+    browser.get('index-debug.html#!/api/ng/service/$q');
+    providerLink = element.all(by.css('ol.api-profile-header-structure li a')).first();
+    expect(providerLink.getText()).not.toEqual('- $qProvider');
+    expect(providerLink.getAttribute('href')).not.toMatch(/api\/ng\/provider\/\$compileProvider/);
+  });
+
+  it("should show parameter defaults", function() {
+    browser.get('index-debug.html#!/api/ng/service/$timeout');
+    expect(element.all(by.css('.input-arguments p em')).first().getText()).toContain('(default: 0)');
+  });
+
+});

docs/app/e2e/docsAppE2E.js → docs/app/e2e/app.scenario.js

@@ -26,21 +26,6 @@ describe('docs.angularjs.org', function () {
     });
 
 
-    it('should show the functioning input directive example', function () {
-      browser.get('index-debug.html#!/api/ng/directive/input');
-
-      // Ensure that the page is loaded before trying to switch frames.
-      browser.waitForAngular();
-
-      browser.switchTo().frame('example-input-directive');
-
-      var nameInput = element(by.model('user.name'));
-      nameInput.sendKeys('!!!');
-
-      var code = element.all(by.css('tt')).first();
-      expect(code.getText()).toContain('guest!!!');
-    });
-
 
     it('should be resilient to trailing slashes', function() {
       browser.get('index-debug.html#!/api/ng/function/angular.noop/');
@@ -67,22 +52,12 @@ describe('docs.angularjs.org', function () {
       browser.get('index-debug.html#!error/ng/areq?p0=Missing&p1=not%20a%20function,%20got%20undefined');
       expect(element(by.css('.minerr-errmsg')).getText()).toEqual("Argument 'Missing' is not a function, got undefined");
     });
-  });
 
-  describe("templates", function() {
-    it("should show parameter defaults", function() {
-      browser.get('index-debug.html#!/api/ng/service/$timeout');
-      expect(element.all(by.css('.input-arguments p em')).first().getText()).toContain('(default: 0)');
-    });
-  });
 
-  describe("API pages", function() {
-    it("should display links to code on GitHub", function() {
-      browser.get('index-debug.html#!/api/ng/service/$http');
-      expect(element(by.css('.improve-docs')).getAttribute('href')).toMatch(/https?:\/\/github\.com\/angular\/angular\.js\/edit\/.+\/src\/ng\/http\.js/);
-
-      browser.get('index-debug.html#!/api/ng/service/$http');
-      expect(element(by.css('.view-source')).getAttribute('href')).toMatch(/https?:\/\/github\.com\/angular\/angular\.js\/tree\/.+\/src\/ng\/http\.js#L\d+/);
+    it("should display an error if the page does not exist", function() {
+      browser.get('index-debug.html#!/api/does/not/exist');
+      expect(element(by.css('h1')).getText()).toBe('Oops!');
     });
   });
+
 });

docs/config/index.js

@@ -1,44 +1,153 @@
-var _ = require('lodash');
+"use strict";
+
 var path = require('canonical-path');
 var packagePath = __dirname;
 
-var basePackage = require('dgeni-packages/ngdoc');
-var examplesPackage = require('dgeni-packages/examples');
+var Package = require('dgeni').Package;
+
+// Create and export a new Dgeni package called dgeni-example. This package depends upon
+// the jsdoc and nunjucks packages defined in the dgeni-packages npm module.
+module.exports = new Package('angularjs', [
+  require('dgeni-packages/ngdoc'),
+  require('dgeni-packages/nunjucks'),
+  require('dgeni-packages/examples')
+])
+
+
+.factory(require('./services/errorNamespaceMap'))
+.factory(require('./services/getMinerrInfo'))
+.factory(require('./services/getVersion'))
+.factory(require('./services/gitData'))
+
+.factory(require('./services/deployments/debug'))
+.factory(require('./services/deployments/default'))
+.factory(require('./services/deployments/jquery'))
+.factory(require('./services/deployments/production'))
+
+.factory(require('./inline-tag-defs/type'))
+
+
+.processor(require('./processors/error-docs'))
+.processor(require('./processors/index-page'))
+.processor(require('./processors/keywords'))
+.processor(require('./processors/pages-data'))
+.processor(require('./processors/versions-data'))
+
+
+.config(function(dgeni, log, readFilesProcessor, writeFilesProcessor) {
+
+  dgeni.stopOnValidationError = true;
+  dgeni.stopOnProcessingError = true;
+
+  log.level = 'info';
+
+  readFilesProcessor.basePath = path.resolve(__dirname,'../..');
+  readFilesProcessor.sourceFiles = [
+    { include: 'src/**/*.js', basePath: 'src' },
+    { include: 'docs/content/**/*.ngdoc', basePath: 'docs/content' }
+  ];
+
+  writeFilesProcessor.outputFolder = 'build/docs';
+
+})
+
+
+.config(function(parseTagsProcessor) {
+  parseTagsProcessor.tagDefinitions.push(require('./tag-defs/tutorial-step'));
+  parseTagsProcessor.tagDefinitions.push(require('./tag-defs/sortOrder'));
+})
+
+
+.config(function(inlineTagProcessor, typeInlineTagDef) {
+  inlineTagProcessor.inlineTagDefinitions.push(typeInlineTagDef);
+})
+
+
+.config(function(templateFinder, renderDocsProcessor, gitData) {
+  templateFinder.templateFolders.unshift(path.resolve(packagePath, 'templates'));
+  renderDocsProcessor.extraData.git = gitData;
+})
+
+
+.config(function(computePathsProcessor, computeIdsProcessor) {
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['error'],
+    pathTemplate: 'error/${namespace}/${name}',
+    outputPathTemplate: 'partials/error/${namespace}/${name}.html'
+  });
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['errorNamespace'],
+    pathTemplate: 'error/${name}',
+    outputPathTemplate: 'partials/error/${name}.html'
+  });
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['overview', 'tutorial'],
+    getPath: function(doc) {
+      var docPath = path.dirname(doc.fileInfo.relativePath);
+      if ( doc.fileInfo.baseName !== 'index' ) {
+        docPath = path.join(docPath, doc.fileInfo.baseName);
+      }
+      return docPath;
+    },
+    getOutputPath: function(doc) {
+      return 'partials/' + doc.path +
+          ( doc.fileInfo.baseName === 'index' ? '/index.html' : '.html');
+    }
+  });
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['e2e-test'],
+    getPath: function() {},
+    outputPathTemplate: 'ptore2e/${example.id}/${deployment.name}_test.js'
+  });
 
-module.exports = function(config) {
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['indexPage'],
+    getPath: function() {},
+    outputPathTemplate: '${id}.html'
+  });
 
-  config = basePackage(config);
-  config = examplesPackage(config);
 
-  config.append('processing.processors', [
-    require('./processors/git-data'),
-    require('./processors/error-docs'),
-    require('./processors/keywords'),
-    require('./processors/versions-data'),
-    require('./processors/pages-data'),
-    require('./processors/protractor-generate'),
-    require('./processors/index-page'),
-    require('./processors/debug-dump')
-  ]);
+  computeIdsProcessor.idTemplates.push({
+    docTypes: ['overview', 'tutorial', 'e2e-test', 'indexPage'],
+    getId: function(doc) { return doc.fileInfo.baseName; },
+    getAliases: function(doc) { return [doc.id]; }
+  });
 
-  config.append('processing.tagDefinitions', [
-    require('./tag-defs/tutorial-step'),
-    require('./tag-defs/sortOrder')
-  ]);
+  computeIdsProcessor.idTemplates.push({
+    docTypes: ['error', 'errorNamespace'],
+    getId: function(doc) { return 'error:' + doc.name; },
+    getAliases: function(doc) { return [doc.id]; }
+  });
+})
 
-  config.append('processing.defaultTagTransforms', [
-    require('dgeni-packages/jsdoc/tag-defs/transforms/trim-whitespace')
-  ]);
 
-  config.append('processing.inlineTagDefinitions', [
-    require('./inline-tag-defs/type')
-  ]);
+.config(function(
+  generateIndexPagesProcessor,
+  generateProtractorTestsProcessor,
+  generateExamplesProcessor,
+  debugDeployment, defaultDeployment,
+  jqueryDeployment, productionDeployment) {
 
-  config.set('processing.search.ignoreWordsFile', path.resolve(packagePath, 'ignore.words'));
+  generateIndexPagesProcessor.deployments = [
+    debugDeployment,
+    defaultDeployment,
+    jqueryDeployment,
+    productionDeployment
+  ];
 
-  config.prepend('rendering.templateFolders', [
-    path.resolve(packagePath, 'templates')
-  ]);
+  generateProtractorTestsProcessor.deployments = [
+    defaultDeployment,
+    jqueryDeployment
+  ];
 
-  return config;
-};
+  generateExamplesProcessor.deployments = [
+    debugDeployment,
+    defaultDeployment,
+    jqueryDeployment,
+    productionDeployment
+  ];
+});

docs/config/inline-tag-defs/type.js

@@ -1,12 +1,17 @@
-var typeClassFilter = require('dgeni-packages/ngdoc/rendering/filters/type-class');
+"use strict";
+
 var encoder = new require('node-html-encoder').Encoder();
 
-module.exports = {
-  name: 'type',
-  description: 'Replace with markup that displays a nice type',
-  handlerFactory: function() {
-    return function(doc, tagName, tagDescription) {
-      return '<a href="" class="' + typeClassFilter.process(tagDescription) + '">'+encoder.htmlEncode(tagDescription) + '</a>';
-    };
-  }
-};
+/**
+ * @dgService typeInlineTagDef
+ * @description
+ * Replace with markup that displays a nice type
+ */
+module.exports = function typeInlineTagDef(getTypeClass) {
+  return {
+    name: 'type',
+    handler: function(doc, tagName, tagDescription) {
+      return '<a href="" class="' + getTypeClass(tagDescription) + '">'+encoder.htmlEncode(tagDescription) + '</a>';
+    }
+  };
+};