File tree Expand file tree Collapse file tree 3 files changed +17
-14
lines changed Expand file tree Collapse file tree 3 files changed +17
-14
lines changed Original file line number Diff line number Diff line change
1
+ if [ -z " $CIRCLE_PULL_REQUEST " ]
2
+ then
3
+ npm run unit
4
+ # start sauce connect
5
+ cd sc-* -linux && ./bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY -f ~ /sc_ready &
6
+ # Wait for tunnel to be ready
7
+ while [ ! -e ~ /sc_ready ]; do sleep 1; done
8
+ # serve example app
9
+ npm run serve &
10
+ # Run selenium tests
11
+ npm run e2e-sauce
12
+ else
13
+ npm test
14
+ fi
Original file line number Diff line number Diff line change @@ -10,15 +10,4 @@ dependencies:
10
10
11
11
test :
12
12
override :
13
- # Run unit tests
14
- - npm run unit
15
- # start sauce connect
16
- - cd sc-*-linux && ./bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY -f ~/sc_ready :
17
- background : true
18
- # Wait for tunnel to be ready
19
- - while [ ! -e ~/sc_ready ]; do sleep 1; done
20
- # serve example app
21
- - npm run serve :
22
- background : true
23
- # Run selenium tests
24
- - npm run e2e-sauce
13
+ - bash ./build/ci.sh
Original file line number Diff line number Diff line change 50
50
"karma-phantomjs-launcher" : " ^0.2.1" ,
51
51
"karma-spec-reporter" : " 0.0.20" ,
52
52
"karma-webpack" : " ^1.7.0" ,
53
- "nightwatch" : " ^0.7.9 " ,
53
+ "nightwatch" : " ^0.8.4 " ,
54
54
"phantomjs" : " ^1.9.18" ,
55
55
"selenium-server" : " 2.47.1" ,
56
56
"style-loader" : " ^0.12.3" ,
57
- "vue" : " yyx990803/vue#dev " ,
57
+ "vue" : " yyx990803/vue#1.0.0-beta " ,
58
58
"vue-loader" : " ^3.0.3" ,
59
59
"webpack" : " ^1.11.0" ,
60
60
"webpack-dev-server" : " ^1.10.1"
You can’t perform that action at this time.
0 commit comments