chore(test): move plugins tests off of the control flow and remove q

scripts/test.js

@@ -22,12 +22,12 @@ var passingTests = [
   // 'node built/cli.js spec/suitesConf.js --suite okspec',
   // 'node built/cli.js spec/suitesConf.js --suite okmany,okspec',
   // 'node built/cli.js spec/plugins/smokeConf.js',
-  // 'node built/cli.js spec/plugins/multiPluginConf.js',
-  // 'node built/cli.js spec/plugins/jasminePostTestConf.js',
-  // 'node built/cli.js spec/plugins/mochaPostTestConf.js',
-  // 'node built/cli.js spec/plugins/browserGetSyncedConf.js',
-  // 'node built/cli.js spec/plugins/browserGetUnsyncedConf.js',
-  // 'node built/cli.js spec/plugins/waitForAngularConf.js',
+  'node built/cli.js spec/plugins/multiPluginConf.js',
+  'node built/cli.js spec/plugins/jasminePostTestConf.js',
+  'node built/cli.js spec/plugins/mochaPostTestConf.js',
+  'node built/cli.js spec/plugins/browserGetSyncedConf.js',
+  'node built/cli.js spec/plugins/browserGetUnsyncedConf.js',
+  'node built/cli.js spec/plugins/waitForAngularConf.js',
   // 'node built/cli.js spec/interactionConf.js',
   // 'node built/cli.js spec/directConnectConf.js',
   // 'node built/cli.js spec/restartBrowserBetweenTestsConf.js',

spec/plugins/browserGetSyncedConf.js

@@ -1,9 +1,9 @@
-var env = require('../environment.js'),
-    q = require('q');
+const env = require('../environment.js');
 
 // Make sure that borwser-related plugin hooks work with browser sync on
 exports.config = {
   seleniumAddress: env.seleniumAddress,
+  SELENIUM_PROMISE_MANAGER: false,
 
   framework: 'jasmine',
 
@@ -19,20 +19,26 @@ exports.config = {
   // Plugin patterns are relative to this directory.
   plugins: [{
     inline: {
-      onPageLoad: function() {
-        return q.delay(5000).then(function() {
-          protractor.ON_PAGE_LOAD = true;
+      onPageLoad: async function() {
+        return await new Promise(resolve => {
+          setTimeout(() => {
+            protractor.ON_PAGE_LOAD = true;
+            resolve();
+          }, 5000);
         });
       },
-      onPageStable: function() {
+      onPageStable: async function() {
         if (protractor.ON_PAGE_LOAD) {
           this.addSuccess();
         } else {
           this.addFailure(
               'onPageLoad did not finish before onPageStable began');
         }
-        return q.delay(5000).then(function() {
-          protractor.ON_PAGE_SYNC = true;
+        return await new Promise(resolve => {
+          setTimeout(() => {
+            protractor.ON_PAGE_SYNC = true;
+            resolve();
+          }, 5000);
         });
       },
       teardown: function() {

spec/plugins/browserGetUnsyncedConf.js

@@ -1,9 +1,9 @@
-var env = require('../environment.js'),
-    q = require('q');
+const env = require('../environment.js');
 
 // Make sure that borwser-related plugin hooks work with browser sync off
 exports.config = {
   seleniumAddress: env.seleniumAddress,
+  SELENIUM_PROMISE_MANAGER: false,
 
   framework: 'jasmine',
 
@@ -22,9 +22,12 @@ exports.config = {
       setup: function() {
         browser.ignoreSynchronization = true;
       },
-      onPageLoad: function() {
-        return q.delay(5000).then(function() {
-          protractor.ON_PAGE_LOAD = true;
+      onPageLoad: async function() {
+        return await new Promise(resolve => {
+          setTimeout(() => {
+            protractor.ON_PAGE_LOAD = true;
+            resolve();
+          }, 5000);
         });
       },
       onPageStable: function() {

spec/plugins/multiPluginConf.js

@@ -3,6 +3,7 @@ var env = require('../environment.js');
 // A small suite to make sure the full functionality of plugins work
 exports.config = {
   mockSelenium: true,
+  SELENIUM_PROMISE_MANAGER: false,
 
   framework: 'jasmine',
 

spec/plugins/postTestConfTemplate.js

@@ -1,8 +1,9 @@
 var env = require('../environment.js');
 
-module.exports = function(framework) {
+module.exports = (framework) => {
   return {
     mockSelenium: true,
+    SELENIUM_PROMISE_MANAGER: false,
 
     framework: framework,
 

spec/plugins/specs/bigger_spec.js

@@ -1,9 +1,9 @@
-describe('check if plugin setup ran', function() {
-  it('should have set protractor.__BASIC_PLUGIN_RAN', function() {
+describe('check if plugin setup ran', () => {
+  it('should have set protractor.__BASIC_PLUGIN_RAN', () => {
     expect(protractor.__BASIC_PLUGIN_RAN_SETUP).toBe(true);
   });
 
-  it('should have set protractor.__INLINE_PLUGIN_RAN', function() {
+  it('should have set protractor.__INLINE_PLUGIN_RAN', () => {
     expect(protractor.__INLINE_PLUGIN_RAN).toBe(true);
   });
 });

spec/plugins/specs/browser_get_wait_spec.js

@@ -1,6 +1,6 @@
-describe('category', function() {
-  it('name', function() {
-    browser.get('index.html');
-    browser.waitForAngular();
+describe('category', () => {
+  it('name', async() => {
+    await browser.get('index.html');
+    await browser.waitForAngular();
   });
 });

spec/plugins/specs/fail_spec.js

@@ -1,9 +1,9 @@
-describe('check if plugin setup ran', function() {
-  it('should have set protractor.__BASIC_PLUGIN_RAN', function() {
+describe('check if plugin setup ran', () => {
+  it('should have set protractor.__BASIC_PLUGIN_RAN', () =>  {
     expect(protractor.__BASIC_PLUGIN_RAN_SETUP).toBe(true);
   });
 
-  it('should run multiple tests which fail', function() {
+  it('should run multiple tests which fail', () =>  {
     expect(true).toBe(false);
   });
 });

spec/plugins/specs/simple_spec.js

@@ -1,4 +1,4 @@
-describe('category', function() {
-  it('name', function() {
+describe('category', () => {
+  it('name', () => {
   });
 });

spec/plugins/waitForAngularConf.js

@@ -1,9 +1,9 @@
-var env = require('../environment.js'),
-    q = require('q');
+var env = require('../environment.js');
 
 // A small suite to make sure that the plugin hooks for waitForAngular work
 exports.config = {
   seleniumAddress: env.seleniumAddress,
+  SELENIUM_PROMISE_MANAGER: false,
 
   framework: 'jasmine',
 
@@ -19,9 +19,12 @@ exports.config = {
   // Plugin patterns are relative to this directory.
   plugins: [{
     inline: {
-      waitForPromise: function(/* oldURL */) {
-        return q.delay(5000).then(function() {
-          protractor.WAIT_FOR_PROMISE = true;
+      waitForPromise: async function() {
+        return await new Promise(resolve => {
+          setTimeout(() => {
+            protractor.WAIT_FOR_PROMISE = true;
+            resolve();
+          }, 5000);
         });
       },
       waitForCondition: function() {