chore(website): fix old tests and add new ones for API page upgrades

website/test/e2e/api-page.js

@@ -67,6 +67,18 @@ var ApiPage = function() {
   this.clickOnExtendsType = function(name) {
     $('[ng-if="currentItem.extends"]').element(by.linkText(name)).click();
   };
+
+  /**
+   * Gets the text of elements of the menu that aren't children of another
+   * element or titles (e.g. 'protractor' and 'by' but not 'getText')
+   */
+  this.getAdultNames = function() {
+    return element.all(by.repeater('item in items')).filter(function(elem) {
+      return elem.$$('[ng-switch-default]').count().then(function(count) {
+        return count == 1;
+      });
+    }).getText();
+  };
 };
 
 /** @type {ApiPage} */

website/test/e2e/api_spec.js

@@ -104,7 +104,7 @@ describe('Api', function() {
 
     // Then ensure the child functions are shown.
     expect(apiPage.getChildFunctionNames()).toEqual([
-      'clone', 'locator', 'getWebElement', 'all', 'element', '$$',
+      'then', 'clone', 'locator', 'getWebElement', 'all', 'element', '$$',
       '$', 'isPresent', 'isElementPresent', 'evaluate', 'allowAnimations']);
   });
 
@@ -133,4 +133,11 @@ describe('Api', function() {
     expect(browser.getCurrentUrl()).
         toMatch(/api\?view=webdriver.WebDriver.prototype.executeAsyncScript/);
   });
+
+  it('should sort the menu to put webdriver docs next to the relavant ' +
+      'protractor objects', function() {
+        expect(apiPage.getAdultNames().then(function(names) {
+          return names[names.indexOf('browser') + 1];
+        })).toBe('webdriver.WebDriver');
+  });
 });

website/test/unit/api-controller-spec.js

@@ -87,9 +87,9 @@ describe('ApiCtrl', function() {
     ]});
 
     // Expect alias to be the title.
-    expect(scope.items[1].title).toBe('bar');
+    expect(scope.items[0].title).toBe('bar');
     // Expect the name to be the title.
-    expect(scope.items[2].title).toBe('foo2');
+    expect(scope.items[1].title).toBe('foo2');
   });
 
   it('should use parent alias to generate title', function() {
@@ -100,7 +100,7 @@ describe('ApiCtrl', function() {
     ]});
 
     // Expect the title to be parent + name.
-    expect(scope.items[2].title).toBe('parent.fn');
+    expect(scope.items[1].title).toBe('parent.fn');
   });
 
   it('should assign type to each item', function() {
@@ -199,7 +199,7 @@ describe('ApiCtrl', function() {
       ]});
 
       // Then ensure the extending item has the functions of the parent.
-      var item = scope.items[3];
+      var item = scope.items[0];
       expect(item.title).toBe('name2');
       expect(item.base.name).toBe('name1');
       expect(item.base.items.length).toBe(1);