From 9708a6cff96e99b09a0c7b629694a957ec313277 Mon Sep 17 00:00:00 2001 From: Kevin Midboe Date: Sat, 20 Aug 2022 13:01:02 +0200 Subject: [PATCH] Updated all import statements to be relative --- tests/helpers/createCacheEntry.js | 3 +-- tests/helpers/createToken.js | 4 ++-- tests/helpers/createUser.js | 4 ++-- .../asADeveloperIWantTheServerToRegister.js | 8 ++++---- .../asADeveloperIWantTheServerToStart.js | 3 ++- tests/system/asADeveloperIWantToLogin.js | 10 +++++----- ...WantAForbiddenErrorIfTheTokenIsMalformed.js | 8 ++++---- ...oGetErrorWhenRegisteringExistingUsername.js | 10 +++++----- tests/system/asAUserIWantToGetPopularMovies.js | 12 ++++++------ tests/system/asAUserIWantToGetPopularShows.js | 18 +++++++++--------- tests/system/asAUserIWantToRequestAMovie.js | 14 +++++++------- .../asAnAnonymousUserIWantToSearchForAMovie.js | 10 +++++----- tests/unit/config/testConfig.js | 4 ++-- tests/unit/config/testField.js | 4 ++-- tests/unit/config/testFilters.js | 4 ++-- tests/unit/tmdb/testConvertTmdbToMovie.js | 6 +++--- tests/unit/tmdb/testTmdb.disabled | 6 +++--- 17 files changed, 64 insertions(+), 64 deletions(-) diff --git a/tests/helpers/createCacheEntry.js b/tests/helpers/createCacheEntry.js index 4a9f8b8..f415c04 100644 --- a/tests/helpers/createCacheEntry.js +++ b/tests/helpers/createCacheEntry.js @@ -1,5 +1,4 @@ -const Cache = require('src/tmdb/cache'); -const SqliteDatabase = require('src/database/sqliteDatabase'); +const Cache = require("../../src/tmdb/cache"); function createCacheEntry(key, value) { const cache = new Cache(); diff --git a/tests/helpers/createToken.js b/tests/helpers/createToken.js index 0435968..6b4485d 100644 --- a/tests/helpers/createToken.js +++ b/tests/helpers/createToken.js @@ -1,5 +1,5 @@ -const User = require('src/user/user'); -const Token = require('src/user/token'); +const User = require("../../src/user/user"); +const Token = require("../../src/user/token"); function createToken(username, secret) { const user = new User(username); diff --git a/tests/helpers/createUser.js b/tests/helpers/createUser.js index a22f2a4..eebb5f9 100644 --- a/tests/helpers/createUser.js +++ b/tests/helpers/createUser.js @@ -1,5 +1,5 @@ -const User = require('src/user/user'); -const UserSecurity = require('src/user/userSecurity'); +const User = require("../../src/user/user"); +const UserSecurity = require("../../src/user/userSecurity"); function createUser(username, password) { const userSecurity = new UserSecurity(); diff --git a/tests/system/asADeveloperIWantTheServerToRegister.js b/tests/system/asADeveloperIWantTheServerToRegister.js index 6b0a60a..21f1ad0 100644 --- a/tests/system/asADeveloperIWantTheServerToRegister.js +++ b/tests/system/asADeveloperIWantTheServerToRegister.js @@ -1,7 +1,7 @@ -const assert = require('assert'); -const request = require('supertest-as-promised'); -const app = require('src/webserver/app'); -const resetDatabase = require('test/helpers/resetDatabase'); +const assert = require("assert"); +const request = require("supertest-as-promised"); +const app = require("../../src/webserver/app"); +const resetDatabase = require("../helpers/resetDatabase"); describe('As a user I want to register', () => { before(() => resetDatabase()); diff --git a/tests/system/asADeveloperIWantTheServerToStart.js b/tests/system/asADeveloperIWantTheServerToStart.js index f0819a7..1a7a911 100644 --- a/tests/system/asADeveloperIWantTheServerToStart.js +++ b/tests/system/asADeveloperIWantTheServerToStart.js @@ -1,5 +1,6 @@ /* eslint-disable no-return-assign */ -const net = require('net'); +const net = require("net"); +const server = require("../../src/webserver/server"); xdescribe('As a developer I want the server to start', () => { beforeEach(() => diff --git a/tests/system/asADeveloperIWantToLogin.js b/tests/system/asADeveloperIWantToLogin.js index c769c29..75d2060 100644 --- a/tests/system/asADeveloperIWantToLogin.js +++ b/tests/system/asADeveloperIWantToLogin.js @@ -1,8 +1,8 @@ -const assert = require('assert'); -const request = require('supertest-as-promised'); -const app = require('src/webserver/app'); -const createUser = require('test/helpers/createUser'); -const resetDatabase = require('test/helpers/resetDatabase'); +const request = require("supertest-as-promised"); +const app = require("../../src/webserver/app"); +const createUser = require("../helpers/createUser"); +const resetDatabase = require("../helpers/resetDatabase"); +// const assert = require("assert"); describe('As a user I want to log in', () => { before(() => { diff --git a/tests/system/asAUserIWantAForbiddenErrorIfTheTokenIsMalformed.js b/tests/system/asAUserIWantAForbiddenErrorIfTheTokenIsMalformed.js index df637bd..2da1008 100644 --- a/tests/system/asAUserIWantAForbiddenErrorIfTheTokenIsMalformed.js +++ b/tests/system/asAUserIWantAForbiddenErrorIfTheTokenIsMalformed.js @@ -1,7 +1,7 @@ -const assert = require('assert'); -const resetDatabase = require('test/helpers/resetDatabase'); -const app = require('src/webserver/app'); -const request = require('supertest-as-promised'); +const request = require("supertest-as-promised"); +const app = require("../../src/webserver/app"); +const resetDatabase = require("../helpers/resetDatabase"); +// const assert = require("assert"); describe('As a user I want a forbidden error if the token is malformed', () => { before(() => resetDatabase()); diff --git a/tests/system/asAUserIWantToGetErrorWhenRegisteringExistingUsername.js b/tests/system/asAUserIWantToGetErrorWhenRegisteringExistingUsername.js index 9eab046..390416f 100644 --- a/tests/system/asAUserIWantToGetErrorWhenRegisteringExistingUsername.js +++ b/tests/system/asAUserIWantToGetErrorWhenRegisteringExistingUsername.js @@ -1,8 +1,8 @@ -const assert = require('assert'); -const request = require('supertest-as-promised'); -const app = require('src/webserver/app'); -const createUser = require('test/helpers/createUser'); -const resetDatabase = require('test/helpers/resetDatabase'); +const assert = require("assert"); +const request = require("supertest-as-promised"); +const app = require("../../src/webserver/app"); +const createUser = require("../helpers/createUser"); +const resetDatabase = require("../helpers/resetDatabase"); describe('As a user I want error when registering existing username', () => { before(() => { diff --git a/tests/system/asAUserIWantToGetPopularMovies.js b/tests/system/asAUserIWantToGetPopularMovies.js index 501f97c..d5975ae 100644 --- a/tests/system/asAUserIWantToGetPopularMovies.js +++ b/tests/system/asAUserIWantToGetPopularMovies.js @@ -1,9 +1,9 @@ -const assert = require('assert'); -const createCacheEntry = require('test/helpers/createCacheEntry'); -const resetDatabase = require('test/helpers/resetDatabase'); -const request = require('supertest-as-promised'); -const app = require('src/webserver/app'); -const popularMoviesSuccess = require('test/fixtures/popular-movies-success-response.json'); +const assert = require("assert"); +const request = require("supertest-as-promised"); +const app = require("../../src/webserver/app"); +const resetDatabase = require("../helpers/resetDatabase"); +const createCacheEntry = require("../helpers/createCacheEntry"); +const popularMoviesSuccess = require("../fixtures/popular-movies-success-response.json"); describe('As a user I want to get popular movies', () => { before(() => resetDatabase()); diff --git a/tests/system/asAUserIWantToGetPopularShows.js b/tests/system/asAUserIWantToGetPopularShows.js index 375c95a..b291f3e 100644 --- a/tests/system/asAUserIWantToGetPopularShows.js +++ b/tests/system/asAUserIWantToGetPopularShows.js @@ -1,13 +1,13 @@ -const assert = require('assert'); -const createCacheEntry = require('test/helpers/createCacheEntry'); -const resetDatabase = require('test/helpers/resetDatabase'); -const request = require('supertest-as-promised'); -const app = require('src/webserver/app'); -const popularShowsSuccess = require('test/fixtures/popular-show-success-response.json'); +const assert = require("assert"); +// const request = require("supertest-as-promised"); +const chai = require("chai"); +const chaiHttp = require("chai-http"); +const server = require("../../src/webserver/server"); -describe('As a user I want to get popular shows', () => { - before(() => resetDatabase()); - before(() => createCacheEntry('pt:1', popularShowsSuccess)); +const resetDatabase = require("../helpers/resetDatabase"); +const createCacheEntry = require("../helpers/createCacheEntry"); +const popularShowsSuccess = require("../fixtures/popular-show-success-response.json"); +const should = chai.should(); it('should return 200 with the information', () => request(app) diff --git a/tests/system/asAUserIWantToRequestAMovie.js b/tests/system/asAUserIWantToRequestAMovie.js index 146eca8..4d4688d 100644 --- a/tests/system/asAUserIWantToRequestAMovie.js +++ b/tests/system/asAUserIWantToRequestAMovie.js @@ -1,10 +1,10 @@ -const resetDatabase = require('test/helpers/resetDatabase'); -const createCacheEntry = require('test/helpers/createCacheEntry'); -const app = require('src/webserver/app'); -const request = require('supertest-as-promised'); -const createUser = require('test/helpers/createUser'); -const createToken = require('test/helpers/createToken'); -const infoMovieSuccess = require('test/fixtures/blade_runner_2049-info-success-response.json'); +const request = require("supertest-as-promised"); +const app = require("../../src/webserver/app"); +const createUser = require("../helpers/createUser"); +const createToken = require("../helpers/createToken"); +const resetDatabase = require("../helpers/resetDatabase"); +const createCacheEntry = require("../helpers/createCacheEntry"); +const infoMovieSuccess = require("../fixtures/blade_runner_2049-info-success-response.json"); describe('As a user I want to request a movie', () => { before(async () => { diff --git a/tests/system/asAnAnonymousUserIWantToSearchForAMovie.js b/tests/system/asAnAnonymousUserIWantToSearchForAMovie.js index 788e35b..318c12d 100644 --- a/tests/system/asAnAnonymousUserIWantToSearchForAMovie.js +++ b/tests/system/asAnAnonymousUserIWantToSearchForAMovie.js @@ -1,8 +1,8 @@ -const createCacheEntry = require('test/helpers/createCacheEntry'); -const resetDatabase = require('test/helpers/resetDatabase'); -const request = require('supertest-as-promised'); -const app = require('src/webserver/app'); -const interstellarQuerySuccess = require('test/fixtures/interstellar-query-movie-success-response.json'); +const request = require("supertest-as-promised"); +const app = require("../../src/webserver/app"); +const resetDatabase = require("../helpers/resetDatabase"); +const createCacheEntry = require("../helpers/createCacheEntry"); +const interstellarQuerySuccess = require("../fixtures/interstellar-query-movie-success-response.json"); describe('As an anonymous user I want to search for a movie', () => { before(() => resetDatabase()); diff --git a/tests/unit/config/testConfig.js b/tests/unit/config/testConfig.js index 8b08e40..1af8403 100644 --- a/tests/unit/config/testConfig.js +++ b/tests/unit/config/testConfig.js @@ -1,5 +1,5 @@ -const assert = require('assert'); -const Config = require('src/config/configuration.js'); +const assert = require("assert"); +const Config = require("../../../src/config/configuration"); describe('Config', () => { before(() => { diff --git a/tests/unit/config/testField.js b/tests/unit/config/testField.js index a0449dc..a7f1d9e 100644 --- a/tests/unit/config/testField.js +++ b/tests/unit/config/testField.js @@ -1,5 +1,5 @@ -const assert = require('assert'); -const Field = require('src/config/field.js'); +const assert = require("assert"); +const Field = require("../../../src/config/field"); describe('Field', () => { it('should return an array if it is an array', () => { diff --git a/tests/unit/config/testFilters.js b/tests/unit/config/testFilters.js index 1218f0d..c7bf078 100644 --- a/tests/unit/config/testFilters.js +++ b/tests/unit/config/testFilters.js @@ -1,5 +1,5 @@ -const assert = require('assert'); -const Filters = require('src/config/filters.js'); +const assert = require("assert"); +const Filters = require("../../../src/config/filters"); describe('Filters', () => { it('should extract base64 as filter if it is at start of string followed by pipe', () => { diff --git a/tests/unit/tmdb/testConvertTmdbToMovie.js b/tests/unit/tmdb/testConvertTmdbToMovie.js index 2ae569c..3cdf694 100644 --- a/tests/unit/tmdb/testConvertTmdbToMovie.js +++ b/tests/unit/tmdb/testConvertTmdbToMovie.js @@ -1,7 +1,7 @@ -const assert = require('assert'); +const assert = require("assert"); // const convertTmdbToMovie = require('src/tmdb/convertTmdbToMovie'); -const { Movie } = require('src/tmdb/types'); -const bladeRunnerQuerySuccess = require('test/fixtures/blade_runner_2049-info-success-response.json') +const { Movie } = require("../../../src/tmdb/types"); +const bladeRunnerQuerySuccess = require("../../fixtures/blade_runner_2049-info-success-response.json"); describe('Convert tmdb movieInfo to movie', () => { beforeEach(() => [this.bladeRunnerTmdbMovie] = bladeRunnerQuerySuccess); diff --git a/tests/unit/tmdb/testTmdb.disabled b/tests/unit/tmdb/testTmdb.disabled index 703f9ae..0e6f5ae 100644 --- a/tests/unit/tmdb/testTmdb.disabled +++ b/tests/unit/tmdb/testTmdb.disabled @@ -5,9 +5,9 @@ const Cache = require('src/tmdb/cache'); const SqliteDatabase = require('src/database/sqliteDatabase'); const tmdbMock = require('test/helpers/tmdbMock'); -const emptyQuerySuccess = require('test/fixtures/empty-query-success-response.json'); -const interstellarQuerySuccess = require('test/fixtures/arrival-info-success-response.json'); -const popularMovieSuccessResponse = require('test/fixtures/popular-movies-success-response.json'); +const emptyQuerySuccess = require('tests/fixtures/empty-query-success-response.json'); +const interstellarQuerySuccess = require('tests/fixtures/arrival-info-success-response.json'); +const popularMovieSuccessResponse = require('tests/fixtures/popular-movies-success-response.json'); describe('TMDB', function test() { beforeEach(() => {