Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

Commit 7bc7b0d

Browse files
filipesilvafilipesilva
committed
wip update to 4.0.9
1 parent 7ad0a11 commit 7bc7b0d

File tree

48 files changed

+121
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+121
-125
lines changed

‎public/docs/_examples/_boilerplate/tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"experimentalDecorators": true,
99
"removeComments": false,
1010
"noImplicitAny": true,
11-
"suppressImplicitAnyIndexErrors": true
11+
"suppressImplicitAnyIndexErrors": true,
12+
"types": []
1213
}
1314
}

‎public/docs/_examples/animations/e2e-spec.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
4-
import { ElementFinder } from 'protractor';
3+
import { browser, element, by, ElementFinder } from 'protractor';
54

65
/**
76
* The tests here basically just checking that the end styles
@@ -335,14 +334,14 @@ describe('Animation Tests', () => {
335334
}
336335

337336
function getBoundingClientWidth(el: ElementFinder): Promise<number> {
338-
return browser.driver.executeScript(
337+
return browser.executeScript(
339338
'return arguments[0].getBoundingClientRect().width',
340339
el.getWebElement()
341340
);
342341
}
343342

344343
function getOffsetWidth(el: ElementFinder): Promise<number> {
345-
return browser.driver.executeScript(
344+
return browser.executeScript(
346345
'return arguments[0].offsetWidth',
347346
el.getWebElement()
348347
);

‎public/docs/_examples/architecture/e2e-spec.ts

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { protractor, browser, element, by } from 'protractor/globals';
4-
import { ElementFinder } from 'protractor';
3+
import { protractor, browser, element, by, ElementFinder } from 'protractor';
54

65
const nameSuffix = 'X';
76

@@ -45,7 +44,8 @@ function heroTests() {
4544
});
4645

4746
it('shows selected hero details', async () => {
48-
await element(by.cssContainingText('li', targetHero.name)).click();
47+
// await element(by.cssContainingText('li', targetHero.name)).click();
48+
await <Promise<void>>(<any>(element(by.cssContainingText('li', targetHero.name)).click()));
4949
let page = getPageElts();
5050
let hero = await heroFromDetail(page.heroDetail);
5151
expect(hero.id).toEqual(targetHero.id);
@@ -91,9 +91,11 @@ function getPageElts() {
9191

9292
async function heroFromDetail(detail: ElementFinder): Promise<Hero> {
9393
// Get hero id from the first <div>
94-
let _id = await detail.all(by.css('div')).first().getText();
94+
// let _id = await detail.all(by.css('div')).first().getText();
95+
let _id = await <Promise<string>>(<any>(detail.all(by.css('div')).first().getText()));
9596
// Get name from the h2
96-
let _name = await detail.element(by.css('h4')).getText();
97+
// let _name = await detail.element(by.css('h4')).getText();
98+
let _name = await <Promise<string>>(<any>( detail.element(by.css('h4')).getText()));
9799
return {
98100
id: +_id.substr(_id.indexOf(' ') + 1),
99101
name: _name.substr(0, _name.lastIndexOf(' '))

‎public/docs/_examples/attribute-directives/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
3+
import { browser, element, by } from 'protractor';
44

55
describe('Attribute directives', function () {
66

‎public/docs/_examples/cb-a1-a2-quick-reference/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
3+
import { browser, element, by } from 'protractor';
44

55
describe('Angular 1 to 2 Quick Reference Tests', function () {
66

‎public/docs/_examples/cb-component-communication/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
3+
import { browser, element, by } from 'protractor';
44

55
describe('Component Communication Cookbook Tests', function () {
66

‎public/docs/_examples/cb-component-relative-paths/e2e-spec.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
4-
import { ElementFinder } from 'protractor';
3+
import { browser, element, by, ElementFinder } from 'protractor';
54

65
describe('Cookbook: component-relative paths', function () {
76

‎public/docs/_examples/cb-dependency-injection/e2e-spec.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
4-
import { webdriver } from '../protractor-helpers';
3+
import { browser, element, by } from 'protractor';
54

65
describe('Dependency Injection Cookbook', function () {
76

@@ -74,7 +73,7 @@ describe('Dependency Injection Cookbook', function () {
7473
let yellow = 'rgba(255, 255, 0, 1)';
7574

7675
expect(target.getCssValue('background-color')).not.toEqual(yellow);
77-
browser.actions().mouseMove(target as any as webdriver.WebElement).perform();
76+
browser.actions().mouseMove(target.getWebElement()).perform();
7877
expect(target.getCssValue('background-color')).toEqual(yellow);
7978
});
8079

‎public/docs/_examples/cb-dynamic-form-deprecated/e2e-spec.ts.disabled

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
3+
import { browser, element, by } from 'protractor';
44

55
/* tslint:disable:quotemark */
66
describe('Dynamic Form Deprecated', function () {

‎public/docs/_examples/cb-dynamic-form/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
3+
import { browser, element, by } from 'protractor';
44

55
/* tslint:disable:quotemark */
66
describe('Dynamic Form', function () {

‎public/docs/_examples/cb-form-validation/e2e-spec.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict'; // necessary for node!
22

3-
import { browser, element, by, protractor } from 'protractor/globals';
4-
import { ElementFinder, ElementArrayFinder } from 'protractor';
3+
import { browser, element, by, protractor, ElementFinder, ElementArrayFinder } from 'protractor';
54
import { appLang, describeIf } from '../protractor-helpers';
65

76
// THESE TESTS ARE INCOMPLETE

‎public/docs/_examples/cb-set-document-title/e2e-spec.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
4-
import { ElementFinder } from 'protractor';
3+
import { browser, element, by, ElementFinder } from 'protractor';
54

65
// gulp run-e2e-tests --filter=cb-set-document-title
76
describe('Set Document Title', function () {

‎public/docs/_examples/cb-ts-to-js/e2e-spec.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
4-
import { webdriver } from '../protractor-helpers';
3+
import { browser, element, by } from 'protractor';
54

65
describe('TypeScript to Javascript tests', function () {
76

@@ -57,7 +56,7 @@ describe('TypeScript to Javascript tests', function () {
5756
expect(h1.getAttribute('class')).toBe('active');
5857

5958
h1.click();
60-
browser.actions().doubleClick(h1 as any as webdriver.WebElement).perform();
59+
browser.actions().doubleClick(h1.getWebElement()).perform();
6160
expect(h1.getAttribute('class')).toBe('active');
6261
});
6362

‎public/docs/_examples/cli-quickstart/e2e-spec.ts.disabled

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
3+
import { browser, element, by } from 'protractor';
44

55
describe('cli-quickstart App', () => {
66
beforeEach(() => {

‎public/docs/_examples/component-styles/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
3+
import { browser, element, by } from 'protractor';
44

55
describe('Component Style Tests', function () {
66

‎public/docs/_examples/dependency-injection/e2e-spec.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
4-
import { ElementFinder } from 'protractor';
3+
import { browser, element, by, ElementFinder } from 'protractor';
54

65
describe('Dependency Injection Tests', function () {
76

‎public/docs/_examples/displaying-data/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
3+
import { browser, element, by } from 'protractor';
44

55
describe('Displaying Data Tests', function () {
66
let _title = 'Tour of Heroes';

‎public/docs/_examples/forms/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { browser, element, by } from 'protractor/globals';
1+
import { browser, element, by } from 'protractor';
22
import { appLang, describeIf } from '../protractor-helpers';
33

44
describeIf(appLang.appIsTs || appLang.appIsJs, 'Forms Tests', function () {

‎public/docs/_examples/hierarchical-dependency-injection/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { browser, element, by } from 'protractor/globals';
1+
import { browser, element, by } from 'protractor';
22

33
describe('Hierarchical dependency injection', function () {
44

‎public/docs/_examples/homepage-hello-world/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
3+
import { browser, element, by } from 'protractor';
44

55
describe('Homepage Hello World', function () {
66

‎public/docs/_examples/homepage-tabs/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
3+
import { browser, element, by } from 'protractor';
44

55
describe('Homepage Tabs', function () {
66

‎public/docs/_examples/homepage-todo/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
3+
import { browser, element, by } from 'protractor';
44

55
describe('Homepage Todo', function () {
66

‎public/docs/_examples/lifecycle-hooks/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
3+
import { browser, element, by } from 'protractor';
44

55
describe('Lifecycle hooks', function () {
66

‎public/docs/_examples/ngmodule/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
3+
import { browser, element, by } from 'protractor';
44

55
describe('NgModule', function () {
66

‎public/docs/_examples/package.json

+7-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"angular2-in-memory-web-api": "0.0.20",
4141
"bootstrap": "^3.3.6",
4242
"core-js": "^2.4.1",
43-
"protractor": "^4.0.4",
43+
"protractor": "^4.0.9",
4444
"reflect-metadata": "^0.1.3",
4545
"rollup": "^0.34.13",
4646
"rollup-plugin-node-resolve": "^2.0.0",
@@ -50,7 +50,9 @@
5050
"zone.js": "^0.6.23"
5151
},
5252
"devDependencies": {
53-
"angular-cli": "^1.0.0-beta.5",
53+
"@types/angular": "^1.5.15",
54+
"@types/jasmine": "^2.2.34",
55+
"@types/selenium-webdriver": "^2.53.30",
5456
"angular2-template-loader": "^0.4.0",
5557
"awesome-typescript-loader": "^2.2.4",
5658
"canonical-path": "0.0.2",
@@ -61,6 +63,7 @@
6163
"html-loader": "^0.4.3",
6264
"html-webpack-plugin": "^2.16.1",
6365
"http-server": "^0.9.0",
66+
"jasmine": "^2.5.2",
6467
"jasmine-core": "^2.4.1",
6568
"karma": "^1.2.0",
6669
"karma-chrome-launcher": "^2.0.0",
@@ -75,15 +78,15 @@
7578
"lodash": "^4.13.1",
7679
"null-loader": "^0.1.1",
7780
"phantomjs-prebuilt": "^2.1.7",
78-
"protractor": "^3.3.0",
81+
"protractor": "^4.0.9",
7982
"raw-loader": "^0.5.1",
8083
"rimraf": "^2.5.2",
8184
"rollup-plugin-commonjs": "^4.1.0",
8285
"style-loader": "^0.13.1",
8386
"ts-loader": "^0.8.2",
8487
"ts-node": "^1.3.0",
8588
"tslint": "^3.15.1",
86-
"typescript": "^2.0.2",
89+
"typescript": "^2.0.3",
8790
"typings": "^1.3.2",
8891
"webpack": "^1.13.0",
8992
"webpack-dev-server": "^1.14.1",

‎public/docs/_examples/pipes/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
3+
import { browser, element, by } from 'protractor';
44

55
describe('Pipes', function () {
66

‎public/docs/_examples/protractor-helpers.ts

+8-18
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
import { browser } from 'protractor/globals';
2-
3-
// Hack - remove when protractor4 exports webdriver typings
4-
export namespace webdriver {
5-
export class WebElement {};
6-
};
7-
8-
// Hack - remove when protractor4 exports webdriver typings
9-
// export type WPromise<T> = webdriver.promise.Promise<T>;
10-
export type WPromise<T> = any;
11-
121
export var appLang = {
132
appIsTs: false,
143
appIsJs: false,
@@ -32,15 +21,16 @@ export function itIf(cond: boolean, name: string, func: (done: DoneFn) => void):
3221
}
3322
}
3423

24+
// TODO Jesus - figure out what's needed here for the new upgrade chapters
3525
// Allow changing bootstrap mode to NG1 for upgrade tests
3626
export function setProtractorToNg1Mode(): void {
37-
browser.rootEl = 'body';
27+
// browser.rootEl = 'body';
3828

39-
let disableNgAnimate = function() {
40-
angular.module('disableNgAnimate', []).run(['$animate', function($animate: any) {
41-
$animate.enabled(false);
42-
}]);
43-
};
29+
// let disableNgAnimate = function() {
30+
// angular.module('disableNgAnimate', []).run(['$animate', function($animate: any) {
31+
// $animate.enabled(false);
32+
// }]);
33+
// };
4434

45-
browser.addMockModule('disableNgAnimate', disableNgAnimate);
35+
// browser.addMockModule('disableNgAnimate', disableNgAnimate);
4636
}

‎public/docs/_examples/quickstart/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
3+
import { browser, element, by } from 'protractor';
44

55
describe('QuickStart E2E Tests', function () {
66

‎public/docs/_examples/router/e2e-spec.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
4-
import { ElementFinder } from 'protractor';
3+
import { browser, element, by, ElementFinder } from 'protractor';
54

65
describe('Router', function () {
76

‎public/docs/_examples/security/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, By } from 'protractor/globals';
3+
import { browser, element, By } from 'protractor';
44

55
describe('Security E2E Tests', () => {
66
beforeAll(() => browser.get(''));

‎public/docs/_examples/server-communication/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
3+
import { browser, element, by } from 'protractor';
44

55
describe('Server Communication', function () {
66

‎public/docs/_examples/structural-directives/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
3+
import { browser, element, by } from 'protractor';
44

55
describe('Structural Directives', function () {
66

‎public/docs/_examples/style-guide/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'; // necessary for es6 output in node
22

3-
import { browser, element, by } from 'protractor/globals';
3+
import { browser, element, by } from 'protractor';
44

55
describe('Style Guide', function () {
66
it('01-01', function () {

0 commit comments

Comments
 (0)