Merge branch 'selenium4' into suites

.travis.yml

@@ -13,6 +13,7 @@ env:
     - LOGS_DIR=/tmp/protractor-build/logs
     - BROWSER_PROVIDER_READY_FILE=/tmp/sauce-connect-ready
     - CXX=g++-4.8
+# TODO(selenium4): revert comments
   matrix:
     - JOB=full
     - JOB=smoke
@@ -44,6 +45,7 @@ before_script:
   - mkdir -p $LOGS_DIR
   - ./scripts/travis_setup.sh
 
+
 script:
   - ./scripts/testserver.sh
   - ./scripts/test_on_travis.sh

spec/basic/handling_spec.js

@@ -1,11 +1,10 @@
-
-describe('handling timeout errors', function() {
-
-  it('should call error handler on a timeout', function() {
-    browser.get('http://dummyUrl', 1).then(function() {
+describe('handling timeout errors', () => {
+  it('should call error handler on a timeout', async () => {
+    try {
+      await browser.get('http://dummyUrl', 1);
       throw 'did not handle error';
-    }, function(err) {
+    } catch (err) {
       expect(err instanceof Error).toBeTruthy();
-    });
+    }
   });
 });

spec/basic/navigation_spec.js

@@ -1,58 +1,50 @@
-describe('navigation', function() {
-  beforeEach(function() {
-    browser.get('index.html#/form');
+const env = require('./../environment.js');
+
+describe('navigation', () => {
+  beforeEach(async () => {
+    await browser.get('index.html#/form');
   });
 
-  it('should deal with alerts', function() {
-    var alertButton = $('#alertbutton');
-    alertButton.click();
-    var alertDialog = browser.switchTo().alert();
+  it('should deal with alerts', async () => {
+    const alertButton = $('#alertbutton');
+    await alertButton.click();
+    const alertDialog = await browser.switchTo().alert();
 
-    expect(alertDialog.getText()).toEqual('Hello');
+    expect(await alertDialog.getText()).toEqual('Hello');
 
-    alertDialog.accept();
+    await alertDialog.accept();
   });
 
-  it('should refresh properly', function() {
-    var username = element(by.model('username'));
-    var name = element(by.binding('username'));
-    username.clear();
-    expect(name.getText()).toEqual('');
-
-    browser.navigate().refresh();
+  it('should refresh properly', async () => {
+    const username = element(by.model('username'));
+    const name = element(by.binding('username'));
+    await username.clear();
+    expect(await name.getText()).toEqual('');
 
-    expect(name.getText()).toEqual('Anon');
-  });
+    await browser.navigate().refresh();
 
-  // Back and forward do NOT work at the moment because of an issue
-  // bootstrapping with Angular
-  /*
-  it('should navigate back and forward properly', function() {
-    browser.get('index.html#/repeater');
-    expect(browser.getCurrentUrl()).
-      toEqual(env.baseUrl+'/ng1/index.html#/repeater');
-
-    browser.navigate().back();
-    expect(browser.getCurrentUrl()).
-      toEqual(env.baseUrl+'/ng1/index.html#/form');
-
-    browser.navigate().forward();
-    expect(browser.getCurrentUrl()).
-      toEqual(env.baseUrl+'/ng1/index.html#/repeater');
+    expect(await name.getText()).toEqual('Anon');
   });
-  */
+
+  it('should navigate back and forward properly', async () => {
+    await browser.get('index.html#/repeater');
+    expect(await browser.getCurrentUrl()).toEqual(`${env.baseUrl}/ng1/index.html#/repeater`);
 
-  it('should navigate back and forward properly from link', function() {
-    element(by.linkText('repeater')).click();
-    expect(browser.getCurrentUrl()).
-      toEqual(browser.baseUrl + 'index.html#/repeater');
+    await browser.navigate().back();
+    expect(await browser.getCurrentUrl()).toEqual(`${env.baseUrl}/ng1/index.html#/form`);
 
-    browser.navigate().back();
-    expect(browser.getCurrentUrl()).
-      toEqual(browser.baseUrl + 'index.html#/form');
+    await browser.navigate().forward();
+    expect(await browser.getCurrentUrl()).toEqual(`${env.baseUrl}/ng1/index.html#/repeater`);
+  });
 
-    browser.navigate().forward();
-    expect(browser.getCurrentUrl()).
-      toEqual(browser.baseUrl + 'index.html#/repeater');
+  it('should navigate back and forward properly from link', async () => {
+    await element(by.linkText('repeater')).click();
+    expect(await browser.getCurrentUrl()).toEqual(`${browser.baseUrl}index.html#/repeater`);
+
+    await browser.navigate().back();
+    expect(await browser.getCurrentUrl()).toEqual(`${browser.baseUrl}index.html#/form`);
+
+    await browser.navigate().forward();
+    expect(await browser.getCurrentUrl()).toEqual(`${browser.baseUrl}index.html#/repeater`);
   });
 });

spec/basicConf.js

@@ -10,7 +10,9 @@ exports.config = {
   // Spec patterns are relative to this directory.
   specs: [
     'basic/elements_spec.js',
-    'basic/lib_spec.js'
+    'basic/lib_spec.js',
+    'basic/navigation_spec.js',
+    'basic/handling_spec.js'
   ],
 
   // Exclude patterns are relative to this directory.

spec/ciFullConf.js

@@ -12,7 +12,9 @@ exports.config = {
   // TODO(selenium4): revert back to basic/*_spec.js
   specs: [
     'basic/elements_spec.js',
-    'basic/lib_spec.js'
+    'basic/lib_spec.js',
+    'basic/navigation_spec.js',
+    'basic/handling_spec.js'
   ],
 
   // Exclude patterns are relative to this directory.