we really need proper factories -.-

aslakhellesoy · Nov 4, 2012 · af1396b · af1396b
1 parent 5be1683
commit af1396b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/spec/associations/belongs-to.spec.js b/spec/associations/belongs-to.spec.js
@@ -20,20 +20,20 @@ describe("[" + dialect.toUpperCase() + "] BelongsTo", function() {
 
   describe('setAssociation', function() {
     it('clears the association if null is passed', function(done) {
-      var User = this.sequelize.define('User', { username: Sequelize.STRING })
-        , Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+      var User = this.sequelize.define('UserXYZ', { username: Sequelize.STRING })
+        , Task = this.sequelize.define('TaskXYZ', { title: Sequelize.STRING })
 
       Task.belongsTo(User)
 
       this.sequelize.sync({ force: true }).success(function() {
         User.create({ username: 'foo' }).success(function(user) {
           Task.create({ title: 'task' }).success(function(task) {
-            task.setUser(user).success(function() {
-              task.getUser().success(function(user) {
+            task.setUserXYZ(user).success(function() {
+              task.getUserXYZ().success(function(user) {
                 expect(user).not.toEqual(null)
 
-                task.setUser(null).success(function() {
-                  task.getUser().success(function(user) {
+                task.setUserXYZ(null).success(function() {
+                  task.getUserXYZ().success(function(user) {
                     expect(user).toEqual(null)
                     done()
                   })

diff --git a/spec/associations/has-one.spec.js b/spec/associations/has-one.spec.js
@@ -21,31 +21,29 @@ describe("[" + dialect.toUpperCase() + "] HasOne", function() {
 
   describe('setAssociation', function() {
     it('clears the association if null is passed', function(done) {
-      var User = this.sequelize.define('User', { username: Sequelize.STRING })
-        , Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+      var User = this.sequelize.define('UserXYZ', { username: Sequelize.STRING })
+        , Task = this.sequelize.define('TaskXYZ', { title: Sequelize.STRING })
 
       User.hasOne(Task)
 
       this.sequelize.sync({ force: true }).success(function() {
-        setTimeout(function(){
-          User.create({ username: 'foo' }).success(function(user) {
-            Task.create({ title: 'task' }).success(function(task) {
-              user.setTask(task).success(function() {
-                user.getTask().success(function(task) {
-                  expect(task).not.toEqual(null)
-
-                  user.setTask(null).success(function() {
-                    user.getTask().success(function(task) {
-                      expect(task).toEqual(null)
-                      done()
-                    })
+        User.create({ username: 'foo' }).success(function(user) {
+          Task.create({ title: 'task' }).success(function(task) {
+            user.setTaskXYZ(task).success(function() {
+              user.getTaskXYZ().success(function(task) {
+                expect(task).not.toEqual(null)
+
+                user.setTaskXYZ(null).success(function() {
+                  user.getTaskXYZ().success(function(task) {
+                    expect(task).toEqual(null)
+                    done()
                   })
-
                 })
+
               })
             })
           })
-        }.bind(this), 500)
+        })
       })
     })
   })