added initial test for parallel execution

xuaniyo · Sep 22, 2014 · 77026a4 · 77026a4
1 parent 9ddece0
commit 77026a4
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 8 deletions.
diff --git a/bin/_clirunner.js b/bin/_clirunner.js
@@ -218,6 +218,7 @@ CliRunner.prototype = {
       });
       return this;
     }
+
     this.settings.parallelMode = this.parallelMode;
     var self = this;
 
@@ -253,13 +254,14 @@ CliRunner.prototype = {
    * Starts the test runner
    * @returns {CliRunner}
    */
-  runTests : function() {
+  runTests : function(callback) {
     if (this.parallelMode) {
       return this;
     }
 
     var source = this.getTestSource();
     var self = this;
+
     this.startSelenium(function() {
       Runner.run(source, self.test_settings, {
         output_folder : self.output_folder,
@@ -272,6 +274,7 @@ CliRunner.prototype = {
         var context = self.test_settings && self.test_settings.globals || null;
         afterGlobal.call(context, function() {
           self.globalErrorHandler(err);
+          callback();
         });
 
       });

diff --git a/tests/extra/nightwatch.json b/tests/extra/nightwatch.json
@@ -0,0 +1,30 @@
+{
+  "src_folders" : ["./sampletests"],
+  "output_folder" : "./output",
+  "custom_commands_path" : "",
+  "custom_assertions_path" : "",
+  "globals_path" : "",
+
+  "selenium" : {
+    "start_process" : false,
+    "server_path" : "./bin/selenium-server.jar"
+  },
+
+  "test_settings" : {
+    "default" : {
+      "silent" : true,
+      "desiredCapabilities" : {
+        "browserName" : "firefox",
+        "javascriptEnabled" : true,
+        "acceptSslCerts" : true
+      },
+      "filter" : ["async/*"]
+    },
+
+    "mixed" : {
+      "filter" : ["mixed/*"]
+    }
+  }
+}
+
+
diff --git a/tests/run_tests.js b/tests/run_tests.js
@@ -28,13 +28,14 @@ try {
   var server = require('mockserver').init();
   server.on('listening', function() {
     reporter.run([
-      'src',
-      'src/index',
-      'src/runner',
-      'src/assertions',
-      'src/commands',
-      'src/protocol',
-      'src/http'
+      //'src',
+      //'src/index',
+      'src/cli',
+//      'src/runner',
+//      'src/assertions',
+//      'src/commands',
+//      'src/protocol',
+//      'src/http'
     ], options, function(err) {
       server.close();
       if (err) {

diff --git a/tests/src/cli/testParallelExecution.js b/tests/src/cli/testParallelExecution.js
@@ -0,0 +1,59 @@
+var BASE_PATH = process.env.NIGHTWATCH_COV
+  ? 'lib-cov'
+  : 'lib';
+var util = require('util');
+var events = require('events');
+var mockery = require('mockery');
+module.exports = {
+  setUp: function(callback) {
+    mockery.enable({ useCleanCache: true, warnOnUnregistered: true });
+    callback();
+  },
+
+  tearDown: function(callback) {
+    callback();
+  },
+
+  testParallelExecution : function(test) {
+    var allArgs = [], allOpts = [];
+    mockery.registerMock('child_process', {
+      execFile : function(path, args, opts) {
+        allArgs.push(args);
+        allOpts.push(opts);
+
+        function Stdout() {}
+        function Stderr() {}
+
+        util.inherits(Stdout, events.EventEmitter);
+        util.inherits(Stderr, events.EventEmitter);
+
+        var Child = function() {
+          this.stdout = new Stdout();
+          this.stderr = new Stderr();
+        };
+
+        util.inherits(Child, events.EventEmitter);
+        return new Child();
+      }
+    });
+
+    mockery.registerMock('../lib/runner/run.js', {
+      run : function(source, settings, opts, callback) {
+        console.log('Run', source, settings)
+        //callback();
+      }
+    });
+
+    var CliRunner = require('../../../' + BASE_PATH + '/../bin/_clirunner.js');
+    var runner = new CliRunner({
+      c : './extra/nightwatch.json',
+      e : 'default,mixed'
+    }).init();
+
+    runner.runTests(function() {
+      console.log(allArgs);
+      console.log(allOpts);
+      test.done();
+    });
+  }
+};