Using setter syntax for models in testHelper

nxbdi · Jan 31, 2011 · 6a269ce · 6a269ce
1 parent 889d60b
commit 6a269ce
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 18 deletions.
diff --git a/test/app.test.js b/test/app.test.js
@@ -6,13 +6,15 @@ var app = require('../app'),
 
 app.listen(3001);
 
-testHelper.setup([app.User], function() {
+testHelper.models = [app.User];
+
+testHelper.setup(function() {
   // Fixtures
   var user = new app.User({'email' : 'alex@example.com', 'password' : 'test' });
   user.save(testHelper.run(exports));
 });
 
-testHelper.tests({
+testHelper.tests = {
   'test login': function() {
     zombie.visit('http://localhost:3001/', function(err, browser, status) {
       // Fill email, password and submit form
@@ -26,5 +28,5 @@ testHelper.tests({
         });
     });
   }
-});
+};
 
diff --git a/test/helper.js b/test/helper.js
@@ -1,6 +1,8 @@
 // Force test environment
 process.env.NODE_ENV = 'test';
-var state = {};
+var state = {
+  models: []
+};
 
 function prepare(models, next) {
   var modelCount = models.length;
@@ -17,22 +19,27 @@ function prepare(models, next) {
   });
 };
 
-exports.tests = function(tests) {
-  state.tests = tests;
-};
+module.exports = {
+  run: function(e) {
+    for (var test in state.tests) {
+      e[test] = state.tests[test];
+    }
+  },
 
-exports.run = function(e) {
-  for (var test in state.tests) {
-    e[test] = state.tests[test];
-  }
-};
+  setup: function(next) {
+    prepare(state.models, next);
+  },
 
-exports.setup = function(models, next) {
-  state.models = models;
-  prepare(state.models, next);
-};
+  end: function() {
+    prepare(state.models, process.exit);
+  },
+
+  set models(models) {
+    state.models = models;
+  },
 
-exports.end = function() {
-  prepare(state.models, process.exit);
+  set tests(tests) {
+    state.tests = tests;
+  }
 };