From 85b231bc423340d5232f33b49d87dbeec3adbb96 Mon Sep 17 00:00:00 2001 From: Max Hoffmann Date: Fri, 6 Oct 2017 11:14:39 -0400 Subject: [PATCH] Restructure tests --- .eslintrc.js | 12 +++++++++++- config.json | 9 +++------ {test => scripts/test}/helper.js | 0 {test => scripts/test}/setup.js | 0 src/Draggable/tests/Draggable.test.js | 6 +++--- .../Sensors/MouseSensor/tests/MouseSensor.test.js | 4 ++-- src/Swappable/tests/Swappable.test.js | 3 ++- test/.eslintrc.js | 12 ------------ 8 files changed, 21 insertions(+), 25 deletions(-) rename {test => scripts/test}/helper.js (100%) rename {test => scripts/test}/setup.js (100%) rename test/src/sensors/mouse-sensor.test.js => src/Sensors/MouseSensor/tests/MouseSensor.test.js (98%) delete mode 100644 test/.eslintrc.js diff --git a/.eslintrc.js b/.eslintrc.js index 80abbfa..8c6775b 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -9,5 +9,15 @@ module.exports = { rules: { 'import/no-unresolved': 'off', 'import/no-extraneous-dependencies': 'off', - } + }, + globals: { + jest: false, + afterAll: false, + afterEach: false, + beforeAll: false, + beforeEach: false, + describe: false, + test: false, + expect: false, + }, }; diff --git a/config.json b/config.json index 41322af..d8ab2c1 100644 --- a/config.json +++ b/config.json @@ -1,13 +1,10 @@ { - "testMatch": [ - "/test/src/**/*.test.js", - "/src/**/*.test.js" - ], - "setupFiles": ["/test/setup.js"], + "testMatch": ["/src/**/*.test.js"], + "setupFiles": ["/scripts/test/setup.js"], "transform": {".*": "/node_modules/babel-jest"}, "moduleFileExtensions": ["js"], "collectCoverageFrom": [ "src/**/*.js" ], - "moduleDirectories": ["node_modules", "src", "test"] + "moduleDirectories": ["node_modules", "src", "scripts/test"] } diff --git a/test/helper.js b/scripts/test/helper.js similarity index 100% rename from test/helper.js rename to scripts/test/helper.js diff --git a/test/setup.js b/scripts/test/setup.js similarity index 100% rename from test/setup.js rename to scripts/test/setup.js diff --git a/src/Draggable/tests/Draggable.test.js b/src/Draggable/tests/Draggable.test.js index 5d8115b..a5e1a53 100644 --- a/src/Draggable/tests/Draggable.test.js +++ b/src/Draggable/tests/Draggable.test.js @@ -1,11 +1,11 @@ -import Draggable from 'draggable'; -import {DragStartEvent} from 'events/drag-event'; - import { createSandbox, triggerEvent, } from 'helper'; +import Draggable from './..'; +import {DragStartEvent} from './../../events/drag-event'; + const sampleMarkup = `
  • First item
  • diff --git a/test/src/sensors/mouse-sensor.test.js b/src/Sensors/MouseSensor/tests/MouseSensor.test.js similarity index 98% rename from test/src/sensors/mouse-sensor.test.js rename to src/Sensors/MouseSensor/tests/MouseSensor.test.js index b000604..03a03ff 100644 --- a/test/src/sensors/mouse-sensor.test.js +++ b/src/Sensors/MouseSensor/tests/MouseSensor.test.js @@ -1,5 +1,3 @@ -import MouseSensor from 'sensors/mouse-sensor'; - import { createSandbox, triggerEvent, @@ -9,6 +7,8 @@ import { getLastSensorEventByType, } from 'helper'; +import MouseSensor from './..'; + const sampleMarkup = `
    • First item
    • diff --git a/src/Swappable/tests/Swappable.test.js b/src/Swappable/tests/Swappable.test.js index 0112f47..30faf68 100644 --- a/src/Swappable/tests/Swappable.test.js +++ b/src/Swappable/tests/Swappable.test.js @@ -1,6 +1,7 @@ -import Swappable from 'swappable'; import {createSandbox, triggerEvent} from 'helper'; +import Swappable from './..'; + const sampleMarkup = `
      • First item
      • diff --git a/test/.eslintrc.js b/test/.eslintrc.js deleted file mode 100644 index 84ad3b2..0000000 --- a/test/.eslintrc.js +++ /dev/null @@ -1,12 +0,0 @@ -module.exports = { - globals: { - jest: false, - afterAll: false, - afterEach: false, - beforeAll: false, - beforeEach: false, - describe: false, - test: false, - expect: false, - }, -};