From 9fb8875f498053fb832416c18bc4a0da96f54294 Mon Sep 17 00:00:00 2001 From: Ruben Vermeersch Date: Wed, 15 Jun 2016 10:53:03 +0200 Subject: [PATCH] Fix browser name (#289) --- .jshintrc | 1 + Gruntfile.js | 8 ++++---- package.json | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.jshintrc b/.jshintrc index 8391c39..06a2aa2 100644 --- a/.jshintrc +++ b/.jshintrc @@ -22,6 +22,7 @@ "before", "beforeEach", "browser", + "by", "describe", "element", "expect", diff --git a/Gruntfile.js b/Gruntfile.js index e79f887..6a150b0 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -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"] } diff --git a/package.json b/package.json index 1612f12..dcb57f9 100644 --- a/package.json +++ b/package.json @@ -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": {