refactor

enniel · Feb 14, 2018 · 33cd2c2 · 33cd2c2
1 parent 94722c4
commit 33cd2c2
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/test/fixtures.js b/test/fixtures.js
@@ -7,8 +7,6 @@
  */
 
 const bluebird = require('bluebird')
-const fs = require('fs-extra')
-const path = require('path')
 
 module.exports = {
   setupTables: function (knex) {
@@ -73,7 +71,6 @@ module.exports = {
     return knex.table(table).truncate()
   },
   up: async function (knex) {
-    await fs.ensureDir(path.join(__dirname, './tmp'))
     await this.setupTables(knex)
   },
   down: function (knex) {

diff --git a/test/functional/commands.spec.js b/test/functional/commands.spec.js
@@ -8,34 +8,32 @@
 
 const test = require('japa')
 const ace = require('@adonisjs/ace')
+const fs = require('fs-extra')
 const path = require('path')
 const walkSync = require('walk-sync')
 const { ioc, registrar } = require('@adonisjs/fold')
 const { Config, setupResolver, Helpers } = require('@adonisjs/sink')
-const DatabaseManager = require('@adonisjs/lucid/src/Database/Manager')
-const Model = require('@adonisjs/lucid/src/Lucid/Model')
 const fixtures = require('../fixtures')
 
 test.group('Commands', (group) => {
   group.before(async () => {
-    ioc.singleton('Adonis/Src/Database', function () {
+    ioc.bind('Adonis/Src/Config', () => {
       const config = new Config()
       config.set('database', require('../config'))
-      return new DatabaseManager(config)
+      return config
     })
-    ioc.alias('Adonis/Src/Database', 'Database')
-    ioc.bind('Adonis/Src/Model', () => Model)
-    ioc.alias('Adonis/Src/Model', 'Model')
     ioc.bind('Adonis/Src/Helpers', () => {
       return new Helpers(path.join(__dirname, '..'))
     })
     ioc.alias('Adonis/Src/Helpers', 'Helpers')
 
     await registrar
       .providers([
+        '@adonisjs/lucid/providers/LucidProvider',
         path.join(__dirname, '../../providers/AclProvider'),
         path.join(__dirname, '../../providers/CommandsProvider')
       ]).registerAndBoot()
+    await fs.ensureDir(path.join(__dirname, '../tmp'))
     const Database = use('Database')
     await fixtures.up(Database)
     setupResolver()
@@ -49,7 +47,15 @@ test.group('Commands', (group) => {
     const Database = use('Database')
     await fixtures.down(Database)
     Database.close()
-  })
+
+    try {
+      await fs.remove(path.join(__dirname, '../tmp'))
+    } catch (error) {
+      if (process.platform !== 'win32' || error.code !== 'EBUSY') {
+        throw error
+      }
+    }
+  }).timeout(0)
 
   group.afterEach(async () => {
     const Database = use('Database')

diff --git a/test/functional/providers.spec.js b/test/functional/providers.spec.js
@@ -8,23 +8,9 @@
 
 const path = require('path')
 const { ioc, registrar } = require('@adonisjs/fold')
-const { Config } = require('@adonisjs/sink')
 const test = require('japa')
-const Model = require('@adonisjs/lucid/src/Lucid/Model')
-const DatabaseManager = require('@adonisjs/lucid/src/Database/Manager')
 
 test.group('Providers', (group) => {
-  group.before(() => {
-    ioc.singleton('Adonis/Src/Database', function () {
-      const config = new Config()
-      config.set('database', require('../config'))
-      return new DatabaseManager(config)
-    })
-    ioc.alias('Adonis/Src/Database', 'Database')
-    ioc.bind('Adonis/Src/Model', () => Model)
-    ioc.alias('Adonis/Src/Model', 'Model')
-  })
-
   test('AclProvider', async (assert) => {
     await registrar
       .providers([path.join(__dirname, '../../providers/AclProvider')])

diff --git a/test/unit/traits.spec.js b/test/unit/traits.spec.js
@@ -8,6 +8,8 @@
 
 require('@adonisjs/lucid/lib/iocResolver').setFold(require('@adonisjs/fold'))
 const test = require('japa')
+const fs = require('fs-extra')
+const path = require('path')
 const Model = require('@adonisjs/lucid/src/Lucid/Model')
 const DatabaseManager = require('@adonisjs/lucid/src/Database/Manager')
 const BelongsToMany = require('@adonisjs/lucid/src/Lucid/Relations/BelongsToMany')
@@ -39,6 +41,7 @@ test.group('Traits', function (group) {
     ioc.bind('Adonis/Acl/HasPermission', function () {
       return new HasPermission()
     })
+    await fs.ensureDir(path.join(__dirname, '../tmp'))
     const Database = use('Database')
     await fixtures.up(Database)
     setupResolver()
@@ -52,7 +55,15 @@ test.group('Traits', function (group) {
     const Database = use('Database')
     await fixtures.down(Database)
     Database.close()
-  })
+
+    try {
+      await fs.remove(path.join(__dirname, '../tmp'))
+    } catch (error) {
+      if (process.platform !== 'win32' || error.code !== 'EBUSY') {
+        throw error
+      }
+    }
+  }).timeout(0)
 
   group.afterEach(async function () {
     const Database = use('Database')