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/13 17:29:53 UTC
[6/6] git commit: fix e2e tests
fix e2e tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7fab6737
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7fab6737
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7fab6737
Branch: refs/heads/master
Commit: 7fab673765f95122b4a0a7d886abe6f511f8b607
Parents: a945495
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Aug 13 09:28:51 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Aug 13 09:28:51 2014 -0600
----------------------------------------------------------------------
portal/Gruntfile.js | 2 +-
portal/build.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7fab6737/portal/Gruntfile.js
----------------------------------------------------------------------
diff --git a/portal/Gruntfile.js b/portal/Gruntfile.js
index b44f3e0..5fa1a68 100644
--- a/portal/Gruntfile.js
+++ b/portal/Gruntfile.js
@@ -291,7 +291,7 @@ module.exports = function (grunt) {
// includes files within path
{expand: true, src: ['*.html','config.js', '*.ico', 'helpJson.json'], dest: distPath, filter: 'isFile'},
{expand: true, src: ['sdk/**','css/**','img/**','js/charts/*.json'], dest: distPath},
- {expand: true, src: ['js/*.min.js','js/libs/**','css/**','img/**','bower_components/**'], dest: distPath}
+ {expand: true, src: ['js/generated/**','js/libs/**','css/**','img/**','bower_components/**'], dest: distPath}
]
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7fab6737/portal/build.sh
----------------------------------------------------------------------
diff --git a/portal/build.sh b/portal/build.sh
index c5b79bf..5789446 100755
--- a/portal/build.sh
+++ b/portal/build.sh
@@ -16,7 +16,7 @@ e2e) buildMain
webdriver-manager start --standalone > seleniumLog.txt &
sleep 10
# run the build
- ./node_modules/grunt-cli/bin/grunt e2e
+ ./node_modules/grunt-cli/bin/grunt e2e-chrome
# stop selenium
curl -s -L http://localhost:4444/selenium-server/driver?cmd=shutDownSeleniumServer > seleniumLog.txt &
;;