Skip to content

Commit

Permalink
Merge pull request #267 from addaleax/phantomjs2-tests
Browse files Browse the repository at this point in the history
Use PhantomJS 2 for automated tests
  • Loading branch information
rubenv committed Feb 15, 2016
2 parents 639cf6f + 72345d8 commit 8959f44
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: node_js
node_js:
- "0.10"
sudo: false
before_install:
- npm install -g grunt-cli bower
- bower install
Expand Down
12 changes: 6 additions & 6 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,17 @@ module.exports = function (grunt) {
karma: {
unit: {
configFile: "test/configs/unit.conf.js",
browsers: ["PhantomJS"],
browsers: ["PhantomJS2"],
background: true
},
unit_nojquery: {
configFile: "test/configs/unit-nojquery.conf.js",
browsers: ["PhantomJS"],
browsers: ["PhantomJS2"],
background: true
},
unitci: {
configFile: "test/configs/unit.conf.js",
browsers: ["Firefox", "PhantomJS"],
browsers: ["Firefox", "PhantomJS2"],
singleRun: true,
reporters: ["dots", "junit"],
junitReporter: {
Expand All @@ -115,7 +115,7 @@ module.exports = function (grunt) {
},
unitci_nojquery: {
configFile: "test/configs/unit-nojquery.conf.js",
browsers: ["Firefox", "PhantomJS"],
browsers: ["Firefox", "PhantomJS2"],
singleRun: true,
reporters: ["dots", "junit"],
junitReporter: {
Expand All @@ -124,12 +124,12 @@ module.exports = function (grunt) {
},
e2e: {
configFile: "test/configs/e2e.conf.js",
browsers: ["PhantomJS"],
browsers: ["PhantomJS2"],
background: true
},
e2eci: {
configFile: "test/configs/e2e.conf.js",
browsers: ["Firefox", "PhantomJS"],
browsers: ["Firefox", "PhantomJS2"],
singleRun: true,
reporters: ["dots", "junit"],
junitReporter: {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"karma-junit-reporter": "~0.2.2",
"karma-mocha": "~0.1.0",
"karma-ng-scenario": "~0.1.0",
"karma-phantomjs-launcher": "^0.1.4"
"karma-phantomjs2-launcher": "^0.5.0"
},
"repository": {
"type": "git",
Expand Down

0 comments on commit 8959f44

Please sign in to comment.