jasmine-jquery-rails 1.4.2 → 1.5.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e8b3556accc34ab3a94e5ab912d878adbef78e6e
+  data.tar.gz: 58ab7da7878cbe9ce2ea0c575b4bdde770890baf
+SHA512:
+  metadata.gz: 06a87ba4c95ee47b4824f0d0da470246785a2b00cfe61d47ff36cd85cb11687a08c9458967a46d79c54b30ef08217a62360500c7cdc5ac0d4667e3569bcaf588
+  data.tar.gz: 230360dbbe128625f002ca040b4d148108c9bab61e1f1092502b23cacd70c5e648c59823a3465f9f2c1681b534918b968534838054a960087421a4b8ceba0545

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

@@ -1,7 +1,7 @@
 module Jasmine
   module Jquery
     module Rails
-      VERSION = "1.4.2"
+      VERSION = "1.5.3"
     end
   end
 end

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

@@ -1,3 +1,31 @@
+/*!
+ Jasmine-jQuery: a set of jQuery helpers for Jasmine tests.
+
+ Version 1.5.3
+
+ 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)
 }
@@ -114,27 +142,27 @@ jasmine.Fixtures.prototype.clearCache = function() {
 }
 
 jasmine.Fixtures.prototype.cleanUp = function() {
-  jQuery('#' + this.containerId).remove()
+  $('#' + this.containerId).remove()
 }
 
 jasmine.Fixtures.prototype.sandbox = function(attributes) {
   var attributesToSet = attributes || {}
-  return jQuery('<div id="sandbox" />').attr(attributesToSet)
+  return $('<div id="sandbox" />').attr(attributesToSet)
 }
 
 jasmine.Fixtures.prototype.createContainer_ = function(html) {
   var container
-  if(html instanceof jQuery) {
-    container = jQuery('<div id="' + this.containerId + '" />')
+  if(html instanceof $) {
+    container = $('<div id="' + this.containerId + '" />')
     container.html(html)
   } else {
     container = '<div id="' + this.containerId + '">' + html + '</div>'
   }
-  jQuery('body').append(container)
+  $(document.body).append(container)
 }
 
 jasmine.Fixtures.prototype.addToContainer_ = function(html){
-  var container = jQuery('body').find('#'+this.containerId).append(html)
+  var container = $(document.body).find('#'+this.containerId).append(html)
   if(!container.length){
     this.createContainer_(html)
   }
@@ -149,7 +177,7 @@ jasmine.Fixtures.prototype.getFixtureHtml_ = function(url) {
 
 jasmine.Fixtures.prototype.loadFixtureIntoCache_ = function(relativeUrl) {
   var url = this.makeFixtureUrl_(relativeUrl)
-  var request = jQuery.ajax({
+  var request = $.ajax({
     type: "GET",
     url: url + "?" + new Date().getTime(),
     async: false
@@ -201,11 +229,12 @@ jasmine.StyleFixtures.prototype.cleanUp = function() {
 }
 
 jasmine.StyleFixtures.prototype.createStyle_ = function(html) {
-  var style = jQuery('<style></style>').text(html)
+  var styleText = $('<div></div>').html(html).text(),
+    style = $('<style>' + styleText + '</style>')
 
   this.fixturesNodes_.push(style)
 
-  jQuery('head').append(style)
+  $('head').append(style)
 }
 
 jasmine.StyleFixtures.prototype.clearCache = jasmine.Fixtures.prototype.clearCache
@@ -220,8 +249,6 @@ jasmine.StyleFixtures.prototype.makeFixtureUrl_ = jasmine.Fixtures.prototype.mak
 
 jasmine.StyleFixtures.prototype.proxyCallTo_ = jasmine.Fixtures.prototype.proxyCallTo_
 
-/** jasmine json fixtures */
-
 jasmine.getJSONFixtures = function() {
   return jasmine.currentJSONFixtures_ = jasmine.currentJSONFixtures_ || new jasmine.JSONFixtures()
 }
