Reorganized file to put tests first

adunkman · adunkman · commit 0ed2ccd579cd · 2012-02-22T22:31:20.000-06:00
diff --git a/test/data/adapters/inMemory_test.coffee b/test/data/adapters/inMemory_test.coffee
@@ -1,10 +1,6 @@
 vows = require 'vows'
 should = require 'should'
 InMemoryDataAdapter = require '../../../data/adapters/inMemory'
-sampleObjects = [
-  { 'test': true, 'numeric': 52, 'items': ['one', 'two'] },
-  { 'one': true, 'two': false }
-]
 
 vows.describe('In-memory store (data/adapters/inMemory)').addBatch(
   '': {
@@ -99,4 +95,9 @@ vows.describe('In-memory store (data/adapters/inMemory)').addBatch(
         items[0].newObject.should.eql(sampleObjects[1])
     }
   }
-).export(module)
+).export(module)
+
+sampleObjects = [
+  { 'test': true, 'numeric': 52, 'items': ['one', 'two'] },
+  { 'one': true, 'two': false }
+]
diff --git a/test/data/storedObject_test.coffee b/test/data/storedObject_test.coffee
@@ -2,18 +2,6 @@ vows = require 'vows'
 should = require 'should'
 StoredObject = require '../../data/storedObject'
 
-callCount = 0
-args = []
-
-getTopic = () ->
-  topic = new StoredObject()
-  topic._adapter = 
-    save: (collection, attributes, callback) ->
-      callCount++;
-      args.push([collection, attributes, callback])
-      callback(null, attributes)
-  return topic
-
 vows.describe('Base stored object (data/storedObject)').addBatch(
   '': {
     topic: () -> getTopic()
@@ -35,4 +23,16 @@ vows.describe('Base stored object (data/storedObject)').addBatch(
         args[0][2].should.equal(@callback)
     }
   }
-).export(module)
+).export(module)
+
+callCount = 0
+args = []
+
+getTopic = () ->
+  topic = new StoredObject()
+  topic._adapter = 
+    save: (collection, attributes, callback) ->
+      callCount++;
+      args.push([collection, attributes, callback])
+      callback(null, attributes)
+  return topic
diff --git a/test/models/model_test.coffee b/test/models/model_test.coffee
@@ -3,18 +3,6 @@ should = require 'should'
 StoredObject = require '../../data/storedObject'
 Model = require '../../models/model'
 
-callCount = 0
-args = []
-
-getTopic = () ->
-  topic = new Model()
-  topic._adapter = 
-    save: (collection, attributes, callback) ->
-      callCount++;
-      args.push([collection, attributes, callback])
-      callback(null, attributes)
-  return topic
-
 vows.describe('Base model (models/model)').addBatch(
   '': {
     topic: () -> getTopic()
@@ -43,18 +31,31 @@ vows.describe('Base model (models/model)').addBatch(
         }
         instance.save('testCollection', @callback)
       
-      'it should call save() on the base stored object': (err, attributes) ->
+      'it should call save() on the base object': (err, attributes) ->
         callCount.should.equal(1)
         args.should.have.length(1)
         
       'it should pass model.attributes to the save()': (err, attributes) ->
         args[0].should.have.length(3)
         args[0][1].should.eql({ 'one': true })
 
-      'it should pass collection and callback to base object': (err, attributes) ->
+      'it should pass collection and callback to base': (err, attributes) ->
         args[0].should.have.length(3)
         args[0][0].should.equal('testCollection')
         args[0][2].should.not.be.null
     }
   }
 ).export(module)
+
+callCount = 0
+args = []
+
+getTopic = () ->
+  topic = new Model()
+  topic._adapter = 
+    save: (collection, attributes, callback) ->
+      callCount++;
+      args.push([collection, attributes, callback])
+      callback(null, attributes)
+  return topic
+
diff --git a/test/models/user_test.coffee b/test/models/user_test.coffee
@@ -1,14 +1,6 @@
 vows = require 'vows'
 should = require 'should'
 User = require '../../models/user'
-
-expectedAttributes =
-  name: 'Abraham Lincoln'               
-  userSince: new Date()
-  slugs: ['abe', 'penniesrock']
-  handles: [{type: 'twitter', handle: 'abelincoln'}]
-  credentials: [{provider: 'twitter', id: 1234 }]
-  _id: 1234
     
 vows.describe('User (models/user)').addBatch(
   'when creating a user model': {
@@ -44,3 +36,11 @@ vows.describe('User (models/user)').addBatch(
       user.attributes._id.should.equal(expectedAttributes._id)
   }
 ).export(module)
+
+expectedAttributes =
+  name: 'Abraham Lincoln'               
+  userSince: new Date()
+  slugs: ['abe', 'penniesrock']
+  handles: [{type: 'twitter', handle: 'abelincoln'}]
+  credentials: [{provider: 'twitter', id: 1234 }]
+  _id: 1234
