#10 - move co into mocha.start.js and tidy up the transaction tests

Author: Mike Eldridge

mocha.start.js

@@ -38,7 +38,8 @@ var globals = module.exports = {
   }],
   TYPES_EXCEPT_FUNCTION: ['string', 123, 123.123, null, undefined, {}, [], true, false],
   assert: assert,
-  adapter: undefined
+  adapter: undefined,
+  co: require('co')
 };
 
 var test = new mocha();

test/create_trx.spec.js

@@ -1,64 +1,40 @@
 describe('DSSqlAdapter#create + transaction', function () {
   it('commit should persist created user in a sql db', function* () {
     var id;
-    var co = require('co');
 
     yield adapter.query.transaction(co.wrap(function * (trx) {
       var createUser = yield adapter.create(User, {name: 'Jane'}, {transaction: trx});
       id = createUser.id;
       assert.equal(createUser.name, 'Jane');
       assert.isDefined(createUser.id);
+    }));
 
-      var findUser = yield adapter.find(User, createUser.id, {transaction: trx});
-      assert.equal(findUser.name, 'Jane');
-      assert.isDefined(findUser.id);
-      assert.equalObjects(findUser, {id: id, name: 'Jane', age: null, profileId: null});
-
-      return findUser;
-    })).then(
-      function (user) {
-        assert.isObject(user, 'transaction returned user object');
-        assert.equal(user.name, 'Jane');
-        assert.isDefined(user.id);
-        assert.equalObjects(user, {id: id, name: 'Jane', age: null, profileId: null});
-      },
-      function (err) {
-        throw new Error('transaction threw exception!');
-      }
-    );
-
-    try {
-      var findUser2 = yield adapter.find(User, id);
-      assert.isObject(findUser2, 'user committed to database');
-    } catch(err) {
-      throw new Error('transaction failed to commit!');
-    }
+    var findUser = yield adapter.find(User, id);
+    assert.isObject(findUser, 'user committed to database');
+    assert.equal(findUser.name, 'Jane');
+    assert.isDefined(findUser.id);
+    assert.equalObjects(findUser, {id: id, name: 'Jane', age: null, profileId: null});
   });
 
   it('rollback should not persist created user in a sql db', function* () {
     var id;
-    var co = require('co');
-
-    yield adapter.query.transaction(co.wrap(function * (trx) {
-      var createUser = yield adapter.create(User, {name: 'John'}, {transaction: trx});
-      id = createUser.id;
-      assert.equal(createUser.name, 'John');
-      assert.isDefined(createUser.id);
 
-      var findUser = yield adapter.find(User, createUser.id, {transaction: trx});
-      assert.equal(findUser.name, 'John');
-      assert.isDefined(findUser.id);
-      assert.equalObjects(findUser, {id: id, name: 'John', age: null, profileId: null});
-
-      throw new Error('rollback');
-    })).then(
-      function () { throw new Error('transaction did not throw exception!') },
-      function (err) { assert.equal(err.message, 'rollback') }
-    );
+    try {
+      yield adapter.query.transaction(co.wrap(function * (trx) {
+        var createUser = yield adapter.create(User, {name: 'John'}, {transaction: trx});
+        id = createUser.id;
+        assert.equal(createUser.name, 'John');
+        assert.isDefined(createUser.id);
+
+        throw new Error('rollback');
+      }));
+    } catch (err) {
+      assert.equal(err.message, 'rollback');
+    }
 
     try {
-      var findUser2 = yield adapter.find(User, id);
-      throw new Error('transaction failed to roll back!');
+      var findUser = yield adapter.find(User, id);
+      throw new Error('user committed to database');
     } catch(err) {
       assert.equal(err.message, 'Not Found!');
     }

test/destroy_trx.spec.js

@@ -1,13 +1,10 @@
 describe('DSSqlAdapter#destroy + transaction', function () {
   it('commit should destroy a user from a Sql db', function* () {
-    var co = require('co');
-
     var createUser = yield adapter.create(User, {name: 'John'})
     var id = createUser.id;
 
     yield adapter.query.transaction(co.wrap(function * (trx) {
-      var destroyUser = yield adapter.destroy(User, createUser.id, {transaction: trx});
-      assert.isFalse(!!destroyUser);
+      return adapter.destroy(User, id, {transaction: trx});
     }));
 
     try {
@@ -19,30 +16,20 @@ describe('DSSqlAdapter#destroy + transaction', function () {
   });
 
   it('rollback should not destroy a user from a Sql db', function* () {
-    var co = require('co');
-
     var createUser = yield adapter.create(User, {name: 'John'})
     var id = createUser.id;
 
-    yield adapter.query.transaction(co.wrap(function * (trx) {
-      var destroyUser = yield adapter.destroy(User, createUser.id, {transaction: trx});
-      assert.isFalse(!!destroyUser);
-
-      throw new Error('rollback');
-    })).then(
-      function () { throw new Error('transaction did not throw exception!') },
-      function (err) { assert.equal(err.message, 'rollback') }
-    );
-
     try {
-      var findUser = yield adapter.find(User, id);
-      assert.isObject(findUser, 'user still exists');
+      yield adapter.query.transaction(co.wrap(function * (trx) {
+        yield adapter.destroy(User, createUser.id, {transaction: trx});
+
+        throw new Error('rollback');
+      }));
     } catch (err) {
-      if (err.message == 'Not Found!') {
-        throw new Error('transaction did not roll back');
-      } else {
-        throw new Error('caught exception trying to locate user');
-      }
+      assert.equal(err.message, 'rollback');
     }
+
+    var findUser = yield adapter.find(User, id);
+    assert.isObject(findUser, 'user still exists');
   });
 });

test/update_trx.spec.js

@@ -1,93 +1,45 @@
 describe('DSSqlAdapter#update + transaction', function () {
   it('commit should update a user in a Sql db', function* () {
-    var co = require('co');
-
     var user = yield adapter.create(User, {name: 'John'})
     var id = user.id;
     assert.equal(user.name, 'John');
     assert.isDefined(user.id);
 
-    var foundUser = yield adapter.find(User, user.id);
-    assert.equal(foundUser.name, 'John');
-    assert.isDefined(foundUser.id);
-    assert.equalObjects(foundUser, {id: id, name: 'John', age: null, profileId: null});
-
     yield adapter.query.transaction(co.wrap(function * (trx) {
-      var updatedUser = yield adapter.update(User, foundUser.id, {name: 'Johnny'}, {transaction: trx});
+      var updatedUser = yield adapter.update(User, id, {name: 'Johnny'}, {transaction: trx});
       assert.equal(updatedUser.name, 'Johnny');
       assert.isDefined(updatedUser.id);
       assert.equalObjects(updatedUser, {id: id, name: 'Johnny', age: null, profileId: null});
+    }));
 
-      var foundUser2 = yield adapter.find(User, updatedUser.id, {transaction: trx});
-      assert.equal(foundUser2.name, 'Johnny');
-      assert.isDefined(foundUser2.id);
-      assert.equalObjects(foundUser2, {id: id, name: 'Johnny', age: null, profileId: null});
-
-      return foundUser2;
-    })).then(
-      function (user) { assert.isObject(user, 'transaction returned user object') },
-      function (err) { throw new Error('transaction threw exception!') }
-    );
-
-    var foundUser3 = yield adapter.find(User, user.id);
-    assert.equal(foundUser3.name, 'Johnny');
-    assert.isDefined(foundUser3.id);
-    assert.equalObjects(foundUser3, {id: id, name: 'Johnny', age: null, profileId: null});
-
-    var destroyUser = yield adapter.destroy(User, foundUser3.id);
-    assert.isFalse(!!destroyUser);
-
-    try {
-      yield adapter.find(User, id);
-      throw new Error('Should not have reached here!');
-    } catch (err) {
-      assert.equal(err.message, 'Not Found!');
-    }
+    var foundUser = yield adapter.find(User, id);
+    assert.equal(foundUser.name, 'Johnny');
+    assert.isDefined(foundUser.id);
+    assert.equalObjects(foundUser, {id: id, name: 'Johnny', age: null, profileId: null});
   });
 
   it('rollback should not update a user in a Sql db', function* () {
-    var co = require('co');
-
     var user = yield adapter.create(User, {name: 'John'})
     var id = user.id;
     assert.equal(user.name, 'John');
     assert.isDefined(user.id);
 
-    var foundUser = yield adapter.find(User, user.id);
-    assert.equal(foundUser.name, 'John');
-    assert.isDefined(foundUser.id);
-    assert.equalObjects(foundUser, {id: id, name: 'John', age: null, profileId: null});
-
-    yield adapter.query.transaction(co.wrap(function * (trx) {
-      var updatedUser = yield adapter.update(User, foundUser.id, {name: 'Johnny'}, {transaction: trx});
-      assert.equal(updatedUser.name, 'Johnny');
-      assert.isDefined(updatedUser.id);
-      assert.equalObjects(updatedUser, {id: id, name: 'Johnny', age: null, profileId: null});
-
-      var foundUser2 = yield adapter.find(User, updatedUser.id, {transaction: trx});
-      assert.equal(foundUser2.name, 'Johnny');
-      assert.isDefined(foundUser2.id);
-      assert.equalObjects(foundUser2, {id: id, name: 'Johnny', age: null, profileId: null});
-
-      throw new Error('rollback');
-    })).then(
-      function () { throw new Error('transaction did not throw exception!') },
-      function (err) { assert.equal(err.message, 'rollback') }
-    );
-
-    var foundUser3 = yield adapter.find(User, user.id);
-    assert.equal(foundUser3.name, 'John');
-    assert.isDefined(foundUser3.id);
-    assert.equalObjects(foundUser3, {id: id, name: 'John', age: null, profileId: null});
-
-    var destroyUser = yield adapter.destroy(User, foundUser3.id);
-    assert.isFalse(!!destroyUser);
-
     try {
-      yield adapter.find(User, id);
-      throw new Error('Should not have reached here!');
+      yield adapter.query.transaction(co.wrap(function * (trx) {
+        var updatedUser = yield adapter.update(User, id, {name: 'Johnny'}, {transaction: trx});
+        assert.equal(updatedUser.name, 'Johnny');
+        assert.isDefined(updatedUser.id);
+        assert.equalObjects(updatedUser, {id: id, name: 'Johnny', age: null, profileId: null});
+
+        throw new Error('rollback');
+      }));
     } catch (err) {
-      assert.equal(err.message, 'Not Found!');
+      assert.equal(err.message, 'rollback');
     }
+
+    var foundUser = yield adapter.find(User, id);
+    assert.equal(foundUser.name, 'John');
+    assert.isDefined(foundUser.id);
+    assert.equalObjects(foundUser, {id: id, name: 'John', age: null, profileId: null});
   });
 });