From 60a3e680dd64b29a13ed4f09cf748cc51063d6c9 Mon Sep 17 00:00:00 2001 From: Elliot DeNolf Date: Thu, 8 Oct 2020 05:01:48 -0400 Subject: [PATCH] move tests dir to root --- jest.config.js | 4 ++-- src/auth/auth.spec.js | 2 +- src/collections/graphql/resolvers/resolvers.spec.js | 2 +- src/collections/requestHandlers/collections.spec.js | 8 ++++---- src/globals/requestHandlers/globals.spec.js | 2 +- {src/tests => tests}/api/assets/delete.png | Bin {src/tests => tests}/api/assets/image.png | Bin {src/tests => tests}/api/credentials.js | 0 {src/tests => tests}/api/globalSetup.js | 4 ++-- {src/tests => tests}/api/globalTeardown.js | 0 {src/tests => tests}/api/utils/fileExists.js | 0 11 files changed, 11 insertions(+), 11 deletions(-) rename {src/tests => tests}/api/assets/delete.png (100%) rename {src/tests => tests}/api/assets/image.png (100%) rename {src/tests => tests}/api/credentials.js (100%) rename {src/tests => tests}/api/globalSetup.js (85%) rename {src/tests => tests}/api/globalTeardown.js (100%) rename {src/tests => tests}/api/utils/fileExists.js (100%) diff --git a/jest.config.js b/jest.config.js index a634123f1..84dd2a414 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,8 +1,8 @@ module.exports = { verbose: true, testEnvironment: 'node', - globalSetup: '/src/tests/api/globalSetup.js', - globalTeardown: '/src/tests/api/globalTeardown.js', + globalSetup: '/tests/api/globalSetup.js', + globalTeardown: '/tests/api/globalTeardown.js', testPathIgnorePatterns: [ 'node_modules', 'src/client/*', diff --git a/src/auth/auth.spec.js b/src/auth/auth.spec.js index 5e6aac16a..bf61da3f0 100644 --- a/src/auth/auth.spec.js +++ b/src/auth/auth.spec.js @@ -1,6 +1,6 @@ require('isomorphic-fetch'); const faker = require('faker'); -const { email, password } = require('../tests/api/credentials'); +const { email, password } = require('../../tests/api/credentials'); /** * @jest-environment node diff --git a/src/collections/graphql/resolvers/resolvers.spec.js b/src/collections/graphql/resolvers/resolvers.spec.js index 3598f8c76..c812cfd96 100644 --- a/src/collections/graphql/resolvers/resolvers.spec.js +++ b/src/collections/graphql/resolvers/resolvers.spec.js @@ -5,7 +5,7 @@ const fetch = require('isomorphic-fetch'); const { request, GraphQLClient } = require('graphql-request'); const getConfig = require('../../../utilities/getConfig'); -const { email, password } = require('../../../tests/api/credentials'); +const { email, password } = require('../../../../tests/api/credentials'); const config = getConfig(); diff --git a/src/collections/requestHandlers/collections.spec.js b/src/collections/requestHandlers/collections.spec.js index c96bf2950..14b327666 100644 --- a/src/collections/requestHandlers/collections.spec.js +++ b/src/collections/requestHandlers/collections.spec.js @@ -8,8 +8,8 @@ require('isomorphic-fetch'); const faker = require('faker'); const FormData = require('form-data'); const getConfig = require('../../utilities/getConfig'); -const { email, password } = require('../../tests/api/credentials'); -const fileExists = require('../../tests/api/utils/fileExists'); +const { email, password } = require('../../../tests/api/credentials'); +const fileExists = require('../../../tests/api/utils/fileExists'); const { serverURL: url } = getConfig(); @@ -657,7 +657,7 @@ describe('Collections - REST', () => { it('create', async () => { const formData = new FormData(); - formData.append('file', fs.createReadStream(path.join(__dirname, '../..', 'tests/api/assets/image.png'))); + formData.append('file', fs.createReadStream(path.join(__dirname, '../../..', 'tests/api/assets/image.png'))); formData.append('alt', 'test media'); formData.append('locale', 'en'); @@ -690,7 +690,7 @@ describe('Collections - REST', () => { it('delete', async () => { const formData = new FormData(); - formData.append('file', fs.createReadStream(path.join(__dirname, '../..', 'tests/api/assets/delete.png'))); + formData.append('file', fs.createReadStream(path.join(__dirname, '../../..', 'tests/api/assets/delete.png'))); formData.append('alt', 'test media'); formData.append('locale', 'en'); diff --git a/src/globals/requestHandlers/globals.spec.js b/src/globals/requestHandlers/globals.spec.js index a8157392e..f3d4153d1 100644 --- a/src/globals/requestHandlers/globals.spec.js +++ b/src/globals/requestHandlers/globals.spec.js @@ -4,7 +4,7 @@ require('isomorphic-fetch'); const getConfig = require('../../utilities/getConfig'); -const { email, password } = require('../../tests/api/credentials'); +const { email, password } = require('../../../tests/api/credentials'); const { serverURL: url } = getConfig(); diff --git a/src/tests/api/assets/delete.png b/tests/api/assets/delete.png similarity index 100% rename from src/tests/api/assets/delete.png rename to tests/api/assets/delete.png diff --git a/src/tests/api/assets/image.png b/tests/api/assets/image.png similarity index 100% rename from src/tests/api/assets/image.png rename to tests/api/assets/image.png diff --git a/src/tests/api/credentials.js b/tests/api/credentials.js similarity index 100% rename from src/tests/api/credentials.js rename to tests/api/credentials.js diff --git a/src/tests/api/globalSetup.js b/tests/api/globalSetup.js similarity index 85% rename from src/tests/api/globalSetup.js rename to tests/api/globalSetup.js index f08c2ec7c..3e062ad15 100644 --- a/src/tests/api/globalSetup.js +++ b/tests/api/globalSetup.js @@ -1,7 +1,7 @@ require('isomorphic-fetch'); -const server = require('../../../demo/server'); -const getConfig = require('../../utilities/getConfig'); +const server = require('../../demo/server'); +const getConfig = require('../../src/utilities/getConfig'); const { email, password } = require('./credentials'); const { serverURL } = getConfig(); diff --git a/src/tests/api/globalTeardown.js b/tests/api/globalTeardown.js similarity index 100% rename from src/tests/api/globalTeardown.js rename to tests/api/globalTeardown.js diff --git a/src/tests/api/utils/fileExists.js b/tests/api/utils/fileExists.js similarity index 100% rename from src/tests/api/utils/fileExists.js rename to tests/api/utils/fileExists.js