spec/dummy/tmp/cache/assets/D8C/520/sprockets%2F221cd58a042baac534d27e4cfedc1188 in teabag-0.5.2 vs spec/dummy/tmp/cache/assets/D8C/520/sprockets%2F221cd58a042baac534d27e4cfedc1188 in teabag-0.5.3

- old
+ new

@@ -1,8 +1,8 @@ -o: ActiveSupport::Cache::Entry :@compressedF:@expires_in0:@created_atf1357882148.204898: @value"{I" +o: ActiveSupport::Cache::Entry :@compressedF:@expires_in0:@created_atf1359171529.173918: @value"x{I" class:EFI"BundledAsset;FI"logical_path;FI"jasmine_helper.js;FI" pathname;FI"L/Users/jejacks0n/Projects/teabag/spec/javascripts/jasmine_helper.coffee;FI"content_type;FI"application/javascript;FI" -mtime;FI"2013-01-08T20:37:20-07:00;FI" length;Fi+I" digest;F"%f77e1e4bb8c4ed94dc579f460aa2dc5dI" source;FI"+/*! +mtime;FI"2013-01-25T20:22:14-07:00;FI" length;FiI" digest;F"%54b89ad53c417ea7ad48d0d2cadd2e1dI" source;FI"/*! * jQuery JavaScript Library v1.8.3 * http://jquery.com/ * * Includes Sizzle.js * http://sizzlejs.com/ @@ -9471,11 +9471,11 @@ if ( typeof define === "function" && define.amd && define.amd.jQuery ) { define( "jquery", [], function () { return jQuery; } ); } })( window ); -//https://github.com/velesin/jasmine-jquery/commit/8903b3d4c05cc558c70b3c94adc47321920a6c11 +// https://github.com/velesin/jasmine-jquery/commit/f65c78fb83775bd1f0ce3dc13fe9a82dc2b4e889 var readFixtures = function() { return jasmine.getFixtures().proxyCallTo_('read', arguments) } @@ -9589,13 +9589,11 @@ jasmine.Fixtures.prototype.clearCache = function() { this.fixturesCache_ = {} } jasmine.Fixtures.prototype.cleanUp = function() { - if (typeof($) == 'function') { - $('#' + this.containerId).remove() - } + $('#' + this.containerId).remove() } jasmine.Fixtures.prototype.sandbox = function(attributes) { var attributesToSet = attributes || {} return $('<div id="sandbox" />').attr(attributesToSet) @@ -9607,15 +9605,15 @@ container = $('<div id="' + this.containerId + '" />') container.html(html) } else { container = '<div id="' + this.containerId + '">' + html + '</div>' } - $('body').append(container) + $(document.body).append(container) } jasmine.Fixtures.prototype.addToContainer_ = function(html){ - var container = $('body').find('#'+this.containerId).append(html) + var container = $(document.body).find('#'+this.containerId).append(html) if(!container.length){ this.createContainer_(html) } } @@ -9740,11 +9738,11 @@ dataType: 'json', url: url, success: function(data) { self.fixturesCache_[relativeUrl] = data }, - error: function(jqXHR, status, errorThrown) { + fail: function(jqXHR, status, errorThrown) { throw Error('JSONFixture could not be loaded: ' + url + ' (status: ' + status + ', message: ' + errorThrown.message + ')') } }) } @@ -9794,11 +9792,12 @@ wasTriggered: function(selector, eventName) { return !!(data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]) }, wasPrevented: function(selector, eventName) { - return data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)].isDefaultPrevented() + var e; + return (e = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]) && e.isDefaultPrevented() }, cleanUp: function() { data.spiedEvents = {} data.handlers = [] @@ -9841,10 +9840,14 @@ toExist: function() { return $(document).find(this.actual).length }, + toHaveLength: function(length) { + return this.actual.length === length + }, + toHaveAttr: function(attributeName, expectedAttributeValue) { return hasProperty(this.actual.attr(attributeName), expectedAttributeValue) }, toHaveProp: function(propertyName, expectedPropertyValue) { @@ -9873,11 +9876,11 @@ return trimmedText == text } }, toHaveValue: function(value) { - return this.actual.val() == value + return this.actual.val() === value }, toHaveData: function(key, expectedValue) { return hasProperty(this.actual.data(key), expectedValue) }, @@ -9893,11 +9896,11 @@ toBeDisabled: function(selector){ return this.actual.is(':disabled') }, toBeFocused: function(selector) { - return this.actual.is(':focus') + return this.actual[0] === this.actual[0].ownerDocument.activeElement }, toHandle: function(event) { var events = $._data(this.actual.get(0), "events") @@ -10526,6 +10529,6 @@ (function() { }).call(this); -;FI"required_assets_digest;F"%2c11efcc177c5d107bf0d698f4ff74deI" _version;F"%6776f581a4329e299531e1d52aa59832 +;FI"required_assets_digest;F"%1e356c4d7b0b6c69f9dfa37f49fa42d2I" _version;F"%6776f581a4329e299531e1d52aa59832 \ No newline at end of file