Skip to content

Commit 786959b

Browse files
lukbukkitlukbukkit
committed
Fix tests which are stuck
See gruntjs/grunt-contrib-jasmine#339
1 parent f12389a commit 786959b

File tree

3 files changed

+33
-30
lines changed

3 files changed

+33
-30
lines changed

‎package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,24 @@
3434
"chartist": "0.11.4"
3535
},
3636
"devDependencies": {
37-
"coffeescript": "2.5.1",
38-
"grunt": "1.4.1",
37+
"coffeescript": "^2.5.1",
38+
"grunt": "^1.4.1",
3939
"grunt-contrib-clean": "^2.0.0",
4040
"grunt-contrib-copy": "^1.0.0",
41-
"grunt-contrib-jasmine": "3.0.0",
42-
"grunt-contrib-jshint": "3.0.0",
43-
"grunt-contrib-uglify": "5.0.1",
44-
"grunt-sass": "3.1.0",
45-
"grunt-umd": "~3.0.0",
46-
"jasmine-fixture": "~2.0.0",
47-
"jshint-stylish": "~2.2.1",
48-
"load-grunt-config": "3.0.2",
49-
"node-sass": "6.0.1",
41+
"grunt-contrib-jasmine": "^3.0.0",
42+
"grunt-contrib-jshint": "^3.0.0",
43+
"grunt-contrib-uglify": "^5.0.1",
44+
"grunt-sass": "^3.1.0",
45+
"grunt-umd": "^3.0.0",
46+
"jasmine-fixture": "^2.0.0",
47+
"jshint-stylish": "^2.2.1",
48+
"load-grunt-config": "^3.0.2",
49+
"node-sass": "^6.0.1",
5050
"time-grunt": "^2.0.0"
5151
},
5252
"resolutions": {
53-
"minimist": "~1.2.5",
54-
"lodash": "~4.17.19",
53+
"minimist": "^1.2.5",
54+
"lodash": "^4.17.19",
5555
"ssri": "^8.0.1",
5656
"trim-newlines": "^4.0.2",
5757
"tar": "^6.1.9"

‎tasks/jasmine.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ module.exports = function (grunt) {
2121
helpers: '<%= pkg.config.test %>/spec/**/helper-*.js',
2222
phantomjs: {
2323
'ignore-ssl-errors': true
24-
}
24+
},
25+
// https://github.com/gruntjs/grunt-contrib-jasmine/issues/339
26+
version: '3.8.0',
27+
noSandbox: true
2528
}
2629
}
2730
};

‎yarn.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -502,10 +502,10 @@ coffee-script@^1.10.0, coffee-script@^1.12.7:
502502
resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
503503
integrity sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==
504504

505-
[email protected]:
506-
version "2.5.1"
507-
resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-2.5.1.tgz#b2442a1f2c806139669534a54adc35010559d16a"
508-
integrity sha512-J2jRPX0eeFh5VKyVnoLrfVFgLZtnnmp96WQSLAS8OrLm2wtQLcnikYKe1gViJKDH7vucjuhHvBKKBP3rKcD1tQ==
505+
coffeescript@^2.5.1:
506+
version "2.6.0"
507+
resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-2.6.0.tgz#927d52aa03df17d445c93c1afb66b081d26e1fa0"
508+
integrity sha512-gCGXhR72sTAdEr+oZh3FcOj04DrcMc9lZYSJUBNudkQ4tQXuPKE3cvcYVbK/HiVW+zFzLmnZdHexuJ33ufLZOg==
509509

510510
color-convert@^1.9.0:
511511
version "1.9.3"
@@ -1417,7 +1417,7 @@ grunt-contrib-copy@^1.0.0:
14171417
chalk "^1.1.1"
14181418
file-sync-cmp "^0.1.0"
14191419

1420-
[email protected]:
1420+
grunt-contrib-jasmine@^3.0.0:
14211421
version "3.0.0"
14221422
resolved "https://registry.yarnpkg.com/grunt-contrib-jasmine/-/grunt-contrib-jasmine-3.0.0.tgz#3cdfdf2bbfeaffb18fd7a822b32b4d6ac49b6fff"
14231423
integrity sha512-bJ7euPZneo+lVPUoOx9VG4yZQXvP0ke8rwpdVDSgQRuZSssa/oEYMvLEpLxWFJomUJ6xsMhpNNHJoFxk3SSM8g==
@@ -1430,7 +1430,7 @@ [email protected]:
14301430
rimraf "^2.6.3"
14311431
sprintf-js "^1.1.2"
14321432

1433-
[email protected]:
1433+
grunt-contrib-jshint@^3.0.0:
14341434
version "3.0.0"
14351435
resolved "https://registry.yarnpkg.com/grunt-contrib-jshint/-/grunt-contrib-jshint-3.0.0.tgz#4b52395e78bab122134c99b3b2d8907f17e38cbd"
14361436
integrity sha512-o0V3HNK54+w2Lss/AP0LsAUCEmPDQIcgsDFvTy0sE8sdPXq/8vHdNdMEitK9Wcfoq7H6v02v6soiiwJ0wavT7A==
@@ -1439,7 +1439,7 @@ [email protected]:
14391439
hooker "^0.2.3"
14401440
jshint "~2.12.0"
14411441

