updated unit tests

jlorenc1986 · Oct 4, 2015 · 2589625 · 2589625
1 parent 6408fbe
commit 2589625
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/tests/run_tests.js b/tests/run_tests.js
@@ -29,6 +29,7 @@ try {
   server.on('listening', function() {
     reporter.run([
       'src',
+      'src/runner',
       'src/mocha',
       'src/expect',
       'src/protocol',

diff --git a/tests/sampletests/withchaiexpect/sampleWithChai.js b/tests/sampletests/withchaiexpect/sampleWithChai.js
@@ -9,7 +9,7 @@ module.exports = {
     client.url('http://localhost')
       .elements('css selector', '#weblogin', function(result) {
         var assertion = client.expect(result.value).to.have.length(1);
-        client.globals.test.deepEqual(assertion.__flags.object, { ELEMENT: '0' });
+        client.globals.test.deepEqual(assertion.__flags.object, [{ ELEMENT: '0' }]);
         try {
           client.expect(result.value).to.have.length(2);
         } catch (ex) {

diff --git a/tests/src/runner/testClientManager.js b/tests/src/runner/testClientManager.js
@@ -8,9 +8,11 @@ module.exports = {
     mockery.enable({ useCleanCache: true, warnOnUnregistered: false });
     function Nightwatch(opts) {
       this.results = {};
+      this.terminated = true;
       this.api = {
         currentTest : {}
       };
+
       this.queue = {
         run : function() {},
         reset : function() {},
@@ -24,6 +26,10 @@ module.exports = {
     Nightwatch.prototype.endSessionOnFail = function() {};
     Nightwatch.prototype.printResult = function() {};
     Nightwatch.prototype.clearResult = function() {};
+    Nightwatch.prototype.resetTerminated = function() {
+      this.terminated = false;
+      return this;
+    };
 
     mockery.registerMock('../index.js', {
       client : function(opts) {
@@ -42,12 +48,13 @@ module.exports = {
   },
 
   'test start with callback on success' : function(test) {
-    test.expect(1);
+    test.expect(2);
 
     var ClientManager = require('../../../'+ BASE_PATH +'/runner/clientmanager.js');
     var client = new ClientManager();
     client.init({});
     client.start(function() {
+      test.equals(client['@client'].terminated, false);
       test.equals(arguments.length, 0);
       test.done();
     });

diff --git a/tests/src/runner/testParallelExecution.js b/tests/src/runner/testParallelExecution.js
@@ -113,7 +113,7 @@ module.exports = {
     });
 
     runner.setup({}, function() {
-      test.equals(self.allArgs.length, 18);
+      test.equals(self.allArgs.length, 20);
       test.ok(path.join('sampletests', 'async', 'sample_1') in runner.runningProcesses);
       test.ok(path.join('sampletests', 'before-after', 'sampleSingleTest_2') in runner.runningProcesses);
 
@@ -144,7 +144,7 @@ module.exports = {
 
     runner.setup({}, function() {
       test.ok(!runner.isParallelMode());
-      test.equals(self.allArgs.length, 18);
+      test.equals(self.allArgs.length, 20);
       test.done();
     });
 
@@ -169,7 +169,7 @@ module.exports = {
 
     runner.setup({}, function() {
       test.ok(!runner.isParallelMode());
-      test.equals(self.allArgs.length, 18);
+      test.equals(self.allArgs.length, 20);
       test.done();
     });
 

diff --git a/tests/src/runner/testRunner.js b/tests/src/runner/testRunner.js
@@ -813,20 +813,19 @@ module.exports = {
 
   testRunWithChaiExpect : function(test) {
     var testsPath = path.join(process.cwd(), '/sampletests/withchaiexpect');
-    //test.expect(7);
+    test.expect(6);
 
     this.Runner.run([testsPath], {
       seleniumPort : 10195,
       silent : true,
-      output : true,
+      output : false,
       globals : {
         test : test
       }
     }, {
       output_folder : false,
       start_session : true
     }, function(err, results) {
-      console.log(results)
       test.equals(err, null);
       test.equals(results.modules.sampleWithChai.tests, 2);
       test.equals(results.modules.sampleWithChai.failures, 0);