Merged clean-up

adonisjs · Dec 29, 2015 · 3499ba3 · 3499ba3
2 parents 1df14a7 + 9e53e00
commit 3499ba3
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 30 deletions.
diff --git a/src/Commands/Make.js b/src/Commands/Make.js
@@ -32,6 +32,25 @@ let Make = exports = module.exports = {}
 Make.description = 'Create a new migration file'
 Make.signature = '{name}'
 
+/**
+ * @description writes file with content to a given path
+ * @method writeFile
+ * @param  {String}  migrationPath
+ * @param  {String}  migrationContent
+ * @return {Object}
+ * @public
+ */
+Make.writeFile = function (migrationPath, migrationContent) {
+  return new Promise((resolve, reject) => {
+    fs.writeFile(migrationPath, migrationContent, function (error) {
+      if (error) {
+        return reject(error)
+      }
+      resolve()
+    })
+  })
+}
+
 /**
  * @description creates a new migration file
  * @method handle
@@ -40,21 +59,13 @@ Make.signature = '{name}'
  * @return {Object}
  * @public
  */
-Make.handle = function (options) {
+Make.handle = function * (options) {
   const helpers = Ioc.make('Adonis/Src/Helpers')
   const Console = Ioc.use('Adonis/Src/Console')
 
-  return new Promise((resolve, reject) => {
-    const name = `${new Date().getTime()}_${options.name}.js`
-    const migrationPath = helpers.migrationsPath(name)
+  const name = `${new Date().getTime()}_${options.name}.js`
+  const migrationPath = helpers.migrationsPath(name)
 
-    fs.writeFile(migrationPath, migrationContent, function (error) {
-      if (error) {
-        reject(error)
-      } else {
-        Console.success(Console.icon('success') + ' created %s migration successfully', name)
-        resolve()
-      }
-    })
-  })
+  yield Make.writeFile(migrationPath, migrationContent)
+  Console.success(Console.icon('success') + ' created %s migration successfully', name)
 }
diff --git a/src/Runner/index.js b/src/Runner/index.js
@@ -323,6 +323,7 @@ class Runner {
           return ''
         })
         .then((response) => {
+          this.knex.destroy()
           const status = _.size(migrated) > 0 ? 'completed' : 'skipped'
           resolve({migrated, status})
         })
@@ -348,6 +349,7 @@ class Runner {
           }
         })
         .then((response) => {
+          this.knex.destroy()
           const status = _.size(migrated) > 0 ? 'completed' : 'skipped'
           resolve({migrated, status})
         })

diff --git a/test/unit/commands.spec.js b/test/unit/commands.spec.js
@@ -85,12 +85,16 @@ describe('Commands', function () {
         }
       })
 
-      Make
-        .handle({name: 'create_users_table'})
-        .catch(function (error) {
-          expect(error.code).to.equal('ENOENT')
-          done()
-        })
+      co(function *() {
+        yield Make.handle({name: 'create_users_table'})
+      })
+      .then(function (){
+
+      })
+      .catch(function(error) {
+        expect(error.code).to.equal('ENOENT')
+        done()
+      })
     })
 
     it('should create a file inside migrations directory', function (done) {
@@ -101,18 +105,20 @@ describe('Commands', function () {
         return Helpers
       })
 
-      Make
-        .handle({name: 'create_users_table'})
-        .then(function () {
-          fs.ensureFile(migName, function (err) {
-            if (err) {
-              done(err)
-            } else {
-              done()
-            }
-          })
+      co(function * () {
+        yield Make.handle({name: 'create_users_table'})
+      })
+      .then(function () {
+        fs.ensureFile(migName, function (err) {
+          if (err) {
+            done(err)
+          } else {
+            done()
+          }
         })
-        .catch(done)
+      })
+      .catch(done)
+
     })
   })