Refactored variable names in tests

adunkman · adunkman · commit 8803d44eebc6 · 2012-02-22T22:40:53.000-06:00
diff --git a/test/data/adapters/inMemory_test.coffee b/test/data/adapters/inMemory_test.coffee
@@ -6,15 +6,15 @@ vows.describe('In-memory store (data/adapters/inMemory)').addBatch(
   '': {
     topic: () -> new InMemoryDataAdapter(),
 
-    'it should require no constructor arguments': (instance) ->
-      should.exist(instance)
+    'it should require no constructor arguments': (adapter) ->
+      should.exist(adapter)
     
-    'it should be empty when nothing has been added': (instance) ->
-      instance.items.should.eql({})
+    'it should be empty when nothing has been added': (adapter) ->
+      adapter.items.should.eql({})
     
     'when saving a new item': {
-      topic: (instance) ->
-        instance.save('testObjects', sampleObjects[0], @callback)
+      topic: (adapter) ->
+        adapter.save('testObjects', sampleObjects[0], @callback)
       
       'it should pass back the original attributes': (err, attributes) ->
         should.not.exist(err)
@@ -23,7 +23,7 @@ vows.describe('In-memory store (data/adapters/inMemory)').addBatch(
         attributes.items.should.eql(['one', 'two'])
 
       'it should not simply use the same object in memory': (err, attributes) ->
-        # strict equal compares memory addresses
+        # standard equal compares memory addresses
         attributes.should.not.equal(sampleObjects[0]) 
 
       'it should add an _id attribute': (err, attributes) ->
@@ -32,8 +32,8 @@ vows.describe('In-memory store (data/adapters/inMemory)').addBatch(
     }
     
     'when updating an existing item': {
-      topic: (instance) ->
-        instance.save('testObjects', {
+      topic: (adapter) ->
+        adapter.save('testObjects', {
           '_id': 0
           'newObject': sampleObjects[1]
         }, @callback)
@@ -46,8 +46,8 @@ vows.describe('In-memory store (data/adapters/inMemory)').addBatch(
     }
 
     'when finding an object by real id': {
-      topic: (instance) ->
-        instance.find('testObjects', {
+      topic: (adapter) ->
+        adapter.find('testObjects', {
           '_id': 0
         }, @callback)
 
@@ -60,8 +60,8 @@ vows.describe('In-memory store (data/adapters/inMemory)').addBatch(
     }
 
     'when finding an object by a fake id': {
-      topic: (instance) ->
-        instance.find('testObjects', {
+      topic: (adapter) ->
+        adapter.find('testObjects', {
           '_id': 1
         }, @callback)
 
@@ -72,8 +72,8 @@ vows.describe('In-memory store (data/adapters/inMemory)').addBatch(
     }
 
     'when finding an object in a non-existent collection': {
-      topic: (instance) ->
-        instance.find('noTestObjects', {
+      topic: (adapter) ->
+        adapter.find('noTestObjects', {
           '_id': 0
         }, @callback)
       
@@ -84,8 +84,8 @@ vows.describe('In-memory store (data/adapters/inMemory)').addBatch(
     }
 
     'when searching with no parameters': {
-      topic: (instance) ->
-        instance.find('testObjects', {}, @callback)
+      topic: (adapter) ->
+        adapter.find('testObjects', {}, @callback)
       
       'it should return all items in the collection': (err, items) ->
         should.not.exist(err)
diff --git a/test/data/storedObject_test.coffee b/test/data/storedObject_test.coffee
@@ -4,35 +4,32 @@ StoredObject = require '../../data/storedObject'
 
 vows.describe('Base stored object (data/storedObject)').addBatch(
   '': {
-    topic: () -> getTopic()
+    topic: () -> getStoredObject()
 
     'when save() is called': {
-      topic: (instance) -> 
-        instance.save('testCollection', {
+      topic: (storedObject) -> 
+        storedObject.save('testCollection', {
           'one': true
         }, @callback)
       
       'it should call the adapter\'s save() method': (err, attributes) ->
-        callCount.should.equal(1)
+        callsToSave.should.have.length(1)
       
       'it should pass collection and attributes to the adapter': (err, attributes) ->
-        args.should.have.length(1)
-        args[0].should.have.length(3)
-        args[0][0].should.equal('testCollection')
-        args[0][1].should.eql({ 'one': true })
-        args[0][2].should.equal(@callback)
+        callsToSave[0].should.have.length(3)
+        callsToSave[0][0].should.equal('testCollection')
+        callsToSave[0][1].should.eql({ 'one': true })
+        callsToSave[0][2].should.equal(@callback)
     }
   }
 ).export(module)
 
-callCount = 0
-args = []
+callsToSave = []
 
-getTopic = () ->
-  topic = new StoredObject()
-  topic._adapter = 
+getStoredObject = () ->
+  storedObject = new StoredObject()
+  storedObject._adapter = 
     save: (collection, attributes, callback) ->
-      callCount++;
-      args.push([collection, attributes, callback])
+      callsToSave.push([collection, attributes, callback])
       callback(null, attributes)
-  return topic
+  return storedObject
diff --git a/test/models/model_test.coffee b/test/models/model_test.coffee
@@ -5,57 +5,52 @@ Model = require '../../models/model'
 
 vows.describe('Base model (models/model)').addBatch(
   '': {
-    topic: () -> getTopic()
+    topic: () -> getModel()
 
-    'when toJSON() is called with no attributes': {
-      topic: (instance) -> 
-        instance.toJSON()
+    'when toJSON() is called when the model has no attributes': {
+      topic: (model) -> 
+        model.toJSON()
 
       'it should return an empty object': (jsonObject) ->
         jsonObject.should.eql({})
     }
 
-    'when toJSON() is called with attributes': {
-      topic: (instance) -> 
-        instance.attributes = { 'two': false }
-        instance.toJSON()
+    'when toJSON() is called when the model has attributes': {
+      topic: (model) -> 
+        model.attributes = { 'two': false }
+        model.toJSON()
 
       'it should return the attributes object': (jsonObject) ->
         jsonObject.should.eql({ 'two': false })
     }
 
     'when save() is called': {
-      topic: (instance) -> 
-        instance.attributes = {
-          'one': true
-        }
-        instance.save('testCollection', @callback)
+      topic: (model) -> 
+        model.attributes = { 'one': true }
+        model.save('testCollection', @callback)
       
       'it should call save() on the base object': (err, attributes) ->
-        callCount.should.equal(1)
-        args.should.have.length(1)
+        callsToSave.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 })
+        callsToSave[0].should.have.length(3)
+        callsToSave[0][1].should.eql({ 'one': true })
 
       '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
+        callsToSave[0].should.have.length(3)
+        callsToSave[0][0].should.equal('testCollection')
+        callsToSave[0][2].should.not.be.null
     }
   }
 ).export(module)
 
-callCount = 0
-args = []
+callsToSave = []
 
-getTopic = () ->
-  topic = new Model()
-  topic._adapter = 
+getModel = () ->
+  model = new Model()
+  model._adapter = 
     save: (collection, attributes, callback) ->
-      callCount++;
-      args.push([collection, attributes, callback])
+      callsToSave.push([collection, attributes, callback])
       callback(null, attributes)
-  return topic
+  return model
 
