jasmine-jquery-rails 1.5.9 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da4c21bea3d761fbf0cfb01e25af8ae03005a893
-  data.tar.gz: dda8eabbc7b390904a555042905dd24b0522a454
+  metadata.gz: c3586de1a3e0f7d2e160bffc4fe8bc38fd0b49b7
+  data.tar.gz: d5d38ca8d7c32c6e87720c49fda85a9af0f9f51a
 SHA512:
-  metadata.gz: 2446540a0e916a16cbc29db9b086df18e6733b4406d32452675e06bf25a26d63a38d84bd64bece3f74075047f36e9f8e74073d3aacef33dec37eb9bcb878a995
-  data.tar.gz: fbe32b410456ac91663d3ef6055702a0c73bc55052a578833aa404d3e43999e0fd3fee33b16ad05b99123ab337cad03bdcb18f43d93ae3fb79eaab3935c1919b
+  metadata.gz: b0230afceba722243a2951698c9fdc404fbc377d7d300d80076665be7152c362e8a741dc31acbc326ae7f56300da9f69d3d39ef2abd270999116bb53f37229df
+  data.tar.gz: e8008fe6f78d14dcb07e558293cc8d01ea15a1be0df95663c3a3c80b495edb108c3aa0e718c6718fe7bfbde64384f9b4a0b146441c92cba2e8fbb8e4c82316d8

data/lib/jasmine-jquery-rails/version.rb

@@ -1,7 +1,7 @@
 module Jasmine
   module Jquery
     module Rails
-      VERSION = "1.5.9"
+      VERSION = "2.0.2"
     end
   end
 end

data/vendor/assets/javascripts/jasmine-jquery.js

