fix a test

lib/dialects/sqlite/query-generator.js

@@ -361,7 +361,7 @@ var QueryGenerator = {
   },
   },
 
 
   startTransactionQuery: function(transaction, options) {
   startTransactionQuery: function(transaction, options) {
-    if (options.parent) {
+    if (transaction.parent) {
       return 'SAVEPOINT ' + this.quoteIdentifier(transaction.name) + ';';
       return 'SAVEPOINT ' + this.quoteIdentifier(transaction.name) + ';';
     }
     }
 
 

lib/query-interface.js

@@ -880,9 +880,7 @@ QueryInterface.prototype.deferConstraints = function (transaction, options) {
     transaction: transaction.parent || transaction
     transaction: transaction.parent || transaction
   }, options || {});
   }, options || {});
 
 
-  var sql = this.QueryGenerator.deferConstraintsQuery({
-    parent: transaction.parent
-  });
+  var sql = this.QueryGenerator.deferConstraintsQuery(options);
 
 
   if (sql) {
   if (sql) {
     return this.sequelize.query(sql, options);
     return this.sequelize.query(sql, options);

test/integration/sequelize.transaction.test.js

@@ -6,11 +6,20 @@ var chai = require('chai')
   , Support = require(__dirname + '/support')
   , Support = require(__dirname + '/support')
   , Promise = require(__dirname + '/../../lib/promise')
   , Promise = require(__dirname + '/../../lib/promise')
   , Transaction = require(__dirname + '/../../lib/transaction')
   , Transaction = require(__dirname + '/../../lib/transaction')
+  , sinon = require('sinon')
   , current = Support.sequelize;
   , current = Support.sequelize;
 
 
 if (current.dialect.supports.transactions) {
 if (current.dialect.supports.transactions) {
 
 
 describe(Support.getTestDialectTeaser('Sequelize#transaction'), function() {
 describe(Support.getTestDialectTeaser('Sequelize#transaction'), function() {
+  beforeEach(function () {
+    this.sinon = sinon.sandbox.create();
+  });
+
+  afterEach(function () {
+    this.sinon.restore();
+  });
+
   describe('then', function() {
   describe('then', function() {
     it('gets triggered once a transaction has been successfully committed', function() {
     it('gets triggered once a transaction has been successfully committed', function() {
       var called = false;
       var called = false;

test/integration/sequelize/deferrable.test.js

@@ -15,12 +15,13 @@ if (!Support.sequelize.dialect.supports.deferrableConstraints) {
 }
 }
 
 
 describe(Support.getTestDialectTeaser('Sequelize'), function() {
 describe(Support.getTestDialectTeaser('Sequelize'), function() {
+  describe('Deferrable', function () {
     beforeEach(function () {
     beforeEach(function () {
       this.run = function (deferrable, options) {
       this.run = function (deferrable, options) {
         options = options || {};
         options = options || {};
 
 
         var taskTableName      = options.taskTableName || 'tasks_' + config.rand();
         var taskTableName      = options.taskTableName || 'tasks_' + config.rand();
-      var transactionOptions = _.extend({ deferrable: Sequelize.Deferrable.SET_DEFERRED }, options);
+        var transactionOptions = _.assign({}, { deferrable: Sequelize.Deferrable.SET_DEFERRED }, options);
         var userTableName      = 'users_' + config.rand();
         var userTableName      = 'users_' + config.rand();
 
 
         var User = this.sequelize.define(
         var User = this.sequelize.define(
@@ -62,7 +63,6 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() {
       };
       };
     });
     });
 
 
-  describe('Deferrable', function () {
     describe('NOT', function () {
     describe('NOT', function () {
       it('does not allow the violation of the foreign key constraint', function () {
       it('does not allow the violation of the foreign key constraint', function () {
         return expect(this.run(Sequelize.Deferrable.NOT)).to.eventually.be.rejectedWith(Sequelize.ForeignKeyConstraintError);
         return expect(this.run(Sequelize.Deferrable.NOT)).to.eventually.be.rejectedWith(Sequelize.ForeignKeyConstraintError);