Fixed references in dao-factory.

spec/dao-factory.spec.js

@@ -2368,30 +2368,27 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
 
   describe('references', function() {
   describe('references', function() {
     before(function(done) {
     before(function(done) {
-      this.Author = this.sequelize.define('author', { firstName: Sequelize.STRING })
+      this.sequelize = sequelize
       done()
       done()
     })
     })
 
 
-    describe("use of existing dao factory", function() {
-      before(function(done) {
-        this.Post = this.sequelize.define('post', {
+    it('uses an existing dao factory and references the author table', function(done) {
+      var self    = this
+        , Author  = self.sequelize.define('author', { firstName: Sequelize.STRING })
+        , Post    = self.sequelize.define('post', {
         title:    Sequelize.STRING,
         title:    Sequelize.STRING,
         authorId: {
         authorId: {
           type:          Sequelize.INTEGER,
           type:          Sequelize.INTEGER,
-            references:    this.Author,
+          references:    Author,
           referencesKey: "id"
           referencesKey: "id"
         }
         }
       })
       })
 
 
-        this.Author.hasMany(this.Post)
-        this.Post.belongsTo(this.Author)
-        done()
-      })
+      Author.hasMany(Post)
+      Post.belongsTo(Author)
 
 
-      it('references the author table', function(done) {
-        var self = this
-        this.Author.sync({ force: true }).success(function() {
-          self.Post.sync({ force: true }).on('sql', function(sql) {
+      Author.sync({ force: true }).success(function() {
+        Post.sync({ force: true }).on('sql', function(sql) {
           if (dialect === 'postgres') {
           if (dialect === 'postgres') {
             expect(sql).toMatch(/"authorId" INTEGER REFERENCES "authors" \("id"\)/)
             expect(sql).toMatch(/"authorId" INTEGER REFERENCES "authors" \("id"\)/)
           } else if (dialect === 'mysql') {
           } else if (dialect === 'mysql') {
@@ -2406,11 +2403,12 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
         })
         })
       })
       })
     })
     })
-    })
 
 
-    describe('use of table name as string', function() {
-      before(function(done) {
-        this.Post = this.sequelize.define('post', {
+    it('uses a table name as a string and references the author table', function(done) {
+      this.timeout = 2500
+      var self    = this
+        , Author  = self.sequelize.define('author', { firstName: Sequelize.STRING })
+        , Post    = self.sequelize.define('post', {
           title:    Sequelize.STRING,
           title:    Sequelize.STRING,
           authorId: {
           authorId: {
             type:          Sequelize.INTEGER,
             type:          Sequelize.INTEGER,
@@ -2419,15 +2417,11 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
           }
           }
         })
         })
 
 
-        this.Author.hasMany(this.Post)
-        this.Post.belongsTo(this.Author)
-        done()
-      })
+      Author.hasMany(Post)
+      Post.belongsTo(Author)
 
 
-      it('references the author table', function(done) {
-        var self = this
-        this.Author.sync({ force: true }).success(function() {
-          self.Post.sync({ force: true }).on('sql', function(sql) {
+      Author.sync( {force: true }).success(function() {
+        Post.sync({ force: true }).on('sql', function(sql) {
           if (dialect === 'postgres') {
           if (dialect === 'postgres') {
             expect(sql).toMatch(/"authorId" INTEGER REFERENCES "authors" \("id"\)/)
             expect(sql).toMatch(/"authorId" INTEGER REFERENCES "authors" \("id"\)/)
           } else if (dialect === 'mysql') {
           } else if (dialect === 'mysql') {
@@ -2442,14 +2436,12 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
         })
         })
       })
       })
     })
     })
-    })
 
 
-    describe('use of invalid table name', function() {
-      it("emits the error event as the referenced table name is invalid", function(done) {
-        this.timeout = 3500
+    it("emits an error event as the referenced table name is invalid", function(done) {
+      this.timeout = 2500
       var self    = this
       var self    = this
-
-        self.Post = self.sequelize.define('post', {
+        , Author  = self.sequelize.define('author', { firstName: Sequelize.STRING })
+        , Post    = self.sequelize.define('post', {
         title:    Sequelize.STRING,
         title:    Sequelize.STRING,
         authorId: {
         authorId: {
           type:          Sequelize.INTEGER,
           type:          Sequelize.INTEGER,
@@ -2458,11 +2450,11 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
         }
         }
       })
       })
 
 
-        self.Author.hasMany(self.Post)
-        self.Post.belongsTo(self.Author)
+      Author.hasMany(Post)
+      Post.belongsTo(Author)
 
 
-        self.Author.sync({ force: true }).success(function() {
-          self.Post.sync({ force: true }).success(function() {
+      Author.sync({ force: true }).success(function() {
+        Post.sync({ force: true }).success(function() {
           if (dialect === 'sqlite') {
           if (dialect === 'sqlite') {
             // sorry ... but sqlite is too stupid to understand whats going on ...
             // sorry ... but sqlite is too stupid to understand whats going on ...
             expect(1).toEqual(1)
             expect(1).toEqual(1)
@@ -2488,5 +2480,4 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       })
       })
     })
     })
   })
   })
-  })
 })
 })