konacha-chai-matchers 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6b60b89f98ae533e719ffcab08c0b3e87b8799e
-  data.tar.gz: 191e69e079fa781a2e451fae095d89336f88d26b
+  metadata.gz: 626fca41336d274fa07caf9b97b4b859e33ba5d8
+  data.tar.gz: 8465e7f3959300e06e6458cd9be4cd3b4d5f9610
 SHA512:
-  metadata.gz: 5ecfef8e457cdbe3ee1fca5c66d222284f91c25ef913261f3c3f9931d1db9121b766f4009b77e042676b779824fee78163d2aae93596498e0668079ac2629a99
-  data.tar.gz: 8de203d47ce991198b08732835a37176d46ee9ff713b98956186dfb4ee731d252fbb441ffe83710a442387c2d205e00d8b974fd5533f27ad5a6f826254fa78ad
+  metadata.gz: 6d89068bc4e0b130b9c1aeaae79e2d95015f66dc2223cf858b38cbafa113036b05a27f4d22b1b39cdae119eb2aab871cd7c1d26b552e3a5fedf35a1ff7ee1430
+  data.tar.gz: 09d37ab3972082b1e7c771ac49102084eb55e2075305d058d0bd54119fabe14e6c7cbf71e4e8c12752fbc4d7c976bde0f2f9cfd95acddb3ae2171add79476e17

data/.gitmodules

@@ -61,3 +61,21 @@
 [submodule "chai-change"]
 	path = chai-change
 	url = https://github.com/timruffles/chai-change.git
+[submodule "chai-colors"]
+	path = chai-colors
+	url = git@github.com:hurrymaplelad/chai-colors.git
+[submodule "chai-shallow-deep-equal"]
+	path = chai-shallow-deep-equal
+	url = git@github.com:michelsalib/chai-shallow-deep-equal.git
+[submodule "chai-subset"]
+	path = chai-subset
+	url = git@github.com:e-conomic/chai-subset.git
+[submodule "chai-string"]
+	path = chai-string
+	url = git@github.com:onechiporenko/chai-string.git
+[submodule "chai-param"]
+	path = chai-param
+	url = git@github.com:theblacksmith/chai-param.git
+[submodule "chai-xml"]
+	path = chai-xml
+	url = git@github.com:krampstudio/chai-xml.git

data/README.md

