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 261BE10503 for ; Thu, 5 Mar 2015 08:50:57 +0000 (UTC) Received: (qmail 91013 invoked by uid 500); 5 Mar 2015 08:50:57 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 90960 invoked by uid 500); 5 Mar 2015 08:50:57 -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 90949 invoked by uid 99); 5 Mar 2015 08:50:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Mar 2015 08:50:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B3FD7E05E2; Thu, 5 Mar 2015 08:50:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: garren@apache.org To: commits@couchdb.apache.org Date: Thu, 05 Mar 2015 08:50:56 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] fauxton commit: updated refs/heads/master to 4cb0226 Repository: couchdb-fauxton Updated Branches: refs/heads/master e95eec58d -> 4cb022619 upgrade to selenium 2.45 Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/4cb02261 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/4cb02261 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/4cb02261 Branch: refs/heads/master Commit: 4cb022619f74f5cf9f3c3bd486fce8417e0ee498 Parents: a544122 Author: Garren Smith Authored: Tue Mar 3 12:16:44 2015 +0200 Committer: Garren Smith Committed: Thu Mar 5 10:50:21 2015 +0200 ---------------------------------------------------------------------- tasks/helper.js | 12 ++++++------ test/nightwatch_tests/nightwatch.json.underscore | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/4cb02261/tasks/helper.js ---------------------------------------------------------------------- diff --git a/tasks/helper.js b/tasks/helper.js index ed1ac79..b3a0007 100644 --- a/tasks/helper.js +++ b/tasks/helper.js @@ -17,7 +17,7 @@ exports.init = function(grunt) { var _ = grunt.util._, platform = process.platform; - return { + return { readSettingsFile: function () { if (fs.existsSync("settings.json")) { return grunt.file.readJSON("settings.json"); @@ -33,8 +33,8 @@ exports.init = function(grunt) { }, watchFiles: function (fileExtensions, defaults) { - return _.reduce(this.readSettingsFile().deps, function (files, dep) { - if (dep.path) { + return _.reduce(this.readSettingsFile().deps, function (files, dep) { + if (dep.path) { _.each(fileExtensions, function (fileExtension) { files.push(path.join(dep.path, '**/*' + fileExtension )); }); @@ -44,9 +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' + command: 'test -s ./test/nightwatch_tests/selenium/selenium-server-standalone-2.45.0.jar || ' + + 'curl -o ./test/nightwatch_tests/selenium/selenium-server-standalone-2.45.0.jar ' + + 'http://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar' } }; }; http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/4cb02261/test/nightwatch_tests/nightwatch.json.underscore ---------------------------------------------------------------------- diff --git a/test/nightwatch_tests/nightwatch.json.underscore b/test/nightwatch_tests/nightwatch.json.underscore index b4c3bb0..f92a398 100644 --- a/test/nightwatch_tests/nightwatch.json.underscore +++ b/test/nightwatch_tests/nightwatch.json.underscore @@ -9,7 +9,7 @@ "selenium" : { "start_process" : true, - "server_path" : "test/nightwatch_tests/selenium/selenium-server-standalone-2.43.1.jar", + "server_path" : "test/nightwatch_tests/selenium/selenium-server-standalone-2.45.0.jar", "log_path" : "", "host" : "127.0.0.1", "port" : "<%- selenium_port %>",