move test setup files to separte dir

lbt · Dec 15, 2016 · c5a16ef · c5a16ef
1 parent 2bd4f8f
commit c5a16ef
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/test/DevicesController.test.js b/test/DevicesController.test.js
@@ -1,8 +1,8 @@
 import test from 'ava';
 import request from 'supertest-as-promised';
 import ouathClients from '../src/oauthClients.json';
-import app from './testApp';
-import settings from './settings';
+import app from './setup/testApp';
+import settings from './setup/settings';
 
 const USER_CREDENTIALS = {
   password: 'password',

diff --git a/test/UsersController.test.js b/test/UsersController.test.js
@@ -3,8 +3,8 @@ import type {  TokenObject, UserCredentials } from '../src/types';
 import test from 'ava';
 import request from 'supertest-as-promised';
 import ouathClients from '../src/oauthClients.json';
-import app from './testApp';
-import settings from './settings';
+import app from './setup/testApp';
+import settings from './setup/settings';
 
 const USER_CREDENTIALS: UserCredentials = {
   password: 'password',

diff --git a/test/WebhooksController.test.js b/test/WebhooksController.test.js
@@ -3,8 +3,8 @@ import type { Webhook, WebhookMutator } from '../src/types';
 import test from 'ava';
 import request from 'supertest-as-promised';
 import ouathClients from '../src/oauthClients.json';
-import app from './testApp';
-import settings from './settings';
+import app from './setup/testApp';
+import settings from './setup/settings';
 
 const USER_CREDENTIALS = {
   password: 'password',

diff --git a/test/DeviceServerMock.js → test/setup/DeviceServerMock.js b/test/DeviceServerMock.js → test/setup/DeviceServerMock.js
diff --git a/test/SparkCoreMock.js → test/setup/SparkCoreMock.js b/test/SparkCoreMock.js → test/setup/SparkCoreMock.js
diff --git a/test/settings.js → test/setup/settings.js b/test/settings.js → test/setup/settings.js
@@ -1,15 +1,15 @@
 // @flow
 
 import path from 'path';
-import WebhookFileRepository from '../src/lib/repository/WebhookFileRepository';
-import UsersFileRepository from '../src/lib/repository/UserFileRepository';
+import WebhookFileRepository from '../../src/lib/repository/WebhookFileRepository';
+import UsersFileRepository from '../../src/lib/repository/UserFileRepository';
 import { DeviceAttributeFileRepository, DeviceKeyFileRepository } from 'spark-protocol';
 
 export default {
   accessTokenLifetime: 7776000, // 90 days,
   baseUrl: 'http://localhost',
   coreFlashTimeout: 90000,
-  coreKeysDir: path.join(__dirname, '__test_data__/core_keys'),
+  coreKeysDir: path.join(__dirname, '../__test_data__/core_keys'),
   coreRequestTimeout: 30000,
   coreSignalTimeout: 30000,
   isCoreOnlineTimeout: 2000,
@@ -18,16 +18,16 @@ export default {
   maxHooksPerDevice: 10,
   maxHooksPerUser: 20,
   deviceAttributeRepository: new DeviceAttributeFileRepository(
-    path.join(__dirname, '__test_data__/core_keys'),
+    path.join(__dirname, '../__test_data__/core_keys'),
   ),
   deviceKeyFileRepository: new DeviceKeyFileRepository(
-    path.join(__dirname, '__test_data__/core_keys'),
+    path.join(__dirname, '../__test_data__/core_keys'),
   ),
   usersRepository: new UsersFileRepository(
-    path.join(__dirname, '__test_data__/users'),
+    path.join(__dirname, '../__test_data__/users'),
   ),
   webhookRepository: new WebhookFileRepository(
-    path.join(__dirname, '__test_data__/webhooks'),
+    path.join(__dirname, '../__test_data__/webhooks'),
   ),
 
   /**

diff --git a/test/testApp.js → test/setup/testApp.js b/test/testApp.js → test/setup/testApp.js
@@ -1,6 +1,6 @@
 // @flow
 
-import createApp from '../src/app';
+import createApp from '../../src/app';
 import settings from './settings';
 import DeviceServerMock from './DeviceServerMock';