From d1511a1ccbfded8bd9c6a3cef17e11dc81f48939 Mon Sep 17 00:00:00 2001
From: Assaf Arkin <assaf@labnotes.org>
Date: Thu, 29 Mar 2012 17:40:38 -0700
Subject: [PATCH] Fixed based on client-side tests.

---
 server/models/split_test.coffee |  6 +++---
 server/test/helper.coffee       | 12 ++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/server/models/split_test.coffee b/server/models/split_test.coffee
index ad1e644..4c64e5d 100644
--- a/server/models/split_test.coffee
+++ b/server/models/split_test.coffee
@@ -48,7 +48,7 @@ class SplitTest
   # Create a new split test with the given identifier.  Throws exception is the
   # identifier is invalid.
   constructor: (id)->
-    unless id && /^[\w]+$/.test(id)
+    unless id && /^[\w\-]+$/.test(id)
       throw new Error("Split test identifier may only contain alphanumeric, underscore and hyphen")
     @_base_key = "#{SplitTest.NAMESPACE}.#{id}"
 
@@ -172,7 +172,7 @@ class SplitTest
         result =
           participant:  participant
           alternative:  parseInt(alternative)
-          joined:       Date.create(score)
+          joined:       new Date(parseInt(score))
 
         redis.hget "#{@_base_key}.outcomes", participant, (error, outcome)=>
           return callback(error) if error
@@ -185,7 +185,7 @@ class SplitTest
           # Get when participant compeleted this test
           redis.zscore "#{@_base_key}.completed.#{alternative}", participant, (error, score)->
             return callback(error) if error
-            result.completed = Date.create(score)
+            result.completed = new Date(parseInt(score))
             callback null, result
 
  
diff --git a/server/test/helper.coffee b/server/test/helper.coffee
index 1c2361b..26b29ca 100644
--- a/server/test/helper.coffee
+++ b/server/test/helper.coffee
@@ -10,12 +10,16 @@ Activity  = require("../models/activity")
 
 Helper =
   setup: (callback)->
-    Async.series [
+    Async.parallel [
       (done)->
-        redis.flushdb done
+        redis.flushdb(done)
     , (done)->
-        server.listen 3003, done
-    ], callback
+        server.listen(3003, done)
+    ], (error)->
+      if error
+        throw error
+      else
+        callback()
 
   newIndex: (callback)->
     Activity.deleteIndex (error)->