Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B50FCCCBC for ; Thu, 8 Jan 2015 17:58:09 +0000 (UTC) Received: (qmail 98621 invoked by uid 500); 8 Jan 2015 17:58:11 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 98561 invoked by uid 500); 8 Jan 2015 17:58:10 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 98468 invoked by uid 99); 8 Jan 2015 17:58:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jan 2015 17:58:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8C6108C768B; Thu, 8 Jan 2015 17:58:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: robertkowalski@apache.org To: commits@couchdb.apache.org Date: Thu, 08 Jan 2015 17:58:13 -0000 Message-Id: <0f39315d141244748a4bc655321329fa@git.apache.org> In-Reply-To: <28423b39300c45abacd3b4c1fe0a236d@git.apache.org> References: <28423b39300c45abacd3b4c1fe0a236d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] fauxton commit: updated refs/heads/master to ef2371c Run tests on travis using firefox - remove saucelabs - use xvfb on travis with firefox Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/713ea7bf Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/713ea7bf Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/713ea7bf Branch: refs/heads/master Commit: 713ea7bf4f927d0a5a0b003610663b5fdae8b14e Parents: 696c372 Author: Robert Kowalski Authored: Thu Jan 8 14:43:19 2015 +0100 Committer: Robert Kowalski Committed: Thu Jan 8 18:56:06 2015 +0100 ---------------------------------------------------------------------- .travis.yml | 15 +++++---------- Gruntfile.js | 8 ++------ 2 files changed, 7 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/713ea7bf/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 387ea06..a7bc06f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,21 +6,16 @@ git: services: - couchdb addons: - sauce_connect: true + firefox: "34.0" before_install: + - export DISPLAY=:99.0 + - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1400x900x16" - HOST="http://127.0.0.1:5984" - curl -X PUT $HOST/_config/admins/tester -d '"testerpass"' before_script: - npm install -g grunt-cli - grunt test - grunt dev & + - sleep 5 script: - - grunt nightwatch_saucelabs -branches: - only: - - master -env: - global: - - secure: GZfXnEV5hwH5FKcnbFK57WZLy2C8i650rCFFU4JaHNMNqsqGN/FH4CNyPO//BveZRQWJFRAaH7WclK/4L45NeX4/iufwGf8ypcGR2GvzQtGe1VdoQCNiiDv42BVvX7riT9aCcCdJNqjoKRIL9NkFo+gln1hEymZrQGUC7dojeFY= - - secure: THafpI+3svqxOa9gf5wFxuF/QIngKPlNpKPo7rKTnI76pfTuG7MGeBw1S1Da3hkMx3XIYciHcoqnb7LEwI7+s6UWA7eLA1FBcsRqJbSDI5VqSfOcYVJ05oFQ21/Iofk8r8R/LtJGQWwwZxem6P74cwu2iR2VcuWdImSHGiESOKg= - + - grunt nightwatch http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/713ea7bf/Gruntfile.js ---------------------------------------------------------------------- diff --git a/Gruntfile.js b/Gruntfile.js index 0530db9..b87450b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -405,11 +405,8 @@ module.exports = function(grunt) { check_chrome_driver : helper.check_chrome_driver, start_nightWatch: { command: __dirname + '/node_modules/nightwatch/bin/nightwatch' + - ' -e chrome -c ' + __dirname + '/test/nightwatch_tests/nightwatch.json' - }, - start_nightWatch_saucelabs: { - command: 'sleep 10s; '+ __dirname + '/node_modules/nightwatch/bin/nightwatch' + - ' -e saucelabs -c ' + __dirname + '/test/nightwatch_tests/nightwatch.json' + ' -c ' + __dirname + '/test/nightwatch_tests/nightwatch.json' + } } }, @@ -544,6 +541,5 @@ 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', 'exec:check_chrome_driver', 'initNightwatch', 'exec:start_nightWatch']); };