fix(tests): working directory discrepancy

Adjust test files for the latest ava update that changes the working directory for test files.
haltcase · Dec 17, 2016 · 3330d92 · 3330d92
1 parent 470b48f
commit 3330d92
Show file tree

Hide file tree

Showing 18 changed files with 34 additions and 67 deletions.
diff --git a/tests/.eslintrc.js b/tests/.eslintrc.js
diff --git a/tests/count.js b/tests/count.js
@@ -1,10 +1,10 @@
 import Trilogy from '../dist/trilogy'
 
 import test from 'ava'
-import { basename } from 'path'
 import { remove } from 'fs-jetpack'
+import { join, basename } from 'path'
 
-const filePath = `${basename(__filename, '.js')}.db`
+const filePath = join(__dirname, `${basename(__filename, '.js')}.db`)
 const db = new Trilogy(filePath)
 
 const people = [

diff --git a/tests/decrement.js b/tests/decrement.js
@@ -1,10 +1,10 @@
 import Trilogy from '../dist/trilogy'
 
 import test from 'ava'
-import { basename } from 'path'
 import { remove } from 'fs-jetpack'
+import { join, basename } from 'path'
 
-const filePath = `${basename(__filename, '.js')}.db`
+const filePath = join(__dirname, `${basename(__filename, '.js')}.db`)
 const db = new Trilogy(filePath)
 
 const people = [

diff --git a/tests/deletions.js b/tests/deletions.js
@@ -1,10 +1,10 @@
 import Trilogy from '../dist/trilogy'
 
 import test from 'ava'
-import { basename } from 'path'
 import { remove } from 'fs-jetpack'
+import { join, basename } from 'path'
 
-const filePath = `${basename(__filename, '.js')}.db`
+const filePath = join(__dirname, `${basename(__filename, '.js')}.db`)
 const db = new Trilogy(filePath)
 
 const somePeople = [
@@ -43,7 +43,7 @@ test.serial('removes all rows from the specified table', async t => {
   await db.del('people')
 
   morePeople.forEach(async ({ name }) => {
-    const res = await db.first('people', { name })
+    let res = await db.first('people', { name })
     t.falsy(res)
   })
 })
diff --git a/tests/drop-table.js b/tests/drop-table.js
@@ -1,10 +1,10 @@
 import Trilogy from '../dist/trilogy'
 
 import test from 'ava'
-import { basename } from 'path'
 import { remove } from 'fs-jetpack'
+import { join, basename } from 'path'
 
-const filePath = `${basename(__filename, '.js')}.db`
+const filePath = join(__dirname, `${basename(__filename, '.js')}.db`)
 const db = new Trilogy(filePath)
 
 const columns = ['name']

diff --git a/tests/existing-file.db b/tests/existing-file.db
diff --git a/tests/existing-file.js b/tests/existing-file.js
@@ -1,9 +1,9 @@
 import Trilogy from '../dist/trilogy'
 
 import test from 'ava'
-import { basename } from 'path'
+import { join, basename } from 'path'
 
-const filePath = `${basename(__filename, '.js')}.db`
+const filePath = join(__dirname, `${basename(__filename, '.js')}.db`)
 const db = new Trilogy(filePath)
 
 test.before('insert default data', async () => {

diff --git a/tests/file-creation.js b/tests/file-creation.js
@@ -1,12 +1,10 @@
 import Trilogy from '../dist/trilogy'
 
 import test from 'ava'
-import { join, basename, dirname } from 'path'
+import { join, basename } from 'path'
 import { exists, remove } from 'fs-jetpack'
 
-const directory = dirname(__filename)
-const fileName = `${basename(__filename, '.js')}.db`
-const filePath = join(directory, fileName)
+const filePath = join(__dirname, `${basename(__filename, '.js')}.db`)
 
 test.after.always('remove test database file', () => remove(filePath))
 
@@ -15,7 +13,7 @@ test('throws if no file path is provided', t => {
 })
 
 test('successfully creates a new file', t => {
-  const db = new Trilogy(filePath)
+  let db = new Trilogy(filePath)
   t.is(exists(filePath), 'file')
   t.is(db.path, filePath)
 })
diff --git a/tests/first.js b/tests/first.js
@@ -1,10 +1,10 @@
 import Trilogy from '../dist/trilogy'
 
 import test from 'ava'
-import { basename } from 'path'
 import { remove } from 'fs-jetpack'
+import { join, basename } from 'path'
 
-const filePath = `${basename(__filename, '.js')}.db`
+const filePath = join(__dirname, `${basename(__filename, '.js')}.db`)
 const db = new Trilogy(filePath)
 
 test.before(async () => {

diff --git a/tests/get-value.js b/tests/get-value.js
@@ -1,10 +1,10 @@
 import Trilogy from '../dist/trilogy'
 
 import test from 'ava'
-import { basename } from 'path'
 import { remove } from 'fs-jetpack'
+import { join, basename } from 'path'
 
-const filePath = `${basename(__filename, '.js')}.db`
+const filePath = join(__dirname, `${basename(__filename, '.js')}.db`)
 const db = new Trilogy(filePath)
 
 test.before(async () => {

diff --git a/tests/has-table.js b/tests/has-table.js
@@ -1,10 +1,10 @@
 import Trilogy from '../dist/trilogy'
 
 import test from 'ava'
-import { basename } from 'path'
 import { remove } from 'fs-jetpack'
+import { join, basename } from 'path'
 
-const filePath = `${basename(__filename, '.js')}.db`
+const filePath = join(__dirname, `${basename(__filename, '.js')}.db`)
 const db = new Trilogy(filePath)
 
 const columns = ['name']

diff --git a/tests/increment.js b/tests/increment.js
@@ -1,10 +1,10 @@
 import Trilogy from '../dist/trilogy'
 
 import test from 'ava'
-import { basename } from 'path'
 import { remove } from 'fs-jetpack'
+import { join, basename } from 'path'
 
-const filePath = `${basename(__filename, '.js')}.db`
+const filePath = join(__dirname, `${basename(__filename, '.js')}.db`)
 const db = new Trilogy(filePath)
 
 const people = [

diff --git a/tests/inserts.js b/tests/inserts.js
@@ -1,10 +1,10 @@
 import Trilogy from '../dist/trilogy'
 
 import test from 'ava'
-import { basename } from 'path'
 import { remove } from 'fs-jetpack'
+import { join, basename } from 'path'
 
-const filePath = `${basename(__filename, '.js')}.db`
+const filePath = join(__dirname, `${basename(__filename, '.js')}.db`)
 const db = new Trilogy(filePath)
 
 const columns = [

diff --git a/tests/issues/boolean-to-string.js b/tests/issues/boolean-to-string.js
@@ -1,10 +1,10 @@
 import Trilogy from '../../dist/trilogy'
 
 import test from 'ava'
-import { basename } from 'path'
 import { remove } from 'fs-jetpack'
+import { join, basename } from 'path'
 
-const filePath = `${basename(__filename, '.js')}.db`
+const filePath = join(__dirname, `${basename(__filename, '.js')}.db`)
 const db = new Trilogy(filePath)
 
 test.before(async () => {

diff --git a/tests/knex-builders.js b/tests/knex-builders.js
@@ -1,10 +1,10 @@
 import Trilogy from '../dist/trilogy'
 
 import test from 'ava'
-import { basename } from 'path'
 import { remove } from 'fs-jetpack'
+import { join, basename } from 'path'
 
-const filePath = `${basename(__filename, '.js')}.db`
+const filePath = join(__dirname, `${basename(__filename, '.js')}.db`)
 const db = new Trilogy(filePath)
 
 test.after.always('remove test database file', () => remove(filePath))

diff --git a/tests/select.js b/tests/select.js
@@ -1,10 +1,10 @@
 import Trilogy from '../dist/trilogy'
 
 import test from 'ava'
-import { basename } from 'path'
 import { remove } from 'fs-jetpack'
+import { join, basename } from 'path'
 
-const filePath = `${basename(__filename, '.js')}.db`
+const filePath = join(__dirname, `${basename(__filename, '.js')}.db`)
 const db = new Trilogy(filePath)
 
 const arr = ['fee', 'fi', 'fo', 'fum']

diff --git a/tests/table-creation.js b/tests/table-creation.js
@@ -1,10 +1,10 @@
 import Trilogy from '../dist/trilogy'
 
 import test from 'ava'
-import { basename } from 'path'
 import { remove } from 'fs-jetpack'
+import { join, basename } from 'path'
 
-const filePath = `${basename(__filename, '.js')}.db`
+const filePath = join(__dirname, `${basename(__filename, '.js')}.db`)
 const db = new Trilogy(filePath)
 
 test.after.always('remove test database file', () => remove(filePath))

diff --git a/tests/updates.js b/tests/updates.js
@@ -1,10 +1,10 @@
 import Trilogy from '../dist/trilogy'
 
 import test from 'ava'
-import { basename } from 'path'
 import { remove } from 'fs-jetpack'
+import { join, basename } from 'path'
 
-const filePath = `${basename(__filename, '.js')}.db`
+const filePath = join(__dirname, `${basename(__filename, '.js')}.db`)
 const db = new Trilogy(filePath)
 
 test.before(async () => {