Fixed nightwatchjs#1394 - locateStrategy was not reset when test suit…

…e is retried
niilante · Mar 11, 2017 · 8273828 · 8273828
1 parent 6d456bd
commit 8273828
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 10 deletions.
diff --git a/lib/api/assertions/elementPresent.js b/lib/api/assertions/elementPresent.js
@@ -15,7 +15,6 @@
 
 var util = require('util');
 exports.assertion = function(selector, msg) {
-
   this.message = msg || util.format('Testing if element <%s> is present.', selector);
   this.expected = 'present';
 

diff --git a/lib/index.js b/lib/index.js
@@ -14,8 +14,6 @@ var Utils = require('./util/utils.js');
 function Nightwatch(options) {
   events.EventEmitter.call(this);
 
-  this.locateStrategy = 'css selector';
-
   this.api = {
     capabilities : {},
     globals : options && options.persist_globals && options.globals || {},
@@ -96,9 +94,7 @@ Nightwatch.prototype.setOptions = function(options) {
     };
   }
 
-  if (this.options.use_xpath) {
-    this.locateStrategy = 'xpath';
-  }
+  this.setLocateStrategy();
 
   if (this.options.silent) {
     Logger.disable();
@@ -186,6 +182,11 @@ Nightwatch.prototype.setCapabilities = function() {
   return this;
 };
 
+Nightwatch.prototype.setLocateStrategy = function () {
+  this.locateStrategy = this.options.use_xpath ? 'xpath' : 'css selector';
+  return this;
+};
+
 Nightwatch.prototype.loadKeyCodes = function() {
   this.api.Keys = require('./util/keys.json');
   return this;

diff --git a/lib/runner/clientmanager.js b/lib/runner/clientmanager.js
@@ -142,6 +142,10 @@ ClientManager.prototype.terminate = function() {
   return this;
 };
 
+ClientManager.prototype.setLocateStrategy = function() {
+  this['@client'].setLocateStrategy();
+  return this;
+};
 
 ClientManager.prototype.resetTerminated = function() {
   this['@client'].resetTerminated();

diff --git a/lib/runner/testsuite.js b/lib/runner/testsuite.js
@@ -280,6 +280,7 @@ TestSuite.prototype.printRetry = function() {
 
 TestSuite.prototype.retryTestSuiteModule = function() {
   this.client.resetTerminated();
+  this.client.setLocateStrategy();
   this.clearResult();
   this.suiteRetries +=1;
   this.resetTestCases();

diff --git a/test/sampletests/suiteretries/locate-strategy/suiteRetriesLocateStrategy.js b/test/sampletests/suiteretries/locate-strategy/suiteRetriesLocateStrategy.js
@@ -0,0 +1,28 @@
+var failFirstTime = true;
+
+module.exports = {
+  before: function (client) {
+    client.url('http://localhost')
+  },
+
+  after: function (client) {
+    client.end();
+  },
+
+  demoStep1 : function (client) {
+    client
+      .assert.elementPresent('#weblogin')
+      .elements('css selector', '#weblogin', function() {
+        if (failFirstTime) {
+          client.useRecursion();
+        }
+      })
+      .perform(function() {
+        if (failFirstTime) {
+          failFirstTime = false;
+          client.assert.ok(false);
+        }
+      });
+  }
+
+};
diff --git a/...etests/suiteretries/suiteRetriesSample.js → ...suiteretries/sample/suiteRetriesSample.js b/...etests/suiteretries/suiteRetriesSample.js → ...suiteretries/sample/suiteRetriesSample.js
diff --git a/test/src/runner/cli/testParallelExecution.js b/test/src/runner/cli/testParallelExecution.js
@@ -98,7 +98,7 @@ module.exports = {
           done(err);
           return;
         }
-        assert.equal(self.allArgs.length, 21);
+        assert.equal(self.allArgs.length, 22);
         assert.ok(path.join('sampletests', 'async', 'sample_1') in runner.runningProcesses);
         assert.ok(path.join('sampletests', 'before-after', 'sampleSingleTest_2') in runner.runningProcesses);
 
@@ -156,7 +156,7 @@ module.exports = {
 
       runner.setup({}, function () {
         assert.ok(!runner.isParallelMode());
-        assert.equal(self.allArgs.length, 21);
+        assert.equal(self.allArgs.length, 22);
         done();
       });
 
@@ -184,7 +184,7 @@ module.exports = {
           return;
         }
         assert.ok(!runner.isParallelMode());
-        assert.equal(self.allArgs.length, 21);
+        assert.equal(self.allArgs.length, 22);
         done();
       });
 

diff --git a/test/src/runner/testRunTestsuite.js b/test/src/runner/testRunTestsuite.js
@@ -91,8 +91,38 @@ module.exports = {
       });
     },
 
+    testRunSuiteRetriesWithLocateStrategy : function(done) {
+      var testsPath = path.join(__dirname, '../../sampletests/suiteretries/locate-strategy');
+      var globals = {
+        calls : 0
+      };
+
+      var runner = new Runner([testsPath], {
+        seleniumPort : 10195,
+        silent : true,
+        output : false,
+        persist_globals : true,
+        globals : globals,
+        skip_testcases_on_fail: false
+      }, {
+        output_folder : false,
+        start_session : true,
+        suite_retries: 1
+      }, function(err, results) {
+        if (err) {
+          throw err;
+        }
+        assert.equal(runner.currentTestSuite.client['@client'].locateStrategy, 'css selector');
+        done();
+      });
+
+      runner.run().catch(function(err) {
+        done(err);
+      });
+    },
+
     'test clear command queue when run with suiteRetries' : function(done) {
-      var testsPath = path.join(__dirname, '../../sampletests/suiteretries');
+      var testsPath = path.join(__dirname, '../../sampletests/suiteretries/sample');
       var globals = {
         calls : 0
       };