Testing #90

Merged
KevinMidboe merged 9 commits from testing into master 2018-03-19 15:28:45 +00:00
3 changed files with 11 additions and 15 deletions
Showing only changes of commit e27d5c7084 - Show all commits

View File

@@ -2,8 +2,7 @@ const Cache = require('src/tmdb/cache');
const SqliteDatabase = require('src/database/sqliteDatabase');
function createCacheEntry(key, value) {
const database = new SqliteDatabase(':memory:');
const cache = new Cache(database);
const cache = new Cache();
return cache.set(key, value);
}

View File

@@ -1,12 +1,11 @@
const User = require('src/user/user');
const UserSecurity = require('src/user/userSecurity');
const SqliteDatabase = require('src/database/sqliteDatabase');
function createUser(username, email, password) {
const database = new SqliteDatabase(':memory:');
const userSecurity = new UserSecurity(database);
const user = new User(username, email);
return userSecurity.createNewUser(user, password);
function createUser(username, password) {
const userSecurity = new UserSecurity();
const user = new User(username)
return Promise.resolve(userSecurity.createNewUser(user, password))
}
module.exports = createUser;

View File

@@ -1,11 +1,9 @@
const SqliteDatabase = require('src/database/sqliteDatabase');
const establishedDatabase = require('src/database/database');
function resetDatabase() {
const database = new SqliteDatabase(':memory:');
return Promise.resolve()
.then(() => database.connect())
// .then(() => database.tearDown())
.then(() => database.setUp());
function resetDatabase() {
return Promise.resolve()
.then(() => establishedDatabase.tearDown())
.then(() => establishedDatabase.setUp())
}
module.exports = resetDatabase;