Fixed a few minor bugs and added the ability to run expectThat.jasmin…

…e-node from a command line.
dmohl · Jan 15, 2012 · 0fc43dd · 0fc43dd
1 parent c2d7eaf
commit 0fc43dd
Show file tree

Hide file tree

Showing 28 changed files with 358 additions and 114 deletions.
diff --git a/example/Jasmine-node/node_modules/expectThat.jasmine-node/bin/expectThat.jasmine-node b/example/Jasmine-node/node_modules/expectThat.jasmine-node/bin/expectThat.jasmine-node
diff --git a/example/Jasmine-node/node_modules/expectThat.jasmine-node/lib/cli.js b/example/Jasmine-node/node_modules/expectThat.jasmine-node/lib/cli.js
diff --git a/example/Jasmine-node/node_modules/expectThat.jasmine-node/lib/expectThat.jasmine.js b/example/Jasmine-node/node_modules/expectThat.jasmine-node/lib/expectThat.jasmine.js
diff --git a/example/Jasmine-node/node_modules/expectThat.jasmine-node/lib/expectThat.jasmine.min.gz.js b/example/Jasmine-node/node_modules/expectThat.jasmine-node/lib/expectThat.jasmine.min.gz.js
diff --git a/example/Jasmine-node/node_modules/expectThat.jasmine-node/lib/expectThat.jasmine.min.js b/example/Jasmine-node/node_modules/expectThat.jasmine-node/lib/expectThat.jasmine.min.js
diff --git a/example/Jasmine-node/node_modules/expectThat.jasmine-node/lib/main.js b/example/Jasmine-node/node_modules/expectThat.jasmine-node/lib/main.js
diff --git a/example/Jasmine-node/node_modules/expectThat.jasmine-node/package.json b/example/Jasmine-node/node_modules/expectThat.jasmine-node/package.json
diff --git a/lib/expectThat.jasmine.js b/lib/expectThat.jasmine.js
@@ -2,7 +2,7 @@ var expectThatApi, root;
 root = typeof exports !== "undefined" && exports !== null ? exports : window;
 expectThatApi = (function(expectThatApi) {
   return {
-    version: "0.2.1.1",
+    version: "0.2.2.2",
     init: function(assertProvider) {
       var _this;
       _this = this;
@@ -111,7 +111,7 @@ expectThatApi = (function(expectThatApi) {
       if (typeof desc === "function" && typeof fn !== "function") {
         fn = desc;
         description = fn.toString().match(/^[^\{]*\{((.*\s*)*)\}/m)[1];
-        description = description.replace(/(\^\s+|\s)+$/g, "").replace(/\);/g, "").replace(/[(\^(?)]/g, " ").replace(/.should/g, " should").replace(/return/g, " ").replace(/shouldnt/g, "shouldn't").replace(/void 0/g, "null").replace(/!= null/g, "").replace(/typeof null !== "undefined" && null !== null/g, "undefined");
+        description = description.replace(/\);/g, "").replace(/[(\^(?)]/g, " ").replace(/.should/g, " should").replace(/return/g, " ").replace(/shouldnt/g, "shouldn't").replace(/void 0/g, "null").replace(/!= null/g, "").replace(/typeof null !== "undefined" && null !== null/g, "undefined").replace(/^\s\s*/, '').replace(/\s\s*$/, '');
       } else {
         description = desc;
       }
@@ -228,6 +228,7 @@ expectThatApi = (function(expectThatApi) {
   exports.to = expectThatApi.api.to;
   exports.throwException = expectThatApi.api.throwException;
   exports.expectThat = expectThatApi.expectThat;
+  exports.expectThatApi = expectThatApi;
   expectThatApi.util.extend(exports, expectThatApi.api.extendedMatchers);
   return this;
 })(expectThatApi || (expectThatApi = {}), root);
diff --git a/lib/expectThat.jasmine.min.gz.js b/lib/expectThat.jasmine.min.gz.js