chore(test): move withLogin test off of the control flow

scripts/test.js

@@ -20,7 +20,7 @@ var passingTests = [
   'node built/cli.js spec/onPreparePromiseConf.js',
   'node built/cli.js spec/onPreparePromiseFileConf.js',
   // 'node built/cli.js spec/mochaConf.js',
-  // 'node built/cli.js spec/withLoginConf.js',
+  'node built/cli.js spec/withLoginConf.js',
   'node built/cli.js spec/suitesConf.js --suite okmany',
   'node built/cli.js spec/suitesConf.js --suite okspec',
   'node built/cli.js spec/suitesConf.js --suite okmany,okspec',

spec/login/login_spec.js

@@ -1,15 +1,14 @@
-var env = require('../environment.js');
+const env = require('../environment.js');
 
-describe('pages with login', function() {
-  it('should log in with a non-Angular page', function() {
-    browser.get(env.baseUrl + '/ng1/index.html');
+describe('pages with login', () => {
+  it('should log in with a non-Angular page', async() => {
+    await browser.get(env.baseUrl + '/ng1/index.html');
 
-    var angularElement = element(by.model('username'));
-    expect(angularElement.getAttribute('value')).toEqual('Anon');
+    const angularElement = element(by.model('username'));
+    expect(await angularElement.getAttribute('value')).toEqual('Anon');
 
     // Make sure the cookie is still set.
-    browser.manage().getCookie('testcookie').then(function(cookie) {
-      expect(cookie.value).toEqual('Jane-1234');
-    });
+    const cookie = await browser.manage().getCookie('testcookie');
+    expect(cookie.value).toEqual('Jane-1234');
   });
 });

spec/withLoginConf.js

@@ -4,6 +4,7 @@ var env = require('./environment.js');
 // handle log-in using the onPrepare field.
 exports.config = {
   seleniumAddress: env.seleniumAddress,
+  SELENIUM_PROMISE_MANAGER: false,
 
   framework: 'jasmine',
 
@@ -15,20 +16,19 @@ exports.config = {
 
   baseUrl: env.baseUrl + '/ng1/',
 
-  onPrepare: function() {
-    browser.driver.get(env.baseUrl + '/ng1/login.html');
+  onPrepare: async() => {
+    await browser.driver.get(env.baseUrl + '/ng1/login.html');
 
-    browser.driver.findElement(by.id('username')).sendKeys('Jane');
-    browser.driver.findElement(by.id('password')).sendKeys('1234');
-    browser.driver.findElement(by.id('clickme')).click();
+    await browser.driver.findElement(by.id('username')).sendKeys('Jane');
+    await browser.driver.findElement(by.id('password')).sendKeys('1234');
+    await browser.driver.findElement(by.id('clickme')).click();
 
     // Login takes some time, so wait until it's done.
     // For the test app's login, we know it's done when it redirects to
     // index.html.
-    return browser.driver.wait(function() {
-      return browser.driver.getCurrentUrl().then(function(url) {
-        return /index/.test(url);
-      });
+    return await browser.driver.wait(async() => {
+      const url = await browser.driver.getCurrentUrl();
+      return /index/.test(url);
     }, 10000);
   }
 };