You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/08/27 00:41:11 UTC
[54/63] [abbrv] git commit: add chromedriver via nom
add chromedriver via nom
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/84b8c753
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/84b8c753
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/84b8c753
Branch: refs/heads/two-dot-o-notifications-queue
Commit: 84b8c75383bcdab946a938e074d6a75c28efb4a4
Parents: 08ec99b
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Aug 26 08:57:28 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Aug 26 08:57:28 2014 -0600
----------------------------------------------------------------------
portal/package.json | 4 +++-
portal/tests/protractorConf.js | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/84b8c753/portal/package.json
----------------------------------------------------------------------
diff --git a/portal/package.json b/portal/package.json
index 777bf3d..275f1f4 100644
--- a/portal/package.json
+++ b/portal/package.json
@@ -8,7 +8,9 @@
"type": "git",
"url": "https://github.com/usergrid/usergrid.git"
},
- "dependencies": {},
+ "dependencies": {
+ "chromedriver": "~2.10.0-1"
+ },
"devDependencies": {
"grunt": "~0.4.4",
"grunt-cli": "~0.1.11",
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/84b8c753/portal/tests/protractorConf.js
----------------------------------------------------------------------
diff --git a/portal/tests/protractorConf.js b/portal/tests/protractorConf.js
index 892ed4f..a72f2aa 100644
--- a/portal/tests/protractorConf.js
+++ b/portal/tests/protractorConf.js
@@ -43,7 +43,7 @@ exports.config = {
// find chromedriver. This will be passed to the selenium jar as
// the system property webdriver.chrome.driver. If null, selenium will
// attempt to find chromedriver using PATH.
- chromeDriver: './selenium/chromedriver',
+ chromeDriver: '../node_modules/chromedriver/bin/chromedriver',
// If true, only chromedriver will be started, not a standalone selenium.
// Tests for browsers other than chrome will not run.
chromeOnly: false,