tests(control-flow): add a test onPrepare to make sure control flow doesn't lock

Closes #1385

Author: juliemr

Diff for: scripts/test.js

@@ -26,6 +26,7 @@ var passingTests = [
   'node lib/cli.js spec/directConnectConf.js',
   'node lib/cli.js spec/restartBrowserBetweenTestsConf.js',
   'node lib/cli.js spec/getCapabilitiesConf.js',
+  'node lib/cli.js spec/controlLockConf.js',
   'node node_modules/.bin/jasmine JASMINE_CONFIG_PATH=scripts/unit_test.json'
 ];
 

Diff for: spec/control/spec.js

@@ -0,0 +1,8 @@
+describe('protractor control flow', function() {
+  it('should not deadlock', function() {
+    browser.driver.wait(function() {
+      return true;
+    }, 1000);
+    expect(true).toEqual(true);
+  });
+});

Diff for: spec/controlLockConf.js

@@ -0,0 +1,30 @@
+var env = require('./environment.js');
+var webdriver = require('selenium-webdriver');
+
+// Tests for cases that have caused WebDriver promise locks in
+// the past.
+exports.config = {
+  seleniumAddress: env.seleniumAddress,
+
+  framework: 'jasmine2',
+
+  specs: [
+    'control/spec.js',
+  ],
+
+  capabilities: env.capabilities,
+
+  baseUrl: env.baseUrl,
+
+  onPrepare: function() {
+
+    // This is a reasonable use case - do some promise that takes some time,
+    // and then do a wait until something is set up correctly.
+    return webdriver.promise.delayed(100).then(function() {
+      // This could also be replaced by an 'execute' to see the same behavior.
+      return browser.driver.wait(function() {
+        return true;
+      }, 10000, 'onPrepare wait');
+    });
+  }
+};