Merge branch 'master' of https://github.com/d-reinhold/jasmine into d-reinhold-master

- Merges #1046 from @d-reinhold
- Fixes #510
This commit is contained in:
Gregg Van Hove
2016-11-04 10:27:29 -07:00
6 changed files with 1303 additions and 1203 deletions

View File

@@ -71,6 +71,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
getWindowLocation: function() { return window.location; }
});
var filterSpecs = !!queryString.getParam("spec");
var catchingExceptions = queryString.getParam("catch");
env.catchExceptions(typeof catchingExceptions === "undefined" ? true : catchingExceptions);
@@ -98,7 +100,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
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()
timer: new jasmine.Timer(),
filterSpecs: filterSpecs
});
/**