diff --git a/docs/app/e2e/.eslintrc.json b/docs/app/e2e/.eslintrc.json
index 6a949b92f..60c814cc9 100644
--- a/docs/app/e2e/.eslintrc.json
+++ b/docs/app/e2e/.eslintrc.json
@@ -9,6 +9,7 @@
},
"globals": {
+ "angular": false,
/* testabilityPatch / matchers */
"inject": false,
"module": false,
diff --git a/docs/app/e2e/app.scenario.js b/docs/app/e2e/app.scenario.js
index 1333870ef..a78667962 100644
--- a/docs/app/e2e/app.scenario.js
+++ b/docs/app/e2e/app.scenario.js
@@ -21,6 +21,9 @@ describe('docs.angularjs.org', function() {
console.log('browser console errors: ' + require('util').inspect(filteredLog));
}
});
+
+ browser.ignoreSynchronization = false;
+ browser.clearMockModules();
});
@@ -102,6 +105,66 @@ describe('docs.angularjs.org', function() {
expect(mainHeader.getText()).toEqual('Oops!');
});
+ it('should set "noindex" if the page does not exist', function() {
+ browser.get('build/docs/index-production.html#!/api/does/not/exist');
+ var robots = element(by.css('meta[name="robots"][content="noindex"]'));
+ var googleBot = element(by.css('meta[name="googlebot"][content="noindex"]'));
+ expect(robots.isPresent()).toBe(true);
+ expect(googleBot.isPresent()).toBe(true);
+ });
+
+ it('should remove "noindex" if the page exists', function() {
+ browser.get('build/docs/index-production.html#!/api');
+ var robots = element(by.css('meta[name="robots"][content="noindex"]'));
+ var googleBot = element(by.css('meta[name="googlebot"][content="noindex"]'));
+ expect(robots.isPresent()).toBe(false);
+ expect(googleBot.isPresent()).toBe(false);
+ });
+
+ describe('template request error', function() {
+ beforeEach(function() {
+ browser.addMockModule('httpMocker', function() {
+ angular.module('httpMocker', ['ngMock'])
+ .run(['$httpBackend', function($httpBackend) {
+ $httpBackend.whenGET('localhost:8000/build/docs/partials/api.html').respond(500, '');
+ }]);
+ });
+ });
+
+ it('should set "noindex" for robots if the request fails', function() {
+ // index-test includes ngMock
+ browser.get('build/docs/index-test.html#!/api');
+ var robots = element(by.css('meta[name="robots"][content="noindex"]'));
+ var googleBot = element(by.css('meta[name="googlebot"][content="noindex"]'));
+ expect(robots.isPresent()).toBe(true);
+ expect(googleBot.isPresent()).toBe(true);
+ });
+ });
+
+
+ describe('page bootstrap error', function() {
+ beforeEach(function() {
+ browser.addMockModule('httpMocker', function() {
+ // Require a module that does not exist to break the bootstrapping
+ angular.module('httpMocker', ['doesNotExist']);
+ });
+ });
+
+ it('should have "noindex" for robots if bootstrapping fails', function() {
+ browser.get('build/docs/index.html#!/api').catch(function() {
+ // get() will fail on AngularJS bootstrap, but if we continue here, protractor
+ // will assume the app is ready
+ browser.ignoreSynchronization = true;
+ var robots = element(by.css('meta[name="robots"][content="noindex"]'));
+ var googleBot = element(by.css('meta[name="googlebot"][content="noindex"]'));
+ expect(robots.isPresent()).toBe(true);
+ expect(googleBot.isPresent()).toBe(true);
+ });
+ });
+
+
+ });
+
});
});
diff --git a/docs/app/src/docs.js b/docs/app/src/docs.js
index 33b1be384..b6e6e49a2 100644
--- a/docs/app/src/docs.js
+++ b/docs/app/src/docs.js
@@ -8,6 +8,8 @@ angular.module('DocsController', ['currentVersionData'])
function($scope, $rootScope, $location, $window, $cookies,
NG_PAGES, NG_NAVIGATION, CURRENT_NG_VERSION) {
+ var errorPartialPath = 'Error404.html';
+
$scope.navClass = function(navItem) {
return {
active: navItem.href && this.currentPage && this.currentPage.path,
@@ -16,8 +18,6 @@ angular.module('DocsController', ['currentVersionData'])
};
};
-
-
$scope.$on('$includeContentLoaded', function() {
var pagePath = $scope.currentPage ? $scope.currentPage.path : $location.path();
$window._gaq.push(['_trackPageview', pagePath]);
@@ -26,6 +26,7 @@ angular.module('DocsController', ['currentVersionData'])
$scope.$on('$includeContentError', function() {
$scope.loading = false;
+ $scope.loadingError = true;
});
$scope.$watch(function docsPathWatch() {return $location.path(); }, function docsPathWatchAction(path) {
@@ -35,6 +36,7 @@ angular.module('DocsController', ['currentVersionData'])
var currentPage = $scope.currentPage = NG_PAGES[path];
$scope.loading = true;
+ $scope.loadingError = false;
if (currentPage) {
$scope.partialPath = 'partials/' + path + '.html';
@@ -50,18 +52,22 @@ angular.module('DocsController', ['currentVersionData'])
} else {
$scope.currentArea = NG_NAVIGATION['api'];
$scope.breadcrumb = [];
- $scope.partialPath = 'Error404.html';
+ $scope.partialPath = errorPartialPath;
}
});
+ $scope.hasError = function() {
+ return $scope.partialPath === errorPartialPath || $scope.loadingError;
+ };
+
/**********************************
Initialize
***********************************/
$scope.versionNumber = CURRENT_NG_VERSION.full;
$scope.version = CURRENT_NG_VERSION.full + ' ' + CURRENT_NG_VERSION.codeName;
- $scope.loading = 0;
-
+ $scope.loading = false;
+ $scope.loadingError = false;
var INDEX_PATH = /^(\/|\/index[^.]*.html)$/;
if (!$location.path() || INDEX_PATH.test($location.path())) {
diff --git a/docs/config/index.js b/docs/config/index.js
index 4ddf7922c..12777f6a8 100644
--- a/docs/config/index.js
+++ b/docs/config/index.js
@@ -22,6 +22,7 @@ module.exports = new Package('angularjs', [
.factory(require('./services/deployments/debug'))
.factory(require('./services/deployments/default'))
.factory(require('./services/deployments/jquery'))
+.factory(require('./services/deployments/test'))
.factory(require('./services/deployments/production'))
.factory(require('./inline-tag-defs/type'))
@@ -157,12 +158,14 @@ module.exports = new Package('angularjs', [
generateProtractorTestsProcessor,
generateExamplesProcessor,
debugDeployment, defaultDeployment,
- jqueryDeployment, productionDeployment) {
+ jqueryDeployment, testDeployment,
+ productionDeployment) {
generateIndexPagesProcessor.deployments = [
debugDeployment,
defaultDeployment,
jqueryDeployment,
+ testDeployment,
productionDeployment
];
diff --git a/docs/config/services/deployments/test.js b/docs/config/services/deployments/test.js
new file mode 100644
index 000000000..ba0805b50
--- /dev/null
+++ b/docs/config/services/deployments/test.js
@@ -0,0 +1,40 @@
+'use strict';
+
+module.exports = function testDeployment(getVersion) {
+ return {
+ name: 'test',
+ examples: {
+ commonFiles: {
+ scripts: ['../../../angular.js']
+ },
+ dependencyPath: '../../../'
+ },
+ scripts: [
+ '../angular.js',
+ '../angular-resource.js',
+ '../angular-route.js',
+ '../angular-cookies.js',
+ '../angular-mocks.js',
+ '../angular-sanitize.js',
+ '../angular-touch.js',
+ '../angular-animate.js',
+ 'components/marked-' + getVersion('marked') + '/lib/marked.js',
+ 'js/angular-bootstrap/dropdown-toggle.js',
+ 'components/lunr-' + getVersion('lunr') + '/lunr.js',
+ 'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
+ 'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
+ 'js/current-version-data.js',
+ 'js/all-versions-data.js',
+ 'js/pages-data.js',
+ 'js/nav-data.js',
+ 'js/docs.js'
+ ],
+ stylesheets: [
+ 'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.css',
+ 'css/prettify-theme.css',
+ 'css/angular-topnav.css',
+ 'css/docs.css',
+ 'css/animations.css'
+ ]
+ };
+};
diff --git a/docs/config/templates/app/indexPage.template.html b/docs/config/templates/app/indexPage.template.html
index 44ef6ebd7..eb5c6614a 100644
--- a/docs/config/templates/app/indexPage.template.html
+++ b/docs/config/templates/app/indexPage.template.html
@@ -11,6 +11,18 @@
AngularJS
+