Skip to content

Commit 6e26496

Browse files
committed
Updated packages to match new karma-phantomjs-runner and npm3 requirements
1 parent e87616e commit 6e26496

File tree

5 files changed

+12
-17
lines changed

5 files changed

+12
-17
lines changed

karma-angular-1.2.conf.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ module.exports = function(config) {
55

66
frameworks: [
77
'jasmine',
8-
'jasmine-jquery-matchers',
9-
'phantomjs-shim'
8+
'jasmine-jquery-matchers'
109
],
1110

1211
files: [

karma-angular-1.3.conf.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ module.exports = function(config) {
55

66
frameworks: [
77
'jasmine',
8-
'jasmine-jquery-matchers',
9-
'phantomjs-shim'
8+
'jasmine-jquery-matchers'
109
],
1110

1211
files: [

karma-angular-1.4.conf.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ module.exports = function(config) {
55

66
frameworks: [
77
'jasmine',
8-
'jasmine-jquery-matchers',
9-
'phantomjs-shim'
8+
'jasmine-jquery-matchers'
109
],
1110

1211
files: [

karma-angular-1.5.conf.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ module.exports = function(config) {
55

66
frameworks: [
77
'jasmine',
8-
'jasmine-jquery-matchers',
9-
'phantomjs-shim'
8+
'jasmine-jquery-matchers'
109
],
1110

1211
files: [

package.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@
88
"grunt-contrib-uglify": "",
99
"grunt-git-describe": "",
1010
"grunt-karma": "",
11-
"jasmine-core": "^2.4.1",
12-
"jasmine-jquery-matchers": "^1.0.1",
13-
"jquery": "^2.2.0",
14-
"karma": "",
15-
"karma-jasmine": "0.3.6",
16-
"karma-jasmine-jquery-matchers": "^1.0.0",
11+
"jasmine-core": "~2.4.1",
12+
"jasmine-jquery-matchers": "~1.0.1",
13+
"jquery": "~2.2.0",
14+
"karma": "~0.13.19",
15+
"karma-jasmine": "~0.3.6",
16+
"karma-jasmine-jquery-matchers": "~1.0.0",
1717
"karma-junit-reporter": "",
18-
"karma-phantomjs-launcher": "",
19-
"karma-phantomjs-shim": "",
20-
"phantomjs": "^1.9.19"
18+
"karma-phantomjs-launcher": "~1.0.0",
19+
"phantomjs-prebuilt": "~2.1.3"
2120
},
2221
"main": "build/angular-route-segment.js",
2322
"scripts": {

0 commit comments

Comments
 (0)