From 75175a629716d5c5267680a8dcaf4b484ebc5a00 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sun, 28 Feb 2016 09:28:42 +0100 Subject: [PATCH] Upgrade jasmine to 2 --- package.json | 4 ++-- spec/HtmlWebpackPluginSpec.js | 2 +- spec/support/jasmine.json | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 spec/support/jasmine.json diff --git a/package.json b/package.json index b09209a..4c990d1 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ ], "scripts": { "pretest": "semistandard", - "test": "jasmine-node --captureExceptions spec" + "test": "jasmine" }, "repository": { "type": "git", @@ -38,7 +38,7 @@ "html-loader": "^0.4.0", "jade": "^1.11.0", "jade-loader": "^0.8.0", - "jasmine-node": "^1.14.5", + "jasmine": "^2.4.1", "rimraf": "^2.5.0", "semistandard": "^7.0.5", "style-loader": "^0.13.0", diff --git a/spec/HtmlWebpackPluginSpec.js b/spec/HtmlWebpackPluginSpec.js index 58b5167..a52234f 100644 --- a/spec/HtmlWebpackPluginSpec.js +++ b/spec/HtmlWebpackPluginSpec.js @@ -1,4 +1,4 @@ -/* global describe, it, beforeEach, expect */ +/* eslint-env jasmine */ 'use strict'; // Workaround for css-loader issue diff --git a/spec/support/jasmine.json b/spec/support/jasmine.json new file mode 100644 index 0000000..54750e1 --- /dev/null +++ b/spec/support/jasmine.json @@ -0,0 +1,8 @@ +{ + "spec_dir": "spec", + "spec_files": [ + "**/*[sS]pec.js" + ], + "stopSpecOnExpectationFailure": false, + "random": true +}