Skip to content

Commit

Permalink
Catch up with jasmine/jasmine#1561
Browse files Browse the repository at this point in the history
  • Loading branch information
dfederm committed Aug 14, 2018
1 parent c61d20f commit 28f85d6
Show file tree
Hide file tree
Showing 5 changed files with 133 additions and 104 deletions.
22 changes: 11 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "karma-jasmine-html-reporter",
"version": "1.2.0",
"version": "1.3.0",
"description": "A Karma plugin. Dynamically displays tests results at debug.html page",
"main": "./src/index.js",
"keywords": [
Expand Down Expand Up @@ -44,4 +44,4 @@
"jasmine-core": ">=3"
},
"readmeFilename": "README.md"
}
}
3 changes: 2 additions & 1 deletion src/css/jasmine.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 12 additions & 9 deletions src/lib/adapter.js
@@ -1,4 +1,4 @@
(function(window){
(function (window) {

/**
* Since this is being run in a browser and the results should populate to an HTML page, require the HTML-specific Jasmine code, injecting the same reference.
Expand All @@ -17,7 +17,7 @@
*/

var queryString = new jasmine.QueryString({
getWindowLocation: function() { return window.location; }
getWindowLocation: function () { return window.location; }
});

var filterSpecs = !!queryString.getParam("spec");
Expand All @@ -28,6 +28,9 @@
var throwingExpectationFailures = queryString.getParam("throwFailures");
env.throwOnExpectationFailure(throwingExpectationFailures);

var hideDisabled = queryString.getParam("hideDisabled");
env.hideDisabled(hideDisabled);

var random = queryString.getParam("random");

if (random !== undefined && random !== "") {
Expand All @@ -45,11 +48,11 @@
*/
var htmlReporter = new jasmine.HtmlReporter({
env: env,
navigateWithNewParam: function(key, value) { return queryString.navigateWithNewParam(key, value); },
addToExistingQueryString: function(key, value) { return queryString.fullStringWithNewParam(key, value); },
getContainer: function() { return document.body; },
createElement: function() { return document.createElement.apply(document, arguments); },
createTextNode: function() { return document.createTextNode.apply(document, arguments); },
navigateWithNewParam: function (key, value) { return queryString.navigateWithNewParam(key, value); },
addToExistingQueryString: function (key, value) { return queryString.fullStringWithNewParam(key, value); },
getContainer: function () { return document.body; },
createElement: function () { return document.createElement.apply(document, arguments); },
createTextNode: function () { return document.createTextNode.apply(document, arguments); },
timer: new jasmine.Timer(),
filterSpecs: filterSpecs
});
Expand All @@ -64,10 +67,10 @@
* Filter which specs will be run by matching the start of the full name against the `spec` query param.
*/
var specFilter = new jasmine.HtmlSpecFilter({
filterString: function() { return queryString.getParam("spec"); }
filterString: function () { return queryString.getParam("spec"); }
});

env.specFilter = function(spec) {
env.specFilter = function (spec) {
return specFilter.matches(spec.getFullName());
};

Expand Down

0 comments on commit 28f85d6

Please sign in to comment.