couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robertkowal...@apache.org
Subject [5/5] fauxton commit: updated refs/heads/master to ef2371c
Date Thu, 08 Jan 2015 17:58:14 GMT
start selenium with nightwatch

don't rely on chroemdriver in path, use downloaded chromedriver


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/2b6386a9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/2b6386a9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/2b6386a9

Branch: refs/heads/master
Commit: 2b6386a995a3a1fe70ad7a33f3d9ae53f66b2be1
Parents: c7ce289
Author: Robert Kowalski <robertkowalski@apache.org>
Authored: Wed Jan 7 15:59:28 2015 +0100
Committer: Robert Kowalski <robertkowalski@apache.org>
Committed: Thu Jan 8 18:56:06 2015 +0100

----------------------------------------------------------------------
 Gruntfile.js                                     | 9 ++-------
 package.json                                     | 1 -
 test/nightwatch_tests/nightwatch.json.underscore | 6 +++---
 3 files changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2b6386a9/Gruntfile.js
----------------------------------------------------------------------
diff --git a/Gruntfile.js b/Gruntfile.js
index a880063..0530db9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -412,10 +412,6 @@ module.exports = function(grunt) {
         ' -e saucelabs -c ' + __dirname + '/test/nightwatch_tests/nightwatch.json'
       }
     },
-    
-    selenium_start: {
-      options: { port: 4444 }
-    },
 
     // generates the nightwatch.json file with appropriate content for this env
     initNightwatch: {
@@ -491,7 +487,6 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-cssmin');
   grunt.loadNpmTasks('grunt-mocha-phantomjs');
-  grunt.loadNpmTasks('grunt-selenium-webdriver');
   grunt.loadNpmTasks('grunt-md5');
 
   /*
@@ -545,10 +540,10 @@ module.exports = function(grunt) {
   // setup and install fauxton as couchapp
   grunt.registerTask('couchapp_deploy', ['couchapp_setup', 'couchapp_install']);
 
-  /* 
+  /*
    * Nightwatch functional testing
    */
   //Start Nightwatch test from terminal, using: $ grunt nightwatch
   grunt.registerTask('nightwatch_saucelabs', [ 'initNightwatch', 'exec:start_nightWatch_saucelabs']);
-  grunt.registerTask('nightwatch', [ 'exec:check_selenium', 'selenium_start', 'exec:check_chrome_driver',
'initNightwatch', 'exec:start_nightWatch']);
+  grunt.registerTask('nightwatch', [ 'exec:check_selenium', 'exec:check_chrome_driver', 'initNightwatch',
'exec:start_nightWatch']);
 };

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2b6386a9/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index f92010e..0645e6c 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,6 @@
     "nightwatch": "~0.5.33",
     "nano": "~5.12.0",
     "grunt-chmod": "^1.0.3",
-    "grunt-selenium-webdriver": "^0.2.431",
     "grunt-md5": "^0.1.11"
   }
 }

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2b6386a9/test/nightwatch_tests/nightwatch.json.underscore
----------------------------------------------------------------------
diff --git a/test/nightwatch_tests/nightwatch.json.underscore b/test/nightwatch_tests/nightwatch.json.underscore
index 5acb5a0..f73b216 100644
--- a/test/nightwatch_tests/nightwatch.json.underscore
+++ b/test/nightwatch_tests/nightwatch.json.underscore
@@ -8,13 +8,13 @@
   "live_output" : false,
 
   "selenium" : {
-    "start_process" : false,
-    "server_path" : "",
+    "start_process" : true,
+    "server_path" : "test/nightwatch_tests/selenium/selenium-server-standalone-2.43.1.jar",
     "log_path" : "",
     "host" : "127.0.0.1",
     "port" : 4444,
     "cli_args" : {
-      "webdriver.chrome.driver" : "",
+      "webdriver.chrome.driver" : "test/nightwatch_tests/selenium/chromedriver",
       "webdriver.ie.driver" : "",
       "webdriver.firefox.profile" : ""
     }


Mime
View raw message