From 2623649c5d426180c59b59847bf47f4cb8040918 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Thu, 21 Dec 2017 00:46:52 +0100 Subject: [PATCH] Tried to re-add teardown and updated it to drop only tables that are in the database. Crossing fingers for a second pass. --- seasoned_api/src/database/schemas/teardown.sql | 3 +-- seasoned_api/test/helpers/resetDatabase.js | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/seasoned_api/src/database/schemas/teardown.sql b/seasoned_api/src/database/schemas/teardown.sql index ebc1ac9..750cbab 100644 --- a/seasoned_api/src/database/schemas/teardown.sql +++ b/seasoned_api/src/database/schemas/teardown.sql @@ -1,4 +1,3 @@ DROP TABLE IF EXISTS user; DROP TABLE IF EXISTS search_history; -DROP TABLE IF EXISTS list; -DROP TABLE IF EXISTS list_content; +DROP TABLE IF EXISTS requests; diff --git a/seasoned_api/test/helpers/resetDatabase.js b/seasoned_api/test/helpers/resetDatabase.js index 8fd83a7..06a5152 100644 --- a/seasoned_api/test/helpers/resetDatabase.js +++ b/seasoned_api/test/helpers/resetDatabase.js @@ -3,7 +3,8 @@ const SqliteDatabase = require('src/database/sqliteDatabase'); function resetDatabase() { const database = new SqliteDatabase(':memory:'); return Promise.resolve() - .then(() => database.connect()) + .then(() => database.connect()); + .then(() => database.tearDown()); .then(() => database.setUp()); }