Skip to content

Commit 509bbe3

Browse files
committed
Use PhantomJS 2 for automated tests
This fixes the current build, which is broken on angular 1.5.0 due to angular/angular.js#13794.
1 parent 639cf6f commit 509bbe3

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Diff for: Gruntfile.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,17 @@ module.exports = function (grunt) {
9696
karma: {
9797
unit: {
9898
configFile: "test/configs/unit.conf.js",
99-
browsers: ["PhantomJS"],
99+
browsers: ["PhantomJS2"],
100100
background: true
101101
},
102102
unit_nojquery: {
103103
configFile: "test/configs/unit-nojquery.conf.js",
104-
browsers: ["PhantomJS"],
104+
browsers: ["PhantomJS2"],
105105
background: true
106106
},
107107
unitci: {
108108
configFile: "test/configs/unit.conf.js",
109-
browsers: ["Firefox", "PhantomJS"],
109+
browsers: ["Firefox", "PhantomJS2"],
110110
singleRun: true,
111111
reporters: ["dots", "junit"],
112112
junitReporter: {
@@ -115,7 +115,7 @@ module.exports = function (grunt) {
115115
},
116116
unitci_nojquery: {
117117
configFile: "test/configs/unit-nojquery.conf.js",
118-
browsers: ["Firefox", "PhantomJS"],
118+
browsers: ["Firefox", "PhantomJS2"],
119119
singleRun: true,
120120
reporters: ["dots", "junit"],
121121
junitReporter: {
@@ -124,12 +124,12 @@ module.exports = function (grunt) {
124124
},
125125
e2e: {
126126
configFile: "test/configs/e2e.conf.js",
127-
browsers: ["PhantomJS"],
127+
browsers: ["PhantomJS2"],
128128
background: true
129129
},
130130
e2eci: {
131131
configFile: "test/configs/e2e.conf.js",
132-
browsers: ["Firefox", "PhantomJS"],
132+
browsers: ["Firefox", "PhantomJS2"],
133133
singleRun: true,
134134
reporters: ["dots", "junit"],
135135
junitReporter: {

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"karma-junit-reporter": "~0.2.2",
4242
"karma-mocha": "~0.1.0",
4343
"karma-ng-scenario": "~0.1.0",
44-
"karma-phantomjs-launcher": "^0.1.4"
44+
"karma-phantomjs2-launcher": "^0.5.0"
4545
},
4646
"repository": {
4747
"type": "git",

0 commit comments

Comments
 (0)