Option to run selenium over pha

Option ru run selenium not phantomjs

Author: varya

gulpfile.js

@@ -33,8 +33,10 @@ var knownOptions = {
   'default': { 'section': false }
 }
 
-var options = minimist(process.argv.slice(2), knownOptions);
+/* test server options 'phantom' or 'selenium' */
+var testServer = 'phantom'; // default is phantom
 
+var options = minimist(process.argv.slice(2), knownOptions);
 gulp.task("test:visual:update", function() {
   gulp.src(styleguidePath, { read: false })
     .pipe(sc5StyleguideGemini.gather({
@@ -46,6 +48,7 @@ gulp.task("test:visual:update", function() {
       gridScreenshotsDir: testDirPath + '/grid-screenshots',
       rootUrl: 'http://localhost:3000/',
       sections: options.section,
+      testServer: testServer,
       coreTest: '../../custom-tests/core-test.js',
       customTests: {
         '2.1': '../../custom-tests/custom-test.js'
@@ -72,6 +75,7 @@ gulp.task("test:visual", function(done){
       gridScreenshotsDir: testDirPath + '/grid-screenshots',
       rootUrl: 'http://localhost:3000/',
       sections: options.section,
+      testServer: testServer,
       coreTest: '../../custom-tests/core-test.js',
       customTests: {
         '2.1': '../../custom-tests/custom-test.js'

src/index.es6

@@ -13,19 +13,35 @@ let removeDuplicates = (arr, newArr = []) => {
   return newArr;
 };
 
-var phantomProcess;
-var runPhantom = function() {
+var serverProcess;
+
+var runTestServer = function runTestServer(testServer) {
+
+  if (!testServer) {
+     testServer = 'phantom';
+  }
+
+  console.log('Test server:', testServer.toUpperCase());
+
+  // Run test server
+  if (testServer === 'phantom') {
     var phantomSource = require('phantomjs-prebuilt').path;
 
     // If the path we're given by phantomjs is to a .cmd, it is pointing to a global copy on Windows.
     // Using the cmd as the process to execute causes problems cleaning up the processes
     // so we walk from the cmd to the phantomjs.exe and use that instead.
-    if(path.extname(phantomSource).toLowerCase() === '.cmd') {
-      phantomSource =  path.join(path.dirname(phantomSource), '//node_modules//phantomjs//lib//phantom//phantomjs.exe');
+    if (path.extname(phantomSource).toLowerCase() === '.cmd') {
+      phantomSource = path.join(path.dirname(phantomSource), '//node_modules//phantomjs//lib//phantom//phantomjs.exe');
     }
 
-    phantomProcess = spawn(phantomSource,  ['--webdriver', '4444', '--disk-cache', 'false', '--ignore-ssl-errors', 'true'],  {setsid:true});
-    phantomProcess.stdout.pipe(process.stdout);
+    serverProcess = spawn(phantomSource, ['--webdriver', '4444', '--disk-cache', 'false', '--ignore-ssl-errors', 'true'], { setsid: true });
+    serverProcess.stdout.pipe(process.stdout);
+  }
+
+  if(testServer === 'selenium') {
+    serverProcess = spawn('selenium-standalone', ['start'], { setsid: true, detached:true });
+    serverProcess.stdout.pipe(process.stdout);
+  }
 };
 
 var getGemini = function(options) {
@@ -97,9 +113,9 @@ module.exports.test = function(options) {
   var test = function(file, enc, callback) {
 
     var gemini = getGemini(options);
-
-    // Run PhantomJs
-    runPhantom();
+   
+    // Run test server
+    runTestServer(options.testServer);
 
     // Clean report
     fs.removeSync(options.reportDir + '/*');
@@ -114,7 +130,7 @@ module.exports.test = function(options) {
         tempDir: options.reportDir
       });
       runTestsPromise.done(result => {
-        phantomProcess.kill('SIGTERM');
+        serverProcess.kill('SIGTERM');
         spawn('open', [`${options.reportDir}/index.html`]).on('error', function() {});
       });
     };
@@ -238,8 +254,8 @@ module.exports.gather = function(options) {
 
     var gemini = getGemini(options);
 
-    // Run PhantomJs
-    runPhantom();
+    // Run test server
+    runTestServer(options.testServer);
 
     // Clean screenshot
     if (!options.sections) { // only for full replacement
@@ -254,7 +270,7 @@ module.exports.gather = function(options) {
         reporters: ['flat'],
       })
       .done(result => {
-        phantomProcess.kill('SIGTERM');
+        serverProcess.kill('SIGTERM');
       });
     }
     // TODO: remake with promises

tests/custom-tests/core-test.js

@@ -1,7 +1,5 @@
 'use strict';
 
-var gemini = require('gemini');
-
 module.exports = function (page) {
   gemini.suite(page.name, function (suite) {
     if (page.name === 'index') {

tests/custom-tests/custom-test.js

@@ -1,7 +1,5 @@
 'use strict';
 
-var gemini = require('gemini');
-
 module.exports = function (page) {
   gemini.suite(page.name, function (suite) {
     suite.setUrl(page.url).setCaptureElements('body').capture('plain', function (actions, find) {