one last test + fix for has_one

lib/associations/has-one.js

@@ -88,7 +88,7 @@ module.exports = (function() {
             oldObj[self.identifier] = null
             oldObj[self.identifier] = null
             oldObj
             oldObj
               .save(
               .save(
-                Utils._.extend(options, {
+                Utils._.extend({}, options, {
                   fields:    [self.identifier],
                   fields:    [self.identifier],
                   allowNull: [self.identifier]
                   allowNull: [self.identifier]
                 })
                 })

test/associations/has-many.test.js

@@ -217,12 +217,12 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
                 sequelize.transaction(function(t) {
                 sequelize.transaction(function(t) {
                   article.setLabels([ label ], { transaction: t }).success(function() {
                   article.setLabels([ label ], { transaction: t }).success(function() {
                     Label
                     Label
-                      .findAll({ where: { articleId: article.id }, transaction: undefined })
+                      .findAll({ where: { ArticleId: article.id }, transaction: undefined })
                       .success(function(labels) {
                       .success(function(labels) {
                         expect(labels.length).to.equal(0)
                         expect(labels.length).to.equal(0)
 
 
                         Label
                         Label
-                          .findAll({ where: { articleId: article.id }, transaction: t })
+                          .findAll({ where: { ArticleId: article.id }, transaction: t })
                           .success(function(labels) {
                           .success(function(labels) {
                             expect(labels.length).to.equal(1)
                             expect(labels.length).to.equal(1)
                             t.rollback().success(function() { done() })
                             t.rollback().success(function() { done() })

test/associations/has-one.test.js

@@ -75,9 +75,36 @@ describe(Support.getTestDialectTeaser("HasOne"), function() {
   })
   })
 
 
   describe('setAssociation', function() {
   describe('setAssociation', function() {
+    it('supports transactions', function(done) {
+      Support.prepareTransactionTest(this.sequelize, function(sequelize) {
+        var User  = sequelize.define('User', { username: Support.Sequelize.STRING })
+          , Group = sequelize.define('Group', { name: Support.Sequelize.STRING })
+
+        Group.hasOne(User)
+
+        sequelize.sync({ force: true }).success(function() {
+          User.create({ username: 'foo' }).success(function(user) {
+            Group.create({ name: 'bar' }).success(function(group) {
+              sequelize.transaction(function(t) {
+                group.setUser(user, { transaction: t }).success(function() {
+                  Group.all().success(function(groups) {
+                    groups[0].getUser().success(function(associatedUser) {
+                      expect(associatedUser).to.be.null
+                      t.rollback().success(function() { done() })
+                    })
+                  })
+                })
+              })
+            })
+          })
+        })
+      })
+    })
+
     it('can set an association with predefined primary keys', function(done) {
     it('can set an association with predefined primary keys', function(done) {
       var User = this.sequelize.define('UserXYZZ', { userCoolIdTag: { type: Sequelize.INTEGER, primaryKey: true }, username: Sequelize.STRING })
       var User = this.sequelize.define('UserXYZZ', { userCoolIdTag: { type: Sequelize.INTEGER, primaryKey: true }, username: Sequelize.STRING })
         , Task = this.sequelize.define('TaskXYZZ', { taskOrSomething: { type: Sequelize.INTEGER, primaryKey: true }, title: Sequelize.STRING })
         , Task = this.sequelize.define('TaskXYZZ', { taskOrSomething: { type: Sequelize.INTEGER, primaryKey: true }, title: Sequelize.STRING })
+        , self = this
 
 
       User.hasOne(Task, {foreignKey: 'userCoolIdTag'})
       User.hasOne(Task, {foreignKey: 'userCoolIdTag'})