From 350c5460afee3a37425ecb890fe8041f8684cb39 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Wed, 22 May 2013 17:29:52 -0400 Subject: [PATCH] Revert "Update jasmine-jquery to 1.5.1" This reverts commit 90a9c386eb67d4201d769544628eff3e28362d2d. --- common/static/js/vendor/jasmine-jquery.js | 344 ++-------------------- 1 file changed, 26 insertions(+), 318 deletions(-) diff --git a/common/static/js/vendor/jasmine-jquery.js b/common/static/js/vendor/jasmine-jquery.js index 6af6b13979..f1b2c138c6 100644 --- a/common/static/js/vendor/jasmine-jquery.js +++ b/common/static/js/vendor/jasmine-jquery.js @@ -1,31 +1,3 @@ -/*! - Jasmine-jQuery: a set of jQuery helpers for Jasmine tests. - - Version 1.5.1 - - https://github.com/velesin/jasmine-jquery - - Copyright (c) 2010-2013 Wojciech Zawistowski, Travis Jeffery - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ var readFixtures = function() { return jasmine.getFixtures().proxyCallTo_('read', arguments) } @@ -55,49 +27,13 @@ var sandbox = function(attributes) { } var spyOnEvent = function(selector, eventName) { - return jasmine.JQuery.events.spyOn(selector, eventName) -} - -var preloadStyleFixtures = function() { - jasmine.getStyleFixtures().proxyCallTo_('preload', arguments) -} - -var loadStyleFixtures = function() { - jasmine.getStyleFixtures().proxyCallTo_('load', arguments) -} - -var appendLoadStyleFixtures = function() { - jasmine.getStyleFixtures().proxyCallTo_('appendLoad', arguments) -} - -var setStyleFixtures = function(html) { - jasmine.getStyleFixtures().proxyCallTo_('set', arguments) -} - -var appendSetStyleFixtures = function(html) { - jasmine.getStyleFixtures().proxyCallTo_('appendSet', arguments) -} - -var loadJSONFixtures = function() { - return jasmine.getJSONFixtures().proxyCallTo_('load', arguments) -} - -var getJSONFixture = function(url) { - return jasmine.getJSONFixtures().proxyCallTo_('read', arguments)[url] -} - -jasmine.spiedEventsKey = function (selector, eventName) { - return [$(selector).selector, eventName].toString() + jasmine.JQuery.events.spyOn(selector, eventName) } jasmine.getFixtures = function() { return jasmine.currentFixtures_ = jasmine.currentFixtures_ || new jasmine.Fixtures() } -jasmine.getStyleFixtures = function() { - return jasmine.currentStyleFixtures_ = jasmine.currentStyleFixtures_ || new jasmine.StyleFixtures() -} - jasmine.Fixtures = function() { this.containerId = 'jasmine-fixtures' this.fixturesCache_ = {} @@ -142,27 +78,27 @@ jasmine.Fixtures.prototype.clearCache = function() { } jasmine.Fixtures.prototype.cleanUp = function() { - $('#' + this.containerId).remove() + jQuery('#' + this.containerId).remove() } jasmine.Fixtures.prototype.sandbox = function(attributes) { var attributesToSet = attributes || {} - return $('
').attr(attributesToSet) + return jQuery('
').attr(attributesToSet) } jasmine.Fixtures.prototype.createContainer_ = function(html) { var container - if(html instanceof $) { - container = $('
') + if(html instanceof jQuery) { + container = jQuery('
') container.html(html) } else { container = '
' + html + '
' } - $(document.body).append(container) + jQuery('body').append(container) } jasmine.Fixtures.prototype.addToContainer_ = function(html){ - var container = $(document.body).find('#'+this.containerId).append(html) + var container = jQuery('body').find('#'+this.containerId).append(html) if(!container.length){ this.createContainer_(html) } @@ -177,11 +113,9 @@ jasmine.Fixtures.prototype.getFixtureHtml_ = function(url) { jasmine.Fixtures.prototype.loadFixtureIntoCache_ = function(relativeUrl) { var url = this.makeFixtureUrl_(relativeUrl) - var request = $.ajax({ - type: "GET", - url: url + "?" + new Date().getTime(), - async: false - }) + var request = new XMLHttpRequest() + request.open("GET", url + "?" + new Date().getTime(), false) + request.send(null) this.fixturesCache_[relativeUrl] = request.responseText } @@ -194,128 +128,21 @@ jasmine.Fixtures.prototype.proxyCallTo_ = function(methodName, passedArguments) } -jasmine.StyleFixtures = function() { - this.fixturesCache_ = {} - this.fixturesNodes_ = [] - this.fixturesPath = 'spec/javascripts/fixtures' -} - -jasmine.StyleFixtures.prototype.set = function(css) { - this.cleanUp() - this.createStyle_(css) -} - -jasmine.StyleFixtures.prototype.appendSet = function(css) { - this.createStyle_(css) -} - -jasmine.StyleFixtures.prototype.preload = function() { - this.read_.apply(this, arguments) -} - -jasmine.StyleFixtures.prototype.load = function() { - this.cleanUp() - this.createStyle_(this.read_.apply(this, arguments)) -} - -jasmine.StyleFixtures.prototype.appendLoad = function() { - this.createStyle_(this.read_.apply(this, arguments)) -} - -jasmine.StyleFixtures.prototype.cleanUp = function() { - while(this.fixturesNodes_.length) { - this.fixturesNodes_.pop().remove() - } -} - -jasmine.StyleFixtures.prototype.createStyle_ = function(html) { - var styleText = $('
').html(html).text(), - style = $('') - - this.fixturesNodes_.push(style) - - $('head').append(style) -} - -jasmine.StyleFixtures.prototype.clearCache = jasmine.Fixtures.prototype.clearCache - -jasmine.StyleFixtures.prototype.read_ = jasmine.Fixtures.prototype.read - -jasmine.StyleFixtures.prototype.getFixtureHtml_ = jasmine.Fixtures.prototype.getFixtureHtml_ - -jasmine.StyleFixtures.prototype.loadFixtureIntoCache_ = jasmine.Fixtures.prototype.loadFixtureIntoCache_ - -jasmine.StyleFixtures.prototype.makeFixtureUrl_ = jasmine.Fixtures.prototype.makeFixtureUrl_ - -jasmine.StyleFixtures.prototype.proxyCallTo_ = jasmine.Fixtures.prototype.proxyCallTo_ - -jasmine.getJSONFixtures = function() { - return jasmine.currentJSONFixtures_ = jasmine.currentJSONFixtures_ || new jasmine.JSONFixtures() -} - -jasmine.JSONFixtures = function() { - this.fixturesCache_ = {} - this.fixturesPath = 'spec/javascripts/fixtures/json' -} - -jasmine.JSONFixtures.prototype.load = function() { - this.read.apply(this, arguments) - return this.fixturesCache_ -} - -jasmine.JSONFixtures.prototype.read = function() { - var fixtureUrls = arguments - for(var urlCount = fixtureUrls.length, urlIndex = 0; urlIndex < urlCount; urlIndex++) { - this.getFixtureData_(fixtureUrls[urlIndex]) - } - return this.fixturesCache_ -} - -jasmine.JSONFixtures.prototype.clearCache = function() { - this.fixturesCache_ = {} -} - -jasmine.JSONFixtures.prototype.getFixtureData_ = function(url) { - this.loadFixtureIntoCache_(url) - return this.fixturesCache_[url] -} - -jasmine.JSONFixtures.prototype.loadFixtureIntoCache_ = function(relativeUrl) { - var self = this - var url = this.fixturesPath.match('/$') ? this.fixturesPath + relativeUrl : this.fixturesPath + '/' + relativeUrl - $.ajax({ - async: false, // must be synchronous to guarantee that no tests are run before fixture is loaded - cache: false, - dataType: 'json', - url: url, - success: function(data) { - self.fixturesCache_[relativeUrl] = data - }, - error: function(jqXHR, status, errorThrown) { - throw Error('JSONFixture could not be loaded: ' + url + ' (status: ' + status + ', message: ' + errorThrown.message + ')') - } - }) -} - -jasmine.JSONFixtures.prototype.proxyCallTo_ = function(methodName, passedArguments) { - return this[methodName].apply(this, passedArguments) -} - jasmine.JQuery = function() {} jasmine.JQuery.browserTagCaseIndependentHtml = function(html) { - return $('
').append(html).html() + return jQuery('
').append(html).html() } jasmine.JQuery.elementToString = function(element) { var domEl = $(element).get(0) if (domEl == undefined || domEl.cloneNode) - return $('
').append($(element).clone()).html() + return jQuery('
').append($(element).clone()).html() else return element.toString() } -jasmine.JQuery.matchersClass = {} +jasmine.JQuery.matchersClass = {}; !function(namespace) { var data = { @@ -326,51 +153,18 @@ jasmine.JQuery.matchersClass = {} namespace.events = { spyOn: function(selector, eventName) { var handler = function(e) { - data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)] = jasmine.util.argsToArray(arguments) + data.spiedEvents[[selector, eventName]] = e } - $(selector).on(eventName, handler) + jQuery(selector).bind(eventName, handler) data.handlers.push(handler) - return { - selector: selector, - eventName: eventName, - handler: handler, - reset: function(){ - delete data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)] - } - } - }, - - args: function(selector, eventName) { - var actualArgs = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]; - - if (!actualArgs) { - throw "There is no spy for " + eventName + " on " + selector.toString() + ". Make sure to create a spy using spyOnEvent."; - } - - return actualArgs; }, wasTriggered: function(selector, eventName) { - return !!(data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]) - }, - - wasTriggeredWith: function(selector, eventName, expectedArgs, env) { - var actualArgs = jasmine.JQuery.events.args(selector, eventName).slice(1); - if (Object.prototype.toString.call(expectedArgs) !== '[object Array]') { - actualArgs = actualArgs[0]; - } - return env.equals_(expectedArgs, actualArgs); + return !!(data.spiedEvents[[selector, eventName]]) }, wasPrevented: function(selector, eventName) { - var args = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)], - e = args ? args[0] : undefined; - return e && e.isDefaultPrevented() - }, - - wasStopped: function(selector, eventName) { - var e; - return (e = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]) && e.isPropagationStopped() + return data.spiedEvents[[selector, eventName]].isDefaultPrevented() }, cleanUp: function() { @@ -417,10 +211,6 @@ jasmine.JQuery.matchersClass = {} 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) }, @@ -445,24 +235,15 @@ jasmine.JQuery.matchersClass = {} toHaveText: function(text) { var trimmedText = $.trim(this.actual.text()) - if (text && $.isFunction(text.test)) { + if (text && jQuery.isFunction(text.test)) { return text.test(trimmedText) } else { return trimmedText == text } }, - toContainText: function(text) { - var trimmedText = $.trim(this.actual.text()) - if (text && $.isFunction(text.test)) { - return text.test(trimmedText) - } else { - return trimmedText.indexOf(text) != -1; - } - }, - toHaveValue: function(value) { - return this.actual.val() === value + return this.actual.val() == value }, toHaveData: function(key, expectedValue) { @@ -482,12 +263,12 @@ jasmine.JQuery.matchersClass = {} }, toBeFocused: function(selector) { - return this.actual[0] === this.actual[0].ownerDocument.activeElement + return this.actual.is(':focus') }, toHandle: function(event) { - var events = $._data(this.actual.get(0), "events") + var events = this.actual.data('events') if(!events || !event || typeof event !== "string") { return false @@ -512,7 +293,7 @@ jasmine.JQuery.matchersClass = {} // tests the existence of a specific event binding + handler toHandleWith: function(eventName, eventHandler) { - var stack = $._data(this.actual.get(0), "events")[eventName] + var stack = this.actual.data("events")[eventName] for (var i = 0; i < stack.length; i++) { if (stack[i].handler == eventHandler) return true } @@ -530,12 +311,12 @@ jasmine.JQuery.matchersClass = {} jasmine.JQuery.matchersClass[methodName] = function() { if (this.actual - && (this.actual instanceof $ + && (this.actual instanceof jQuery || jasmine.isDomNode(this.actual))) { this.actual = $(this.actual) var result = jQueryMatchers[methodName].apply(this, arguments) - var element - if (this.actual.get && (element = this.actual.get()[0]) && !$.isWindow(element) && element.tagName !== "HTML") + var element; + if (this.actual.get && (element = this.actual.get()[0]) && !$.isWindow(element) && element.tagName !== "HTML") this.actual = jasmine.JQuery.elementToString(this.actual) return result } @@ -563,42 +344,7 @@ beforeEach(function() { "Expected event " + this.actual + " not to have been triggered on " + selector ] } - return jasmine.JQuery.events.wasTriggered(selector, this.actual) - } - }) - this.addMatchers({ - toHaveBeenTriggered: function(){ - var eventName = this.actual.eventName, - selector = this.actual.selector - this.message = function() { - return [ - "Expected event " + eventName + " to have been triggered on " + selector, - "Expected event " + eventName + " not to have been triggered on " + selector - ] - } - return jasmine.JQuery.events.wasTriggered(selector, eventName) - } - }) - this.addMatchers({ - toHaveBeenTriggeredOnAndWith: function() { - var selector = arguments[0], - expectedArgs = arguments[1], - wasTriggered = jasmine.JQuery.events.wasTriggered(selector, this.actual); - this.message = function() { - if (wasTriggered) { - var actualArgs = jasmine.JQuery.events.args(selector, this.actual, expectedArgs)[1]; - return [ - "Expected event " + this.actual + " to have been triggered with " + jasmine.pp(expectedArgs) + " but it was triggered with " + jasmine.pp(actualArgs), - "Expected event " + this.actual + " not to have been triggered with " + jasmine.pp(expectedArgs) + " but it was triggered with " + jasmine.pp(actualArgs) - ] - } else { - return [ - "Expected event " + this.actual + " to have been triggered on " + selector, - "Expected event " + this.actual + " not to have been triggered on " + selector - ] - } - } - return wasTriggered && jasmine.JQuery.events.wasTriggeredWith(selector, this.actual, expectedArgs, this.env); + return jasmine.JQuery.events.wasTriggered($(selector), this.actual) } }) this.addMatchers({ @@ -612,47 +358,9 @@ beforeEach(function() { return jasmine.JQuery.events.wasPrevented(selector, this.actual) } }) - this.addMatchers({ - toHaveBeenPrevented: function() { - var eventName = this.actual.eventName, - selector = this.actual.selector - this.message = function() { - return [ - "Expected event " + eventName + " to have been prevented on " + selector, - "Expected event " + eventName + " not to have been prevented on " + selector - ] - } - return jasmine.JQuery.events.wasPrevented(selector, eventName) - } - }) - this.addMatchers({ - toHaveBeenStoppedOn: function(selector) { - this.message = function() { - return [ - "Expected event " + this.actual + " to have been stopped on " + selector, - "Expected event " + this.actual + " not to have been stopped on " + selector - ] - } - return jasmine.JQuery.events.wasStopped(selector, this.actual) - } - }) - this.addMatchers({ - toHaveBeenStopped: function() { - var eventName = this.actual.eventName, - selector = this.actual.selector - this.message = function() { - return [ - "Expected event " + eventName + " to have been stopped on " + selector, - "Expected event " + eventName + " not to have been stopped on " + selector - ] - } - return jasmine.JQuery.events.wasStopped(selector, eventName) - } - }) }) afterEach(function() { jasmine.getFixtures().cleanUp() - jasmine.getStyleFixtures().cleanUp() jasmine.JQuery.events.cleanUp() })