- Added waitUrl helper.

res/test/e2e/control/control-spec.js

@@ -21,6 +21,19 @@ describe('Control Page', function () {
 
   it('should control an usable device', function () {
     deviceListPage.controlAvailableDevice()
+
+    browser.waitUrl(/control/)
+
+    //browser.debugger();
+    //console.log('after')
+
+
+    //browser.driver.wait(function () {
+    //  return browser.driver.getCurrentUrl().then(function (url) {
+    //    return /control/.test(url)
+    //  })
+    //})
+
     browser.getLocationAbsUrl().then(function (newUrl) {
       expect(newUrl).toMatch(protractor.getInstance().baseUrl + 'control')
     })

res/test/e2e/devices/index.js

@@ -18,6 +18,6 @@ module.exports = function DeviceListPage() {
     return this.devicesUsable.first()
   }
   this.controlAvailableDevice = function () {
-    this.availableDevice().click()
+    return this.availableDevice().click()
   }
 }

res/test/e2e/helpers/wait-url.js

@@ -0,0 +1,22 @@
+/**
+ * @name waitUrl
+ *
+ * @description Wait until the URL changes to match a provided regex
+ * @param {RegExp} urlRegex wait until the URL changes to match this regex
+ * @returns {!webdriver.promise.Promise} Promise
+ */
+module.exports = function waitUrl(urlRegex) {
+  var currentUrl
+
+  return browser.getCurrentUrl().then(function storeCurrentUrl(url) {
+      currentUrl = url
+    }
+  ).then(function waitForUrlToChangeTo() {
+      return browser.wait(function waitForUrlToChangeTo() {
+        return browser.getCurrentUrl().then(function compareCurrentUrl(url) {
+          return urlRegex.test(url)
+        })
+      })
+    }
+  )
+}