couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robertkowal...@apache.org
Subject fauxton commit: updated refs/heads/master to 3b3151b
Date Tue, 02 Dec 2014 19:35:10 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master dca437a54 -> 3b3151ba0


Add nightwatch tests to work with Travis and Saucelabs


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

Branch: refs/heads/master
Commit: 3b3151ba09b09b03b73de1876bfb1f8cee0e9322
Parents: dca437a
Author: Michelle Phung <michellephung@gmail.com>
Authored: Tue Dec 2 13:58:21 2014 -0500
Committer: Robert Kowalski <robertkowalski@apache.org>
Committed: Tue Dec 2 20:34:27 2014 +0100

----------------------------------------------------------------------
 .travis.yml     | 18 +++++++++++++++++-
 Gruntfile.js    |  5 +++++
 tasks/helper.js |  3 +++
 3 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/3b3151ba/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 2fba053..353e8bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,21 @@
 language: node_js
 node_js:
-  - "0.10"
+- '0.10'
 git:
   depth: 10
+services:
+- couchdb
+addons:
+  sauce_connect: true
+before_install:
+- HOST="http://127.0.0.1:5984"
+- curl -X PUT $HOST/_config/admins/tester -d '"testerpass"'
+before_script:
+- npm install -g grunt-cli
+- grunt dev &
+script:
+- grunt nightwatch_saucelabs
+env:
+  global:
+  - secure: GZfXnEV5hwH5FKcnbFK57WZLy2C8i650rCFFU4JaHNMNqsqGN/FH4CNyPO//BveZRQWJFRAaH7WclK/4L45NeX4/iufwGf8ypcGR2GvzQtGe1VdoQCNiiDv42BVvX7riT9aCcCdJNqjoKRIL9NkFo+gln1hEymZrQGUC7dojeFY=
+  - secure: THafpI+3svqxOa9gf5wFxuF/QIngKPlNpKPo7rKTnI76pfTuG7MGeBw1S1Da3hkMx3XIYciHcoqnb7LEwI7+s6UWA7eLA1FBcsRqJbSDI5VqSfOcYVJ05oFQ21/Iofk8r8R/LtJGQWwwZxem6P74cwu2iR2VcuWdImSHGiESOKg=

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/3b3151ba/Gruntfile.js
----------------------------------------------------------------------
diff --git a/Gruntfile.js b/Gruntfile.js
index 2dd1db2..8a95020 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -405,6 +405,10 @@ module.exports = function(grunt) {
       start_nightWatch: {
          command: __dirname + '/node_modules/nightwatch/bin/nightwatch' +
           ' -e chrome -c ' + __dirname + '/test/nightwatch_tests/' + 'nightwatch.json'
+      },
+      start_nightWatch_saucelabs: {
+         command: __dirname + '/node_modules/nightwatch/bin/nightwatch' +
+          ' -e saucelabs -c ' + __dirname + '/test/nightwatch_tests/' + 'nightwatch.json'
       }
     },
     
@@ -521,5 +525,6 @@ module.exports = function(grunt) {
    * 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']);
 };

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/3b3151ba/tasks/helper.js
----------------------------------------------------------------------
diff --git a/tasks/helper.js b/tasks/helper.js
index 8da3b6b..0150072 100644
--- a/tasks/helper.js
+++ b/tasks/helper.js
@@ -69,6 +69,9 @@ exports.init = function(grunt) {
               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 && open ./test/nightwatch_tests/selenium/chromedriver_'+type+'.zip)';


Mime
View raw message