Fixed protractor webdriver imports @see angular/protractor#3878 (samvloeberghs#45)

DennisJaamann · samvloeberghs · commit 39fb5c174f94 · 2017-01-04T23:55:40.000+01:00
diff --git a/package.json b/package.json
@@ -166,7 +166,7 @@
     "phantomjs-polyfill": "0.0.2",
     "phantomjs-prebuilt": "^2.1.6",
     "postcss-loader": "^0.8.2",
-    "protractor": "^4.0.9",
+    "protractor": "^4.0.14",
     "protractor-cucumber-framework": "^0.6.0",
     "raw-loader": "0.5.1",
     "remap-istanbul": "^0.5.1",
diff --git a/test/e2e/authentication/authentication.page.ts b/test/e2e/authentication/authentication.page.ts
@@ -1,5 +1,5 @@
 import { browser } from 'protractor';
-import Promise = webdriver.promise.Promise;
+import { promise as wdpromise } from 'selenium-webdriver';
 
 export class AuthenticationPageObject {
 
@@ -16,27 +16,27 @@ export class AuthenticationPageObject {
 
   }
 
-  openApp(): Promise<void> {
+  openApp(): wdpromise.Promise<void> {
     return browser.get('');
   }
 
-  goToLoginPage(): Promise<void> {
+  goToLoginPage(): wdpromise.Promise<void> {
     return browser.get(`${this.pages['login']}`);
   }
 
-  goToRegisterPage(): Promise<void> {
+  goToRegisterPage(): wdpromise.Promise<void> {
     return browser.get(`${this.pages['register']}`);
   }
 
-  goToForgotPasswordPage(): Promise<void> {
+  goToForgotPasswordPage(): wdpromise.Promise<void> {
     return browser.get(`${this.pages['forgotPassword']}`);
   }
 
-  goToSetNewPasswordPage(id?: string, nonce?: string): Promise<void> {
+  goToSetNewPasswordPage(id?: string, nonce?: string): wdpromise.Promise<void> {
     return browser.get(`${this.pages['setNewPassword']}?id=${id}&nonce=${nonce}`);
   }
 
-  getCurrentUrl(): Promise<string> {
+  getCurrentUrl(): wdpromise.Promise<string> {
     return browser.getCurrentUrl();
   }
 }
diff --git a/test/e2e/authentication/forgot-password/forgotPassword.page.ts b/test/e2e/authentication/forgot-password/forgotPassword.page.ts
@@ -1,5 +1,5 @@
 import { element, by, protractor, ElementArrayFinder } from 'protractor';
-import Promise = webdriver.promise.Promise;
+import { promise as wdpromise } from 'selenium-webdriver';
 
 export class ForgotPasswordPageObject {
 
@@ -23,19 +23,19 @@ export class ForgotPasswordPageObject {
 
   }
 
-  setEmail(value: string): Promise<void> {
+  setEmail(value: string): wdpromise.Promise<void> {
     return this.emailInput.clear().sendKeys(value);
   }
 
-  getTitle(): Promise<string> {
+  getTitle(): wdpromise.Promise<string> {
     return this.title.getText();
   }
 
-  submitForm(): Promise<void> {
+  submitForm(): wdpromise.Promise<void> {
     return this.submitButton.sendKeys(protractor.Key.ENTER);
   }
 
-  formIsValid(): Promise<boolean> {
+  formIsValid(): wdpromise.Promise<boolean> {
     return this.getAllErrorMessages().count().then(value => {
       return value === 0;
     });
diff --git a/test/e2e/authentication/login/login.page.ts b/test/e2e/authentication/login/login.page.ts
@@ -1,5 +1,5 @@
 import { element, by, protractor, ElementArrayFinder } from 'protractor';
-import Promise = webdriver.promise.Promise;
+import { promise as wdpromise } from 'selenium-webdriver';
 
 export class LoginPageObject {
 
@@ -25,31 +25,31 @@ export class LoginPageObject {
 
     }
 
-    navigateToForgotPasswordPage(): Promise<void> {
+    navigateToForgotPasswordPage(): wdpromise.Promise<void> {
         return this.goToForgotPasswordLink.click();
     }
 
-    navigateToRegisterPage(): Promise<void> {
+    navigateToRegisterPage(): wdpromise.Promise<void> {
         return this.goToRegisterLink.click();
     }
 
-    setEmail(value: string): Promise<void> {
+    setEmail(value: string): wdpromise.Promise<void> {
         return this.emailInput.clear().sendKeys(value);
     }
 
-    setPassword(value: string): Promise<void> {
+    setPassword(value: string): wdpromise.Promise<void> {
         return this.passwordInput.clear().sendKeys(value);
     }
 
-    getTitle(): Promise<string> {
+    getTitle(): wdpromise.Promise<string> {
         return this.title.getText();
     }
 
-    submitForm(): Promise<void> {
+    submitForm(): wdpromise.Promise<void> {
         return this.submitButton.sendKeys(protractor.Key.ENTER);
     }
 
-    formIsValid(): Promise<boolean> {
+    formIsValid(): wdpromise.Promise<boolean> {
         return this.getAllErrorMessages().count().then(value => {
             return value === 0;
         });
diff --git a/test/e2e/authentication/register/register.page.ts b/test/e2e/authentication/register/register.page.ts
@@ -1,5 +1,5 @@
 import { element, by, protractor, ElementArrayFinder } from 'protractor';
-import Promise = webdriver.promise.Promise;
+import { promise as wdpromise } from 'selenium-webdriver';
 
 export class RegisterPageObject {
 
@@ -29,31 +29,31 @@ export class RegisterPageObject {
 
   }
 
-  setName(value: string): Promise<void> {
+  setName(value: string): wdpromise.Promise<void> {
     return this.nameInput.clear().sendKeys(value);
   }
 
-  setEmail(value: string): Promise<void> {
+  setEmail(value: string): wdpromise.Promise<void> {
     return this.emailInput.clear().sendKeys(value);
   }
 
-  setPassword(value: string): Promise<void> {
+  setPassword(value: string): wdpromise.Promise<void> {
     return this.passwordInput.clear().sendKeys(value);
   }
 
-  setRepeatPassword(value: string): Promise<void> {
+  setRepeatPassword(value: string): wdpromise.Promise<void> {
     return this.repeatPasswordInput.clear().sendKeys(value);
   }
 
-  getTitle(): Promise<string> {
+  getTitle(): wdpromise.Promise<string> {
     return this.title.getText();
   }
 
-  submitForm(): Promise<void> {
+  submitForm(): wdpromise.Promise<void> {
     return this.submitButton.sendKeys(protractor.Key.ENTER);
   }
 
-  formIsValid(): Promise<boolean> {
+  formIsValid(): wdpromise.Promise<boolean> {
     return this.getAllErrorMessages().count().then(value => {
       return value === 0;
     });
diff --git a/test/e2e/authentication/set-new-password/setNewPassword.page.ts b/test/e2e/authentication/set-new-password/setNewPassword.page.ts
@@ -1,5 +1,5 @@
 import { browser, element, by, protractor, ElementArrayFinder } from 'protractor';
-import Promise = webdriver.promise.Promise;
+import { promise as wdpromise } from 'selenium-webdriver';
 
 export class SetNewPasswordPageObject {
 
@@ -25,35 +25,35 @@ export class SetNewPasswordPageObject {
 
   }
 
-  setPassword(value: string): Promise<void> {
+  setPassword(value: string): wdpromise.Promise<void> {
     return this.passwordInput.clear().sendKeys(value);
   }
 
-  setRepeatPassword(value: string): Promise<void> {
+  setRepeatPassword(value: string): wdpromise.Promise<void> {
     return this.repeatPasswordInput.clear().sendKeys(value);
   }
 
-  getTitle(): Promise<string> {
+  getTitle(): wdpromise.Promise<string> {
     return this.title.getText();
   }
 
-  submitForm(): Promise<void> {
+  submitForm(): wdpromise.Promise<void> {
     return this.submitButton.sendKeys(protractor.Key.ENTER);
   }
 
-  hasAlertMessages(): Promise<boolean> {
+  hasAlertMessages(): wdpromise.Promise<boolean> {
     return this.getAllAlerts().count().then(value => {
       return value > 0;
     });
   }
 
-  hasFormElements(): Promise<boolean> {
+  hasFormElements(): wdpromise.Promise<boolean> {
     return this.getAllFormElements().count().then(value => {
       return value > 0;
     });
   }
 
-  formIsValid(): Promise<boolean> {
+  formIsValid(): wdpromise.Promise<boolean> {
     return this.getAllErrorMessages().count().then(value => {
       return value === 0;
     });
diff --git a/test/e2e/speakerregistration/stepone.page.ts b/test/e2e/speakerregistration/stepone.page.ts
@@ -1,5 +1,5 @@
 import { browser, element, by, protractor, ElementArrayFinder } from 'protractor';
-import Promise = webdriver.promise.Promise;
+import { promise as wdpromise } from 'selenium-webdriver';
 
 export class StepOnePageObject {
 
diff --git a/test/e2e/speakerregistration/stepthree.page.ts b/test/e2e/speakerregistration/stepthree.page.ts
@@ -1,11 +1,11 @@
 import { browser, element, by, protractor, ElementArrayFinder } from 'protractor';
-import Promise = webdriver.promise.Promise;
+import { promise as wdpromise } from 'selenium-webdriver';
 
 export class StepThreePageObject {
 
 
     constructor() {
 
     }
-    
+
 }
diff --git a/test/e2e/speakerregistration/steptwo.page.ts b/test/e2e/speakerregistration/steptwo.page.ts
@@ -1,11 +1,11 @@
 import { browser, element, by, protractor, ElementArrayFinder } from 'protractor';
-import Promise = webdriver.promise.Promise;
+import { promise as wdpromise } from 'selenium-webdriver';
 
 export class StepTwoPageObject {
 
 
     constructor() {
 
     }
-    
+
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -14,6 +14,7 @@
       "es6"
     ],
     "types": [
+      "selenium-webdriver",
       "hammerjs",
       "jasmine",
       "node",

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import { browser } from 'protractor';`
`2`		`-import Promise = webdriver.promise.Promise;`
	`2`	`+import { promise as wdpromise } from 'selenium-webdriver';`
`3`	`3`
`4`	`4`	`export class AuthenticationPageObject {`
`5`	`5`
`@@ -16,27 +16,27 @@ export class AuthenticationPageObject {`
`16`	`16`
`17`	`17`	`}`
`18`	`18`
`19`		`- openApp(): Promise<void> {`
	`19`	`+ openApp(): wdpromise.Promise<void> {`
`20`	`20`	`return browser.get('');`
`21`	`21`	`}`
`22`	`22`
`23`		`- goToLoginPage(): Promise<void> {`
	`23`	`+ goToLoginPage(): wdpromise.Promise<void> {`
`24`	`24`	return browser.get(`${this.pages['login']}`);
`25`	`25`	`}`
`26`	`26`
`27`		`- goToRegisterPage(): Promise<void> {`
	`27`	`+ goToRegisterPage(): wdpromise.Promise<void> {`
`28`	`28`	return browser.get(`${this.pages['register']}`);
`29`	`29`	`}`
`30`	`30`
`31`		`- goToForgotPasswordPage(): Promise<void> {`
	`31`	`+ goToForgotPasswordPage(): wdpromise.Promise<void> {`
`32`	`32`	return browser.get(`${this.pages['forgotPassword']}`);
`33`	`33`	`}`
`34`	`34`
`35`		`- goToSetNewPasswordPage(id?: string, nonce?: string): Promise<void> {`
	`35`	`+ goToSetNewPasswordPage(id?: string, nonce?: string): wdpromise.Promise<void> {`
`36`	`36`	return browser.get(`${this.pages['setNewPassword']}?id=${id}&nonce=${nonce}`);
`37`	`37`	`}`
`38`	`38`
`39`		`- getCurrentUrl(): Promise<string> {`
	`39`	`+ getCurrentUrl(): wdpromise.Promise<string> {`
`40`	`40`	`return browser.getCurrentUrl();`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import { element, by, protractor, ElementArrayFinder } from 'protractor';`
`2`		`-import Promise = webdriver.promise.Promise;`
	`2`	`+import { promise as wdpromise } from 'selenium-webdriver';`
`3`	`3`
`4`	`4`	`export class ForgotPasswordPageObject {`
`5`	`5`
`@@ -23,19 +23,19 @@ export class ForgotPasswordPageObject {`
`23`	`23`
`24`	`24`	`}`
`25`	`25`
`26`		`- setEmail(value: string): Promise<void> {`
	`26`	`+ setEmail(value: string): wdpromise.Promise<void> {`
`27`	`27`	`return this.emailInput.clear().sendKeys(value);`
`28`	`28`	`}`
`29`	`29`
`30`		`- getTitle(): Promise<string> {`
	`30`	`+ getTitle(): wdpromise.Promise<string> {`
`31`	`31`	`return this.title.getText();`
`32`	`32`	`}`
`33`	`33`
`34`		`- submitForm(): Promise<void> {`
	`34`	`+ submitForm(): wdpromise.Promise<void> {`
`35`	`35`	`return this.submitButton.sendKeys(protractor.Key.ENTER);`
`36`	`36`	`}`
`37`	`37`
`38`		`- formIsValid(): Promise<boolean> {`
	`38`	`+ formIsValid(): wdpromise.Promise<boolean> {`
`39`	`39`	`return this.getAllErrorMessages().count().then(value => {`
`40`	`40`	`return value === 0;`
`41`	`41`	`});`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import { browser, element, by, protractor, ElementArrayFinder } from 'protractor';`
`2`		`-import Promise = webdriver.promise.Promise;`
	`2`	`+import { promise as wdpromise } from 'selenium-webdriver';`
`3`	`3`
`4`	`4`	`export class SetNewPasswordPageObject {`
`5`	`5`
`@@ -25,35 +25,35 @@ export class SetNewPasswordPageObject {`
`25`	`25`
`26`	`26`	`}`
`27`	`27`
`28`		`- setPassword(value: string): Promise<void> {`
	`28`	`+ setPassword(value: string): wdpromise.Promise<void> {`
`29`	`29`	`return this.passwordInput.clear().sendKeys(value);`
`30`	`30`	`}`
`31`	`31`
`32`		`- setRepeatPassword(value: string): Promise<void> {`
	`32`	`+ setRepeatPassword(value: string): wdpromise.Promise<void> {`
`33`	`33`	`return this.repeatPasswordInput.clear().sendKeys(value);`
`34`	`34`	`}`
`35`	`35`
`36`		`- getTitle(): Promise<string> {`
	`36`	`+ getTitle(): wdpromise.Promise<string> {`
`37`	`37`	`return this.title.getText();`
`38`	`38`	`}`
`39`	`39`
`40`		`- submitForm(): Promise<void> {`
	`40`	`+ submitForm(): wdpromise.Promise<void> {`
`41`	`41`	`return this.submitButton.sendKeys(protractor.Key.ENTER);`
`42`	`42`	`}`
`43`	`43`
`44`		`- hasAlertMessages(): Promise<boolean> {`
	`44`	`+ hasAlertMessages(): wdpromise.Promise<boolean> {`
`45`	`45`	`return this.getAllAlerts().count().then(value => {`
`46`	`46`	`return value > 0;`
`47`	`47`	`});`
`48`	`48`	`}`
`49`	`49`
`50`		`- hasFormElements(): Promise<boolean> {`
	`50`	`+ hasFormElements(): wdpromise.Promise<boolean> {`
`51`	`51`	`return this.getAllFormElements().count().then(value => {`
`52`	`52`	`return value > 0;`
`53`	`53`	`});`
`54`	`54`	`}`
`55`	`55`
`56`		`- formIsValid(): Promise<boolean> {`
	`56`	`+ formIsValid(): wdpromise.Promise<boolean> {`
`57`	`57`	`return this.getAllErrorMessages().count().then(value => {`
`58`	`58`	`return value === 0;`
`59`	`59`	`});`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`import { browser, element, by, protractor, ElementArrayFinder } from 'protractor';`
`2`		`-import Promise = webdriver.promise.Promise;`
	`2`	`+import { promise as wdpromise } from 'selenium-webdriver';`
`3`	`3`
`4`	`4`	`export class StepThreePageObject {`
`5`	`5`
`6`	`6`
`7`	`7`	`constructor() {`
`8`	`8`
`9`	`9`	`}`
`10`		`-`
	`10`	`+`
`11`	`11`	`}`