Merge pull request samvloeberghs#30 from samvloeberghs/updateprotractor

updated protractor

Author: samvloeberghs

package.json

@@ -70,6 +70,7 @@
   },
   "devDependencies": {
     "@types/cucumber": "0.0.31",
+    "@types/es6-promise": "0.0.32",
     "@types/hammerjs": "^2.0.32",
     "@types/jasmine": "^2.2.33",
     "@types/node": "^6.0.38",
@@ -106,7 +107,7 @@
     "phantomjs-polyfill": "0.0.2",
     "phantomjs-prebuilt": "^2.1.6",
     "postcss-loader": "^0.8.2",
-    "protractor": "^4.0.8",
+    "protractor": "^4.0.9",
     "protractor-cucumber-framework": "^0.6.0",
     "raw-loader": "0.5.1",
     "remap-istanbul": "^0.5.1",

test/e2e/authentication/authentication.page.ts

@@ -1,4 +1,4 @@
-import { browser } from 'protractor/globals';
+import { browser } from 'protractor';
 import Promise = webdriver.promise.Promise;
 
 export class AuthenticationPageObject {

test/e2e/authentication/forgot-password/forgotPassword.page.ts

@@ -1,5 +1,4 @@
-import { element, by, protractor } from 'protractor/globals';
-import { ElementArrayFinder } from 'protractor';
+import { element, by, protractor, ElementArrayFinder } from 'protractor';
 import Promise = webdriver.promise.Promise;
 
 export class ForgotPasswordPageObject {

test/e2e/authentication/login/login.page.ts

@@ -1,5 +1,4 @@
-import { element, by, protractor } from 'protractor/globals';
-import { ElementArrayFinder } from 'protractor';
+import { element, by, protractor, ElementArrayFinder } from 'protractor';
 import Promise = webdriver.promise.Promise;
 
 export class LoginPageObject {

test/e2e/authentication/register/register.page.ts

@@ -1,5 +1,4 @@
-import { element, by, protractor } from 'protractor/globals';
-import { ElementArrayFinder } from 'protractor';
+import { element, by, protractor, ElementArrayFinder } from 'protractor';
 import Promise = webdriver.promise.Promise;
 
 export class RegisterPageObject {

test/e2e/authentication/set-new-password/setNewPassword.page.ts

@@ -1,5 +1,4 @@
-import { browser, element, by, protractor } from 'protractor/globals';
-import { ElementArrayFinder } from 'protractor';
+import { browser, element, by, protractor, ElementArrayFinder } from 'protractor';
 import Promise = webdriver.promise.Promise;
 
 export class SetNewPasswordPageObject {

tsconfig.json

@@ -20,7 +20,8 @@
       "cucumber",
       "source-map",
       "uglify-js",
-      "webpack"
+      "webpack",
+      "es6-promise"
     ]
   },
   "exclude": [