@@ -248,7 +275,7 @@ jasmine.JSONFixtures.prototype.clearCache = function() {
   this.fixturesCache_ = {}
 }
 
-jasmine.JSONFixtures.prototype.getFixtureData_ = function(url) {  
+jasmine.JSONFixtures.prototype.getFixtureData_ = function(url) {
   this.loadFixtureIntoCache_(url)
   return this.fixturesCache_[url]
 }
@@ -256,7 +283,7 @@ jasmine.JSONFixtures.prototype.getFixtureData_ = function(url) {
 jasmine.JSONFixtures.prototype.loadFixtureIntoCache_ = function(relativeUrl) {
   var self = this
   var url = this.fixturesPath.match('/$') ? this.fixturesPath + relativeUrl : this.fixturesPath + '/' + relativeUrl
-  jQuery.ajax({
+  $.ajax({
     async: false, // must be synchronous to guarantee that no tests are run before fixture is loaded
     cache: false,
     dataType: 'json',
@@ -277,13 +304,13 @@ jasmine.JSONFixtures.prototype.proxyCallTo_ = function(methodName, passedArgumen
 jasmine.JQuery = function() {}
 
 jasmine.JQuery.browserTagCaseIndependentHtml = function(html) {
-  return jQuery('<div/>').append(html).html()
+  return $('<div/>').append(html).html()
 }
 
 jasmine.JQuery.elementToString = function(element) {
   var domEl = $(element).get(0)
   if (domEl == undefined || domEl.cloneNode)
-    return jQuery('<div />').append($(element).clone()).html()
+    return $('<div />').append($(element).clone()).html()
   else
     return element.toString()
 }
@@ -299,9 +326,9 @@ jasmine.JQuery.matchersClass = {}
   namespace.events = {
     spyOn: function(selector, eventName) {
       var handler = function(e) {
-        data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)] = e
+        data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)] = jasmine.util.argsToArray(arguments)
       }
-      jQuery(selector).bind(eventName, handler)
+      $(selector).on(eventName, handler)
       data.handlers.push(handler)
       return {
         selector: selector,
@@ -313,12 +340,38 @@ jasmine.JQuery.matchersClass = {}
       }
     },
 
+    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);
+    },
+
     wasPrevented: function(selector, eventName) {
-      return data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)].isDefaultPrevented()
+      var args = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)],
+          e = args ? args[0] : undefined;
+      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()
     },
 
     cleanUp: function() {
@@ -365,6 +418,10 @@ 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)
     },
@@ -389,15 +446,24 @@ jasmine.JQuery.matchersClass = {}
 
     toHaveText: function(text) {
       var trimmedText = $.trim(this.actual.text())
-      if (text && jQuery.isFunction(text.test)) {
+      if (text && $.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) {
@@ -417,7 +483,7 @@ jasmine.JQuery.matchersClass = {}
     },
 
     toBeFocused: function(selector) {
-      return this.actual.is(':focus')
+      return this.actual[0] === this.actual[0].ownerDocument.activeElement
     },
 
     toHandle: function(event) {
@@ -465,7 +531,7 @@ jasmine.JQuery.matchersClass = {}
 
     jasmine.JQuery.matchersClass[methodName] = function() {
       if (this.actual
-        && (this.actual instanceof jQuery
+        && (this.actual instanceof $
           || jasmine.isDomNode(this.actual))) {
             this.actual = $(this.actual)
             var result = jQueryMatchers[methodName].apply(this, arguments)
@@ -514,6 +580,28 @@ beforeEach(function() {
       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() {
@@ -538,6 +626,30 @@ beforeEach(function() {
       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() {

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jasmine-jquery-rails
 version: !ruby/object:Gem::Version
-  version: 1.4.2
-  prerelease: 
+  version: 1.5.3
 platform: ruby
 authors:
 - Travis Jeffery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -30,32 +29,25 @@ files:
 - vendor/assets/javascripts/jasmine-jquery.js
 homepage: http://github.com/travisjeffery/jasmine-jquery-rails
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 270161812332261063
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 270161812332261063
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: jasmine-jquery via asset pipeline
 test_files: []