couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robertkowal...@apache.org
Subject [1/5] fauxton commit: updated refs/heads/master to ef2371c
Date Thu, 08 Jan 2015 17:58:10 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master c8dd98a58 -> ef2371cf6


remove now unused 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/ef2371cf
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/ef2371cf
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/ef2371cf

Branch: refs/heads/master
Commit: ef2371cf6e292fd33a19a3ad8c0bf96b19b26584
Parents: 713ea7b
Author: Robert Kowalski <robertkowalski@apache.org>
Authored: Thu Jan 8 15:13:47 2015 +0100
Committer: Robert Kowalski <robertkowalski@apache.org>
Committed: Thu Jan 8 18:56:06 2015 +0100

----------------------------------------------------------------------
 Gruntfile.js    |  3 +--
 tasks/helper.js | 35 +++--------------------------------
 2 files changed, 4 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ef2371cf/Gruntfile.js
----------------------------------------------------------------------
diff --git a/Gruntfile.js b/Gruntfile.js
index b87450b..c5932c5 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -402,7 +402,6 @@ module.exports = function(grunt) {
 
     exec: {
       check_selenium: helper.check_selenium,
-      check_chrome_driver : helper.check_chrome_driver,
       start_nightWatch: {
         command: __dirname + '/node_modules/nightwatch/bin/nightwatch' +
         ' -c ' + __dirname + '/test/nightwatch_tests/nightwatch.json'
@@ -541,5 +540,5 @@ module.exports = function(grunt) {
    * Nightwatch functional testing
    */
   //Start Nightwatch test from terminal, using: $ grunt nightwatch
-  grunt.registerTask('nightwatch', [ 'exec:check_selenium', 'exec:check_chrome_driver', 'initNightwatch',
'exec:start_nightWatch']);
+  grunt.registerTask('nightwatch', [ 'exec:check_selenium', 'initNightwatch', 'exec:start_nightWatch']);
 };

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ef2371cf/tasks/helper.js
----------------------------------------------------------------------
diff --git a/tasks/helper.js b/tasks/helper.js
index 95536bc..ed1ac79 100644
--- a/tasks/helper.js
+++ b/tasks/helper.js
@@ -44,38 +44,9 @@ exports.init = function(grunt) {
     },
 
     check_selenium: {
-      command: 'test -s ./test/nightwatch_tests/selenium/selenium-server-standalone-2.43.1.jar
|| curl -o ./test/nightwatch_tests/selenium/selenium-server-standalone-2.43.1.jar  http://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar'
-    },
-
-    check_chrome_driver: {
-      command: function () {
-
-        var type;
-
-        switch (platform) {
-          case 'darwin':
-            type = 'mac32';
-            break;
-
-          case 'win32':
-            type = 'win32';
-            break;
-
-          case 'linux': 
-            var os = require('os');
-            if (os.arch() === 'x64') {
-              type = 'linux64';
-            }else{
-              type = 'linux32';
-            }
-            break;
-
-          default:
-            type = 'linux64';
-        }
-
-        return 'test -s ./test/nightwatch_tests/selenium/chromedriver || (curl -o ./test/nightwatch_tests/selenium/chromedriver_'
+ type + '.zip http://chromedriver.storage.googleapis.com/2.9/chromedriver_' + type + '.zip
&& unzip -o ./test/nightwatch_tests/selenium/chromedriver_' + type + '.zip -d ./test/nightwatch_tests/selenium/)';
-      }
+      command: 'test -s ./test/nightwatch_tests/selenium/selenium-server-standalone-2.43.1.jar
|| ' +
+        'curl -o ./test/nightwatch_tests/selenium/selenium-server-standalone-2.43.1.jar '
+
+        'http://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar'
     }
   };
 };


Mime
View raw message