Skip to content

Commit 890c0db

Browse files
committed
On travis run test on headless chrome
1 parent e022273 commit 890c0db

File tree

3 files changed

+83
-70
lines changed

3 files changed

+83
-70
lines changed

karma.conf.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
var webpack = require('webpack');
1+
const webpack = require('webpack');
2+
3+
const {TEST_BROWSER} = process.env;
4+
const runOnNode = TEST_BROWSER === 'ChromeHeadless';
25

36
module.exports = function (config) {
47
config.set({
5-
browsers: ['Chrome'],
6-
singleRun: false,
8+
browsers: [TEST_BROWSER || 'Chrome'],
9+
singleRun: runOnNode,
710
frameworks: ['jasmine'],
811
files: [
912
'./test/**/*.spec.js'
1013
],
11-
reporters: ['kjhtml'],
14+
reporters: [runOnNode ? 'spec' : 'kjhtml'],
1215
preprocessors: {
1316
'./test/**/*.js': [ 'webpack','sourcemap'] //preprocess with webpack
1417
},

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,13 @@
5656
"jasmine": "^2.4.1",
5757
"jasmine-core": "^2.4.1",
5858
"json-loader": "^0.5.4",
59-
"karma": "^0.13.22",
60-
"karma-chrome-launcher": "^0.2.3",
61-
"karma-cli": "^0.1.2",
59+
"karma": "^1.7.1",
60+
"karma-chrome-launcher": "^2.2.0",
61+
"karma-cli": "^1.0.1",
6262
"karma-jasmine": "^0.3.7",
6363
"karma-jasmine-html-reporter": "^0.2.0",
6464
"karma-sourcemap-loader": "^0.3.7",
65+
"karma-spec-reporter": "^0.0.31",
6566
"karma-webpack": "^1.7.0",
6667
"material-ui": "^0.19.2",
6768
"react": "^16.0.0",

yarn.lock

Lines changed: 72 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -745,10 +745,6 @@ [email protected]:
745745
version "0.6.1"
746746
resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
747747

748-
batch@^0.5.3:
749-
version "0.5.3"
750-
resolved "https://registry.yarnpkg.com/batch/-/batch-0.5.3.tgz#3f3414f380321743bfc1042f9a83ff1d5824d464"
751-
752748
bcrypt-pbkdf@^1.0.0:
753749
version "1.0.1"
754750
resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
@@ -779,11 +775,11 @@ block-stream@*:
779775
dependencies:
780776
inherits "~2.0.0"
781777

782-
bluebird@^2.9.27:
783-
version "2.11.0"
784-
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
778+
bluebird@^3.3.0:
779+
version "3.5.1"
780+
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
785781

786-
[email protected], body-parser@^1.12.4:
782+
[email protected], body-parser@^1.16.1:
787783
version "1.18.2"
788784
resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
789785
dependencies:
@@ -980,10 +976,16 @@ [email protected]:
980976
version "0.5.1"
981977
resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
982978

983-
colors@^1.1.0:
979+
colors@^1.1.0, colors@^1.1.2:
984980
version "1.1.2"
985981
resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
986982

983+
combine-lists@^1.0.0:
984+
version "1.0.1"
985+
resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
986+
dependencies:
987+
lodash "^4.5.0"
988+
987989
combined-stream@^1.0.5, combined-stream@~1.0.5:
988990
version "1.0.5"
989991
resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
@@ -1048,7 +1050,7 @@ connect-history-api-fallback@^1.3.0:
10481050
version "1.3.0"
10491051
resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz#e51d17f8f0ef0db90a64fdb47de3051556e9f169"
10501052

1051-
connect@^3.3.5:
1053+
connect@^3.6.0:
10521054
version "3.6.5"
10531055
resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.5.tgz#fb8dde7ba0763877d0ec9df9dac0b4b40e72c7da"
10541056
dependencies:
@@ -1099,7 +1101,7 @@ core-js@^1.0.0:
10991101
version "1.2.7"
11001102
resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
11011103

1102-
core-js@^2.1.0, core-js@^2.4.0, core-js@^2.5.0:
1104+
core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.0:
11031105
version "2.5.1"
11041106
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
11051107

@@ -1335,9 +1337,9 @@ encoding@^0.1.11:
13351337
dependencies:
13361338
iconv-lite "~0.4.13"
13371339

1338-
engine.io-client@~1.8.4:
1339-
version "1.8.4"
1340-
resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.4.tgz#9fe85dee25853ca6babe25bd2ad68710863e91c2"
1340+
1341+
version "1.8.3"
1342+
resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.3.tgz#1798ed93451246453d4c6f635d7a201fe940d5ab"
13411343
dependencies:
13421344
component-emitter "1.2.1"
13431345
component-inherit "0.0.3"
@@ -1363,16 +1365,16 @@ [email protected]:
13631365
has-binary "0.1.7"
13641366
wtf-8 "1.0.0"
13651367

1366-
engine.io@~1.8.4:
1367-
version "1.8.4"
1368-
resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.4.tgz#77bce12b80e5d60429337fec3b0daf691ebc9003"
1368+
1369+
version "1.8.3"
1370+
resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.3.tgz#8de7f97895d20d39b85f88eeee777b2bd42b13d4"
13691371
dependencies:
13701372
accepts "1.3.3"
13711373
base64id "1.0.0"
13721374
cookie "0.3.1"
13731375
debug "2.3.3"
13741376
engine.io-parser "1.3.2"
1375-
ws "1.1.4"
1377+
ws "1.1.2"
13761378

13771379
enhanced-resolve@~0.9.0:
13781380
version "0.9.1"
@@ -1982,7 +1984,7 @@ glob-parent@^2.0.0:
19821984
dependencies:
19831985
is-glob "^2.0.0"
19841986

1985-
glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.2:
1987+
glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2:
19861988
version "7.1.2"
19871989
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
19881990
dependencies:
@@ -2482,16 +2484,16 @@ jsprim@^1.2.2:
24822484
json-schema "0.2.3"
24832485
verror "1.10.0"
24842486

2485-
karma-chrome-launcher@^0.2.3:
2486-
version "0.2.3"
2487-
resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-0.2.3.tgz#4c6d700d163a9d34c618efd87918be49e7a4a8c9"
2487+
karma-chrome-launcher@^2.2.0:
2488+
version "2.2.0"
2489+
resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
24882490
dependencies:
24892491
fs-access "^1.0.0"
24902492
which "^1.2.1"
24912493

2492-
karma-cli@^0.1.2:
2493-
version "0.1.2"
2494-
resolved "https://registry.yarnpkg.com/karma-cli/-/karma-cli-0.1.2.tgz#cacea84371ece19876265c8fa102ebbb9fee4a8c"
2494+
karma-cli@^1.0.1:
2495+
version "1.0.1"
2496+
resolved "https://registry.yarnpkg.com/karma-cli/-/karma-cli-1.0.1.tgz#ae6c3c58a313a1d00b45164c455b9b86ce17f960"
24952497
dependencies:
24962498
resolve "^1.1.6"
24972499

@@ -2515,6 +2517,12 @@ karma-sourcemap-loader@^0.3.7:
25152517
dependencies:
25162518
graceful-fs "^4.1.2"
25172519

2520+
karma-spec-reporter@^0.0.31:
2521+
version "0.0.31"
2522+
resolved "https://registry.yarnpkg.com/karma-spec-reporter/-/karma-spec-reporter-0.0.31.tgz#4830dc7148a155c7d7a186e632339a0d80fadec3"
2523+
dependencies:
2524+
colors "^1.1.2"
2525+
25182526
karma-webpack@^1.7.0:
25192527
version "1.8.1"
25202528
resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-1.8.1.tgz#39d5fd2edeea3cc3ef5b405989b37d5b0e6a3b4e"
@@ -2525,33 +2533,37 @@ karma-webpack@^1.7.0:
25252533
source-map "^0.1.41"
25262534
webpack-dev-middleware "^1.0.11"
25272535

2528-
karma@^0.13.22:
2529-
version "0.13.22"
2530-
resolved "https://registry.yarnpkg.com/karma/-/karma-0.13.22.tgz#07750b1bd063d7e7e7b91bcd2e6354d8f2aa8744"
2536+
karma@^1.7.1:
2537+
version "1.7.1"
2538+
resolved "https://registry.yarnpkg.com/karma/-/karma-1.7.1.tgz#85cc08e9e0a22d7ce9cca37c4a1be824f6a2b1ae"
25312539
dependencies:
2532-
batch "^0.5.3"
2533-
bluebird "^2.9.27"
2534-
body-parser "^1.12.4"
2540+
bluebird "^3.3.0"
2541+
body-parser "^1.16.1"
25352542
chokidar "^1.4.1"
25362543
colors "^1.1.0"
2537-
connect "^3.3.5"
2538-
core-js "^2.1.0"
2544+
combine-lists "^1.0.0"
2545+
connect "^3.6.0"
2546+
core-js "^2.2.0"
25392547
di "^0.0.1"
25402548
dom-serialize "^2.2.0"
25412549
expand-braces "^0.1.1"
2542-
glob "^7.0.0"
2550+
glob "^7.1.1"
25432551
graceful-fs "^4.1.2"
25442552
http-proxy "^1.13.0"
25452553
isbinaryfile "^3.0.0"
25462554
lodash "^3.8.0"
25472555
log4js "^0.6.31"
25482556
mime "^1.3.4"
2549-
minimatch "^3.0.0"
2557+
minimatch "^3.0.2"
25502558
optimist "^0.6.1"
2551-
rimraf "^2.3.3"
2552-
socket.io "^1.4.5"
2559+
qjobs "^1.1.4"
2560+
range-parser "^1.2.0"
2561+
rimraf "^2.6.0"
2562+
safe-buffer "^5.0.1"
2563+
socket.io "1.7.3"
25532564
source-map "^0.5.3"
2554-
useragent "^2.1.6"
2565+
tmp "0.0.31"
2566+
useragent "^2.1.12"
25552567

25562568
keycode@^2.1.8:
25572569
version "2.1.9"
@@ -2644,7 +2656,7 @@ lodash@^3.8.0:
26442656
version "3.10.1"
26452657
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
26462658

2647-
lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.6.1:
2659+
lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.6.1:
26482660
version "4.17.4"
26492661
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
26502662

@@ -3026,7 +3038,7 @@ os-homedir@^1.0.0:
30263038
version "1.0.2"
30273039
resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
30283040

3029-
os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
3041+
os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
30303042
version "1.0.2"
30313043
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
30323044

@@ -3219,6 +3231,10 @@ punycode@^1.2.4, punycode@^1.4.1:
32193231
version "1.4.1"
32203232
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
32213233

3234+
qjobs@^1.1.4:
3235+
version "1.1.5"
3236+
resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.1.5.tgz#659de9f2cf8dcc27a1481276f205377272382e73"
3237+
32223238
32233239
version "6.5.1"
32243240
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
@@ -3267,7 +3283,7 @@ randomatic@^1.1.3:
32673283
is-number "^3.0.0"
32683284
kind-of "^4.0.0"
32693285

3270-
range-parser@^1.0.3, range-parser@~1.2.0:
3286+
range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0:
32713287
version "1.2.0"
32723288
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
32733289

@@ -3529,7 +3545,7 @@ right-align@^0.1.1:
35293545
dependencies:
35303546
align-text "^0.1.1"
35313547

3532-
rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.5.1, rimraf@^2.6.1:
3548+
rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.0, rimraf@^2.6.1:
35333549
version "2.6.2"
35343550
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
35353551
dependencies:
@@ -3674,15 +3690,15 @@ [email protected]:
36743690
debug "2.3.3"
36753691
socket.io-parser "2.3.1"
36763692

3677-
3678-
version "1.7.4"
3679-
resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.7.4.tgz#ec9f820356ed99ef6d357f0756d648717bdd4281"
3693+
3694+
version "1.7.3"
3695+
resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.7.3.tgz#b30e86aa10d5ef3546601c09cde4765e381da377"
36803696
dependencies:
36813697
backo2 "1.0.2"
36823698
component-bind "1.0.0"
36833699
component-emitter "1.2.1"
36843700
debug "2.3.3"
3685-
engine.io-client "~1.8.4"
3701+
engine.io-client "1.8.3"
36863702
has-binary "0.1.7"
36873703
indexof "0.0.1"
36883704
object-component "0.0.3"
@@ -3699,16 +3715,16 @@ [email protected]:
36993715
isarray "0.0.1"
37003716
json3 "3.3.2"
37013717

3702-
socket.io@^1.4.5:
3703-
version "1.7.4"
3704-
resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.7.4.tgz#2f7ecedc3391bf2d5c73e291fe233e6e34d4dd00"
3718+
socket.io@1.7.3:
3719+
version "1.7.3"
3720+
resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.7.3.tgz#b8af9caba00949e568e369f1327ea9be9ea2461b"
37053721
dependencies:
37063722
debug "2.3.3"
3707-
engine.io "~1.8.4"
3723+
engine.io "1.8.3"
37083724
has-binary "0.1.7"
37093725
object-assign "4.1.0"
37103726
socket.io-adapter "0.5.0"
3711-
socket.io-client "1.7.4"
3727+
socket.io-client "1.7.3"
37123728
socket.io-parser "2.3.1"
37133729

37143730
sockjs-client@^1.0.3:
@@ -3915,11 +3931,11 @@ timers-browserify@^2.0.2:
39153931
dependencies:
39163932
setimmediate "^1.0.4"
39173933

3918-
3919-
version "0.0.33"
3920-
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
3934+
3935+
version "0.0.31"
3936+
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
39213937
dependencies:
3922-
os-tmpdir "~1.0.2"
3938+
os-tmpdir "~1.0.1"
39233939

39243940
39253941
version "0.1.4"
@@ -4042,7 +4058,7 @@ user-home@^2.0.0:
40424058
dependencies:
40434059
os-homedir "^1.0.0"
40444060

4045-
useragent@^2.1.6:
4061+
useragent@^2.1.12:
40464062
version "2.2.1"
40474063
resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.2.1.tgz#cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"
40484064
dependencies:
@@ -4228,13 +4244,6 @@ [email protected]:
42284244
options ">=0.0.5"
42294245
ultron "1.0.x"
42304246

4231-
4232-
version "1.1.4"
4233-
resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.4.tgz#57f40d036832e5f5055662a397c4de76ed66bf61"
4234-
dependencies:
4235-
options ">=0.0.5"
4236-
ultron "1.0.x"
4237-
42384247
42394248
version "1.0.0"
42404249
resolved "https://registry.yarnpkg.com/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"

0 commit comments

Comments
 (0)