Fixed some tests on tag and model

dynajoe · dynajoe · commit 0d759a79ec3f · 2012-03-01T21:31:25.000-06:00
diff --git a/test/models/model.spec.coffee b/test/models/model.spec.coffee
@@ -14,44 +14,41 @@ getModel = (attribs) ->
   return model
 
 describe 'When a model is being created without attributes', ->
-  model = null
-  
+
   beforeEach ->
-    model = getModel()
+    @model = getModel()
 
   it 'should not have any attributes', ->
-    model.attributes.should.eql({})
+    @model.attributes.should.eql({})
 
   describe 'When toJSON() is called', ->
     beforeEach ->
-      jsonObject = model.toJSON()
+      @jsonObject = @model.toJSON()
 
     it 'should return an empty object', ->
-      jsonObject.should.eql({})
+      @jsonObject.should.eql({})
 
 describe 'When a model is created with attributes', ->
-  model = null
 
   beforeEach ->
-    model = new Model(two: false)
+    @model = new Model(two: false)
 
   it 'should have the correct attributes', ->
-    model.attributes.should.eql two: false 
+    @model.attributes.should.eql two: false 
 
   describe 'When toJSON() is called', ->
-    modelJson = null
     
     beforeEach ->
-      modelJson = model.toJSON()
+      @modelJson = @model.toJSON()
 
     it 'should return the attributes object', ->
-      modelJson.should.eql({ 'two': false })
+      @modelJson.should.eql({ 'two': false })
 
 describe 'when save() is called', ->
 
-  model = getModel({'one': true})
-
-  model.save 'testCollection', ->
+  beforeEach ->
+    @model = getModel({'one': true})
+    @model.save 'testCollection', ->
 
   it 'should call save() on the base object', ->
     callsToSave.should.have.length(1)
diff --git a/test/models/tag.spec.coffee b/test/models/tag.spec.coffee
@@ -21,38 +21,39 @@ getTag = () ->
   return tag
 
 describe 'When creating a new tag', ->
-  tag = null
 
   beforeEach ->
-    tag = new Tag()
+    @tag = new Tag()
 
   it 'should have default attributes', ->
-    should.strictEqual(tag.attributes._id, undefined)
-    should.strictEqual(tag.attributes.user, undefined)
-    should.strictEqual(tag.attributes.event, undefined)
-    should.exist(tag.attributes.generatedOn)
-    should.exist(tag.attributes.code)
+    should.strictEqual(@tag.attributes._id, undefined)
+    should.strictEqual(@tag.attributes.user, undefined)
+    should.strictEqual(@tag.attributes.event, undefined)
+    should.exist(@tag.attributes.generatedOn)
+    should.exist(@tag.attributes.code)
 
 describe 'When creating a tag with attributes', -> 
-  tag = null
-
+  
   beforeEach ->
-    tag = new Tag(expectedAttributes)
+    @tag = new Tag(expectedAttributes)
     
   it 'should set the correct id', ->
-    tag.attributes._id.should.equal(expectedAttributes._id)
+    @tag.attributes._id.should.equal(expectedAttributes._id)
   
   it 'should set the correct generatedOn date', ->
-    tag.attributes.generatedOn.should.equal(expectedAttributes.generatedOn)
+    @tag.attributes.generatedOn.should.eql(expectedAttributes.generatedOn)
   
   it 'should set the correct code', ->
-    tag.attributes.code.should.equal(expectedAttributes.code)
+    @tag.attributes.code.should.equal(expectedAttributes.code)
   
   it 'should set the correct user', ->
-    tag.attributes.user.should.equal(expectedAttributes.user)
+    console.log @tag.attributes.user
+
+    console.log expectedAttributes.user
+    @tag.attributes.user.should.eql(expectedAttributes.user)
   
   it 'should set the correct event', ->
-    tag.attributes.event.should.equal(expectedAttributes.event)
+    @tag.attributes.event.should.eql(expectedAttributes.event)
 
   describe 'when calling save() on a tag', ->
     getTag().save ->