1442-
[email protected]:
1442+
grunt-contrib-uglify@^5.0.1:
14431443
version "5.0.1"
14441444
resolved "https://registry.yarnpkg.com/grunt-contrib-uglify/-/grunt-contrib-uglify-5.0.1.tgz#d1eeccafdfedc27353e5f610415d18340c568c51"
14451445
integrity sha512-T/aXZ4WIpAtoswZqb6HROKg7uq9QbKwl+lUuOwK4eoFj3tFv9/a/oMyd3/qvetV29Pbf8P1YYda1gDwZppr60A==
@@ -1493,20 +1493,20 @@ grunt-legacy-util@~2.0.1:
14931493
underscore.string "~3.3.5"
14941494
which "~2.0.2"
14951495

1496-
[email protected]:
1496+
grunt-sass@^3.1.0:
14971497
version "3.1.0"
14981498
resolved "https://registry.yarnpkg.com/grunt-sass/-/grunt-sass-3.1.0.tgz#a5936cc2a80ec08092d9f31c101dc307d1e4f71c"
14991499
integrity sha512-90s27H7FoCDcA8C8+R0GwC+ntYD3lG6S/jqcavWm3bn9RiJTmSfOvfbFa1PXx4NbBWuiGQMLfQTj/JvvqT5w6A==
15001500

1501-
grunt-umd@~3.0.0:
1501+
grunt-umd@^3.0.0:
15021502
version "3.0.0"
15031503
resolved "https://registry.yarnpkg.com/grunt-umd/-/grunt-umd-3.0.0.tgz#3526e771b062b89c6cd6dcfc62b3e1f71a0d7370"
15041504
integrity sha512-hrorGHjHv2EjN2DtZVqj5Y1KjX95RrdIuJlL5KyckArcw2UBijDOy0jrkauz1HTKSYUm7F0nUftLphjcexHTGw==
15051505
dependencies:
15061506
libumd "^0.9.0"
15071507
xtend "^4.0.1"
15081508

1509-
[email protected]:
1509+
grunt@^1.4.1:
15101510
version "1.4.1"
15111511
resolved "https://registry.yarnpkg.com/grunt/-/grunt-1.4.1.tgz#7d1e17db1f9c8108777f7273d6b9359755576f50"
15121512
integrity sha512-ZXIYXTsAVrA7sM+jZxjQdrBOAg7DyMUplOMhTaspMRExei+fD0BTwdWXnn0W5SXqhb/Q/nlkzXclSi3IH55PIA==
@@ -1904,7 +1904,7 @@ isstream@~0.1.2:
19041904
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
19051905
integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
19061906

1907-
jasmine-fixture@~2.0.0:
1907+
jasmine-fixture@^2.0.0:
19081908
version "2.0.0"
19091909
resolved "https://registry.yarnpkg.com/jasmine-fixture/-/jasmine-fixture-2.0.0.tgz#b6d0c5a3bb4834d23dd137464ef96f04f93bbd60"
19101910
integrity sha1-ttDFo7tINNI90TdGTvlvBPk7vWA=
@@ -1945,7 +1945,7 @@ jsbn@~0.1.0:
19451945
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
19461946
integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
19471947

1948-
jshint-stylish@~2.2.1:
1948+
jshint-stylish@^2.2.1:
19491949
version "2.2.1"
19501950
resolved "https://registry.yarnpkg.com/jshint-stylish/-/jshint-stylish-2.2.1.tgz#242082a2c035ae03fd81044e0570cc4208cf6e61"
19511951
integrity sha1-JCCCosA1rgP9gQROBXDMQgjPbmE=
@@ -2059,7 +2059,7 @@ lines-and-columns@^1.1.6:
20592059
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
20602060
integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
20612061

2062-
[email protected]:
2062+
load-grunt-config@^3.0.2:
20632063
version "3.0.2"
20642064
resolved "https://registry.yarnpkg.com/load-grunt-config/-/load-grunt-config-3.0.2.tgz#e1b84585889837d17749079e9272c05b5a57eec3"
20652065
integrity sha512-RTJ3F4iXe6b3Nz8wBFnud06AQM8Vpa8ifnVm8jabmyY8wE46gXcOFd5YecIfU5IfCWPrIa7Rl8c5u+RIZR0UEQ==
@@ -2235,7 +2235,7 @@ [email protected]:
22352235
is-plain-obj "^1.1.0"
22362236
kind-of "^6.0.3"
22372237

2238-
minimist@^1.2.5, minimist@~1.2.5:
2238+
minimist@^1.2.5:
22392239
version "1.2.5"
22402240
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
22412241
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
@@ -2391,7 +2391,7 @@ node-gyp@^7.1.0:
23912391
tar "^6.0.2"
23922392
which "^2.0.2"
23932393

2394-
[email protected]:
2394+
node-sass@^6.0.1:
23952395
version "6.0.1"
23962396
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-6.0.1.tgz#cad1ccd0ce63e35c7181f545d8b986f3a9a887fe"
23972397
integrity sha512-f+Rbqt92Ful9gX0cGtdYwjTrWAaGURgaK5rZCWOgCNyGWusFYHhbqCCBoFBeat+HKETOU02AyTxNhJV0YZf2jQ==
@@ -3496,7 +3496,7 @@ tar-stream@^2.1.4:
34963496
inherits "^2.0.3"
34973497
readable-stream "^3.1.1"
34983498

3499-
tar@^4.4.10, tar@^6.0.2, tar@^6.1.6:
3499+
tar@^4.4.10, tar@^6.0.2, tar@^6.1.9:
35003500
version "6.1.11"
35013501
resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
35023502
integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==

0 commit comments

Comments
 (0)