Merge branch 'master' into connect-middleware

maritz · Nov 27, 2011 · a91f28d · a91f28d
2 parents 04096a5 + ce8b29f
commit a91f28d
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 52 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,7 @@
+### v0.6.4
+   - unique values are now case insensitive when validating or searching
+   - now compatible with node v0.6.3
+   - now uses nodeunit v0.6.4
 
 ### v0.6.3
 

diff --git a/README.md b/README.md
@@ -28,9 +28,10 @@ Do you have code that should/could be listed here? Message me!
 Yes, please contact me or just fork and request pulls. Any help or feedback is appreciated. If you use nohm I'd also be happy if you just drop me a quick msg about it.
 
 ## Running tests
-To run the tests you need to have nodeunit\@0.1.0:
+To run the tests you need to have nodeunit v0.6.4. This will be installed if you installed nohm with the --dev argument.
+Otherwise you can run:
 
-    npm install nodeunit@0.1.0
+    npm install nodeunit@0.6.4
 
 Then run
 

diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
     "name": "nohm",
-    "version": "0.6.3",
+    "version": "0.6.4",
     "engines": {
-        "node" : ">=0.4.0" 
+        "node" : ">=0.4.0 || >= 0.6.3" 
     },
     "author": "Moritz Peters",
     "repository" : { 
@@ -19,5 +19,8 @@
     "dependencies": {
       "async": "0.1.15",
       "redis": ">=0.7.1"
+    },
+    "devDependencies": {
+      "nodeunit": "0.6.4"
     }
-}
+}
diff --git a/test/featureTests.js b/test/featureTests.js
@@ -1,5 +1,5 @@
 var util = require('util');
-var args = require('testArgs');
+var args = require(__dirname+'/testArgs.js');
 
 exports.checkModules = function (t) {
   var redis, nohm, async;

diff --git a/test/nodeunit b/test/nodeunit
diff --git a/test/tests.js b/test/tests.js
@@ -1,6 +1,3 @@
-require.paths.unshift(__dirname); //tests
-require.paths.unshift(__dirname + '/../lib'); // nohm itself
-
 var nodeunit = require('nodeunit')
     , util = require('util');
 
@@ -14,47 +11,15 @@ run = function(files){
 
     var start = new Date().getTime();
 
-    nodeunit.runFiles(files, {
-        moduleStart: function(name){
-            util.puts('\n' + bold(name));
-        },
-        testDone: function(name, assertions){
-            if(!assertions.failures){
-                util.puts('✔ ' + name);
-            }
-            else {
-                util.puts(red('✖ ' + name) + '\n');
-                assertions.forEach(function(assertion){
-                    if(assertion.failed()){
-                        util.puts(assertion.message);
-                        util.puts(assertion.error.stack + '\n');
-                    }
-                });
-            }
-        },
-        done: function(assertions){
-          cleanup(function () {
-            if (assertions.failures) {
-              util.puts(
-                '\n' + bold(red('FAILURES: ')) + assertions.failures +
-                '/' + assertions.length + ' assertions failed (' +
-                assertions.duration + 'ms)'
-              );
-              process.exit(1);
-            } else {
-                util.puts(
-                    '\n' + bold(green('OK: ')) + assertions.length +
-                    ' assertions (' + assertions.duration + 'ms)'
-                  );
-                process.exit(0);
-            }
-          });
-        }
+    nodeunit.reporters.default.run(files, undefined, function () {
+      cleanup(function () {
+        redis.end();
+      });
     });
 };
 
 
-var args = require('testArgs');
+var args = require(__dirname+'/testArgs.js');
 
 var runner = function () {
   process.chdir(__dirname);

diff --git a/test/validationTests.js b/test/validationTests.js
@@ -351,11 +351,11 @@ exports.castTimestamp = function (t) {
   user.p('castTimestamp', '1988-03-12T00:00:00Z');
   t.ok(user.p('castTimestamp') === should, 'Setting a Timestamp to a string "1988-03-12T00:00:00Z" did not cast it to ' + should);
 
-  user.p('castTimestamp', '1988-03-12T04:30:00+04:30');
-  t.ok(user.p('castTimestamp') === should, 'Setting a Timestamp to a string "1988-03-12T00:00:00+04:30" did not cast it to ' + should);
+  user.p('castTimestamp', '1988-03-12 04:30:00 +04:30');
+  t.ok(user.p('castTimestamp') === should, 'Setting a Timestamp to a string "1988-03-12 04:30:00 +04:30" did not cast it to ' + should);
 
-  user.p('castTimestamp', '1988-03-11T20:30:00-04:30');
-  t.ok(user.p('castTimestamp') === should, 'Setting a Timestamp to a string "1988-03-12T00:00:00+04:30" did not cast it to ' + should);
+  user.p('castTimestamp', '1988-03-11 20:30:00 -04:30');
+  t.ok(user.p('castTimestamp') === should, 'Setting a Timestamp to a string "1988-03-11 20:30:00 -04:30" did not cast it to ' + should);
 
   user.p('castTimestamp', 'Sat, 12 Mar 1988 00:00:00');
   t.ok(user.p('castTimestamp') === should, 'Setting a Timestamp to a string "Sat, 12 Mar 1988 00:00:00" did not cast it to ' + should);
@@ -645,4 +645,4 @@ exports.invalidSaveResetsId = function (t) {
     t.same(user.id, null, 'The id of an invalid user was not reset properly.');
     t.done();
   });
-};
+};