Upgrade to Jasmine 3.3

dfederm · Oct 28, 2018 · baa99b5 · baa99b5
1 parent 1a9ea67
commit baa99b5
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 41 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "karma-jasmine-html-reporter",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "A Karma plugin. Dynamically displays tests results at debug.html page",
   "main": "./src/index.js",
   "keywords": [
@@ -40,12 +40,12 @@
   "peerDependencies": {
     "karma": ">=0.9",
     "karma-jasmine": ">=1.1",
-    "jasmine-core": ">=3.2"
+    "jasmine-core": ">=3.3"
   },
   "license": "MIT",
   "devDependencies": {
     "chalk": "*",
-    "jasmine-core": ">=3.2"
+    "jasmine-core": ">=3.3"
   },
   "readmeFilename": "README.md"
-}
+}
diff --git a/src/css/jasmine.css b/src/css/jasmine.css
diff --git a/src/lib/adapter.js b/src/lib/adapter.js
@@ -22,24 +22,21 @@
 
   var filterSpecs = !!queryString.getParam("spec");
 
-  var stoppingOnSpecFailure = queryString.getParam("failFast");
-  env.stopOnSpecFailure(stoppingOnSpecFailure);
-
-  var throwingExpectationFailures = queryString.getParam("throwFailures");
-  env.throwOnExpectationFailure(throwingExpectationFailures);
-
-  var hideDisabled = queryString.getParam("hideDisabled");
-  env.hideDisabled(hideDisabled);
+  var config = {
+    failFast: queryString.getParam("failFast"),
+    oneFailurePerSpec: queryString.getParam("oneFailurePerSpec"),
+    hideDisabled: queryString.getParam("hideDisabled")
+  };
 
   var random = queryString.getParam("random");
 
   if (random !== undefined && random !== "") {
-    env.randomizeTests(random);
+    config.random = random;
   }
 
   var seed = queryString.getParam("seed");
   if (seed) {
-    env.seed(seed);
+    config.seed = seed;
   }
 
   /**
@@ -70,10 +67,12 @@
     filterString: function () { return queryString.getParam("spec"); }
   });
 
-  env.specFilter = function (spec) {
+  config.specFilter = function (spec) {
     return specFilter.matches(spec.getFullName());
   };
 
+  env.configure(config);
+
   htmlReporter.initialize();
 
 })(window);
diff --git a/src/lib/html.jasmine.reporter.js b/src/lib/html.jasmine.reporter.js
@@ -80,7 +80,7 @@ jasmineRequire.HtmlReporter = function (j$) {
 
 
   function HtmlReporter(options) {
-    var env = options.env || {},
+    var config = function () { return (options.env && options.env.configuration()) || {}; },
       getContainer = options.getContainer,
       createElement = options.createElement,
       createTextNode = options.createTextNode,
@@ -167,7 +167,7 @@ jasmineRequire.HtmlReporter = function (j$) {
 
     this.resultStatus = function (status) {
       if (status === 'excluded') {
-        return env.hidingDisabled() ? 'jasmine-excluded-no-display' : 'jasmine-excluded';
+        return config().hideDisabled ? 'jasmine-excluded-no-display' : 'jasmine-excluded';
       }
       return 'jasmine-' + status;
     };
@@ -179,7 +179,7 @@ jasmineRequire.HtmlReporter = function (j$) {
       var i;
       alert.appendChild(createDom('span', { className: 'jasmine-duration' }, 'finished in ' + timer.elapsed() / 1000 + 's'));
 
-      banner.appendChild(optionsMenu(env));
+      banner.appendChild(optionsMenu(config()));
 
       if (stateBuilder.specsExecuted < totalSpecsDefined) {
         var skippedMessage = 'Ran ' + stateBuilder.specsExecuted + ' of ' + totalSpecsDefined + ' specs - run all';
@@ -339,7 +339,7 @@ jasmineRequire.HtmlReporter = function (j$) {
       }
     }
 
-    function optionsMenu(env) {
+    function optionsMenu(config) {
       var optionsMenuDom = createDom('div', { className: 'jasmine-run-options' },
         createDom('span', { className: 'jasmine-trigger' }, 'Options'),
         createDom('div', { className: 'jasmine-payload' },
@@ -375,27 +375,27 @@ jasmineRequire.HtmlReporter = function (j$) {
       );
 
       var failFastCheckbox = optionsMenuDom.querySelector('#jasmine-fail-fast');
-      failFastCheckbox.checked = env.stoppingOnSpecFailure();
+      failFastCheckbox.checked = config.failFast;
       failFastCheckbox.onclick = function () {
-        navigateWithNewParam('failFast', !env.stoppingOnSpecFailure());
+        navigateWithNewParam('failFast', !config.failFast);
       };
 
       var throwCheckbox = optionsMenuDom.querySelector('#jasmine-throw-failures');
-      throwCheckbox.checked = env.throwingExpectationFailures();
+      throwCheckbox.checked = config.oneFailurePerSpec;
       throwCheckbox.onclick = function () {
-        navigateWithNewParam('throwFailures', !env.throwingExpectationFailures());
+        navigateWithNewParam('throwFailures', !config.oneFailurePerSpec);
       };
 
       var randomCheckbox = optionsMenuDom.querySelector('#jasmine-random-order');
-      randomCheckbox.checked = env.randomTests();
+      randomCheckbox.checked = config.random;
       randomCheckbox.onclick = function () {
-        navigateWithNewParam('random', !env.randomTests());
+        navigateWithNewParam('random', !config.random);
       };
 
       var hideDisabled = optionsMenuDom.querySelector('#jasmine-hide-disabled');
-      hideDisabled.checked = env.hidingDisabled();
+      hideDisabled.checked = config.hideDisabled;
       hideDisabled.onclick = function () {
-        navigateWithNewParam('hideDisabled', !env.hidingDisabled());
+        navigateWithNewParam('hideDisabled', !config.hideDisabled);
       };
 
       var optionsTrigger = optionsMenuDom.querySelector('.jasmine-trigger'),