minor refactoring + first tests

spec/associations/has-many.spec.js

@@ -3,14 +3,14 @@ if (typeof require === 'function') {
       , Sequelize = require("../../index")
       , Sequelize = require("../../index")
       , config    = require("../config/config")
       , config    = require("../config/config")
       , sequelize = new Sequelize(config.database, config.username, config.password, {
       , sequelize = new Sequelize(config.database, config.username, config.password, {
-          logging: false
+          logging: true
         })
         })
 }
 }
 
 
 buster.spec.expose()
 buster.spec.expose()
 buster.testRunner.timeout = 500
 buster.testRunner.timeout = 500
 
 
-describe('Associations', function() {
+describe('HasMany', function() {
   before(function(done) {
   before(function(done) {
     var self = this
     var self = this
 
 
@@ -18,10 +18,10 @@ describe('Associations', function() {
       .dropAllTables()
       .dropAllTables()
       .success(done)
       .success(done)
       .error(function(err) { console.log(err) })
       .error(function(err) { console.log(err) })
-  }),
+  })
 
 
-  describe('hasMany', function() {
-    describe('hasAssociation', function() {
+  describe('Many To One', function() {
+    describe('hasSingle', function() {
       before(function(done) {
       before(function(done) {
         var self = this
         var self = this
 
 
@@ -33,106 +33,158 @@ describe('Associations', function() {
         sequelize.sync({ force: true }).success(done)
         sequelize.sync({ force: true }).success(done)
       })
       })
 
 
-      describe('hasLabel', function() {
-        it('does not have any labels assigned to it initially', function(done) {
-          var self = this
+      it('does not have any labels assigned to it initially', function(done) {
+        var self = this
+
+        var chainer = new Sequelize.Utils.QueryChainer([
+          this.Article.create({ title: 'Article' }),
+          this.Label.create({ text: 'Awesomeness' }),
+          this.Label.create({ text: 'Epicness' })
+        ])
 
 
+        chainer.run().success(function(results, article, label1, label2) {
           var chainer = new Sequelize.Utils.QueryChainer([
           var chainer = new Sequelize.Utils.QueryChainer([
-            this.Article.create({ title: 'Article' }),
-            this.Label.create({ text: 'Awesomeness' }),
-            this.Label.create({ text: 'Epicness' })
+            article.hasLabel(label1),
+            article.hasLabel(label2)
           ])
           ])
 
 
-          chainer.run().success(function(results, article, label1, label2) {
-            var chainer = new Sequelize.Utils.QueryChainer([
-              article.hasLabel(label1),
-              article.hasLabel(label2)
-            ])
-
-            chainer.run().success(function(_, hasLabel1, hasLabel2) {
-              expect(hasLabel1).toBeFalse()
-              expect(hasLabel2).toBeFalse()
-              done()
-            })
+          chainer.run().success(function(_, hasLabel1, hasLabel2) {
+            expect(hasLabel1).toBeFalse()
+            expect(hasLabel2).toBeFalse()
+            done()
           })
           })
         })
         })
+      })
+
+      it('answers true if the label has been assigned', function(done) {
+        var self = this
 
 
-        it('answers true if the label has been assigned', function(done) {
-          var self = this
+        var chainer = new Sequelize.Utils.QueryChainer([
+          this.Article.create({ title: 'Article' }),
+          this.Label.create({ text: 'Awesomeness' }),
+          this.Label.create({ text: 'Epicness' })
+        ])
 
 
+        chainer.run().success(function(results, article, label1, label2) {
           var chainer = new Sequelize.Utils.QueryChainer([
           var chainer = new Sequelize.Utils.QueryChainer([
-            this.Article.create({ title: 'Article' }),
-            this.Label.create({ text: 'Awesomeness' }),
-            this.Label.create({ text: 'Epicness' })
+            [ article, 'addLabel', [ label1 ]],
+            [ article, 'hasLabel', [ label1 ]],
+            [ article, 'hasLabel', [ label2 ]]
           ])
           ])
 
 
-          chainer.run().success(function(results, article, label1, label2) {
-            var chainer = new Sequelize.Utils.QueryChainer([
-              [ article, 'addLabel', [ label1 ]],
-              [ article, 'hasLabel', [ label1 ]],
-              [ article, 'hasLabel', [ label2 ]]
-            ])
-
-            chainer.runSerially().success(function(_, label1, hasLabel1, hasLabel2) {
-              expect(hasLabel1).toBeTrue()
-              expect(hasLabel2).toBeFalse()
-              done()
-            })
+          chainer.runSerially().success(function(_, label1, hasLabel1, hasLabel2) {
+            expect(hasLabel1).toBeTrue()
+            expect(hasLabel2).toBeFalse()
+            done()
           })
           })
         })
         })
       })
       })
+    })
 
 
-      describe('hasLabels', function() {
-        it('answers false if only some labels have been assigned', function(done) {
-          var self = this
+    describe('hasAll', function() {
+      before(function(done) {
+        var self = this
 
 
-          var chainer = new Sequelize.Utils.QueryChainer([
-            this.Article.create({ title: 'Article' }),
-            this.Label.create({ text: 'Awesomeness' }),
-            this.Label.create({ text: 'Epicness' })
-          ])
+        this.Article = sequelize.define('Article', { 'title': Sequelize.STRING })
+        this.Label = sequelize.define('Label', { 'text': Sequelize.STRING })
 
 
-          chainer.run().success(function(results, article, label1, label2) {
-            article.addLabel(label1).success(function() {
-              article.hasLabels([label1, label2]).success(function(result) {
-                expect(result).toBeFalse()
-                done()
-              })
+        this.Article.hasMany(this.Label)
+
+        sequelize.sync({ force: true }).success(done)
+      })
+
+      it('answers false if only some labels have been assigned', function(done) {
+        var self = this
+
+        var chainer = new Sequelize.Utils.QueryChainer([
+          this.Article.create({ title: 'Article' }),
+          this.Label.create({ text: 'Awesomeness' }),
+          this.Label.create({ text: 'Epicness' })
+        ])
+
+        chainer.run().success(function(results, article, label1, label2) {
+          article.addLabel(label1).success(function() {
+            article.hasLabels([label1, label2]).success(function(result) {
+              expect(result).toBeFalse()
+              done()
             })
             })
           })
           })
         })
         })
+      })
 
 
-        it('answers true if all label have been assigned', function(done) {
-          var self = this
+      it('answers true if all label have been assigned', function(done) {
+        var self = this
 
 
-          var chainer = new Sequelize.Utils.QueryChainer([
-            this.Article.create({ title: 'Article' }),
-            this.Label.create({ text: 'Awesomeness' }),
-            this.Label.create({ text: 'Epicness' })
-          ])
+        var chainer = new Sequelize.Utils.QueryChainer([
+          this.Article.create({ title: 'Article' }),
+          this.Label.create({ text: 'Awesomeness' }),
+          this.Label.create({ text: 'Epicness' })
+        ])
 
 
-          chainer.run().success(function(results, article, label1, label2) {
-            article.setLabels([label1, label2]).success(function() {
-              article.hasLabels([label1, label2]).success(function(result) {
-                expect(result).toBeTrue()
-                done()
-              })
+        chainer.run().success(function(results, article, label1, label2) {
+          article.setLabels([label1, label2]).success(function() {
+            article.hasLabels([label1, label2]).success(function(result) {
+              expect(result).toBeTrue()
+              done()
             })
             })
           })
           })
         })
         })
       })
       })
     })
     })
+  })
+
+  describe('(N:M)', function() {
+    it("removes the reference id, which was added in the first place", function() {
+      var User = sequelize.define('User', { username: Sequelize.STRING })
+        , Task = sequelize.define('Task', { title: Sequelize.STRING })
 
 
-    describe('many to many', function() {
-      it("removes the reference id, which was added in the first place", function() {
-        var User = sequelize.define('User', { username: Sequelize.STRING })
-          , Task = sequelize.define('Task', { title: Sequelize.STRING })
+      User.hasMany(Task)
+      expect(Task.attributes.UserId).toBeDefined()
 
 
-        User.hasMany(Task)
-        expect(Task.attributes.UserId).toBeDefined()
+      Task.hasMany(User)
+      expect(Task.attributes.UserId).not.toBeDefined()
+    })
 
 
-        Task.hasMany(User)
-        expect(Task.attributes.UserId).not.toBeDefined()
+    it("=>clears associations when passing null to the set-method", function(done) {
+      var User = sequelize.define('User', { username: Sequelize.STRING })
+        , Task = sequelize.define('Task', { title: Sequelize.STRING })
+
+      User.hasMany(Task)
+      Task.hasMany(User)
+
+      sequelize.sync().success(function() {
+        console.log('sync ok')
+        User.create({ username: 'foo' }).success(function(user) {
+          console.log('user was created')
+          Task.create({ title: 'task' }).run().success(function(task) {
+            console.log('task was created')
+            expect(1).toEqual(1)
+            return done()
+            task.setUsers([ user ])
+              .success(function() {
+                console.log('set users done')
+
+                task.getUsers().success(function(_users) {
+                  expect(_users.length).toEqual(1)
+
+                  task.setUsers(null).success(function() {
+
+                    task.getUsers().success(function(_users) {
+                      expect(_users.length).toEqual(0)
+                      done()
+                    })
+                  }).error(function(err) {
+                    console.log(err)
+                  })
+                }).error(function(err) {
+                  console.log(err)
+                })
+              })
+              .error(function(err) {
+                console.log(err)
+              })
+          })
+        })
       })
       })
     })
     })
   })
   })