couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robertkowal...@apache.org
Subject [1/2] fauxton commit: updated refs/heads/master to 390e902
Date Tue, 28 Jul 2015 20:44:35 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master eb201de75 -> 390e902b3


tests: fix ssl issues

don't error when requesting additional resources via https

PR: #487
PR-URL: https://github.com/apache/couchdb-fauxton/pull/487
Reviewed-By: Michelle Phung <michellep@apache.org>


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

Branch: refs/heads/master
Commit: 390e902b3797499b0daf9613d5e5f7d53773490c
Parents: cb175d1
Author: Robert Kowalski <robertkowalski@apache.org>
Authored: Tue Jul 28 18:13:18 2015 +0200
Committer: Robert Kowalski <rok@kowalski.gd>
Committed: Tue Jul 28 22:46:19 2015 +0200

----------------------------------------------------------------------
 Gruntfile.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/390e902b/Gruntfile.js
----------------------------------------------------------------------
diff --git a/Gruntfile.js b/Gruntfile.js
index 36c8e01..5c5c854 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -402,8 +402,9 @@ module.exports = function (grunt) {
       },
 
       phantomjs: {
-        command: './node_modules/mocha-phantomjs/bin/mocha-phantomjs ' +
-          '-p ./node_modules/phantomjs/bin/phantomjs test/runner.html'
+        command: './node_modules/phantomjs/bin/phantomjs --debug=false ' +
+          '--ssl-protocol=sslv2 --web-security=false --ignore-ssl-errors=true ' +
+          './node_modules/mocha-phantomjs/lib/mocha-phantomjs.coffee test/runner.html'
       }
     },
 


Mime
View raw message