jasmine-core
Advanced tools
Comparing version 2.5.2 to 2.6.0
/* | ||
Copyright (c) 2008-2016 Pivotal Labs | ||
Copyright (c) 2008-2017 Pivotal Labs | ||
@@ -4,0 +4,0 @@ Permission is hereby granted, free of charge, to any person obtaining |
/* | ||
Copyright (c) 2008-2016 Pivotal Labs | ||
Copyright (c) 2008-2017 Pivotal Labs | ||
@@ -74,2 +74,4 @@ Permission is hereby granted, free of charge, to any person obtaining | ||
var filterSpecs = !!queryString.getParam("spec"); | ||
var catchingExceptions = queryString.getParam("catch"); | ||
@@ -102,3 +104,4 @@ env.catchExceptions(typeof catchingExceptions === "undefined" ? true : catchingExceptions); | ||
createTextNode: function() { return document.createTextNode.apply(document, arguments); }, | ||
timer: new jasmine.Timer() | ||
timer: new jasmine.Timer(), | ||
filterSpecs: filterSpecs | ||
}); | ||
@@ -105,0 +108,0 @@ |
/* | ||
Copyright (c) 2008-2016 Pivotal Labs | ||
Copyright (c) 2008-2017 Pivotal Labs | ||
@@ -46,2 +46,3 @@ Permission is hereby granted, free of charge, to any person obtaining | ||
addToExistingQueryString = options.addToExistingQueryString || defaultQueryString, | ||
filterSpecs = options.filterSpecs, | ||
timer = options.timer || noopTimer, | ||
@@ -267,2 +268,5 @@ results = [], | ||
var resultNode = resultsTree.children[i]; | ||
if (filterSpecs && !hasActiveSpec(resultNode)) { | ||
continue; | ||
} | ||
if (resultNode.type == 'suite') { | ||
@@ -395,2 +399,16 @@ var suiteListNode = createDom('ul', {className: 'jasmine-suite', id: 'suite-' + resultNode.result.id}, | ||
} | ||
function hasActiveSpec(resultNode) { | ||
if (resultNode.type == 'spec' && resultNode.result.status != 'disabled') { | ||
return true; | ||
} | ||
if (resultNode.type == 'suite') { | ||
for (var i = 0, j = resultNode.children.length; i < j; i++) { | ||
if (hasActiveSpec(resultNode.children[i])) { | ||
return true; | ||
} | ||
} | ||
} | ||
} | ||
} | ||
@@ -397,0 +415,0 @@ |
/* | ||
Copyright (c) 2008-2016 Pivotal Labs | ||
Copyright (c) 2008-2017 Pivotal Labs | ||
@@ -4,0 +4,0 @@ Permission is hereby granted, free of charge, to any person obtaining |
{ | ||
"name": "jasmine-core", | ||
"license": "MIT", | ||
"version": "2.5.2", | ||
"version": "2.6.0", | ||
"repository": { | ||
@@ -29,3 +29,3 @@ "type": "git", | ||
"grunt-contrib-jshint": "^1.0.0", | ||
"jasmine": "^2.4.0", | ||
"jasmine": "^2.5.0", | ||
"load-grunt-tasks": "^0.4.0", | ||
@@ -32,0 +32,0 @@ "shelljs": "^0.7.0", |
@@ -13,3 +13,3 @@ <a name="README">[<img src="https://rawgithub.com/jasmine/jasmine/master/images/jasmine-horizontal.svg" width="400px" />](http://jasmine.github.io)</a> | ||
Documentation & guides live here: [http://jasmine.github.io](http://jasmine.github.io/) | ||
For a quick start guide of Jasmine 2.0, see the beginning of [http://jasmine.github.io/2.0/introduction.html](http://jasmine.github.io/2.0/introduction.html) | ||
For a quick start guide of Jasmine 2.x, see the beginning of [http://jasmine.github.io/edge/introduction.html](http://jasmine.github.io/edge/introduction.html) | ||
@@ -20,3 +20,3 @@ Upgrading from Jasmine 1.x? Check out the [2.0 release notes](https://github.com/jasmine/jasmine/blob/v2.0.0/release_notes/20.md) for a list of what's new (including breaking interface changes). You can also read the [upgrade guide](http://jasmine.github.io/2.0/upgrading.html). | ||
Please read the [contributors' guide](https://github.com/jasmine/jasmine/blob/master/CONTRIBUTING.md) | ||
Please read the [contributors' guide](https://github.com/jasmine/jasmine/blob/master/.github/CONTRIBUTING.md) | ||
@@ -70,13 +70,13 @@ ## Installation | ||
* [Gregg Van Hove](mailto:gvanhove@pivotal.io), Pivotal Labs | ||
### Maintainers Emeritus | ||
* [Davis W. Frank](mailto:dwfrank@pivotal.io), Pivotal Labs | ||
* [Rajan Agaskar](mailto:rajan@pivotal.io), Pivotal Labs | ||
* [Gregg Van Hove](mailto:gvanhove@pivotal.io), Pivotal Labs | ||
* [Greg Cobb](mailto:gcobb@pivotal.io), Pivotal Labs | ||
* [Chris Amavisca](mailto:camavisca@pivotal.io), Pivotal Labs | ||
### Maintainers Emeritus | ||
* [Christian Williams](mailto:antixian666@gmail.com), Cloud Foundry | ||
* Sheel Choksi | ||
Copyright (c) 2008-2016 Pivotal Labs. This software is licensed under the MIT License. | ||
Copyright (c) 2008-2017 Pivotal Labs. This software is licensed under the MIT License. |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
247652
5620