test: fix breaking tests

adonisjs · Sep 30, 2019 · d32f9f0 · d32f9f0
1 parent 43fe9f7
commit d32f9f0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/test-helpers/index.ts b/test-helpers/index.ts
@@ -152,6 +152,7 @@ export async function resetTables () {
   await db.table('users').truncate()
   await db.table('profiles').truncate()
   await db.table('identities').truncate()
+  await db.destroy()
 }
 
 /**

diff --git a/test/database/query-client.spec.ts b/test/database/query-client.spec.ts
@@ -12,7 +12,7 @@
 import test from 'japa'
 import { Connection } from '../../src/Connection'
 import { QueryClient } from '../../src/QueryClient'
-import { getConfig, setup, cleanup, getLogger } from '../../test-helpers'
+import { getConfig, setup, cleanup, getLogger, resetTables } from '../../test-helpers'
 
 test.group('Query client', (group) => {
   group.before(async () => {
@@ -23,6 +23,10 @@ test.group('Query client', (group) => {
     await cleanup()
   })
 
+  group.afterEach(async () => {
+    await resetTables()
+  })
+
   test('get query client in dual mode', async (assert) => {
     const connection = new Connection('primary', getConfig(), getLogger())
     connection.connect()
@@ -60,6 +64,10 @@ test.group('Query client | dual mode', (group) => {
     await cleanup()
   })
 
+  group.afterEach(async () => {
+    await resetTables()
+  })
+
   test('perform select queries in dual mode', async (assert) => {
     const connection = new Connection('primary', getConfig(), getLogger())
     connection.connect()
@@ -131,6 +139,10 @@ test.group('Query client | read mode', (group) => {
     await cleanup()
   })
 
+  group.afterEach(async () => {
+    await resetTables()
+  })
+
   test('perform select queries in read mode', async (assert) => {
     const connection = new Connection('primary', getConfig(), getLogger())
     connection.connect()
@@ -194,6 +206,10 @@ test.group('Query client | write mode', (group) => {
     await cleanup()
   })
 
+  group.afterEach(async () => {
+    await resetTables()
+  })
+
   test('perform select queries in write mode', async (assert) => {
     const connection = new Connection('primary', getConfig(), getLogger())
     connection.connect()

diff --git a/test/orm/adapter.spec.ts b/test/orm/adapter.spec.ts
@@ -140,7 +140,7 @@ test.group('Adapter', (group) => {
     assert.isFalse(users[0].$isDirty)
     assert.isFalse(users[1].$isDirty)
 
-    assert.deepEqual(users[0].$attributes, { id: 1, username: 'virk' })
-    assert.deepEqual(users[1].$attributes, { id: 2, username: 'nikk' })
+    assert.deepEqual(users[0].$attributes, { id: 2, username: 'nikk' })
+    assert.deepEqual(users[1].$attributes, { id: 1, username: 'virk' })
   })
 })