Test assert against fake transaction object and extra check on options parameter

lib/model.js

@@ -1641,7 +1641,7 @@ Model.prototype.findOrCreate = function(options) {
     );
     );
   }
   }
 
 
-  if (this.sequelize.constructor.cls) {
+  if (options.transaction === undefined && this.sequelize.constructor.cls) {
     options.transaction = this.sequelize.constructor.cls.get('transaction');
     options.transaction = this.sequelize.constructor.cls.get('transaction');
   }
   }
 
 

test/unit/model/find-or-create.test.js

@@ -36,16 +36,21 @@ describe(Support.getTestDialectTeaser('Model'), function() {
     });
     });
 
 
     it('should use transaction from cls if available', function () {
     it('should use transaction from cls if available', function () {
+      var self = this;
+
+      current.constructor.cls.run(function () {
+        current.constructor.cls.set('transaction', { id: 123 });
 
 
         var options = {
         var options = {
           where : {
           where : {
-          name : '123'
+            name : 'John'
           }
           }
         };
         };
 
 
-      this.User.findOrCreate(options);
+        self.User.findOrCreate(options);
 
 
-      expect(options).to.have.any.keys('transaction');
+        expect(options.transaction).to.have.property('id', 123);
+      });
     });
     });
   });
   });
 });
 });