@@ -1,11 +1,11 @@
 /*!
 Jasmine-jQuery: a set of jQuery helpers for Jasmine tests.
 
-Version 1.5.9
+Version 2.0.2
 
 https://github.com/velesin/jasmine-jquery
 
-Copyright (c) 2010-2013 Wojciech Zawistowski, Travis Jeffery
+Copyright (c) 2010-2014 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
@@ -27,7 +27,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-+function (jasmine, $) { "use strict";
++function (window, jasmine, $) { "use strict";
 
   jasmine.spiedEventsKey = function (selector, eventName) {
     return [$(selector).selector, eventName].toString()
@@ -104,7 +104,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
   jasmine.Fixtures.prototype.addToContainer_ = function (html){
     var container = $(document.body).find('#'+this.containerId).append(html)
-    if(!container.length){
+
+    if (!container.length) {
       this.createContainer_(html)
     }
   }
@@ -119,17 +120,36 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   jasmine.Fixtures.prototype.loadFixtureIntoCache_ = function (relativeUrl) {
     var self = this
       , url = this.makeFixtureUrl_(relativeUrl)
+      , htmlText = ''
       , request = $.ajax({
         async: false, // must be synchronous to guarantee that no tests are run before fixture is loaded
         cache: false,
         url: url,
         success: function (data, status, $xhr) {
-          self.fixturesCache_[relativeUrl] = $xhr.responseText
-        },
-        error: function (jqXHR, status, errorThrown) {
-          throw new Error('Fixture could not be loaded: ' + url + ' (status: ' + status + ', message: ' + errorThrown.message + ')')
+          htmlText = $xhr.responseText
         }
+      }).fail(function () {
+          throw new Error('Fixture could not be loaded: ' + url + ' (status: ' + status + ', message: ' + errorThrown.message + ')')
+      })
+
+      var scripts = $($.parseHTML(htmlText, true)).find('script[src]') || [];
+
+      scripts.each(function(){
+        $.ajax({
+            async: false, // must be synchronous to guarantee that no tests are run before fixture is loaded
+            cache: false,
+            dataType: 'script',
+            url: $(this).attr('src'),
+            success: function (data, status, $xhr) {
+                htmlText += '<script>' + $xhr.responseText + '</script>'
+            },
+            error: function (jqXHR, status, errorThrown) {
+                throw new Error('Script could not be loaded: ' + scriptSrc + ' (status: ' + status + ', message: ' + errorThrown.message + ')')
+            }
+        });
       })
+
+      self.fixturesCache_[relativeUrl] = htmlText;
   }
 
   jasmine.Fixtures.prototype.makeFixtureUrl_ = function (relativeUrl){
@@ -219,7 +239,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   }
 
   jasmine.JSONFixtures.prototype.getFixtureData_ = function (url) {
-    this.loadFixtureIntoCache_(url)
+    if (!this.fixturesCache_[url]) this.loadFixtureIntoCache_(url)
     return this.fixturesCache_[url]
   }
 
@@ -245,461 +265,549 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     return this[methodName].apply(this, passedArguments)
   }
 
-  jasmine.JQuery = function () {}
+  jasmine.jQuery = function () {}
 
-  jasmine.JQuery.browserTagCaseIndependentHtml = function (html) {
+  jasmine.jQuery.browserTagCaseIndependentHtml = function (html) {
     return $('<div/>').append(html).html()
   }
 
-  jasmine.JQuery.elementToString = function (element) {
-    var domEl = $(element).get(0)
+  jasmine.jQuery.elementToString = function (element) {
+    return $(element).map(function () { return this.outerHTML; }).toArray().join(', ')
+  }
 
-    if (domEl === undefined || domEl.cloneNode)
-      return $('<div />').append($(element).clone()).html()
-    else
-      return element.toString()
+  var data = {
+      spiedEvents: {}
+    , handlers:    []
   }
 
-  jasmine.JQuery.matchersClass = {}
+  jasmine.jQuery.events = {
+    spyOn: function (selector, eventName) {
+      var handler = function (e) {
+        data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)] = jasmine.util.argsToArray(arguments)
+      }
 
-  !function (namespace) {
-    var data = {
-        spiedEvents: {}
-      , handlers:    []
-    }
+      $(selector).on(eventName, handler)
+      data.handlers.push(handler)
 
-    namespace.events = {
-      spyOn: function (selector, eventName) {
-        var handler = function (e) {
-          data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)] = jasmine.util.argsToArray(arguments)
+      return {
+        selector: selector,
+        eventName: eventName,
+        handler: handler,
+        reset: function (){
+          delete data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]
         }
+      }
+    },
 
-        $(selector).on(eventName, handler)
-        data.handlers.push(handler)
+    args: function (selector, eventName) {
+      var actualArgs = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]
 
-        return {
-          selector: selector,
-          eventName: eventName,
-          handler: handler,
-          reset: function (){
-            delete 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."
+      }
 
-      args: function (selector, eventName) {
-        var actualArgs = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]
+      return actualArgs
+    },
 
-        if (!actualArgs) {
-          throw "There is no spy for " + eventName + " on " + selector.toString() + ". Make sure to create a spy using spyOnEvent."
-        }
+    wasTriggered: function (selector, eventName) {
+      return !!(data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)])
+    },
 
-        return actualArgs
-      },
+    wasTriggeredWith: function (selector, eventName, expectedArgs, util, customEqualityTesters) {
+      var actualArgs = jasmine.jQuery.events.args(selector, eventName).slice(1)
 
-      wasTriggered: function (selector, eventName) {
-        return !!(data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)])
-      },
+      if (Object.prototype.toString.call(expectedArgs) !== '[object Array]')
+        actualArgs = actualArgs[0]
 
-      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 util.equals(expectedArgs, actualArgs, customEqualityTesters)
+    },
 
-      wasPrevented: function (selector, eventName) {
-        var args = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]
-          , e = args ? args[0] : undefined
+    wasPrevented: function (selector, eventName) {
+      var args = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]
+        , e = args ? args[0] : undefined
 
-        return e && e.isDefaultPrevented()
-      },
+      return e && e.isDefaultPrevented()
+    },
 
-      wasStopped: function (selector, eventName) {
-        var args = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]
-          , e = args ? args[0] : undefined
-        return e && e.isPropagationStopped()
-      },
+    wasStopped: function (selector, eventName) {
+      var args = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]
+        , e = args ? args[0] : undefined
+      return e && e.isPropagationStopped()
+    },
 
-      cleanUp: function () {
-        data.spiedEvents = {}
-        data.handlers    = []
-      }
+    cleanUp: function () {
+      data.spiedEvents = {}
+      data.handlers    = []
     }
-  }(jasmine.JQuery)
+  }
+
+  var hasProperty = function (actualValue, expectedValue) {
+    if (expectedValue === undefined)
+      return actualValue !== undefined
 
-  !function (){
-    var jQueryMatchers = {
-      toHaveClass: function (className) {
-        return this.actual.hasClass(className)
+    return actualValue === expectedValue
+  }
+
+  beforeEach(function () {
+    jasmine.addMatchers({
+      toHaveClass: function () {
+        return {
+          compare: function (actual, className) {
+            return { pass: $(actual).hasClass(className) }
+          }
+        }
       },
 
-      toHaveCss: function (css){
-        for (var prop in css){
-          var value = css[prop]
-          // see issue #147 on gh
-          ;if (value === 'auto' && this.actual.get(0).style[prop] === 'auto') continue
-          if (this.actual.css(prop) !== value) return false
+      toHaveCss: function () {
+        return {
+          compare: function (actual, css) {
+            for (var prop in css){
+              var value = css[prop]
+              // see issue #147 on gh
+              ;if (value === 'auto' && $(actual).get(0).style[prop] === 'auto') continue
+              if ($(actual).css(prop) !== value) return { pass: false }
+            }
+            return { pass: true }
+          }
         }
-        return true
       },
 
       toBeVisible: function () {
-        return this.actual.is(':visible')
+        return {
+          compare: function (actual) {
+            return { pass: $(actual).is(':visible') }
+          }
+        }
       },
 
       toBeHidden: function () {
-        return this.actual.is(':hidden')
+        return {
+          compare: function (actual) {
+            return { pass: $(actual).is(':hidden') }
+          }
+        }
       },
 
       toBeSelected: function () {
-        return this.actual.is(':selected')
+        return {
+          compare: function (actual) {
+            return { pass: $(actual).is(':selected') }
+          }
+        }
       },
 
       toBeChecked: function () {
-        return this.actual.is(':checked')
+        return {
+          compare: function (actual) {
+            return { pass: $(actual).is(':checked') }
+          }
+        }
       },
 
       toBeEmpty: function () {
-        return this.actual.is(':empty')
+        return {
+          compare: function (actual) {
+            return { pass: $(actual).is(':empty') }
+          }
+        }
       },
 
-      toExist: function () {
-        return this.actual.length
+      toBeInDOM: function () {
+        return {
+          compare: function (actual) {
+            return { pass: $.contains(document.documentElement, $(actual)[0]) }
+          }
+        }
       },
 
-      toHaveLength: function (length) {
-        return this.actual.length === length
+      toExist: function () {
+        return {
+          compare: function (actual) {
+            return { pass: $(actual).length }
+          }
+        }
       },
 
-      toHaveAttr: function (attributeName, expectedAttributeValue) {
-        return hasProperty(this.actual.attr(attributeName), expectedAttributeValue)
+      toHaveLength: function () {
+        return {
+          compare: function (actual, length) {
+            return { pass: $(actual).length === length }
+          }
+        }
       },
 
-      toHaveProp: function (propertyName, expectedPropertyValue) {
-        return hasProperty(this.actual.prop(propertyName), expectedPropertyValue)
+      toHaveAttr: function () {
+        return {
+          compare: function (actual, attributeName, expectedAttributeValue) {
+            return { pass: hasProperty($(actual).attr(attributeName), expectedAttributeValue) }
+          }
+        }
       },
 
-      toHaveId: function (id) {
-        return this.actual.attr('id') == id
+      toHaveProp: function () {
+        return {
+          compare: function (actual, propertyName, expectedPropertyValue) {
+            return { pass: hasProperty($(actual).prop(propertyName), expectedPropertyValue) }
+          }
+        }
       },
 
-      toHaveHtml: function (html) {
-        return this.actual.html() == jasmine.JQuery.browserTagCaseIndependentHtml(html)
+      toHaveId: function () {
+        return {
+          compare: function (actual, id) {
+            return { pass: $(actual).attr('id') == id }
+          }
+        }
       },
 
-      toContainHtml: function (html){
-        var actualHtml = this.actual.html()
-          , expectedHtml = jasmine.JQuery.browserTagCaseIndependentHtml(html)
-
-        return (actualHtml.indexOf(expectedHtml) >= 0)
+      toHaveHtml: function () {
+        return {
+          compare: function (actual, html) {
+            return { pass: $(actual).html() == jasmine.jQuery.browserTagCaseIndependentHtml(html) }
+          }
+        }
       },
 
-      toHaveText: function (text) {
-        var trimmedText = $.trim(this.actual.text())
+      toContainHtml: function () {
+        return {
+          compare: function (actual, html) {
+            var actualHtml = $(actual).html()
+              , expectedHtml = jasmine.jQuery.browserTagCaseIndependentHtml(html)
 
-        if (text && $.isFunction(text.test)) {
-          return text.test(trimmedText)
-        } else {
-          return trimmedText == text
+            return { pass: (actualHtml.indexOf(expectedHtml) >= 0) }
+          }
         }
       },
 
-      toContainText: function (text) {
-        var trimmedText = $.trim(this.actual.text())
+      toHaveText: function () {
+        return {
+          compare: function (actual, text) {
+            var trimmedText = $.trim($(actual).text())
 
-        if (text && $.isFunction(text.test)) {
-          return text.test(trimmedText)
-        } else {
-          return trimmedText.indexOf(text) != -1
+            if (text && $.isFunction(text.test)) {
+              return { pass: text.test(trimmedText) }
+            } else {
+              return { pass: trimmedText == text }
+            }
+          }
         }
       },
 
-      toHaveValue: function (value) {
-        return this.actual.val() === value
+      toContainText: function () {
+        return {
+          compare: function (actual, text) {
+            var trimmedText = $.trim($(actual).text())
+
+            if (text && $.isFunction(text.test)) {
+              return { pass: text.test(trimmedText) }
+            } else {
+              return { pass: trimmedText.indexOf(text) != -1 }
+            }
+          }
+        }
       },
 
-      toHaveData: function (key, expectedValue) {
-        return hasProperty(this.actual.data(key), expectedValue)
+      toHaveValue: function () {
+        return {
+          compare: function (actual, value) {
+            return { pass: $(actual).val() === value }
+          }
+        }
       },
 
-      toBe: function (selector) {
-        return this.actual.is(selector)
+      toHaveData: function () {
+        return {
+          compare: function (actual, key, expectedValue) {
+            return { pass: hasProperty($(actual).data(key), expectedValue) }
+          }
+        }
       },
 
-      toContain: function (selector) {
-        return this.actual.find(selector).length
+      toContainElement: function () {
+        return {
+          compare: function (actual, selector) {
+            if (window.debug) debugger
+            return { pass: $(actual).find(selector).length }
+          }
+        }
       },
 
-      toBeMatchedBy: function (selector) {
-        return this.actual.filter(selector).length
+      toBeMatchedBy: function () {
+        return {
+          compare: function (actual, selector) {
+            return { pass: $(actual).filter(selector).length }
+          }
+        }
       },
 
-      toBeDisabled: function (selector){
-        return this.actual.is(':disabled')
+      toBeDisabled: function () {
+        return {
+          compare: function (actual, selector) {
+            return { pass: $(actual).is(':disabled') }
+          }
+        }
       },
 
       toBeFocused: function (selector) {
-        return this.actual[0] === this.actual[0].ownerDocument.activeElement
+        return {
+          compare: function (actual, selector) {
+            return { pass: $(actual)[0] === $(actual)[0].ownerDocument.activeElement }
+          }
+        }
       },
 
-      toHandle: function (event) {
-        var events = $._data(this.actual.get(0), "events")
+      toHandle: function () {
+        return {
+          compare: function (actual, event) {
+            var events = $._data($(actual).get(0), "events")
 
-        if(!events || !event || typeof event !== "string") {
-          return false
-        }
+            if (!events || !event || typeof event !== "string") {
+              return { pass: false }
+            }
 
-        var namespaces = event.split(".")
-          , eventType = namespaces.shift()
-          , sortedNamespaces = namespaces.slice(0).sort()
-          , namespaceRegExp = new RegExp("(^|\\.)" + sortedNamespaces.join("\\.(?:.*\\.)?") + "(\\.|$)")
+            var namespaces = event.split(".")
+              , eventType = namespaces.shift()
+              , sortedNamespaces = namespaces.slice(0).sort()
+              , namespaceRegExp = new RegExp("(^|\\.)" + sortedNamespaces.join("\\.(?:.*\\.)?") + "(\\.|$)")
 
-        if(events[eventType] && namespaces.length) {
-          for(var i = 0; i < events[eventType].length; i++) {
-            var namespace = events[eventType][i].namespace
+            if (events[eventType] && namespaces.length) {
+              for (var i = 0; i < events[eventType].length; i++) {
+                var namespace = events[eventType][i].namespace
 
-            if(namespaceRegExp.test(namespace)) {
-              return true
+                if (namespaceRegExp.test(namespace))
+                  return { pass: true }
+              }
+            } else {
+              return { pass: (events[eventType] && events[eventType].length > 0) }
             }
+
+            return { pass: false }
           }
-        } else {
-          return events[eventType] && events[eventType].length > 0
         }
       },
 
-      toHandleWith: function (eventName, eventHandler) {
-        var normalizedEventName = eventName.split('.')[0]
-          , stack = $._data(this.actual.get(0), "events")[normalizedEventName]
+      toHandleWith: function () {
+        return {
+          compare: function (actual, eventName, eventHandler) {
+            var normalizedEventName = eventName.split('.')[0]
+              , stack = $._data($(actual).get(0), "events")[normalizedEventName]
 
-        for (var i = 0; i < stack.length; i++) {
-          if (stack[i].handler == eventHandler) return true
+            for (var i = 0; i < stack.length; i++) {
+              if (stack[i].handler == eventHandler) return { pass: true }
+            }
+
+            return { pass: false }
+          }
         }
+      },
 
-        return false
-      }
-    }
+      toHaveBeenTriggeredOn: function () {
+        return {
+          compare: function (actual, selector) {
+            var result = { pass: jasmine.jQuery.events.wasTriggered(selector, actual) }
 
-    var hasProperty = function (actualValue, expectedValue) {
-      if (expectedValue === undefined) return actualValue !== undefined
+            result.message = result.pass ?
+              "Expected event " + $(actual) + " not to have been triggered on " + selector :
+              "Expected event " + $(actual) + " to have been triggered on " + selector
 
-      return actualValue == expectedValue
-    }
+            return result;
+          }
+        }
+      },
 
-    var bindMatcher = function (methodName) {
-      var builtInMatcher = jasmine.Matchers.prototype[methodName]
+      toHaveBeenTriggered: function (){
+        return {
+          compare: function (actual) {
+            var eventName = actual.eventName
+              , selector = actual.selector
+              , result = { pass: jasmine.jQuery.events.wasTriggered(selector, eventName) }
+
+            result.message = result.pass ?
+            "Expected event " + eventName + " not to have been triggered on " + selector :
+              "Expected event " + eventName + " to have been triggered on " + selector
 
-      jasmine.JQuery.matchersClass[methodName] = function () {
-        if (this.actual
-          && (this.actual instanceof $
-            || jasmine.isDomNode(this.actual))) {
-              this.actual = $(this.actual)
-              var result = jQueryMatchers[methodName].apply(this, arguments)
-                , element
+            return result
+          }
+        }
+      },
 
-              if (this.actual.get && (element = this.actual.get()[0]) && !$.isWindow(element) && element.tagName !== "HTML")
-                this.actual = jasmine.JQuery.elementToString(this.actual)
+      toHaveBeenTriggeredOnAndWith: function (j$, customEqualityTesters) {
+        return {
+          compare: function (actual, selector, expectedArgs) {
+            var wasTriggered = jasmine.jQuery.events.wasTriggered(selector, actual)
+              , result = { pass: wasTriggered && jasmine.jQuery.events.wasTriggeredWith(selector, actual, expectedArgs, j$, customEqualityTesters) }
+
+              if (wasTriggered) {
+                var actualArgs = jasmine.jQuery.events.args(selector, actual, expectedArgs)[1]
+                result.message = result.pass ?
+                  "Expected event " + actual + " not to have been triggered with " + jasmine.pp(expectedArgs) + " but it was triggered with " + jasmine.pp(actualArgs) :
+                  "Expected event " + actual + " to have been triggered with " + jasmine.pp(expectedArgs) + "  but it was triggered with " + jasmine.pp(actualArgs)
+
+              } else {
+                // todo check on this
+                result.message = result.pass ?
+                  "Expected event " + actual + " not to have been triggered on " + selector :
+                  "Expected event " + actual + " to have been triggered on " + selector
+              }
 
               return result
-            }
+          }
+        }
+      },
 
-            if (builtInMatcher) {
-              return builtInMatcher.apply(this, arguments)
-            }
+      toHaveBeenPreventedOn: function () {
+        return {
+          compare: function (actual, selector) {
+            var result = { pass: jasmine.jQuery.events.wasPrevented(selector, actual) }
 
-            return false
-      }
-    }
+            result.message = result.pass ?
+              "Expected event " + actual + " not to have been prevented on " + selector :
+              "Expected event " + actual + " to have been prevented on " + selector
 
-    for(var methodName in jQueryMatchers) {
-      bindMatcher(methodName)
-    }
-  }()
+            return result
+          }
+        }
+      },
 
-  beforeEach(function () {
-    this.addMatchers(jasmine.JQuery.matchersClass)
-    this.addMatchers({
-      toHaveBeenTriggeredOn: function (selector) {
-        this.message = function () {
-          return [
-            "Expected event " + this.actual + " to have been triggered on " + selector,
-            "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
+      toHaveBeenPrevented: function () {
+        return {
+          compare: function (actual) {
+            var eventName = actual.eventName
+              , selector = actual.selector
+              , result = { pass: jasmine.jQuery.events.wasPrevented(selector, eventName) }
 
-        this.message = function () {
-          return [
-            "Expected event " + eventName + " to have been triggered on " + selector,
-            "Expected event " + eventName + " not to have been triggered on " + selector
-          ]
-        }
+            result.message = result.pass ?
+              "Expected event " + eventName + " not to have been prevented on " + selector :
+              "Expected event " + eventName + " to have been prevented 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)
-      }
-    })
-    this.addMatchers({
-      toHaveBeenPreventedOn: function (selector) {
-        this.message = function () {
-          return [
-            "Expected event " + this.actual + " to have been prevented on " + selector,
-            "Expected event " + this.actual + " not to have been prevented on " + selector
-          ]
+            return result
+          }
         }
+      },
 
-        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
-          ]
-        }
+      toHaveBeenStoppedOn: function () {
+        return {
+          compare: function (actual, selector) {
+            var result = { pass: jasmine.jQuery.events.wasStopped(selector, actual) }
 
-        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
-          ]
+            result.message = result.pass ?
+              "Expected event " + actual + " not to have been stopped on " + selector :
+              "Expected event " + actual + " to have been stopped on " + selector
+
+            return result;
+          }
         }
+      },
 
-        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)
-      }
-    })
-    jasmine.getEnv().addEqualityTester(function (a, b) {
-      if(a instanceof jQuery && b instanceof jQuery) {
-        if(a.size() != b.size()) {
-          return jasmine.undefined
-        }
-        else if(a.is(b)) {
-          return true
+        return {
+          compare: function (actual) {
+            var eventName = actual.eventName
+              , selector = actual.selector
+              , result = { pass: jasmine.jQuery.events.wasStopped(selector, eventName) }
+
+            result.message = result.pass ?
+              "Expected event " + eventName + " not to have been stopped on " + selector :
+              "Expected event " + eventName + " to have been stopped on " + selector
+
+            return result
+          }
         }
       }
+    })
+
+    jasmine.getEnv().addCustomEqualityTester(function(a, b) {
+     if (a && b) {
+       if (a instanceof $ || jasmine.isDomNode(a)) {
+         var $a = $(a)
+
+         if (b instanceof $)
+           return $a.length == b.length && a.is(b)
+
+         return $a.is(b);
+       }
+
+       if (b instanceof $ || jasmine.isDomNode(b)) {
+         var $b = $(b)
 
-      return jasmine.undefined
+         if (a instanceof jQuery)
+           return a.length == $b.length && $b.is(a)
+
+         return $(b).is(a);
+       }
+     }
+    })
+
+    jasmine.getEnv().addCustomEqualityTester(function (a, b) {
+     if (a instanceof jQuery && b instanceof jQuery && a.size() == b.size())
+        return a.is(b)
     })
   })
 
   afterEach(function () {
     jasmine.getFixtures().cleanUp()
     jasmine.getStyleFixtures().cleanUp()
-    jasmine.JQuery.events.cleanUp()
+    jasmine.jQuery.events.cleanUp()
   })
-}(window.jasmine, window.jQuery)
 
-+function (jasmine, global) { "use strict";
-
-  global.readFixtures = function () {
+  window.readFixtures = function () {
     return jasmine.getFixtures().proxyCallTo_('read', arguments)
   }
 
-  global.preloadFixtures = function () {
+  window.preloadFixtures = function () {
     jasmine.getFixtures().proxyCallTo_('preload', arguments)
   }
 
-  global.loadFixtures = function () {
+  window.loadFixtures = function () {
     jasmine.getFixtures().proxyCallTo_('load', arguments)
   }
 
-  global.appendLoadFixtures = function () {
+  window.appendLoadFixtures = function () {
     jasmine.getFixtures().proxyCallTo_('appendLoad', arguments)
   }
 
-  global.setFixtures = function (html) {
+  window.setFixtures = function (html) {
     return jasmine.getFixtures().proxyCallTo_('set', arguments)
   }
 
-  global.appendSetFixtures = function () {
+  window.appendSetFixtures = function () {
     jasmine.getFixtures().proxyCallTo_('appendSet', arguments)
   }
 
-  global.sandbox = function (attributes) {
+  window.sandbox = function (attributes) {
     return jasmine.getFixtures().sandbox(attributes)
   }
 
-  global.spyOnEvent = function (selector, eventName) {
-    return jasmine.JQuery.events.spyOn(selector, eventName)
+  window.spyOnEvent = function (selector, eventName) {
+    return jasmine.jQuery.events.spyOn(selector, eventName)
   }
 
-  global.preloadStyleFixtures = function () {
+  window.preloadStyleFixtures = function () {
     jasmine.getStyleFixtures().proxyCallTo_('preload', arguments)
   }
 
-  global.loadStyleFixtures = function () {
+  window.loadStyleFixtures = function () {
     jasmine.getStyleFixtures().proxyCallTo_('load', arguments)
   }
 
-  global.appendLoadStyleFixtures = function () {
+  window.appendLoadStyleFixtures = function () {
     jasmine.getStyleFixtures().proxyCallTo_('appendLoad', arguments)
   }
 
-  global.setStyleFixtures = function (html) {
+  window.setStyleFixtures = function (html) {
     jasmine.getStyleFixtures().proxyCallTo_('set', arguments)
   }
 
-  global.appendSetStyleFixtures = function (html) {
+  window.appendSetStyleFixtures = function (html) {
     jasmine.getStyleFixtures().proxyCallTo_('appendSet', arguments)
   }
 
-  global.loadJSONFixtures = function () {
+  window.loadJSONFixtures = function () {
     return jasmine.getJSONFixtures().proxyCallTo_('load', arguments)
   }
 
-  global.getJSONFixture = function (url) {
+  window.getJSONFixture = function (url) {
     return jasmine.getJSONFixtures().proxyCallTo_('read', arguments)[url]
   }
-}(jasmine, window);
+}(window, window.jasmine, window.jQuery);
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jasmine-jquery-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 2.0.2
 platform: ruby
 authors:
 - Travis Jeffery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: