chore(docs): show error 404 without partial failing

We can move the test back into the main describe as it no longer causes an
error message to be logged

Author: petebacondarwin

docs/app/e2e/app.scenario.js

@@ -76,14 +76,11 @@ describe('docs.angularjs.org', function () {
       expect(element(by.css('.minerr-errmsg')).getText()).toEqual("Argument 'Missing' is not a function, got undefined");
     });
 
+    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!');
+    });
 
   });
 
-});
-
-describe('Error Handling', function() {
-  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/app/src/docs.js

@@ -24,20 +24,14 @@ angular.module('DocsController', [])
     $window._gaq.push(['_trackPageview', pagePath]);
   });
 
-  $scope.$on('$includeContentError', function() {
-    $scope.partialPath = 'Error404.html';
-  });
-
-
   $scope.$watch(function docsPathWatch() {return $location.path(); }, function docsPathWatchAction(path) {
 
     path = path.replace(/^\/?(.+?)(\/index)?\/?$/, '$1');
 
-    $scope.partialPath = 'partials/' + path + '.html';
-
     currentPage = $scope.currentPage = NG_PAGES[path];
 
     if ( currentPage ) {
+      $scope.partialPath = 'partials/' + path + '.html';
       $scope.currentArea = NG_NAVIGATION[currentPage.area];
       var pathParts = currentPage.path.split('/');
       var breadcrumb = $scope.breadcrumb = [];
@@ -50,6 +44,7 @@ angular.module('DocsController', [])
     } else {
       $scope.currentArea = NG_NAVIGATION['api'];
       $scope.breadcrumb = [];
+      $scope.partialPath = 'Error404.html';
     }
   });