@@ -4,6 +4,7 @@ Konacha Chai Matchers
 [![Gem Version](https://fury-badge.herokuapp.com/rb/konacha-chai-matchers.png)](http://badge.fury.io/rb/konacha-chai-matchers)
 
 This library contains all [Chai.js plugins](http://chaijs.com/plugins)
+that have browser support.
 
 Not all plugins are tested!
 
@@ -29,6 +30,11 @@ Example:
     #= require chai-backbone
     #= require chai-jquery
 
+Included versions
+-----------------
+
+See `VERSIONS` for info
+
 Contribution
 ------------
 

data/VERSIONS

@@ -1,7 +1,7 @@
 chai-spies: 0.5.1
-sinon-chai: 2.5.0
+sinon-chai: 2.6.0
 chai-as-promised: 4.1.1
-chai-jquery: 1.2.3
+chai-jquery: 2.0.0
 chai-timers: 0.2.0
 chai-stats: 0.3.0
 chai-null: 0.1.0
@@ -12,10 +12,16 @@ js-factories: 1.1.1
 mocha-as-promised: 2.0.0
 chai-things: 0.2.0
 chai-fuzzy: 1.4.0
-sinon: 1.10.3
+sinon: 1.12.2
 memo-is: 0.0.2
-chai-jq: 0.0.7
+chai-jq: 0.0.8
 chai-js-factories: 0.1.3
 chai-json-schema: 1.1.0
-chai-datetime: 1.3.0
+chai-datetime: 1.3.1
 chai-change: 1.0.0
+chai-colors: 1.0.0
+chai-shallow-deep-equal: 1.0.0
+chai-subset: 0.3.0
+chai-string: 1.1.0
+chai-param: 0.1.0
+chai-xml: 0.2.0

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

@@ -1,7 +1,7 @@
 module Konacha
   module Chai
     module Matchers
-      VERSION = "0.3.0"
+      VERSION = "1.0.0"
     end
   end
 end

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

@@ -0,0 +1,16 @@
+var color = require('onecolor');
+
+module.exports = function (chai, utils) {
+  chai.Assertion.addMethod('colored', function (colorString) {
+    var expected = color(colorString),
+        actual = color(this._obj);
+
+    this.assert(
+      actual.equals(expected),
+      'expected #{act} to be the same color as #{exp}',
+      'expected #{act} to be a different color than #{exp}',
+      expected.hex(),
+      actual.hex()
+    );
+  });
+};

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

@@ -37,12 +37,16 @@
     return actual.toDateString() === expected.toDateString();
   };
 
+  var dateWithoutTime = function(date) {
+    return new Date(date.getFullYear(), date.getMonth(), date.getDate());
+  }
+
   chai.datetime.beforeDate = function(actual, expected) {
-    return actual.getUTCFullYear() < expected.getUTCFullYear() || actual.getUTCMonth() < expected.getUTCMonth() || actual.getUTCDate() < expected.getUTCDate();
+    return chai.datetime.beforeTime(dateWithoutTime(actual), dateWithoutTime(expected));
   };
 
   chai.datetime.afterDate = function(actual, expected) {
-    return actual.getUTCFullYear() > expected.getUTCFullYear() || actual.getUTCMonth() > expected.getUTCMonth() || actual.getUTCDate() > expected.getUTCDate();
+    return chai.datetime.afterTime(dateWithoutTime(actual), dateWithoutTime(expected));
   };
 
   chai.datetime.beforeTime = function(actual, expected) {

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

@@ -25,6 +25,11 @@
      * Give a more useful element name.
      */
     var _elName = function ($el) {
+      // Detect if completely empty.
+      if (!$el || $el.length === 0) {
+        return "<EMPTY OBJECT>";
+      }
+
       var name = "",
         id = $el.attr("id"),
         cls = $el.attr("class") || "";
@@ -128,7 +133,7 @@
      */
     var _containMethod = function (jqMeth, opts) {
       // Unpack options.
-      opts || (opts = {});
+      opts = opts || /* istanbul ignore next */ {};
       opts.hasArg       = !!opts.hasArg;
       opts.isProperty   = !!opts.isProperty;
       opts.hasContains  = !!opts.hasContains;
@@ -246,7 +251,9 @@
      * @api public
      */
     var $val = _jqAssert(function (exp) {
-      var act = this._$el.val(),
+      // Manually check empty elements for `.val` call b/c ie9 can otherwise
+      // report `Unspecified error.` at least in Sauce Labs.
+      var act = this._$el && this._$el.length > 0 ? this._$el.val() : undefined,
         comp = _isRegExp(exp) ? _regExpMatch : _equals;
 
       this.assert(
@@ -327,8 +334,8 @@
     chai.Assertion.addMethod("$attr", $attr);
 
     /**
-     * Asserts that the target has exactly the given named 
-     * data-attribute, or asserts the target contains a subset 
+     * Asserts that the target has exactly the given named
+     * data-attribute, or asserts the target contains a subset
      * of the data-attribute when using the
      * `include` or `contain` modifiers.
      *
@@ -338,7 +345,7 @@
      *   .to.contain.$data("foo", "bar");
      * ```
      *
-     * Changes context to data-attribute string *value* when no 
+     * Changes context to data-attribute string *value* when no
      * expected value is provided:
      *
      * ```js
@@ -486,6 +493,7 @@
     chai.Assertion.addMethod("$css", $css);
   }
 
+  /* istanbul ignore next */
   /*!
    * Wrap AMD, etc. using boilerplate.
    */

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

@@ -145,6 +145,15 @@
     );
   });
 
+  chai.Assertion.addMethod('descendants', function (selector) {
+    this.assert(
+        flag(this, 'object').has(selector).length > 0
+      , 'expected #{this} to have #{exp}'
+      , 'expected #{this} not to have #{exp}'
+      , selector
+    );
+  });
+
   $.each(['visible', 'hidden', 'selected', 'checked', 'enabled', 'disabled'], function (i, attr) {
     chai.Assertion.addProperty(attr, function () {
       this.assert(
@@ -182,27 +191,6 @@
     };
   });
 
-  chai.Assertion.overwriteProperty('be', function (_super) {
-    return function () {
-      var obj = flag(this, 'object');
-      if (obj instanceof $) {
-        var be = function (selector) {
-          this.assert(
-              obj.is(selector)
-            , 'expected #{this} to be #{exp}'
-            , 'expected #{this} not to be #{exp}'
-            , selector
-          );
-        };
-        setPrototypeOf(be, this);
-        return be;
-      }
-      else {
-        _super.call(this);
-      }
-    }
-  });
-
   chai.Assertion.overwriteMethod('match', function (_super) {
     return function (selector) {
       var obj = flag(this, 'object');
@@ -219,46 +207,25 @@
     }
   });
 
-  chai.Assertion.overwriteProperty('contain', function (_super) {
-    return function () {
-      _super.call(this);
-      var contain = function (text) {
+  chai.Assertion.overwriteChainableMethod('contain',
+    function (_super) {
+      return function (text) {
         var obj = flag(this, 'object');
         if (obj instanceof $) {
           this.assert(
               obj.is(':contains(\'' + text + '\')')
             , 'expected #{this} to contain #{exp}'
             , 'expected #{this} not to contain #{exp}'
-            , text
-          );
+            , text);
         } else {
-          return Function.prototype.apply.call(_super.call(this), this, arguments);
+          _super.apply(this, arguments);
         }
-      };
-      setPrototypeOf(contain, this);
-      return contain;
-    }
-  });
-
-  chai.Assertion.overwriteProperty('have', function (_super) {
-    return function () {
-      var obj = flag(this, 'object');
-      if (obj instanceof $) {
-        var have = function (selector) {
-          this.assert(
-              // Using find() rather than has() to work around a jQuery bug:
-              //   http://bugs.jquery.com/ticket/11706
-              obj.find(selector).length > 0
-            , 'expected #{this} to have #{exp}'
-            , 'expected #{this} not to have #{exp}'
-            , selector
-          );
-        };
-        setPrototypeOf(have, this);
-        return have;
-      } else {
-        _super.call(this);
       }
+    },
+    function(_super) {
+      return function() {
+        _super.call(this);
+      };
     }
-  });
+  );
 }));

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

@@ -0,0 +1,161 @@
+/*!
+ * chai-param
+ * Copyright(c) 2014 The Blacksmith (a.k.a. Saulo Vallory) <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+var path = require('path'),
+    chalk = require('chalk'),
+    stackTrace = require('stack-trace'),
+    chai = require('chai'),
+    utils = require('chai/lib/chai/utils');
+
+var exports = module.exports = chaiParam;
+
+chaiParam.config = require('./config');
+
+// chalk wrapper for easy enabling and disabling colors
+function c(color, text) {
+  if(chaiParam.config.disableColors)
+    return text;
+
+  return chalk[color](text);
+}
+
+function chaiParam(chai, utils) {
+
+  if(chaiParam._param)
+    // already initialized
+    return;
+
+  var flag = utils.flag
+    , objDisplay = utils.objDisplay;
+
+  chaiParam._param = function param(val, paramName, functionName, topic) {
+    var assertion = new chai.Assertion(val, functionName);
+
+    utils.flag(assertion, 'paramName', paramName);
+
+    if(functionName && functionName.trim && functionName.trim() != '')
+      utils.flag(assertion, 'functionName', functionName);
+
+    if(topic && topic.trim && topic.trim() != '')
+      utils.flag(assertion, 'message', topic);
+
+    return { should: assertion };
+  }
+
+  /**
+   * ### .param(paramName, functionName)
+   *
+   * The `param` chain allows you provide metadata about
+   * the parameter being validated.
+   *
+   *     // examples
+   *     expect(text).param('text', 'log').to.be.a('string');
+   *     expect(user).param('user', 'register').to.have.length.below(16);
+   *
+   * @name param
+   * @param {String} paramName
+   * @param {String} functionName _optional_ Adding this allows chai-param to look for the caller
+   * @api public
+   */
+  utils.addMethod(chai.Assertion.prototype, 'param', function(paramName, functionName) {
+    utils.flag(this, 'paramName', paramName);
+
+    if(functionName && functionName.trim && functionName.trim() != '')
+      utils.flag(this, 'functionName', functionName);
+  });
+
+  if(chaiParam.config.improveMessages) {
+
+    // Overwriting getMessages
+    var oldGetMessage = utils.getMessage;
+    utils.getMessage = getMessage;
+
+    function getMessage (obj, args) {
+
+      if(!chaiParam.config.improveMessages)
+      {
+        return oldGetMessage(obj, args);
+      }
+
+      var negate = utils.flag(obj, 'negate')
+        , val = utils.flag(obj, 'object')
+        , expected = args[3]
+        , actual = utils.getActual(obj, args)
+        , msg = negate ? args[2] : args[1]
+        , flagMsg = utils.flag(obj, 'message')
+        , flagParam = utils.flag(obj, 'paramName')
+        , fnTarget = utils.flag(obj, 'functionName');
+
+      msg = msg || '';
+
+      var hasActToken = msg.indexOf('#{act}') >= 0;
+
+      msg = msg
+        .replace(/#{this}/g, flagParam ? 'parameter ' + c('yellow', flagParam) + ' ('+objDisplay(val)+')': objDisplay(val))
+        .replace(/#{act}/g, c('red', objDisplay(actual)))
+        .replace(/#{exp}/g, c('green', objDisplay(expected)))
+        .replace(/(not) to/, c('green', 'not') + ' to').replace(/to not/, 'to ' + c('green', 'not'))
+        .replace(/(length )?(below|at least|above|at most|within)(\s*)([0-9]*)/, c('green', '$1$2$3$4'))
+        .replace(/(include|truthy|falsy|true|false|undefined|match|satisfy|same members as)/, c('green', '$1'))
+        .replace(/(exist|empty|arguments|equal|deeply equal|instance of|be a superset)/, c('green', '$1'));
+
+      if(flagParam && !hasActToken)
+        msg += ' but got ' + c('red', objDisplay(val)) + ' instead';
+
+      var isNode = (typeof window == 'undefined');
+
+      if(chaiParam.config.showCaller && isNode && fnTarget) // show Caller
+      {
+        var trace = stackTrace.get();
+
+        var i = 0;
+
+        if(fnTarget) {
+          while(i < trace.length && trace[i].getFunctionName() != fnTarget) {
+            i++;
+          }
+
+          if(++i < trace.length) {
+            var file = trace[i].getFileName();
+            var filePath = path.dirname(file) + path.sep + c('blue', path.basename(file));
+
+            var spaces = flagMsg ? flagMsg.replace(/./g, ' ') : '';
+
+            msg += '\n' + spaces + '  - Called at: ' + filePath + ':' + c('blue', trace[i].getLineNumber());
+          }
+        }
+      }
+
+      return flagMsg ? flagMsg + ': ' + msg : msg;
+    };
+  }
+}
+
+/**
+ * ### param(value, name, function)
+ *
+ * The `param` method allows you to use the should syntax
+ * and still provide metadata about the parameter being validated.
+ *
+ *     // examples
+ *     param(text, 'text', 'log').should.be.a('string');
+ *     param(user, 'user', 'register').should.have.length.below(16);
+ *
+ * @name param
+ * @param {Mixed} value
+ * @param {String} paramName
+ * @param {String} functionName _optional_ Adding this allows chai-param to look for the caller
+ * @param {String} topic _optional_ A prefix for the message
+ * @api public
+ */
+chaiParam.param = function param(val, paramName, functionName, topic) {
+
+  if(!chaiParam._param) {
+    throw new Error("You need to add chai-param to chai through `chai.use()` method before using it")
+  }
+
+  return chaiParam._param(val, paramName, functionName, topic);
+};