wip update to 4.0.9

filipesilva · filipesilva · commit 7bc7b0df5835 · 2016-09-23T00:11:12.000+01:00
diff --git a/public/docs/_examples/_boilerplate/tsconfig.json b/public/docs/_examples/_boilerplate/tsconfig.json
@@ -8,6 +8,7 @@
     "experimentalDecorators": true,
     "removeComments": false,
     "noImplicitAny": true,
-    "suppressImplicitAnyIndexErrors": true
+    "suppressImplicitAnyIndexErrors": true,
+    "types": []
   }
 }
diff --git a/public/docs/_examples/animations/e2e-spec.ts b/public/docs/_examples/animations/e2e-spec.ts
@@ -1,7 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
-import { ElementFinder } from 'protractor';
+import { browser, element, by, ElementFinder } from 'protractor';
 
 /**
  * The tests here basically just checking that the end styles
@@ -335,14 +334,14 @@ describe('Animation Tests', () => {
   }
 
   function getBoundingClientWidth(el: ElementFinder): Promise<number> {
-    return browser.driver.executeScript(
+    return browser.executeScript(
       'return arguments[0].getBoundingClientRect().width',
       el.getWebElement()
     );
   }
 
   function getOffsetWidth(el: ElementFinder): Promise<number> {
-    return browser.driver.executeScript(
+    return browser.executeScript(
       'return arguments[0].offsetWidth',
       el.getWebElement()
     );
diff --git a/public/docs/_examples/architecture/e2e-spec.ts b/public/docs/_examples/architecture/e2e-spec.ts
@@ -1,7 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { protractor, browser, element, by } from 'protractor/globals';
-import { ElementFinder } from 'protractor';
+import { protractor, browser, element, by, ElementFinder } from 'protractor';
 
 const nameSuffix = 'X';
 
@@ -45,7 +44,8 @@ function heroTests() {
   });
 
   it('shows selected hero details', async () => {
-    await element(by.cssContainingText('li', targetHero.name)).click();
+    // await element(by.cssContainingText('li', targetHero.name)).click(); 
+    await <Promise<void>>(<any>(element(by.cssContainingText('li', targetHero.name)).click()));
     let page = getPageElts();
     let hero = await heroFromDetail(page.heroDetail);
     expect(hero.id).toEqual(targetHero.id);
@@ -91,9 +91,11 @@ function getPageElts() {
 
 async function heroFromDetail(detail: ElementFinder): Promise<Hero> {
   // Get hero id from the first <div>
-  let _id = await detail.all(by.css('div')).first().getText();
+  // let _id = await detail.all(by.css('div')).first().getText();
+  let _id = await <Promise<string>>(<any>(detail.all(by.css('div')).first().getText()));
   // Get name from the h2
-  let _name = await detail.element(by.css('h4')).getText();
+  // let _name = await detail.element(by.css('h4')).getText();
+  let _name = await <Promise<string>>(<any>( detail.element(by.css('h4')).getText()));
   return {
     id: +_id.substr(_id.indexOf(' ') + 1),
     name: _name.substr(0, _name.lastIndexOf(' '))
diff --git a/public/docs/_examples/attribute-directives/e2e-spec.ts b/public/docs/_examples/attribute-directives/e2e-spec.ts
@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 
 describe('Attribute directives', function () {
 
diff --git a/public/docs/_examples/cb-a1-a2-quick-reference/e2e-spec.ts b/public/docs/_examples/cb-a1-a2-quick-reference/e2e-spec.ts
@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 
 describe('Angular 1 to 2 Quick Reference Tests', function () {
 
diff --git a/public/docs/_examples/cb-component-communication/e2e-spec.ts b/public/docs/_examples/cb-component-communication/e2e-spec.ts
@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 
 describe('Component Communication Cookbook Tests', function () {
 
diff --git a/public/docs/_examples/cb-component-relative-paths/e2e-spec.ts b/public/docs/_examples/cb-component-relative-paths/e2e-spec.ts
@@ -1,7 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
-import { ElementFinder } from 'protractor';
+import { browser, element, by, ElementFinder } from 'protractor';
 
 describe('Cookbook: component-relative paths', function () {
 
diff --git a/public/docs/_examples/cb-dependency-injection/e2e-spec.ts b/public/docs/_examples/cb-dependency-injection/e2e-spec.ts
@@ -1,7 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
-import { webdriver } from '../protractor-helpers';
+import { browser, element, by } from 'protractor';
 
 describe('Dependency Injection Cookbook', function () {
 
@@ -74,7 +73,7 @@ describe('Dependency Injection Cookbook', function () {
       let yellow = 'rgba(255, 255, 0, 1)';
 
       expect(target.getCssValue('background-color')).not.toEqual(yellow);
-      browser.actions().mouseMove(target as any as webdriver.WebElement).perform();
+      browser.actions().mouseMove(target.getWebElement()).perform();
       expect(target.getCssValue('background-color')).toEqual(yellow);
     });
 
diff --git a/public/docs/_examples/cb-dynamic-form-deprecated/e2e-spec.ts.disabled b/public/docs/_examples/cb-dynamic-form-deprecated/e2e-spec.ts.disabled
@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 
 /* tslint:disable:quotemark */
 describe('Dynamic Form Deprecated', function () {
diff --git a/public/docs/_examples/cb-dynamic-form/e2e-spec.ts b/public/docs/_examples/cb-dynamic-form/e2e-spec.ts
@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 
 /* tslint:disable:quotemark */
 describe('Dynamic Form', function () {
diff --git a/public/docs/_examples/cb-form-validation/e2e-spec.ts b/public/docs/_examples/cb-form-validation/e2e-spec.ts
@@ -1,7 +1,6 @@
 'use strict'; // necessary for node!
 
-import { browser, element, by, protractor } from 'protractor/globals';
-import { ElementFinder, ElementArrayFinder } from 'protractor';
+import { browser, element, by, protractor, ElementFinder, ElementArrayFinder } from 'protractor';
 import { appLang, describeIf } from '../protractor-helpers';
 
 // THESE TESTS ARE INCOMPLETE
diff --git a/public/docs/_examples/cb-set-document-title/e2e-spec.ts b/public/docs/_examples/cb-set-document-title/e2e-spec.ts
@@ -1,7 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
-import { ElementFinder } from 'protractor';
+import { browser, element, by, ElementFinder } from 'protractor';
 
 // gulp run-e2e-tests --filter=cb-set-document-title
 describe('Set Document Title', function () {
diff --git a/public/docs/_examples/cb-ts-to-js/e2e-spec.ts b/public/docs/_examples/cb-ts-to-js/e2e-spec.ts
@@ -1,7 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
-import { webdriver } from '../protractor-helpers';
+import { browser, element, by } from 'protractor';
 
 describe('TypeScript to Javascript tests', function () {
 
@@ -57,7 +56,7 @@ describe('TypeScript to Javascript tests', function () {
     expect(h1.getAttribute('class')).toBe('active');
 
     h1.click();
-    browser.actions().doubleClick(h1 as any as webdriver.WebElement).perform();
+    browser.actions().doubleClick(h1.getWebElement()).perform();
     expect(h1.getAttribute('class')).toBe('active');
   });
 
diff --git a/public/docs/_examples/cli-quickstart/e2e-spec.ts.disabled b/public/docs/_examples/cli-quickstart/e2e-spec.ts.disabled
@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 
 describe('cli-quickstart App', () => {
   beforeEach(() => {
diff --git a/public/docs/_examples/component-styles/e2e-spec.ts b/public/docs/_examples/component-styles/e2e-spec.ts
@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 
 describe('Component Style Tests', function () {
 
diff --git a/public/docs/_examples/dependency-injection/e2e-spec.ts b/public/docs/_examples/dependency-injection/e2e-spec.ts
@@ -1,7 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
-import { ElementFinder } from 'protractor';
+import { browser, element, by, ElementFinder } from 'protractor';
 
 describe('Dependency Injection Tests', function () {
 
diff --git a/public/docs/_examples/displaying-data/e2e-spec.ts b/public/docs/_examples/displaying-data/e2e-spec.ts
@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node
 
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 
 describe('Displaying Data Tests', function () {
   let _title = 'Tour of Heroes';
diff --git a/public/docs/_examples/forms/e2e-spec.ts b/public/docs/_examples/forms/e2e-spec.ts
@@ -1,4 +1,4 @@
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 import { appLang, describeIf } from '../protractor-helpers';
 
 describeIf(appLang.appIsTs || appLang.appIsJs, 'Forms Tests', function () {
diff --git a/public/docs/_examples/hierarchical-dependency-injection/e2e-spec.ts b/public/docs/_examples/hierarchical-dependency-injection/e2e-spec.ts
@@ -1,4 +1,4 @@
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 
 describe('Hierarchical dependency injection', function () {
 
diff --git a/public/docs/_examples/homepage-hello-world/e2e-spec.ts b/public/docs/_examples/homepage-hello-world/e2e-spec.ts
@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 
 describe('Homepage Hello World', function () {
 
diff --git a/public/docs/_examples/homepage-tabs/e2e-spec.ts b/public/docs/_examples/homepage-tabs/e2e-spec.ts
@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 
 describe('Homepage Tabs', function () {
 
diff --git a/public/docs/_examples/homepage-todo/e2e-spec.ts b/public/docs/_examples/homepage-todo/e2e-spec.ts
@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 
 describe('Homepage Todo', function () {
 
diff --git a/public/docs/_examples/lifecycle-hooks/e2e-spec.ts b/public/docs/_examples/lifecycle-hooks/e2e-spec.ts
@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 
 describe('Lifecycle hooks', function () {
 
diff --git a/public/docs/_examples/ngmodule/e2e-spec.ts b/public/docs/_examples/ngmodule/e2e-spec.ts
@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 
 describe('NgModule', function () {
 
diff --git a/public/docs/_examples/package.json b/public/docs/_examples/package.json
@@ -40,7 +40,7 @@
     "angular2-in-memory-web-api": "0.0.20",
     "bootstrap": "^3.3.6",
     "core-js": "^2.4.1",
-    "protractor": "^4.0.4",
+    "protractor": "^4.0.9",
     "reflect-metadata": "^0.1.3",
     "rollup": "^0.34.13",
     "rollup-plugin-node-resolve": "^2.0.0",
@@ -50,7 +50,9 @@
     "zone.js": "^0.6.23"
   },
   "devDependencies": {
-    "angular-cli": "^1.0.0-beta.5",
+    "@types/angular": "^1.5.15",
+    "@types/jasmine": "^2.2.34",
+    "@types/selenium-webdriver": "^2.53.30",
     "angular2-template-loader": "^0.4.0",
     "awesome-typescript-loader": "^2.2.4",
     "canonical-path": "0.0.2",
@@ -61,6 +63,7 @@
     "html-loader": "^0.4.3",
     "html-webpack-plugin": "^2.16.1",
     "http-server": "^0.9.0",
+    "jasmine": "^2.5.2",
     "jasmine-core": "^2.4.1",
     "karma": "^1.2.0",
     "karma-chrome-launcher": "^2.0.0",
@@ -75,15 +78,15 @@
     "lodash": "^4.13.1",
     "null-loader": "^0.1.1",
     "phantomjs-prebuilt": "^2.1.7",
-    "protractor": "^3.3.0",
+    "protractor": "^4.0.9",
     "raw-loader": "^0.5.1",
     "rimraf": "^2.5.2",
     "rollup-plugin-commonjs": "^4.1.0",
     "style-loader": "^0.13.1",
     "ts-loader": "^0.8.2",
     "ts-node": "^1.3.0",
     "tslint": "^3.15.1",
-    "typescript": "^2.0.2",
+    "typescript": "^2.0.3",
     "typings": "^1.3.2",
     "webpack": "^1.13.0",
     "webpack-dev-server": "^1.14.1",
diff --git a/public/docs/_examples/pipes/e2e-spec.ts b/public/docs/_examples/pipes/e2e-spec.ts
@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 
 describe('Pipes', function () {
 
diff --git a/public/docs/_examples/protractor-helpers.ts b/public/docs/_examples/protractor-helpers.ts
@@ -1,14 +1,3 @@
-import { browser } from 'protractor/globals';
-
-// Hack - remove when protractor4 exports webdriver typings
-export namespace webdriver {
-  export class WebElement {};
-};
-
-// Hack - remove when protractor4 exports webdriver typings
-// export type WPromise<T> = webdriver.promise.Promise<T>;
-export type WPromise<T> = any;
-
 export var appLang = {
   appIsTs: false,
   appIsJs: false,
@@ -32,15 +21,16 @@ export function itIf(cond: boolean, name: string, func: (done: DoneFn) => void):
   }
 }
 
+  // TODO Jesus - figure out what's needed here for the new upgrade chapters
 // Allow changing bootstrap mode to NG1 for upgrade tests
 export function setProtractorToNg1Mode(): void {
-  browser.rootEl = 'body';
+  // browser.rootEl = 'body';
 
-  let disableNgAnimate = function() {
-    angular.module('disableNgAnimate', []).run(['$animate', function($animate: any) {
-      $animate.enabled(false);
-    }]);
-  };
+  // let disableNgAnimate = function() {
+  //   angular.module('disableNgAnimate', []).run(['$animate', function($animate: any) {
+  //     $animate.enabled(false);
+  //   }]);
+  // };
 
-  browser.addMockModule('disableNgAnimate', disableNgAnimate);
+  // browser.addMockModule('disableNgAnimate', disableNgAnimate);
 }
diff --git a/public/docs/_examples/quickstart/e2e-spec.ts b/public/docs/_examples/quickstart/e2e-spec.ts
@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 
 describe('QuickStart E2E Tests', function () {
 
diff --git a/public/docs/_examples/router/e2e-spec.ts b/public/docs/_examples/router/e2e-spec.ts
@@ -1,7 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
-import { ElementFinder } from 'protractor';
+import { browser, element, by, ElementFinder } from 'protractor';
 
 describe('Router', function () {
 
diff --git a/public/docs/_examples/security/e2e-spec.ts b/public/docs/_examples/security/e2e-spec.ts
@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, By } from 'protractor/globals';
+import { browser, element, By } from 'protractor';
 
 describe('Security E2E Tests', () => {
   beforeAll(() => browser.get(''));
diff --git a/public/docs/_examples/server-communication/e2e-spec.ts b/public/docs/_examples/server-communication/e2e-spec.ts
@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 
 describe('Server Communication', function () {
 
diff --git a/public/docs/_examples/structural-directives/e2e-spec.ts b/public/docs/_examples/structural-directives/e2e-spec.ts
@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 
 describe('Structural Directives', function () {
 
diff --git a/public/docs/_examples/style-guide/e2e-spec.ts b/public/docs/_examples/style-guide/e2e-spec.ts
@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node 
 
-import { browser, element, by } from 'protractor/globals';
+import { browser, element, by } from 'protractor';
 
 describe('Style Guide', function () {
   it('01-01', function () {
diff --git a/public/docs/_examples/styleguide/e2e-spec.ts b/public/docs/_examples/styleguide/e2e-spec.ts
diff --git a/public/docs/_examples/template-syntax/e2e-spec.ts b/public/docs/_examples/template-syntax/e2e-spec.ts
diff --git a/public/docs/_examples/toh-1/e2e-spec.ts b/public/docs/_examples/toh-1/e2e-spec.ts
diff --git a/public/docs/_examples/toh-2/e2e-spec.ts b/public/docs/_examples/toh-2/e2e-spec.ts
diff --git a/public/docs/_examples/toh-3/e2e-spec.ts b/public/docs/_examples/toh-3/e2e-spec.ts
diff --git a/public/docs/_examples/toh-4/e2e-spec.ts b/public/docs/_examples/toh-4/e2e-spec.ts
diff --git a/public/docs/_examples/toh-5/e2e-spec.ts b/public/docs/_examples/toh-5/e2e-spec.ts
diff --git a/public/docs/_examples/toh-6/e2e-spec.ts b/public/docs/_examples/toh-6/e2e-spec.ts
diff --git a/public/docs/_examples/tsconfig.json b/public/docs/_examples/tsconfig.json
diff --git a/public/docs/_examples/upgrade-adapter/e2e-spec.ts.disabled b/public/docs/_examples/upgrade-adapter/e2e-spec.ts.disabled
diff --git a/public/docs/_examples/upgrade-phonecat-1-typescript/e2e-spec.ts b/public/docs/_examples/upgrade-phonecat-1-typescript/e2e-spec.ts
diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/e2e-spec.ts.disabled b/public/docs/_examples/upgrade-phonecat-2-hybrid/e2e-spec.ts.disabled
diff --git a/public/docs/_examples/upgrade-phonecat-3-final/e2e-spec.ts.disabled b/public/docs/_examples/upgrade-phonecat-3-final/e2e-spec.ts.disabled
diff --git a/public/docs/_examples/user-input/e2e-spec.ts b/public/docs/_examples/user-input/e2e-spec.ts
diff --git a/public/docs/_examples/webpack/e2e-spec.ts b/public/docs/_examples/webpack/e2e-spec.ts

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`"experimentalDecorators": true,`
`9`	`9`	`"removeComments": false,`
`10`	`10`	`"noImplicitAny": true,`
`11`		`- "suppressImplicitAnyIndexErrors": true`
	`11`	`+ "suppressImplicitAnyIndexErrors": true,`
	`12`	`+ "types": []`
`12`	`13`	`}`
`13`	`14`	`}`