File tree Expand file tree Collapse file tree 2 files changed +8
-4
lines changed Expand file tree Collapse file tree 2 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -120,8 +120,7 @@ before_script:
120
120
- echo "export SPARK_HOME=`pwd`/spark-$SPARK_VER-bin-hadoop$HADOOP_VER" > conf/zeppelin-env.sh
121
121
- echo "export ZEPPELIN_HELIUM_REGISTRY=helium" >> conf/zeppelin-env.sh
122
122
- tail conf/zeppelin-env.sh
123
- - export DISPLAY=:99.0 # required to execute e2e tests in chrome
124
- - sh -e /etc/init.d/xvfb start # required to execute e2e tests in chrome
123
+ - if [[ -n $TEST_MODULES ]]; then export CHROME_BIN=chromium-browser; export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; sleep 3; fi
125
124
126
125
script :
127
126
- if [[ -n $TEST_MODULES ]]; then export MODULES=$TEST_MODULES; fi
Original file line number Diff line number Diff line change 1
- exports . config = {
1
+ var baseConfig = {
2
2
baseUrl : 'http://localhost:8080/' ,
3
3
directConnect : true ,
4
4
// chromeOnly: true,
@@ -24,7 +24,6 @@ exports.config = {
24
24
browser . manage ( ) . timeouts ( ) . pageLoadTimeout ( 80000 ) ;
25
25
browser . manage ( ) . timeouts ( ) . implicitlyWait ( 50000 ) ;
26
26
27
-
28
27
// add reporter to display executed tests in console
29
28
var SpecReporter = require ( 'jasmine-spec-reporter' ) . SpecReporter ;
30
29
jasmine . getEnv ( ) . addReporter ( new SpecReporter ( {
@@ -34,3 +33,9 @@ exports.config = {
34
33
} ) ) ;
35
34
} ,
36
35
} ;
36
+
37
+ if ( process . env . TRAVIS ) {
38
+ baseConfig . binary = process . env . CHROME_BIN
39
+ }
40
+
41
+ exports . config = baseConfig ;
You can’t perform that action at this time.
0 commit comments