improved tests and read globals external

xuaniyo · May 16, 2014 · f15977c · f15977c
1 parent f00b092
commit f15977c
Show file tree

Hide file tree

Showing 2 changed files with 94 additions and 8 deletions.
diff --git a/bin/_clirunner.js b/bin/_clirunner.js
@@ -106,9 +106,11 @@ CliRunner.prototype = {
     try {
       var fullPath = path.resolve(this.settings.globals_path);
       if (fs.existsSync(fullPath)) {
-        var globals = require(fullPath);
+        var globals = this.test_settings.globals = require(fullPath);
         if (globals && globals.hasOwnProperty(this.argv.e)) {
-          this.test_settings.globals = globals[this.argv.e];
+          for (var prop in globals[this.argv.e]) {
+            this.test_settings.globals[prop] = globals[this.argv.e][prop];
+          }
         }
         return this;
       }
@@ -138,7 +140,9 @@ CliRunner.prototype = {
         err.message = 'There was an error while running the test.';
       }
 
-      console.error(Logger.colors.red(err.message));
+      if (this.test_settings.output) {
+        console.error(Logger.colors.red(err.message));
+      }
 
       process.exit(1);
     }
@@ -207,7 +211,9 @@ CliRunner.prototype = {
     var self = this;
     Selenium.startServer(this.settings, function(error, child, error_out, exitcode) {
       if (error) {
-        Logger.error('There was an error while starting the Selenium server:');
+        if (self.test_settings.output) {
+          Logger.error('There was an error while starting the Selenium server:');
+        }
         self.globalErrorHandler({
           message : error_out
         });

diff --git a/tests/src/runner/testCliRunner.js b/tests/src/runner/testCliRunner.js
@@ -42,6 +42,13 @@ module.exports = {
       }
     });
 
+    mockery.registerMock('./globals.json', {
+      extra : {
+        someGlobal : 'test'
+      },
+      otherGlobal : 'other-value'
+    });
+
     mockery.registerMock('./settings.json', {
       src_folders : 'tests',
       test_settings : {
@@ -300,10 +307,7 @@ module.exports = {
   testParseTestSettingsIncorrect : function(test) {
     mockery.registerMock('fs', {
       existsSync : function(module) {
-        if (module == './incorrect.json') {
-          return true;
-        }
-        return false;
+        return module == './incorrect.json';
       }
     });
 
@@ -316,5 +320,81 @@ module.exports = {
     }, 'Invalid testing environment specified: incorrect');
 
     test.done();
+  },
+
+  testReadExternalGlobals : function(test) {
+    mockery.registerMock('fs', {
+      existsSync : function(module) {
+        if (module == './custom.json' || module == './globals.json') {
+          return true;
+        }
+        return false;
+      }
+    });
+
+    var CliRunner = require('../../../'+ BASE_PATH +'/../bin/_clirunner.js');
+    var runner = new CliRunner({
+      c : './custom.json',
+      e : 'extra'
+    }).init();
+
+    runner.settings.globals_path = './globals.json';
+    runner.readExternalGlobals();
+
+    test.equals(runner.test_settings.globals.otherGlobal, 'other-value');
+    test.equals(runner.test_settings.globals.someGlobal, 'test');
+
+
+    test.throws(function() {
+      var runner = new CliRunner({
+        c : './custom.json',
+        e : 'extra'
+      }).init();
+      runner.settings.globals_path = './incorrect.json';
+      runner.readExternalGlobals();
+
+    }, 'External global file could not be located - using ./incorrect.json.');
+
+    test.done();
+  },
+
+  testStartSeleniumDisabled : function(test) {
+    var CliRunner = require('../../../'+ BASE_PATH +'/../bin/_clirunner.js');
+    var runner = new CliRunner({
+      c : './nightwatch.json',
+      e : 'default'
+    }).init();
+
+    runner.manageSelenium = false;
+    test.expect(1);
+    runner.startSelenium(function() {
+      test.ok('callback called');
+      test.done();
+    });
+  },
+
+  testStartSeleniumEnabled : function(test) {
+    mockery.registerMock('../lib/runner/selenium.js', {
+      startServer : function(settings, cb) {
+        cb({}, null, 'Server already running.');
+      }
+    });
+    var CliRunner = require('../../../'+ BASE_PATH +'/../bin/_clirunner.js');
+    var runner = new CliRunner({
+      c : './nightwatch.json',
+      e : 'default'
+    }).init();
+
+    runner.manageSelenium = true;
+    runner.parallelMode = true;
+    test.expect(2);
+
+    runner.globalErrorHandler = function(err) {
+      test.equals(err.message, 'Server already running.');
+      test.equals(runner.settings.parallelMode, true);
+      test.done();
+    };
+
+    runner.startSelenium();
   }
 };