vendor/assets/javascripts/jasmine-jquery.js in jasmine-jquery-rails-1.5.3 vs vendor/assets/javascripts/jasmine-jquery.js in jasmine-jquery-rails-1.5.6

- old
+ new

@@ -1,9 +1,9 @@ /*! Jasmine-jQuery: a set of jQuery helpers for Jasmine tests. - Version 1.5.3 + Version 1.5.6 https://github.com/velesin/jasmine-jquery Copyright (c) 2010-2013 Wojciech Zawistowski, Travis Jeffery @@ -476,10 +476,14 @@ toContain: function(selector) { return this.actual.find(selector).length }, + toBeMatchedBy: function(selector) { + return this.actual.filter(selector).length + }, + toBeDisabled: function(selector){ return this.actual.is(':disabled') }, toBeFocused: function(selector) { @@ -511,11 +515,12 @@ } }, // tests the existence of a specific event binding + handler toHandleWith: function(eventName, eventHandler) { - var stack = $._data(this.actual.get(0), "events")[eventName] + var normalizedEventName = eventName.split('.')[0]; + var stack = $._data(this.actual.get(0), "events")[normalizedEventName] for (var i = 0; i < stack.length; i++) { if (stack[i].handler == eventHandler) return true } return false } @@ -654,6 +659,6 @@ afterEach(function() { jasmine.getFixtures().cleanUp() jasmine.getStyleFixtures().cleanUp() jasmine.JQuery.events.cleanUp() -}) +}) \ No newline at end of file