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/26 16:59:38 UTC
[1/2] git commit: add chromedriver via nom
Repository: incubator-usergrid
Updated Branches:
refs/heads/add-chromedriver [created] fe2db32cf
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/add-chromedriver
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,
[2/2] git commit: change chromedriver to devdependency
Posted by sf...@apache.org.
change chromedriver to devdependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/fe2db32c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/fe2db32c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/fe2db32c
Branch: refs/heads/add-chromedriver
Commit: fe2db32cfebaa7cd78a97716734a9a7ac6a015fd
Parents: 84b8c75
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Aug 26 08:59:01 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Aug 26 08:59:01 2014 -0600
----------------------------------------------------------------------
portal/package.json | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/fe2db32c/portal/package.json
----------------------------------------------------------------------
diff --git a/portal/package.json b/portal/package.json
index 275f1f4..78aba40 100644
--- a/portal/package.json
+++ b/portal/package.json
@@ -8,10 +8,8 @@
"type": "git",
"url": "https://github.com/usergrid/usergrid.git"
},
- "dependencies": {
- "chromedriver": "~2.10.0-1"
- },
"devDependencies": {
+ "chromedriver": "~2.10.0-1",
"grunt": "~0.4.4",
"grunt-cli": "~0.1.11",
"grunt-contrib-cssmin": "~0.7.0",