不要怂,就是干,撸起袖子干!

Commit 7b5d2c4b by Mick Hansen

chore: semicolons

1 parent 655c57b8
Showing with 58 additions and 58 deletions
...@@ -3,49 +3,49 @@ var chai = require('chai') ...@@ -3,49 +3,49 @@ var chai = require('chai')
, Support = require(__dirname + '/support') , Support = require(__dirname + '/support')
, dialect = Support.getTestDialect() , dialect = Support.getTestDialect()
, Transaction = require(__dirname + '/../lib/transaction') , Transaction = require(__dirname + '/../lib/transaction')
, sinon = require('sinon') , sinon = require('sinon');
describe(Support.getTestDialectTeaser("Transaction"), function () { describe(Support.getTestDialectTeaser("Transaction"), function () {
this.timeout(4000); this.timeout(4000);
describe('constructor', function() { describe('constructor', function() {
it('stores options', function() { it('stores options', function() {
var transaction = new Transaction(this.sequelize) var transaction = new Transaction(this.sequelize);
expect(transaction.options).to.be.an.instanceOf(Object) expect(transaction.options).to.be.an.instanceOf(Object);
}) });
it('generates an identifier', function() { it('generates an identifier', function() {
var transaction = new Transaction(this.sequelize) var transaction = new Transaction(this.sequelize);
expect(transaction.id).to.exist expect(transaction.id).to.exist;
}) });
}) });
describe('commit', function() { describe('commit', function() {
it('is a commit method available', function() { it('is a commit method available', function() {
expect(Transaction).to.respondTo('commit') expect(Transaction).to.respondTo('commit');
}) });
}) });
describe('rollback', function() { describe('rollback', function() {
it('is a rollback method available', function() { it('is a rollback method available', function() {
expect(Transaction).to.respondTo('rollback') expect(Transaction).to.respondTo('rollback');
}) });
}) });
if (dialect !== 'sqlite') { if (dialect !== 'sqlite') {
describe('row locking', function () { describe('row locking', function () {
this.timeout(10000); this.timeout(10000);
it('supports for update', function (done) { it('supports for update', function (done) {
var User = this.sequelize.define('user', { var User = this.sequelize.define('user', {
username: Support.Sequelize.STRING, username: Support.Sequelize.STRING,
awesome: Support.Sequelize.BOOLEAN awesome: Support.Sequelize.BOOLEAN
}) })
, self = this , self = this
, t1Spy = sinon.spy() , t1Spy = sinon.spy()
, t2Spy = sinon.spy() , t2Spy = sinon.spy();
this.sequelize.sync({ force: true }).then(function () { this.sequelize.sync({ force: true }).then(function () {
return User.create({ username: 'jan'}) return User.create({ username: 'jan'});
}).then(function () { }).then(function () {
self.sequelize.transaction().then(function (t1) { self.sequelize.transaction().then(function (t1) {
return User.find({ return User.find({
...@@ -63,48 +63,48 @@ describe(Support.getTestDialectTeaser("Transaction"), function () { ...@@ -63,48 +63,48 @@ describe(Support.getTestDialectTeaser("Transaction"), function () {
where: { where: {
username: 'jan' username: 'jan'
}, },
}, { }, {
lock: t2.LOCK.UPDATE, lock: t2.LOCK.UPDATE,
transaction: t2 transaction: t2
}).then(function () { }).then(function () {
t2Spy() t2Spy()
t2.commit().then(function () { t2.commit().then(function () {
expect(t2Spy).to.have.been.calledAfter(t1Spy) // Find should not succeed before t1 has comitted expect(t2Spy).to.have.been.calledAfter(t1Spy); // Find should not succeed before t1 has comitted
done() done();
}) });
}) });
t1Jan.updateAttributes({ t1Jan.updateAttributes({
awesome: true awesome: true
}, { transaction: t1}).then(function () { }, { transaction: t1}).then(function () {
t1Spy() t1Spy()
setTimeout(t1.commit.bind(t1), 2000) setTimeout(t1.commit.bind(t1), 2000);
}) });
}) });
}) });
}) });
}) });
}) });
it('supports for share', function (done) { it('supports for share', function (done) {
var User = this.sequelize.define('user', { var User = this.sequelize.define('user', {
username: Support.Sequelize.STRING, username: Support.Sequelize.STRING,
awesome: Support.Sequelize.BOOLEAN awesome: Support.Sequelize.BOOLEAN
}) })
, self = this , self = this
, t1Spy = sinon.spy() , t1Spy = sinon.spy()
, t2FindSpy = sinon.spy() , t2FindSpy = sinon.spy()
, t2UpdateSpy = sinon.spy() , t2UpdateSpy = sinon.spy();
this.sequelize.sync({ force: true }).then(function () { this.sequelize.sync({ force: true }).then(function () {
return User.create({ username: 'jan'}) return User.create({ username: 'jan'});
}).then(function () { }).then(function () {
self.sequelize.transaction().then(function (t1) { self.sequelize.transaction().then(function (t1) {
return User.find({ return User.find({
where: { where: {
username: 'jan' username: 'jan'
} }
}, { }, {
lock: t1.LOCK.SHARE, lock: t1.LOCK.SHARE,
transaction: t1 transaction: t1
}).then(function (t1Jan) { }).then(function (t1Jan) {
...@@ -116,21 +116,21 @@ describe(Support.getTestDialectTeaser("Transaction"), function () { ...@@ -116,21 +116,21 @@ describe(Support.getTestDialectTeaser("Transaction"), function () {
username: 'jan' username: 'jan'
} }
}, { transaction: t2}).then(function (t2Jan) { }, { transaction: t2}).then(function (t2Jan) {
t2FindSpy() t2FindSpy();
t2Jan.updateAttributes({ t2Jan.updateAttributes({
awesome: false awesome: false
}, { }, {
transaction: t2 transaction: t2
}).then(function () { }).then(function () {
t2UpdateSpy() t2UpdateSpy();
t2.commit().then(function () { t2.commit().then(function () {
expect(t2FindSpy).to.have.been.calledBefore(t1Spy) // The find call should have returned expect(t2FindSpy).to.have.been.calledBefore(t1Spy); // The find call should have returned
expect(t2UpdateSpy).to.have.been.calledAfter(t1Spy) // But the update call should not happen before the first transaction has committed expect(t2UpdateSpy).to.have.been.calledAfter(t1Spy); // But the update call should not happen before the first transaction has committed
done() done();
}) });
}) });
}) });
t1Jan.updateAttributes({ t1Jan.updateAttributes({
awesome: true awesome: true
...@@ -138,15 +138,15 @@ describe(Support.getTestDialectTeaser("Transaction"), function () { ...@@ -138,15 +138,15 @@ describe(Support.getTestDialectTeaser("Transaction"), function () {
transaction: t1 transaction: t1
}).then(function () { }).then(function () {
setTimeout(function () { setTimeout(function () {
t1Spy() t1Spy();
t1.commit() t1.commit();
}, 2000) }, 2000);
}) });
}) });
}) });
}) });
}) });
}) });
}) });
} }
}) });
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!