Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merged in diff support

  • Loading branch information...
commit 0779766b14ce37bcea16903c3d3dbe0216a4242e 2 parents bfdd005 + bfb8998
@JerrySievert JerrySievert authored
Showing with 145 additions and 10 deletions.
  1. +25 −0 LICENSE
  2. +115 −5 lib/assert/error.js
  3. +5 −5 package.json
View
25 LICENSE
@@ -18,3 +18,28 @@ 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.
+
+This software contains code adapted from Mocha
+(https://github.com/visionmedia/mocha) by TJ Holowaychuk
+and is used herein under the following MIT license:
+
+Copyright (c) 2011-2012 TJ Holowaychuk <tj@vision-media.ca>
+
+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.
View
120 lib/assert/error.js
@@ -1,5 +1,79 @@
+/**
+This software contains code adapted from Mocha
+(https://github.com/visionmedia/mocha) by TJ Holowaychuk
+and is used herein under the following MIT license:
+
+Copyright (c) 2011-2012 TJ Holowaychuk <tj@vision-media.ca>
+
+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 stylize = require('../vows/console').stylize;
var inspect = require('../vows/console').inspect;
+var diff = require('diff');
+
+/**
+ * Pad the given `str` to `len`.
+ *
+ * @param {String} str
+ * @param {String} len
+ * @return {String}
+ * @api private
+ */
+
+function pad(str, len) {
+ str = String(str);
+ return Array(len - str.length + 1).join(' ') + str;
+}
+
+/**
+ * Color lines for `str`, using the color `name`.
+ *
+ * @param {String} name
+ * @param {String} str
+ * @return {String}
+ * @api private
+ */
+
+function styleLines(str, name) {
+ return str.split('\n').map(function(str){
+ return stylize(str, name);
+ }).join('\n');
+}
+
+/**
+ * Return a character diff for `err`.
+ *
+ * @param {Error} err
+ * @return {String}
+ * @api private
+ */
+
+function errorDiff(err, type) {
+ return diff['diff' + type](err.actual, err.expected).map(function(str){
+ if (/^(\n+)$/.test(str.value)) str.value = Array(++RegExp.$1.length).join('<newline>');
+ if (str.added) return styleLines(str.value, 'green');
+ if (str.removed) return styleLines(str.value, 'red');
+ return str.value;
+ }).join('');
+}
require('assert').AssertionError.prototype.toString = function () {
var that = this,
@@ -10,14 +84,50 @@ require('assert').AssertionError.prototype.toString = function () {
}
function parse(str) {
- var actual = inspect(that.actual, {showHidden: that.actual instanceof Error}),
- expected;
+ var actual = that.actual,
+ expected = that.expected,
+ msg, len;
+
+ if (
+ 'string' === typeof actual &&
+ 'string' === typeof expected
+ ) {
+ len = Math.max(actual.length, expected.length);
+
+ if (len < 20) msg = errorDiff(that, 'Chars');
+ else msg = errorDiff(that, 'Words');
+
+ // linenos
+ var lines = msg.split('\n');
+ if (lines.length > 4) {
+ var width = String(lines.length).length;
+ msg = lines.map(function(str, i){
+ return pad(++i, width) + ' |' + ' ' + str;
+ }).join('\n');
+ }
+
+ // legend
+ msg = '\n'
+ + stylize('actual', 'green')
+ + ' '
+ + stylize('expected', 'red')
+ + '\n\n'
+ + msg
+ + '\n';
+
+ // indent
+ msg = msg.replace(/^/gm, ' ');
+
+ return msg;
+ }
+
+ actual = inspect(actual, {showHidden: actual instanceof Error});
- if (that.expected instanceof Function) {
- expected = that.expected.name;
+ if (expected instanceof Function) {
+ expected = expected.name;
}
else {
- expected = inspect(that.expected, {showHidden: that.actual instanceof Error});
+ expected = inspect(expected, {showHidden: actual instanceof Error});
}
return str.replace(/{actual}/g, actual).
View
10 package.json
@@ -5,11 +5,11 @@
"keywords" : ["testing", "spec", "test", "BDD"],
"author" : "Alexis Sellier <self@cloudhead.net>",
"contributors" : [{ "name": "Charlie Robbins", "email": "charlie.robbins@gmail.com" }],
- "dependencies" : {"eyes": ">=0.1.6"},
+ "dependencies" : {"eyes": ">=0.1.6", "diff": "~1.0.3"},
"main" : "./lib/vows",
- "bin" : { "vows": "./bin/vows" },
- "directories" : { "test": "./test", "bin": "./bin" },
- "version" : "0.6.3",
- "scripts" : {"test": "./bin/vows --spec"},
+ "bin" : {"vows": "./bin/vows"},
+ "directories" : {"test": "./test", "bin": "./bin"},
+ "version" : "0.6.4",
+ "scripts" : {"test": "node ./bin/vows --spec"},
"engines" : {"node": ">=0.2.6"}
}
Please sign in to comment.
Something went wrong with that request. Please try again.