Updated all tests to create and delete database files

Setup and tear down will manage test related database files, helping in removing unneccessary files from commit
adonisjs · Dec 27, 2015 · 9e4396f · 9e4396f
1 parent 01676b4
commit 9e4396f
Show file tree

Hide file tree

Showing 16 changed files with 187 additions and 47 deletions.
diff --git a/src/Runner/index.js b/src/Runner/index.js
@@ -14,9 +14,10 @@ const log = new CatLog('adonis:lucid')
 class Runner {
 
   constructor (Config) {
-    const config = Config.get('database.connection')
+    const connection = Config.get('database.connection')
+    const config = Config.get(`database.${connection}`)
     this.knex = require('knex')(config)
-    this.migrationsTable = Config.get('database.migrationsTable')
+    this.migrationsTable = Config.get('database.migrationsTable', 'adonis_schema')
     this.lockTable = `${this.migrationsTable}_lock`
     this.migrations = []
   }

diff --git a/test/implementation/model-relations.spec.js b/test/implementation/model-relations.spec.js
@@ -5,6 +5,7 @@ const chai = require('chai')
 const expect = chai.expect
 const co = require('co')
 const Database = require('../../src/Database')
+const manageDb = require('../unit/blueprints/manage')
 const blueprint = require('./blueprints/model-blueprint')
 const Model = require('../../src/Orm/Proxy/Model')
 const Ioc = require('adonis-fold').Ioc
@@ -55,16 +56,23 @@ Ioc.bind('App/Model/User', function () {
 describe('Database Implementation', function () {
 
   before(function (done) {
-    blueprint
-    .setup(db)
-    .then (function () {
-      done()
-    }).catch(done)
+    manageDb
+      .make(path.join(__dirname, './storage/blog.sqlite3'))
+      .then(function () {
+        return blueprint.setup(db)
+      })
+      .then (function () {
+        done()
+      })
+      .catch(done)
   })
 
   after(function (done) {
     blueprint
     .tearDown(db)
+    .then(function () {
+      return manageDb.remove(path.join(__dirname, './storage/blog.sqlite3'))
+    })
     .then (function () {
       done()
     }).catch(done)

diff --git a/test/implementation/model.spec.js b/test/implementation/model.spec.js
@@ -4,6 +4,7 @@ const path = require('path')
 const chai = require('chai')
 const expect = chai.expect
 const Database = require('../../src/Database')
+const manageDb = require('../unit/blueprints/manage')
 const blueprint = require('./blueprints/model-blueprint')
 const Model = require('../../src/Orm/Proxy/Model')
 
@@ -15,7 +16,7 @@ let Config = {
     return {
       client: 'sqlite3',
       connection: {
-        filename: path.join(__dirname,'./storage/blog.sqlite3')
+        filename: path.join(__dirname,'./storage/model.sqlite3')
       },
       debug: false
     }
@@ -49,19 +50,27 @@ let postId = null
 describe('Database Implementation', function () {
 
   before(function (done) {
-    blueprint
-    .setup(db)
-    .then (function () {
-      done()
-    }).catch(done)
+    manageDb
+      .make(path.join(__dirname, './storage/model.sqlite3'))
+      .then(function () {
+        return blueprint.setup(db)
+      })
+      .then (function () {
+        done()
+      })
+      .catch(done)
   })
 
   after(function (done) {
     blueprint
-    .tearDown(db)
-    .then (function () {
-      done()
-    }).catch(done)
+      .tearDown(db)
+      .then(function () {
+        return manageDb.remove(path.join(__dirname, './storage/model.sqlite3'))
+      })
+      .then (function () {
+        done()
+      })
+      .catch(done)
   })
 
 

diff --git a/test/implementation/storage/blog.sqlite3 b/test/implementation/storage/blog.sqlite3
diff --git a/test/unit/blueprints/manage.js b/test/unit/blueprints/manage.js
@@ -0,0 +1,34 @@
+'use strict'
+
+/**
+ * adonis-lucid
+ * Copyright(c) 2015-2015 Harminder Virk
+ * MIT Licensed
+*/
+const fs = require('fs-extra')
+module.exports = {
+  make: function (file) {
+    return new Promise(function (resolve, reject) {
+      fs.ensureFile(file, function (error) {
+        if(error) {
+          reject(error)
+        }
+        else {
+          resolve()
+        }
+      })
+    })
+  },
+  remove: function (file) {
+    return new Promise(function (resolve, reject) {
+      fs.remove(file, function (error) {
+        if(error) {
+          reject(error)
+        }
+        else {
+          resolve()
+        }
+      })
+    })
+  }
+}
diff --git a/test/unit/blueprints/model-relations-blueprint.js b/test/unit/blueprints/model-relations-blueprint.js
@@ -5,7 +5,7 @@ const Q = require('q')
 let blueprint = exports = module.exports = {}
 
 blueprint.tearDown = function(knex) {
-  return Q.all([
+  const tablesToRemove = [
     knex.schema.dropTable('users'),
     knex.schema.dropTable('phones'),
     knex.schema.dropTable('authors'),
@@ -17,12 +17,19 @@ blueprint.tearDown = function(knex) {
     knex.schema.dropTable('chat_operators'),
     knex.schema.dropTable('relation_table'),
     knex.schema.dropTable('cbooks')
-  ])
+  ]
+  let result = Q()
+  tablesToRemove.forEach(function (item) {
+    result = result.then(function () {
+      return item
+    })
+  })
+  return result
 }
 
 blueprint.setup = function(knex) {
 
-  return Q.all([
+  const setupTables = [
     knex.schema.createTable('users', function (table) {
 
       table.increments()
@@ -119,7 +126,14 @@ blueprint.setup = function(knex) {
      table.string('relation_user_id').references('co_id').inTable('chat_operators').onDelete('CASCADE')
 
     })
-  ])
+  ]
+  let result = Q()
+  setupTables.forEach(function (item) {
+    result = result.then(function () {
+      return item
+    })
+  })
+  return result
 }
 
 blueprint.seed = function(knex){
@@ -235,7 +249,7 @@ blueprint.seed = function(knex){
   ]
 
 
-  return Q.all([
+  const seeds = [
     knex.table('users').insert(users),
     knex.table('phones').insert(phones),
     knex.table('authors').insert(authors),
@@ -247,5 +261,12 @@ blueprint.seed = function(knex){
     knex.table('chat_operators').insert(operators),
     knex.table('cbooks').insert(cbooks),
     knex.table('relation_table').insert(relational_values)
-  ])
+  ]
+  let result = Q()
+  seeds.forEach(function (item) {
+    result = result.then(function () {
+      return item
+    })
+  })
+  return result
 }
diff --git a/test/unit/commands.spec.js b/test/unit/commands.spec.js
@@ -46,6 +46,16 @@ describe('Commands', function () {
     })
   })
 
+  after(function (done) {
+    fs.emptyDir(path.join(__dirname, './migrations'), function (error) {
+      if (error) {
+        done(error)
+      } else {
+        done()
+      }
+    })
+  })
+
   context('Make', function () {
     it('should create a file inside migrations directory', function (done) {
       expect(Make.description).not.equal(undefined)

diff --git a/test/unit/database.spec.js b/test/unit/database.spec.js
@@ -10,6 +10,7 @@
 const Database = require('../../src/Database')
 const path = require('path')
 const chai = require('chai')
+const manageDb = require('./blueprints/manage')
 const expect = chai.expect
 
 let alternateConnection = {
@@ -38,18 +39,39 @@ let Config = {
 }
 
 describe('Database', function () {
+
+  before(function (done) {
+    manageDb
+      .make(path.join(__dirname, './storage/test.sqlite3'))
+      .then(function () {
+        return manageDb.make(path.join(__dirname, './storage/connection.sqlite3'))
+      })
+      .then(function () {
+        done()
+      })
+      .catch(done)
+  })
+
+  after(function (done) {
+    manageDb
+      .remove(path.join(__dirname, './storage/test.sqlite3'))
+      .then(function () {
+        return manageDb.remove(path.join(__dirname, './storage/connection.sqlite3'))
+      })
+      .then(function () {
+        done()
+      })
+      .catch(done)
+  })
+
   it('should make connection with sqlite database', function () {
     const db = new Database(Config)
     expect(db.client.config.client).to.equal('sqlite3')
   })
 
-  it('should be able to switch connections using connection method', function (done) {
+  it('should be able to switch connections using connection method', function () {
     const db = new Database(Config)
-    db.connection('new')
-      .table('accounts')
-      .then(function (accounts) {
-        expect(accounts).to.be.an('array')
-        done()
-      }).catch(done)
+    const newConnection = db.connection('new')
+    expect(newConnection.client.config.connection.filename).to.equal(path.join(__dirname, './storage/connection.sqlite3'))
   })
 })
diff --git a/test/unit/model-relations.spec.js b/test/unit/model-relations.spec.js
@@ -26,6 +26,7 @@ const expect = chai.expect
 const blueprint = require('./blueprints/model-relations-blueprint')
 const co = require('co')
 const Ioc = require('adonis-fold').Ioc
+const manageDb = require('./blueprints/manage')
 const Database = require('../../src/Database')
 const Model = require('../../src/Orm/Proxy/Model')
 const _ = require('lodash')
@@ -39,7 +40,7 @@ let Config = {
     return {
       client: 'sqlite3',
       connection: {
-        filename: path.join(__dirname, './storage/test.sqlite3')
+        filename: path.join(__dirname, './storage/relation.sqlite3')
       },
       debug: false
     }
@@ -57,11 +58,15 @@ const db = new Database(Config)
  * Tests begins here
  */
 describe('Model Relations', function () {
+
   before(function (done) {
-    blueprint
-      .setup(db)
+    manageDb
+      .make(path.join(__dirname, './storage/relation.sqlite3'))
+      .then(function () {
+        return blueprint.setup(db)
+      })
       .then(function () {
-        blueprint.seed(db)
+        return blueprint.seed(db)
       })
       .then(function () {
         done()
@@ -72,6 +77,9 @@ describe('Model Relations', function () {
   after(function (done) {
     blueprint
       .tearDown(db)
+      .then(function () {
+        return manageDb.remove(path.join(__dirname, './storage/relation.sqlite3'))
+      })
       .then(function () {
         done()
       })

diff --git a/test/unit/model.spec.js b/test/unit/model.spec.js
@@ -10,6 +10,7 @@ const path = require('path')
 const chai = require('chai')
 const expect = chai.expect
 const co = require('co')
+const manageDb = require('./blueprints/manage')
 const blueprint = require('./blueprints/model-blueprint')
 const Database = require('../../src/Database')
 const Model = require('../../src/Orm/Proxy/Model')
@@ -20,7 +21,7 @@ let Config = {
     return {
       client: 'sqlite3',
       connection: {
-        filename: path.join(__dirname, './storage/test.sqlite3')
+        filename: path.join(__dirname, './storage/model.sqlite3')
       },
       debug: false
     }
@@ -30,19 +31,27 @@ let Config = {
 const db = new Database(Config)
 
 describe('Model', function () {
+
   before(function (done) {
-    blueprint
-      .setup(db)
+    manageDb
+      .make(path.join(__dirname, './storage/model.sqlite3'))
+      .then(function () {
+        return blueprint.setup(db)
+      })
       .then(function () {
-        blueprint.seed(db)
+        return blueprint.seed(db)
       }).then(function () {
-      done()
-    }).catch(done)
+        done()
+      })
+      .catch(done)
   })
 
   after(function (done) {
     blueprint
       .tearDown(db)
+      .then(function () {
+        return manageDb.remove(path.join(__dirname, './storage/model.sqlite3'))
+      })
       .then(function () {
         done()
       }).catch(done)