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

@@ -3,8 +3,8 @@
 /* jshint -W030 */
 /* jshint -W030 */
 var chai = require('chai')
 var chai = require('chai')
   , expect = chai.expect
   , expect = chai.expect
-  , Support   = require(__dirname + '/../support')
-  , current   = Support.sequelize
+  , Support = require(__dirname + '/../support')
+  , current = Support.sequelize
   , cls = require('continuation-local-storage')
   , cls = require('continuation-local-storage')
   , sinon = require('sinon')
   , sinon = require('sinon')
   , stub = sinon.stub
   , stub = sinon.stub
@@ -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;
 
 
-      var options = {
-        where : {
-          name : '123'
-        }
-      };
+      current.constructor.cls.run(function () {
+        current.constructor.cls.set('transaction', { id: 123 });
 
 
-      this.User.findOrCreate(options);
+        var options = {
+          where : {
+            name : 'John'
+          }
+        };
 
 
-      expect(options).to.have.any.keys('transaction');
+        self.User.findOrCreate(options);
+
+        expect(options.transaction).to.have.property('id', 123);
+      });
     });
     });
   });
   });
 });
 });