From 01955a9de5ad29ebf45e57aeb8037d1518e5a165 Mon Sep 17 00:00:00 2001
From: Anatoliy Chakkaev <anatoliy.chakkaev@flatsoft.com>
Date: Fri, 20 Jan 2012 00:25:50 +0400
Subject: [PATCH] Adjust test

---
 package.json        | 2 +-
 test/common_test.js | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 7f8eba68..9932ec03 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   },
   "main": "index.js",
   "scripts": {
-    "test": "ONLY=memory ./support/nodeunit/bin/nodeunit test/*_test.* & ONLY=redis nodeunit test/common_test.js & ONLY=mysql nodeunit test/common_test.js"
+    "test": "ONLY=memory ./support/nodeunit/bin/nodeunit test/*_test.* && ONLY=redis nodeunit test/common_test.js && ONLY=mysql nodeunit test/common_test.js"
   },
   "engines": [
     "node >= 0.4.0"
diff --git a/test/common_test.js b/test/common_test.js
index 2df43dab..6c7ba68c 100644
--- a/test/common_test.js
+++ b/test/common_test.js
@@ -426,7 +426,8 @@ function testOrm(schema) {
 
     it('should handle ORDER clause', function (test) {
         var titles = [ 'Title A', 'Title Z', 'Title M', 'Title B', 'Title C' ];
-        var dates = Post.schema.name === 'redis' ? [ 5, 9, 0, 17, 9 ] : [
+        var isRedis = Post.schema.name === 'redis';
+        var dates = isRedis ? [ 5, 9, 0, 17, 9 ] : [
             new Date(1000 * 5 ),
             new Date(1000 * 9),
             new Date(1000 * 0),
@@ -440,9 +441,9 @@ function testOrm(schema) {
         var i = 0, tests = 0;
         function done(err, obj) {
             if (++i === titles.length) {
+                doFilterAndSortTest();
                 doStringTest();
                 doNumberTest();
-                doFilterAndSortTest();
             }
         }
 
@@ -474,7 +475,7 @@ function testOrm(schema) {
 
         function doFilterAndSortTest() {
             tests += 1;
-            Post.all({where: {title: new Date(1000 * 9)}, order: 'title', limit: 3}, function (err, posts) {
+            Post.all({where: {date: isRedis ? 9 : new Date(1000 * 9)}, order: 'title', limit: 3}, function (err, posts) {
                 if (err) console.log(err);
                 test.equal(posts.length, 2, 'Exactly 2 posts returned by query');
                 [ 'Title C', 'Title Z' ].forEach(function (t, i) {