From 33372cd7ac4ab678480c20ae3d2f5594d64faabd Mon Sep 17 00:00:00 2001
From: Joe Fleming <joe.fleming@gmail.com>
Date: Fri, 30 Oct 2015 16:37:47 -0700
Subject: [PATCH] cleanup, tweak URL wait time

---
 test/fixtures/scenarioManager.js                | 1 -
 test/functional/apps/settings/_initial_state.js | 2 --
 test/functional/apps/settings/testSettings.js   | 3 ++-
 test/support/pages/Common.js                    | 2 --
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/test/fixtures/scenarioManager.js b/test/fixtures/scenarioManager.js
index d033341c2b42..acc350e6ac90 100644
--- a/test/fixtures/scenarioManager.js
+++ b/test/fixtures/scenarioManager.js
@@ -37,7 +37,6 @@ ScenarioManager.prototype.load = function (id) {
         body: require(path.join(scenario.baseDir, bulk.source)),
       });
     });
-
   }));
 };
 
diff --git a/test/functional/apps/settings/_initial_state.js b/test/functional/apps/settings/_initial_state.js
index b1590dc968a1..abd07359c9b9 100644
--- a/test/functional/apps/settings/_initial_state.js
+++ b/test/functional/apps/settings/_initial_state.js
@@ -14,8 +14,6 @@ define(function (require) {
       });
 
       bdd.it('should load with time pattern checked', function () {
-        console.log(Object.keys(this));
-
         return settingsPage.getTimeBasedEventsCheckbox().isSelected()
         .then(function (selected) {
           expect(selected).to.be.ok();
diff --git a/test/functional/apps/settings/testSettings.js b/test/functional/apps/settings/testSettings.js
index 08793b288d6d..3f0a3f87a55e 100644
--- a/test/functional/apps/settings/testSettings.js
+++ b/test/functional/apps/settings/testSettings.js
@@ -32,7 +32,7 @@ define(function (require) {
         return scenarioManager.loadIfEmpty('makelogs');
       })
       .then(function () {
-        return common.sleep(2500);
+        return common.sleep(3000);
       })
       .then(function () {
         return common.tryForTime(25000, function () {
@@ -40,6 +40,7 @@ define(function (require) {
             pathname: ''
           })))
           .then(function () {
+            // give angular enough time to update the URL
             return common.sleep(2000);
           })
           .then(function () {
diff --git a/test/support/pages/Common.js b/test/support/pages/Common.js
index 169cd827e4c1..c785f5cfc2c6 100644
--- a/test/support/pages/Common.js
+++ b/test/support/pages/Common.js
@@ -12,8 +12,6 @@ define(function (require) {
     this.remote = remote;
   }
 
-  var defaultTimeout = 5000;
-
   Common.prototype = {
     constructor: Common,