konacha-chai-matchers 0.0.14 → 0.0.15

data/lib/konacha-chai-matchers/version.rb

@@ -1,7 +1,7 @@
 module Konacha
   module Chai
     module Matchers
-      VERSION = "0.0.14"
+      VERSION = "0.0.15"
     end
   end
 end

data/vendor/assets/javascripts/chai-changes.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.3.2
+// Generated by CoffeeScript 1.3.3
 (function() {
 
   (function(chaiChanges) {
@@ -38,9 +38,6 @@
       }
       result = val();
       isPromise = (typeof result === 'object') && (typeof result.then === 'function');
-      if (((typeof DS !== "undefined" && DS !== null ? DS.Model : void 0) != null) && result instanceof DS.Model) {
-        isPromise = false;
-      }
       if (isPromise) {
         done = options != null ? options.notify : void 0;
         if (done == null) {

data/vendor/assets/javascripts/sinon.js

@@ -1,5 +1,5 @@
 /**
- * Sinon.JS 1.5.2, 2013/01/15
+ * Sinon.JS 1.5.2, 2013/02/05
  *
  * @author Christian Johansen (christian@cjohansen.no)
  * @author Contributors: https://github.com/cjohansen/Sinon.JS/blob/master/AUTHORS
@@ -616,19 +616,19 @@ var sinon = (function (buster) {
 }(typeof sinon == "object" && sinon || null));
 
 /**
- * @depend ../sinon.js
- * @depend match.js
- */
+  * @depend ../sinon.js
+  * @depend match.js
+  */
 /*jslint eqeqeq: false, onevar: false, plusplus: false*/
 /*global module, require, sinon*/
 /**
- * Spy functions
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2011 Christian Johansen
- */
+  * Spy functions
+  *
+  * @author Christian Johansen (christian@cjohansen.no)
+  * @license BSD
+  *
+  * Copyright (c) 2010-2011 Christian Johansen
+  */
 
 (function (sinon) {
     var commonJSModule = typeof module == "object" && typeof require == "function";
@@ -651,7 +651,7 @@ var sinon = (function (buster) {
         }
 
         if (!object && !property) {
-            return spy.create(function () {});
+            return spy.create(function () { });
         }
 
         var method = object[property];
@@ -724,7 +724,7 @@ var sinon = (function (buster) {
             var p;
             if (func.length) {
                 eval("p = (function proxy(" + vars.substring(0, func.length * 2 - 1) +
-                  ") { return p.invoke(func, this, slice.call(arguments)); });");
+                    ") { return p.invoke(func, this, slice.call(arguments)); });");
             }
             else {
                 p = function proxy() {
@@ -765,7 +765,7 @@ var sinon = (function (buster) {
                 var name;
 
                 if (typeof func != "function") {
-                    func = function () {};
+                    func = function () { };
                 } else {
                     name = sinon.functionName(func);
                 }
@@ -822,8 +822,8 @@ var sinon = (function (buster) {
                 }
 
                 return spyCall.create(this, this.thisValues[i], this.args[i],
-                                      this.returnValues[i], this.exceptions[i],
-                                      this.callIds[i]);
+                                        this.returnValues[i], this.exceptions[i],
+                                        this.callIds[i]);
             },
 
             calledBefore: function calledBefore(spyFn) {
@@ -933,15 +933,26 @@ var sinon = (function (buster) {
             throw new Error(this.toString() + " cannot call arg since it was not yet invoked.");
         });
         spyApi.callArgWith = spyApi.callArg;
+        delegateToCalls(spyApi, "callArgOn", false, "callArgOnWith", function () {
+            throw new Error(this.toString() + " cannot call arg since it was not yet invoked.");
+        });
+        spyApi.callArgOnWith = spyApi.callArgOn;
         delegateToCalls(spyApi, "yield", false, "yield", function () {
             throw new Error(this.toString() + " cannot yield since it was not yet invoked.");
         });
         // "invokeCallback" is an alias for "yield" since "yield" is invalid in strict mode.
         spyApi.invokeCallback = spyApi.yield;
+        delegateToCalls(spyApi, "yieldOn", false, "yieldOn", function () {
+            throw new Error(this.toString() + " cannot yield since it was not yet invoked.");
+        });
         delegateToCalls(spyApi, "yieldTo", false, "yieldTo", function (property) {
             throw new Error(this.toString() + " cannot yield to '" + property +
                 "' since it was not yet invoked.");
         });
+        delegateToCalls(spyApi, "yieldToOn", false, "yieldToOn", function (property) {
+            throw new Error(this.toString() + " cannot yield to '" + property +
+                "' since it was not yet invoked.");
+        });
 
         spyApi.formatters = {
             "c": function (spy) {
@@ -1032,14 +1043,14 @@ var sinon = (function (buster) {
             },
 
             calledWithMatch: function calledWithMatch() {
-              for (var i = 0, l = arguments.length; i < l; i += 1) {
-                  var actual = this.args[i];
-                  var expectation = arguments[i];
-                  if (!sinon.match || !sinon.match(expectation).test(actual)) {
-                      return false;
-                  }
-              }
-              return true;
+                for (var i = 0, l = arguments.length; i < l; i += 1) {
+                    var actual = this.args[i];
+                    var expectation = arguments[i];
+                    if (!sinon.match || !sinon.match(expectation).test(actual)) {
+                        return false;
+                    }
+                }
+                return true;
             },
 
             calledWithExactly: function calledWithExactly() {
@@ -1052,7 +1063,7 @@ var sinon = (function (buster) {
             },
 
             notCalledWithMatch: function notCalledWithMatch() {
-              return !this.calledWithMatch.apply(this, arguments);
+                return !this.calledWithMatch.apply(this, arguments);
             },
 
             returned: function returned(value) {
@@ -1087,16 +1098,28 @@ var sinon = (function (buster) {
                 this.args[pos]();
             },
 
+            callArgOn: function (pos, thisValue) {
+                this.args[pos].apply(thisValue);
+            },
+
             callArgWith: function (pos) {
-                var args = slice.call(arguments, 1);
-                this.args[pos].apply(null, args);
+                this.callArgOnWith.apply(this, [pos, null].concat(slice.call(arguments, 1)));
+            },
+
+            callArgOnWith: function (pos, thisValue) {
+                var args = slice.call(arguments, 2);
+                this.args[pos].apply(thisValue, args);
             },
 
             "yield": function () {
+                this.yieldOn.apply(this, [null].concat(slice.call(arguments, 0)));
+            },
+
+            yieldOn: function (thisValue) {
                 var args = this.args;
                 for (var i = 0, l = args.length; i < l; ++i) {
                     if (typeof args[i] === "function") {
-                        args[i].apply(null, slice.call(arguments));
+                        args[i].apply(thisValue, slice.call(arguments, 1));
                         return;
                     }
                 }
@@ -1104,10 +1127,14 @@ var sinon = (function (buster) {
             },
 
             yieldTo: function (prop) {
+                this.yieldToOn.apply(this, [prop, null].concat(slice.call(arguments, 1)));
+            },
+
+            yieldToOn: function (prop, thisValue) {
                 var args = this.args;
                 for (var i = 0, l = args.length; i < l; ++i) {
                     if (args[i] && typeof args[i][prop] === "function") {
-                        args[i][prop].apply(null, slice.call(arguments, 1));
+                        args[i][prop].apply(thisValue, slice.call(arguments, 2));
                         return;
                     }
                 }
@@ -1214,7 +1241,8 @@ var sinon = (function (buster) {
 
     function getChangingValue(stub, property) {
         var index = stub.callCount - 1;
-        var prop = index in stub[property] ? stub[property][index] : stub[property + "Last"];
+        var values = stub[property];
+        var prop = index in values ? values[index] : values[values.length - 1];
         stub[property + "Last"] = prop;
 
         return prop;
@@ -1271,8 +1299,6 @@ var sinon = (function (buster) {
     var nextTick = (function () {
         if (typeof process === "object" && typeof process.nextTick === "function") {
             return process.nextTick;
-        } else if (typeof msSetImmediate === "function") {
-            return msSetImmediate.bind(window);
         } else if (typeof setImmediate === "function") {
             return setImmediate;
         } else {
@@ -1290,8 +1316,6 @@ var sinon = (function (buster) {
                 throw new TypeError(getCallbackError(stub, func, args));
             }
 
-            var index = stub.callCount - 1;
-
             var callbackArguments = getChangingValue(stub, "callbackArguments");
             var callbackContext = getChangingValue(stub, "callbackContexts");
 
@@ -1910,7 +1934,8 @@ var sinon = (function (buster) {
                 }
 
                 var callStr = sinon.spyCall.toString.call({
-                    proxy: this.method, args: args
+                    proxy: this.method || "anonymous mock expectation",
+                    args: args
                 });
 
                 var message = callStr.replace(", [...", "[, ...") + " " +
@@ -2264,6 +2289,8 @@ if (typeof sinon == "undefined") {
             if (firstException) {
               throw firstException;
             }
+
+            return this.now;
         },
 
         firstTimerInRange: function (from, to) {
@@ -2770,6 +2797,8 @@ sinon.xhr = { XMLHttpRequest: this.XMLHttpRequest };
 
             if (this.async) {
                 this.readyStateChange(FakeXMLHttpRequest.HEADERS_RECEIVED);
+            } else {
+                this.readyState = FakeXMLHttpRequest.HEADERS_RECEIVED;
             }
         },
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konacha-chai-matchers
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies: []
 description: A set of Chai.js libraries ready to use for Konacha
 email:
@@ -56,21 +56,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4374627379221921237
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4374627379221921237
 requirements: []
 rubyforge_project: konacha-chai-matchers
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Chai.js plugins collection for Konacha