sinon-rails 1.3.2.1 → 1.4.2

data/README.md

@@ -1,6 +1,6 @@
-# Sinon::Rails
+# Sinon.js for Rails
 
-TODO: Write a gem description
+sinon.js via asset pipeline
 
 ## Installation
 
@@ -12,16 +12,20 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
+Add this line to your test manifest file:
 
-    $ gem install sinon-rails
+    //=require sinon
+
+Or directly include at `/assets/sinon.js`
 
 ## Usage
 
-TODO: Write usage instructions here
+Read about sinon.js [here](http://sinonjs.org/).
 
 ## Contributing
 
+sinon-rails maintained by [Travis Jeffery](http://github.com/travisjeffery)
+
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Added some feature'`)

data/lib/sinon-rails.rb

@@ -2,6 +2,6 @@ require "sinon-rails/version"
 
 module Sinon
   module Rails
-    require 'sinon-rails/engine' if defined?(Rails)
+    require 'lib/sinon-rails/engine' if defined?(Rails)
   end
 end

data/lib/sinon-rails/version.rb

@@ -1,5 +1,5 @@
 module Sinon
   module Rails
-    VERSION = "1.3.2.1"
+    VERSION = "1.4.2"
   end
 end

data/sinon-rails.gemspec

@@ -1,5 +1,4 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
 require File.expand_path('../lib/sinon-rails/version', __FILE__)
 
 Gem::Specification.new do |gem|

data/vendor/assets/javascripts/sinon.js

@@ -1,11 +1,12 @@
 /**
- * Sinon.JS 1.3.2, 2012/03/11
+ * Sinon.JS 1.4.2, 2012/07/11
  *
  * @author Christian Johansen (christian@cjohansen.no)
+ * @author Contributors: https://github.com/cjohansen/Sinon.JS/blob/master/AUTHORS
  *
  * (The BSD License)
  * 
- * Copyright (c) 2010-2011, Christian Johansen, christian@cjohansen.no
+ * Copyright (c) 2010-2012, Christian Johansen, christian@cjohansen.no
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without modification,
@@ -34,94 +35,232 @@
 
 "use strict";
 var sinon = (function () {
-var buster = (function (buster, setTimeout) {
-    function extend(target) {
-        if (!target) {
-            return;
-        }
-
-        for (var i = 1, l = arguments.length, prop; i < l; ++i) {
-            for (prop in arguments[i]) {
-                target[prop] = arguments[i][prop];
-            }
-        }
-
-        return target;
-    }
-
+var buster = (function (setTimeout, B) {
+    var isNode = typeof require == "function" && typeof module == "object";
     var div = typeof document != "undefined" && document.createElement("div");
+    var F = function () {};
 
-    return extend(buster, {
-        bind: function (obj, methOrProp) {
+    var buster = {
+        bind: function bind(obj, methOrProp) {
             var method = typeof methOrProp == "string" ? obj[methOrProp] : methOrProp;
             var args = Array.prototype.slice.call(arguments, 2);
-
             return function () {
                 var allArgs = args.concat(Array.prototype.slice.call(arguments));
                 return method.apply(obj, allArgs);
             };
         },
 
-        create: (function () {
-            function F() {}
+        partial: function partial(fn) {
+            var args = [].slice.call(arguments, 1);
+            return function () {
+                return fn.apply(this, args.concat([].slice.call(arguments)));
+            };
+        },
 
-            return function create(object) {
-                F.prototype = object;
-                return new F();
-            }
-        }()),
+        create: function create(object) {
+            F.prototype = object;
+            return new F();
+        },
 
-        extend: extend,
+        extend: function extend(target) {
+            if (!target) { return; }
+            for (var i = 1, l = arguments.length, prop; i < l; ++i) {
+                for (prop in arguments[i]) {
+                    target[prop] = arguments[i][prop];
+                }
+            }
+            return target;
+        },
 
-        nextTick: function (callback) {
+        nextTick: function nextTick(callback) {
             if (typeof process != "undefined" && process.nextTick) {
                 return process.nextTick(callback);
             }
-
             setTimeout(callback, 0);
         },
 
-        functionName: function (func) {
+        functionName: function functionName(func) {
             if (!func) return "";
             if (func.displayName) return func.displayName;
             if (func.name) return func.name;
-
             var matches = func.toString().match(/function\s+([^\(]+)/m);
             return matches && matches[1] || "";
         },
 
-        isNode: function (obj) {
+        isNode: function isNode(obj) {
             if (!div) return false;
-
             try {
                 obj.appendChild(div);
                 obj.removeChild(div);
             } catch (e) {
                 return false;
             }
-
             return true;
         },
 
-        isElement: function (obj) {
-            return obj && buster.isNode(obj) && obj.nodeType === 1;
-        }
-    });
-}(buster || {}, setTimeout));
+        isElement: function isElement(obj) {
+            return obj && obj.nodeType === 1 && buster.isNode(obj);
+        },
 
-if (typeof module == "object" && typeof require == "function") {
-    module.exports = buster;
-    buster.eventEmitter = require("./buster-event-emitter");
+        isArray: function isArray(arr) {
+            return Object.prototype.toString.call(arr) == "[object Array]";
+        },
 
-    Object.defineProperty(buster, "defineVersionGetter", {
-        get: function () {
-            return require("./define-version-getter");
+        flatten: function flatten(arr) {
+            var result = [], arr = arr || [];
+            for (var i = 0, l = arr.length; i < l; ++i) {
+                result = result.concat(buster.isArray(arr[i]) ? flatten(arr[i]) : arr[i]);
+            }
+            return result;
+        },
+
+        each: function each(arr, callback) {
+            for (var i = 0, l = arr.length; i < l; ++i) {
+                callback(arr[i]);
+            }
+        },
+
+        map: function map(arr, callback) {
+            var results = [];
+            for (var i = 0, l = arr.length; i < l; ++i) {
+                results.push(callback(arr[i]));
+            }
+            return results;
+        },
+
+        parallel: function parallel(fns, callback) {
+            function cb(err, res) {
+                if (typeof callback == "function") {
+                    callback(err, res);
+                    callback = null;
+                }
+            }
+            if (fns.length == 0) { return cb(null, []); }
+            var remaining = fns.length, results = [];
+            function makeDone(num) {
+                return function done(err, result) {
+                    if (err) { return cb(err); }
+                    results[num] = result;
+                    if (--remaining == 0) { cb(null, results); }
+                };
+            }
+            for (var i = 0, l = fns.length; i < l; ++i) {
+                fns[i](makeDone(i));
+            }
+        },
+
+        series: function series(fns, callback) {
+            function cb(err, res) {
+                if (typeof callback == "function") {
+                    callback(err, res);
+                }
+            }
+            var remaining = fns.slice();
+            var results = [];
+            function callNext() {
+                if (remaining.length == 0) return cb(null, results);
+                var promise = remaining.shift()(next);
+                if (promise && typeof promise.then == "function") {
+                    promise.then(buster.partial(next, null), next);
+                }
+            }
+            function next(err, result) {
+                if (err) return cb(err);
+                results.push(result);
+                callNext();
+            }
+            callNext();
+        },
+
+        countdown: function countdown(num, done) {
+            return function () {
+                if (--num == 0) done();
+            };
         }
-    });
-}
+    };
+
+    if (typeof process === "object" &&
+        typeof require === "function" && typeof module === "object") {
+        var crypto = require("crypto");
+        var path = require("path");
+
+        buster.tmpFile = function (fileName) {
+            var hashed = crypto.createHash("sha1");
+            hashed.update(fileName);
+            var tmpfileName = hashed.digest("hex");
+
+            if (process.platform == "win32") {
+                return path.join(process.env["TEMP"], tmpfileName);
+            } else {
+                return path.join("/tmp", tmpfileName);
+            }
+        };
+    }
+
+    if (Array.prototype.some) {
+        buster.some = function (arr, fn, thisp) {
+            return arr.some(fn, thisp);
+        };
+    } else {
+        // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
+        buster.some = function (arr, fun, thisp) {
+                        if (arr == null) { throw new TypeError(); }
+            arr = Object(arr);
+            var len = arr.length >>> 0;
+            if (typeof fun !== "function") { throw new TypeError(); }
+
+            for (var i = 0; i < len; i++) {
+                if (arr.hasOwnProperty(i) && fun.call(thisp, arr[i], i, arr)) {
+                    return true;
+                }
+            }
+
+            return false;
+        };
+    }
 
+    if (Array.prototype.filter) {
+        buster.filter = function (arr, fn, thisp) {
+            return arr.filter(fn, thisp);
+        };
+    } else {
+        // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/filter
+        buster.filter = function (fn, thisp) {
+                        if (this == null) { throw new TypeError(); }
+
+            var t = Object(this);
+            var len = t.length >>> 0;
+            if (typeof fn != "function") { throw new TypeError(); }
+
+            var res = [];
+            for (var i = 0; i < len; i++) {
+                if (i in t) {
+                    var val = t[i]; // in case fun mutates this
+                    if (fn.call(thisp, val, i, t)) { res.push(val); }
+                }
+            }
+
+            return res;
+        };
+    }
 
-if (typeof require != "undefined") {
+    if (isNode) {
+        module.exports = buster;
+        buster.eventEmitter = require("./buster-event-emitter");
+        Object.defineProperty(buster, "defineVersionGetter", {
+            get: function () {
+                return require("./define-version-getter");
+            }
+        });
+    }
+
+    return buster.extend(B || {}, buster);
+}(setTimeout, buster));
+if (typeof buster === "undefined") {
+    var buster = {};
+}
+
+if (typeof module === "object" && typeof require === "function") {
     buster = require("buster-core");
 }
 
@@ -130,12 +269,26 @@ buster.format.excludeConstructors = ["Object", /^.$/];
 buster.format.quoteStrings = true;
 
 buster.format.ascii = (function () {
+    
+    var hasOwn = Object.prototype.hasOwnProperty;
+
+    var specialObjects = [];
+    if (typeof global != "undefined") {
+        specialObjects.push({ obj: global, value: "[object global]" });
+    }
+    if (typeof document != "undefined") {
+        specialObjects.push({ obj: document, value: "[object HTMLDocument]" });
+    }
+    if (typeof window != "undefined") {
+        specialObjects.push({ obj: window, value: "[object Window]" });
+    }
+
     function keys(object) {
         var k = Object.keys && Object.keys(object) || [];
 
         if (k.length == 0) {
             for (var prop in object) {
-                if (object.hasOwnProperty(prop)) {
+                if (hasOwn.call(object, prop)) {
                     k.push(prop);
                 }
             }
@@ -175,7 +328,7 @@ buster.format.ascii = (function () {
         }
 
         if (Object.prototype.toString.call(object) == "[object Array]") {
-            return ascii.array(object);
+            return ascii.array.call(this, object, processed);
         }
 
         if (!object) {
@@ -186,10 +339,17 @@ buster.format.ascii = (function () {
             return ascii.element(object);
         }
 
-        if (object.toString !== Object.prototype.toString) {
+        if (typeof object.toString == "function" &&
+            object.toString !== Object.prototype.toString) {
             return object.toString();
         }
 
+        for (var i = 0, l = specialObjects.length; i < l; i++) {
+            if (object === specialObjects[i].obj) {
+                return specialObjects[i].value;
+            }
+        }
+
         return ascii.object.call(this, object, processed, indent);
     }
 
@@ -203,7 +363,7 @@ buster.format.ascii = (function () {
         var pieces = [];
 
         for (var i = 0, l = array.length; i < l; ++i) {
-            pieces.push(ascii(array[i], processed));
+            pieces.push(ascii.call(this, array[i], processed));
         }
 
         return "[" + pieces.join(", ") + "]";
@@ -376,11 +536,15 @@ var sinon = (function (buster) {
             method.displayName = property;
 
             method.restore = function () {
-                if(owned) {
-                    object[property] = wrappedMethod;
-                } else {
+                // For prototype properties try to reset by delete first.
+                // If this fails (ex: localStorage on mobile safari) then force a reset
+                // via direct assignment.
+                if (!owned) {
                     delete object[property];
                 }
+                if (object[property] === method) {
+                    object[property] = wrappedMethod;
+                }
             };
 
             method.restore.sinon = true;
@@ -414,6 +578,9 @@ var sinon = (function (buster) {
         },
 
         deepEqual: function deepEqual(a, b) {
+            if (sinon.match && sinon.match.isMatcher(a)) {
+                return a.test(b);
+            }
             if (typeof a != "object" || typeof b != "object") {
                 return a === b;
             }
@@ -565,6 +732,14 @@ var sinon = (function (buster) {
                 err.message = msg + err.message;
                 throw err;
             }, 0);
+        },
+
+        typeOf: function (value) {
+            if (value === null) {
+              return "null";
+            }
+            var string = Object.prototype.toString.call(value);
+            return string.substring(8, string.length - 1).toLowerCase();
         }
     };
 
@@ -584,6 +759,7 @@ var sinon = (function (buster) {
         module.exports.test = require("./sinon/test");
         module.exports.testCase = require("./sinon/test_case");
         module.exports.assert = require("./sinon/assert");
+        module.exports.match = require("./sinon/match");
     }
 
     if (buster) {
@@ -596,7 +772,7 @@ var sinon = (function (buster) {
         try {
             var util = require("util");
             sinon.format = function (value) {
-                return typeof value == "object" ? util.inspect(value) : value;
+                return typeof value == "object" && value.toString === Object.prototype.toString ? util.inspect(value) : value;
             };
         } catch (e) {
             /* Node, but no util module - would be very old, but better safe than
@@ -610,6 +786,248 @@ var sinon = (function (buster) {
 /* @depend ../sinon.js */
 /*jslint eqeqeq: false, onevar: false, plusplus: false*/
 /*global module, require, sinon*/
+/**
+ * Match functions
+ *
+ * @author Maximilian Antoni (mail@maxantoni.de)
+ * @license BSD
+ *
+ * Copyright (c) 2012 Maximilian Antoni
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module == "object" && typeof require == "function";
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function assertType(value, type, name) {
+        var actual = sinon.typeOf(value);
+        if (actual !== type) {
+            throw new TypeError("Expected type of " + name + " to be " +
+                type + ", but was " + actual);
+        }
+    }
+
+    var matcher = {
+        toString: function () {
+            return this.message;
+        }
+    };
+
+    function isMatcher(object) {
+        return matcher.isPrototypeOf(object);
+    }
+
+    function matchObject(expectation, actual) {
+        if (actual === null || actual === undefined) {
+            return false;
+        }
+        for (var key in expectation) {
+            if (expectation.hasOwnProperty(key)) {
+                var exp = expectation[key];
+                var act = actual[key];
+                if (match.isMatcher(exp)) {
+                    if (!exp.test(act)) {
+                        return false;
+                    }
+                } else if (sinon.typeOf(exp) === "object") {
+                    if (!matchObject(exp, act)) {
+                        return false;
+                    }
+                } else if (!sinon.deepEqual(exp, act)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    matcher.or = function (m2) {
+        if (!isMatcher(m2)) {
+            throw new TypeError("Matcher expected");
+        }
+        var m1 = this;
+        var or = sinon.create(matcher);
+        or.test = function (actual) {
+            return m1.test(actual) || m2.test(actual);
+        };
+        or.message = m1.message + ".or(" + m2.message + ")";
+        return or;
+    };
+
+    matcher.and = function (m2) {
+        if (!isMatcher(m2)) {
+            throw new TypeError("Matcher expected");
+        }
+        var m1 = this;
+        var and = sinon.create(matcher);
+        and.test = function (actual) {
+            return m1.test(actual) && m2.test(actual);
+        };
+        and.message = m1.message + ".and(" + m2.message + ")";
+        return and;
+    };
+
+    var match = function (expectation, message) {
+        var m = sinon.create(matcher);
+        var type = sinon.typeOf(expectation);
+        switch (type) {
+        case "object":
+            if (typeof expectation.test === "function") {
+                m.test = function (actual) {
+                    return expectation.test(actual) === true;
+                };
+                m.message = "match(" + sinon.functionName(expectation.test) + ")";
+                return m;
+            }
+            var str = [];
+            for (var key in expectation) {
+                if (expectation.hasOwnProperty(key)) {
+                    str.push(key + ": " + expectation[key]);
+                }
+            }
+            m.test = function (actual) {
+                return matchObject(expectation, actual);
+            };
+            m.message = "match(" + str.join(", ") + ")";
+            break;
+        case "number":
+            m.test = function (actual) {
+                return expectation == actual;
+            };
+            break;
+        case "string":
+            m.test = function (actual) {
+                if (typeof actual !== "string") {
+                    return false;
+                }
+                return actual.indexOf(expectation) !== -1;
+            };
+            m.message = "match(\"" + expectation + "\")";
+            break;
+        case "regexp":
+            m.test = function (actual) {
+                if (typeof actual !== "string") {
+                    return false;
+                }
+                return expectation.test(actual);
+            };
+            break;
+        case "function":
+            m.test = expectation;
+            if (message) {
+                m.message = message;
+            } else {
+                m.message = "match(" + sinon.functionName(expectation) + ")";
+            }
+            break;
+        default:
+            m.test = function (actual) {
+              return sinon.deepEqual(expectation, actual);
+            };
+        }
+        if (!m.message) {
+            m.message = "match(" + expectation + ")";
+        }
+        return m;
+    };
+
+    match.isMatcher = isMatcher;
+
+    match.any = match(function () {
+        return true;
+    }, "any");
+
+    match.defined = match(function (actual) {
+        return actual !== null && actual !== undefined;
+    }, "defined");
+
+    match.truthy = match(function (actual) {
+        return !!actual;
+    }, "truthy");
+
+    match.falsy = match(function (actual) {
+        return !actual;
+    }, "falsy");
+
+    match.same = function (expectation) {
+        return match(function (actual) {
+            return expectation === actual;
+        }, "same(" + expectation + ")");
+    };
+
+    match.typeOf = function (type) {
+        assertType(type, "string", "type");
+        return match(function (actual) {
+            return sinon.typeOf(actual) === type;
+        }, "typeOf(\"" + type + "\")");
+    };
+
+    match.instanceOf = function (type) {
+        assertType(type, "function", "type");
+        return match(function (actual) {
+            return actual instanceof type;
+        }, "instanceOf(" + sinon.functionName(type) + ")");
+    };
+
+    function createPropertyMatcher(propertyTest, messagePrefix) {
+        return function (property, value) {
+            assertType(property, "string", "property");
+            var onlyProperty = arguments.length === 1;
+            var message = messagePrefix + "(\"" + property + "\"";
+            if (!onlyProperty) {
+                message += ", " + value;
+            }
+            message += ")";
+            return match(function (actual) {
+                if (actual === undefined || actual === null ||
+                        !propertyTest(actual, property)) {
+                    return false;
+                }
+                return onlyProperty || sinon.deepEqual(value, actual[property]);
+            }, message);
+        };
+    }
+
+    match.has = createPropertyMatcher(function (actual, property) {
+        if (typeof actual === "object") {
+            return property in actual;
+        }
+        return actual[property] !== undefined;
+    }, "has");
+
+    match.hasOwn = createPropertyMatcher(function (actual, property) {
+        return actual.hasOwnProperty(property);
+    }, "hasOwn");
+
+    match.bool = match.typeOf("boolean");
+    match.number = match.typeOf("number");
+    match.string = match.typeOf("string");
+    match.object = match.typeOf("object");
+    match.func = match.typeOf("function");
+    match.array = match.typeOf("array");
+    match.regexp = match.typeOf("regexp");
+    match.date = match.typeOf("date");
+
+    if (commonJSModule) {
+        module.exports = match;
+    } else {
+        sinon.match = match;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend match.js
+ */
+/*jslint eqeqeq: false, onevar: false, plusplus: false*/
+/*global module, require, sinon*/
 /**
  * Spy functions
  *
@@ -639,7 +1057,7 @@ var sinon = (function (buster) {
             return spy.create(object);
         }
 
-        if (!object || !property) {
+        if (!object && !property) {
             return spy.create(function () {});
         }
 
@@ -694,6 +1112,7 @@ var sinon = (function (buster) {
         function incrementCallCount() {
             this.called = true;
             this.callCount += 1;
+            this.notCalled = false;
             this.calledOnce = this.callCount == 1;
             this.calledTwice = this.callCount == 2;
             this.calledThrice = this.callCount == 3;
@@ -712,6 +1131,7 @@ var sinon = (function (buster) {
         var spyApi = {
             reset: function () {
                 this.called = false;
+                this.notCalled = true;
                 this.calledOnce = false;
                 this.calledTwice = false;
                 this.calledThrice = false;
@@ -725,6 +1145,11 @@ var sinon = (function (buster) {
                 this.thisValues = [];
                 this.exceptions = [];
                 this.callIds = [];
+                if (this.fakes) {
+                    for (var i = 0; i < this.fakes.length; i++) {
+                        this.fakes[i].reset();
+                    }
+                }
             },
 
             create: function create(func) {
@@ -882,11 +1307,15 @@ var sinon = (function (buster) {
         delegateToCalls(spyApi, "calledOn", true);
         delegateToCalls(spyApi, "alwaysCalledOn", false, "calledOn");
         delegateToCalls(spyApi, "calledWith", true);
+        delegateToCalls(spyApi, "calledWithMatch", true);
         delegateToCalls(spyApi, "alwaysCalledWith", false, "calledWith");
+        delegateToCalls(spyApi, "alwaysCalledWithMatch", false, "calledWithMatch");
         delegateToCalls(spyApi, "calledWithExactly", true);
         delegateToCalls(spyApi, "alwaysCalledWithExactly", false, "calledWithExactly");
         delegateToCalls(spyApi, "neverCalledWith", false, "notCalledWith",
             function () { return true; });
+        delegateToCalls(spyApi, "neverCalledWithMatch", false, "notCalledWithMatch",
+            function () { return true; });
         delegateToCalls(spyApi, "threw", true);
         delegateToCalls(spyApi, "alwaysThrew", false, "threw");
         delegateToCalls(spyApi, "returned", true);
@@ -937,7 +1366,13 @@ var sinon = (function (buster) {
             },
 
             "*": function (spy, args) {
-                return args.join(", ");
+                var formatted = [];
+
+                for (var i = 0, l = args.length; i < l; ++i) {
+                    push.call(formatted, sinon.format(args[i]));
+                }
+
+                return formatted.join(", ");
             }
         };
 
@@ -982,22 +1417,32 @@ var sinon = (function (buster) {
                 return true;
             },
 
+            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;
+            },
+
             calledWithExactly: function calledWithExactly() {
                 return arguments.length == this.args.length &&
                     this.calledWith.apply(this, arguments);
             },
 
             notCalledWith: function notCalledWith() {
-                for (var i = 0, l = arguments.length; i < l; i += 1) {
-                    if (!sinon.deepEqual(arguments[i], this.args[i])) {
-                        return true;
-                    }
-                }
-                return false;
+                return !this.calledWith.apply(this, arguments);
+            },
+
+            notCalledWithMatch: function notCalledWithMatch() {
+              return !this.calledWithMatch.apply(this, arguments);
             },
 
             returned: function returned(value) {
-                return this.returnValue === value;
+                return sinon.deepEqual(value, this.returnValue);
             },
 
             threw: function threw(error) {
@@ -1195,6 +1640,20 @@ var sinon = (function (buster) {
         return "argument at index " + stub.callArgAt + " is not a function: " + func;
     }
 
+    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 {
+            return function (callback) {
+                setTimeout(callback, 0);
+            };
+        }
+    })();
+
     function callCallback(stub, args) {
         if (typeof stub.callArgAt == "number") {
             var func = getCallback(stub, args);
@@ -1203,14 +1662,20 @@ var sinon = (function (buster) {
                 throw new TypeError(getCallbackError(stub, func, args));
             }
 
-            func.apply(stub.callbackContext, stub.callbackArguments);
+            if (stub.callbackAsync) {
+                nextTick(function() {
+                    func.apply(stub.callbackContext, stub.callbackArguments);
+                });
+            } else {
+                func.apply(stub.callbackContext, stub.callbackArguments);
+            }
         }
     }
 
     var uuid = 0;
 
     sinon.extend(stub, (function () {
-        var slice = Array.prototype.slice;
+        var slice = Array.prototype.slice, proto;
 
         function throwsException(error, message) {
             if (typeof error == "string") {
@@ -1221,21 +1686,23 @@ var sinon = (function (buster) {
             } else {
                 this.exception = error;
             }
-            
+
             return this;
         }
 
-        return {
+        proto = {
             create: function create() {
                 var functionStub = function () {
+
+                    callCallback(functionStub, arguments);
+
                     if (functionStub.exception) {
                         throw functionStub.exception;
                     } else if (typeof functionStub.returnArgAt == 'number') {
                         return arguments[functionStub.returnArgAt];
+                    } else if (functionStub.returnThis) {
+                        return this;
                     }
-
-                    callCallback(functionStub, arguments);
-
                     return functionStub.returnValue;
                 };
 
@@ -1262,12 +1729,18 @@ var sinon = (function (buster) {
                 if (typeof pos != "number") {
                     throw new TypeError("argument index is not number");
                 }
-                
+
                 this.returnArgAt = pos;
 
                 return this;
             },
 
+            returnsThis: function returnsThis() {
+                this.returnThis = true;
+
+                return this;
+            },
+
             "throws": throwsException,
             throwsException: throwsException,
 
@@ -1363,6 +1836,21 @@ var sinon = (function (buster) {
                 return this;
             }
         };
+        
+        // create asynchronous versions of callsArg* and yields* methods
+        for (var method in proto) {
+            if (proto.hasOwnProperty(method) && method.match(/^(callsArg|yields)/)) {
+                proto[method + 'Async'] = (function (syncFnName) {
+                    return function () {
+                        this.callbackAsync = true;
+                        return this[syncFnName].apply(this, arguments);
+                    };
+                })(method);
+            }
+        }
+        
+        return proto;
+        
     }()));
 
     if (commonJSModule) {
@@ -1488,6 +1976,8 @@ var sinon = (function (buster) {
 
                 if (messages.length > 0) {
                     sinon.expectation.fail(messages.concat(met).join("\n"));
+                } else {
+                    sinon.expectation.pass(messages.concat(met).join("\n"));
                 }
 
                 return true;
@@ -1495,21 +1985,30 @@ var sinon = (function (buster) {
 
             invokeMethod: function invokeMethod(method, thisValue, args) {
                 var expectations = this.expectations && this.expectations[method];
-                var length = expectations && expectations.length || 0;
+                var length = expectations && expectations.length || 0, i;
 
-                for (var i = 0; i < length; i += 1) {
+                for (i = 0; i < length; i += 1) {
                     if (!expectations[i].met() &&
                         expectations[i].allowsCall(thisValue, args)) {
                         return expectations[i].apply(thisValue, args);
                     }
                 }
 
-                var messages = [];
+                var messages = [], available, exhausted = 0;
 
                 for (i = 0; i < length; i += 1) {
+                    if (expectations[i].allowsCall(thisValue, args)) {
+                        available = available || expectations[i];
+                    } else {
+                        exhausted += 1;
+                    }
                     push.call(messages, "    " + expectations[i].toString());
                 }
 
+                if (exhausted === 0) {
+                    return available.apply(thisValue, args);
+                }
+
                 messages.unshift("Unexpected call: " + sinon.spyCall.toString.call({
                     proxy: method,
                     args: args
@@ -1660,7 +2159,7 @@ var sinon = (function (buster) {
                     return;
                 }
 
-                if (!args || args.length === 0) {
+                if (!args) {
                     sinon.expectation.fail(this.method + " received no arguments, expected " +
                         this.expectedArguments.join());
                 }
@@ -1685,7 +2184,7 @@ var sinon = (function (buster) {
             },
 
             allowsCall: function allowsCall(thisValue, args) {
-                if (this.met()) {
+                if (this.met() && receivedMaxCalls(this)) {
                     return false;
                 }
 
@@ -1758,11 +2257,16 @@ var sinon = (function (buster) {
             verify: function verify() {
                 if (!this.met()) {
                     sinon.expectation.fail(this.toString());
+                } else {
+                    sinon.expectation.pass(this.toString());
                 }
 
                 return true;
             },
 
+            pass: function(message) {
+              sinon.assert.pass(message);
+            },
             fail: function (message) {
                 var exception = new Error(message);
                 exception.name = "ExpectationError";
@@ -1886,6 +2390,17 @@ var sinon = (function (buster) {
                     });
                 }
             }
+            if (!property && !!object && typeof object == "object") {
+                var stubbedObj = sinon.stub.apply(sinon, arguments);
+
+                for (var prop in stubbedObj) {
+                    if (typeof stubbedObj[prop] === "function") {
+                        this.add(stubbedObj[prop]);
+                    }
+                }
+
+                return stubbedObj;
+            }
 
             return this.add(sinon.stub.apply(sinon, arguments));
         },
@@ -1962,7 +2477,8 @@ if (typeof sinon == "undefined") {
         this.timeouts[toId] = {
             id: toId,
             func: args[0],
-            callAt: this.now + delay
+            callAt: this.now + delay,
+            invokeArgs: Array.prototype.slice.call(args, 2)
         };
 
         if (recurring === true) {
@@ -2096,7 +2612,8 @@ if (typeof sinon == "undefined") {
                             func: this.timeouts[id].func,
                             callAt: this.timeouts[id].callAt,
                             interval: this.timeouts[id].interval,
-                            id: this.timeouts[id].id
+                            id: this.timeouts[id].id,
+                            invokeArgs: this.timeouts[id].invokeArgs
                         };
                     }
                 }
@@ -2106,9 +2623,15 @@ if (typeof sinon == "undefined") {
         },
 
         callTimer: function (timer) {
+            if (typeof timer.interval == "number") {
+                this.timeouts[timer.id].callAt += timer.interval;
+            } else {
+                delete this.timeouts[timer.id];
+            }
+
             try {
                 if (typeof timer.func == "function") {
-                    timer.func.call(null);
+                    timer.func.apply(null, timer.invokeArgs);
                 } else {
                     eval(timer.func);
                 }
@@ -2123,12 +2646,6 @@ if (typeof sinon == "undefined") {
                 return;
             }
 
-            if (typeof timer.interval == "number") {
-                this.timeouts[timer.id].callAt += timer.interval;
-            } else {
-                delete this.timeouts[timer.id];
-            }
-
             if (exception) {
               throw exception;
             }
@@ -2204,11 +2721,19 @@ if (typeof sinon == "undefined") {
 
         for (var i = 0, l = this.methods.length; i < l; i++) {
             method = this.methods[i];
-            global[method] = this["_" + method];
+            if (global[method].hadOwnProperty) {
+                global[method] = this["_" + method];
+            } else {
+                delete global[method];
+            }
         }
+
+        // Prevent multiple executions which will completely remove these props
+        this.methods = [];
     }
 
     function stubGlobal(method, clock) {
+        clock[method].hadOwnProperty = Object.prototype.hasOwnProperty.call(global, method);
         clock["_" + method] = global[method];
 
         if (method == "Date") {
@@ -2849,7 +3374,7 @@ sinon.fakeServer = (function () {
         return response;
     }
 
-    var wloc = window.location;
+    var wloc = typeof window !== "undefined" ? window.location : {};
     var rCurrLoc = new RegExp("^" + wloc.protocol + "//" + wloc.host);
 
     function matchOne(response, reqMethod, reqUrl) {
@@ -3533,11 +4058,16 @@ if (typeof module == "object" && typeof require == "function") {
     mirrorPropAsAssertion("calledThrice", "expected %n to be called thrice but was called %c%C");
     mirrorPropAsAssertion("calledOn", "expected %n to be called with %1 as this but was called with %t");
     mirrorPropAsAssertion("alwaysCalledOn", "expected %n to always be called with %1 as this but was called with %t");
+    mirrorPropAsAssertion("calledWithNew", "expected %n to be called with new");
+    mirrorPropAsAssertion("alwaysCalledWithNew", "expected %n to always be called with new");
     mirrorPropAsAssertion("calledWith", "expected %n to be called with arguments %*%C");
+    mirrorPropAsAssertion("calledWithMatch", "expected %n to be called with match %*%C");
     mirrorPropAsAssertion("alwaysCalledWith", "expected %n to always be called with arguments %*%C");
+    mirrorPropAsAssertion("alwaysCalledWithMatch", "expected %n to always be called with match %*%C");
     mirrorPropAsAssertion("calledWithExactly", "expected %n to be called with exact arguments %*%C");
     mirrorPropAsAssertion("alwaysCalledWithExactly", "expected %n to always be called with exact arguments %*%C");
     mirrorPropAsAssertion("neverCalledWith", "expected %n to never be called with arguments %*%C");
+    mirrorPropAsAssertion("neverCalledWithMatch", "expected %n to never be called with match %*%C");
     mirrorPropAsAssertion("threw", "%n did not throw exception%C");
     mirrorPropAsAssertion("alwaysThrew", "%n did not always throw exception%C");
 
@@ -3548,5 +4078,4 @@ if (typeof module == "object" && typeof require == "function") {
     }
 }(typeof sinon == "object" && sinon || null, typeof window != "undefined" ? window : global));
 
-return sinon;}.call(typeof window != 'undefined' && window || {}));
-
+return sinon;}.call(typeof window != 'undefined' && window || {}));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinon-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.2.1
+  version: 1.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000 Z
+date: 2012-09-07 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -48,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: sinon.js via asset pipeline