update to [email protected]

Author: afc163

expect/Gruntfile.js

@@ -13,14 +13,14 @@ module.exports = function(grunt) {
           header: 'define(function(require, exports, module) {',
           footer: '});'
         },
-        url: 'https://raw.github.com/LearnBoost/expect.js/<%= pkg.version %>/expect.js',
+        url: 'https://raw.github.com/LearnBoost/expect.js/<%= pkg.version %>/index.js',
         name: 'expect.js'
       }
     }
   });
 
-  require('grunt-spm-build').initConfig(grunt, {pkg: pkg});
-  grunt.loadGlobalTasks('grunt-spm-build');
+  grunt.loadGlobalTasks('spm-build');
+  grunt.util._.merge(grunt.config.data, require('spm-build').config);
 
   grunt.loadTasks('../_tasks/download/tasks');
   grunt.registerTask('build', ['download', 'spm-build']);

expect/dist/expect-debug.js

@@ -1,10 +1,6 @@
-define("gallery/expect/0.2.0/expect-debug", [], function(require, exports, module) {
+define("gallery/expect/0.3.1/expect-debug", [], function(require, exports, module) {
     (function(global, module) {
-        if ("undefined" == typeof module) {
-            var module = {
-                exports: {}
-            }, exports = module.exports;
-        }
+        var exports = module.exports;
         /**
    * Exports.
    */
@@ -13,7 +9,7 @@ define("gallery/expect/0.2.0/expect-debug", [], function(require, exports, modul
         /**
    * Exports version.
    */
-        expect.version = "0.1.2";
+        expect.version = "0.3.1";
         /**
    * Possible assertion flags.
    */
@@ -71,10 +67,16 @@ define("gallery/expect/0.2.0/expect-debug", [], function(require, exports, modul
    *
    * @api private
    */
-        Assertion.prototype.assert = function(truth, msg, error) {
-            var msg = this.flags.not ? error : msg, ok = this.flags.not ? !truth : truth;
+        Assertion.prototype.assert = function(truth, msg, error, expected) {
+            var msg = this.flags.not ? error : msg, ok = this.flags.not ? !truth : truth, err;
             if (!ok) {
-                throw new Error(msg.call(this));
+                err = new Error(msg.call(this));
+                if (arguments.length > 3) {
+                    err.actual = this.obj;
+                    err.expected = expected;
+                    err.showDiff = true;
+                }
+                throw err;
             }
             this.and = new Assertion(this.obj);
         };
@@ -91,6 +93,19 @@ define("gallery/expect/0.2.0/expect-debug", [], function(require, exports, modul
             });
         };
         /**
+   * Creates an anonymous function which calls fn with arguments.
+   *
+   * @api public
+   */
+        Assertion.prototype.withArgs = function() {
+            expect(this.obj).to.be.a("function");
+            var fn = this.obj;
+            var args = Array.prototype.slice.call(arguments);
+            return expect(function() {
+                fn.apply(null, args);
+            });
+        };
+        /**
    * Assert that the function throws.
    *
    * @param {Function|RegExp} callback, or regexp to match error string against
@@ -102,19 +117,19 @@ define("gallery/expect/0.2.0/expect-debug", [], function(require, exports, modul
             try {
                 this.obj();
             } catch (e) {
-                if ("function" == typeof fn) {
-                    fn(e);
-                } else if ("object" == typeof fn) {
+                if (isRegExp(fn)) {
                     var subject = "string" == typeof e ? e : e.message;
                     if (not) {
                         expect(subject).to.not.match(fn);
                     } else {
                         expect(subject).to.match(fn);
                     }
+                } else if ("function" == typeof fn) {
+                    fn(e);
                 }
                 thrown = true;
             }
-            if ("object" == typeof fn && not) {
+            if (isRegExp(fn) && not) {
                 // in the presence of a matcher, ensure the `not` only applies to
                 // the matching.
                 this.flags.not = false;
@@ -172,11 +187,11 @@ define("gallery/expect/0.2.0/expect-debug", [], function(require, exports, modul
    * @api public
    */
         Assertion.prototype.eql = function(obj) {
-            this.assert(expect.eql(obj, this.obj), function() {
+            this.assert(expect.eql(this.obj, obj), function() {
                 return "expected " + i(this.obj) + " to sort of equal " + i(obj);
             }, function() {
                 return "expected " + i(this.obj) + " to sort of not equal " + i(obj);
-            });
+            }, obj);
             return this;
         };
         /**
@@ -205,7 +220,7 @@ define("gallery/expect/0.2.0/expect-debug", [], function(require, exports, modul
                 // proper english in error msg
                 var n = /^[aeiou]/.test(type) ? "n" : "";
                 // typeof with support for 'array'
-                this.assert("array" == type ? isArray(this.obj) : "object" == type ? "object" == typeof this.obj && null !== this.obj : type == typeof this.obj, function() {
+                this.assert("array" == type ? isArray(this.obj) : "regexp" == type ? isRegExp(this.obj) : "object" == type ? "object" == typeof this.obj && null !== this.obj : type == typeof this.obj, function() {
                     return "expected " + i(this.obj) + " to be a" + n + " " + type;
                 }, function() {
                     return "expected " + i(this.obj) + " not to be a" + n + " " + type;
@@ -393,8 +408,10 @@ define("gallery/expect/0.2.0/expect-debug", [], function(require, exports, modul
    * @api public
    */
         Assertion.prototype.fail = function(msg) {
-            msg = msg || "explicit failure";
-            this.assert(false, msg, msg);
+            var error = function() {
+                return msg || "explicit failure";
+            };
+            this.assert(false, error, error);
             return this;
         };
         /**
@@ -441,7 +458,6 @@ define("gallery/expect/0.2.0/expect-debug", [], function(require, exports, modul
             if ("outerHTML" in element) return element.outerHTML;
             var ns = "http://www.w3.org/1999/xhtml";
             var container = document.createElementNS(ns, "_");
-            var elemProto = (window.HTMLElement || window.Element).prototype;
             var xmlSerializer = new XMLSerializer();
             var html;
             if (document.xmlVersion) {
@@ -518,6 +534,10 @@ define("gallery/expect/0.2.0/expect-debug", [], function(require, exports, modul
                 if (isDate(value) && $keys.length === 0) {
                     return stylize(value.toUTCString(), "date");
                 }
+                // Error objects can be shortcutted
+                if (value instanceof Error) {
+                    return stylize("[" + value.toString() + "]", "Error");
+                }
                 var base, type, braces;
                 // Determine the object type
                 if (isArray(value)) {
@@ -620,8 +640,9 @@ define("gallery/expect/0.2.0/expect-debug", [], function(require, exports, modul
             }
             return format(obj, typeof depth === "undefined" ? 2 : depth);
         }
+        expect.stringify = i;
         function isArray(ar) {
-            return Object.prototype.toString.call(ar) == "[object Array]";
+            return Object.prototype.toString.call(ar) === "[object Array]";
         }
         function isRegExp(re) {
             var s;
@@ -635,8 +656,7 @@ define("gallery/expect/0.2.0/expect-debug", [], function(require, exports, modul
             typeof re === "function" && re.constructor.name === "RegExp" && re.compile && re.test && re.exec && s.match(/^\/.*\/[gim]{0,3}$/);
         }
         function isDate(d) {
-            if (d instanceof Date) return true;
-            return false;
+            return d instanceof Date;
         }
         function keys(obj) {
             if (Object.keys) {
@@ -704,6 +724,8 @@ define("gallery/expect/0.2.0/expect-debug", [], function(require, exports, modul
                 return actual.getTime() === expected.getTime();
             } else if (typeof actual != "object" && typeof expected != "object") {
                 return actual == expected;
+            } else if (isRegExp(actual) && isRegExp(expected)) {
+                return regExpEquiv(actual, expected);
             } else {
                 return objEquiv(actual, expected);
             }
@@ -714,6 +736,9 @@ define("gallery/expect/0.2.0/expect-debug", [], function(require, exports, modul
         function isArguments(object) {
             return Object.prototype.toString.call(object) == "[object Arguments]";
         }
+        function regExpEquiv(a, b) {
+            return a.source === b.source && a.global === b.global && a.ignoreCase === b.ignoreCase && a.multiline === b.multiline;
+        }
         function objEquiv(a, b) {
             if (isUndefinedOrNull(a) || isUndefinedOrNull(b)) return false;
             // an identical "prototype" property.
@@ -969,5 +994,7 @@ define("gallery/expect/0.2.0/expect-debug", [], function(require, exports, modul
         if ("undefined" != typeof window) {
             window.expect = module.exports;
         }
-    })(this, "undefined" != typeof module ? module : {}, "undefined" != typeof exports ? exports : {});
-});
+    })(this, "undefined" != typeof module ? module : {
+        exports: {}
+    });
+});