Skip to content

Commit

Permalink
Fix browser name (#289)
Browse files Browse the repository at this point in the history
  • Loading branch information
rubenv committed Jun 15, 2016
1 parent c5845c5 commit 9fb8875
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
1 change: 1 addition & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"before",
"beforeEach",
"browser",
"by",
"describe",
"element",
"expect",
Expand Down
8 changes: 4 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,23 +96,23 @@ module.exports = function (grunt) {
karma: {
unit: {
configFile: "test/configs/unit.conf.js",
browsers: ["PhantomJS2"],
browsers: ["PhantomJS"],
background: true
},
unit_nojquery: {
configFile: "test/configs/unit-nojquery.conf.js",
browsers: ["PhantomJS2"],
browsers: ["PhantomJS"],
background: true
},
unitci: {
configFile: "test/configs/unit.conf.js",
browsers: ["Firefox", "PhantomJS2"],
browsers: ["Firefox", "PhantomJS"],
singleRun: true,
reporters: ["dots"]
},
unitci_nojquery: {
configFile: "test/configs/unit-nojquery.conf.js",
browsers: ["Firefox", "PhantomJS2"],
browsers: ["Firefox", "PhantomJS"],
singleRun: true,
reporters: ["dots"]
}
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@
"karma-chai": "~0.1.0",
"karma-firefox-launcher": "~1.0.0",
"karma-mocha": "~1.0.1",
"karma-phantomjs2-launcher": "^0.5.0",
"karma-phantomjs-launcher": "^1.0.0",
"mocha": "^2.5.3",
"phantomjs-prebuilt": "^2.1.7",
"serve-static": "^1.11.1"
},
"repository": {
Expand Down

0 comments on commit 9fb8875

Please sign in to comment.