From b4833a9dce76b3f8c0b77c8a35870bb0f77d9973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raimund=20Schl=C3=BC=C3=9Fler?= Date: Sun, 27 Oct 2019 20:39:24 +0100 Subject: [PATCH] =?UTF-8?q?Sort=20tests=20in=20javascript=20and=20php=20fo?= =?UTF-8?q?lders=20Signed-off-by:=20Raimund=20Schl=C3=BC=C3=9Fler=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raimund Schlüßler --- phpunit.integration.xml | 4 ++-- phpunit.xml | 4 ++-- tests/{ => javascript/unit}/OC.js | 0 tests/{ => javascript/unit}/components/Colorpicker.spec.js | 0 tests/{ => javascript/unit}/models/task.spec.js | 2 +- tests/{ => javascript/unit}/setup.js | 0 tests/{ => javascript/unit}/store/storeHelper.spec.js | 2 +- tests/{ => php}/bootstrap.php | 2 +- tests/{ => php}/integration/AppInfo/ApplicationTest.php | 0 tests/{ => php}/unit/Controller/CollectionsControllerTest.php | 0 tests/{ => php}/unit/Controller/PageControllerTest.php | 0 tests/{ => php}/unit/Controller/SettingsControllerTest.php | 0 tests/{ => php}/unit/Service/CollectionsServiceTest.php | 0 tests/{ => php}/unit/Service/SettingsServiceTest.php | 0 14 files changed, 7 insertions(+), 7 deletions(-) rename tests/{ => javascript/unit}/OC.js (100%) rename tests/{ => javascript/unit}/components/Colorpicker.spec.js (100%) rename tests/{ => javascript/unit}/models/task.spec.js (98%) rename tests/{ => javascript/unit}/setup.js (100%) rename tests/{ => javascript/unit}/store/storeHelper.spec.js (94%) rename tests/{ => php}/bootstrap.php (80%) rename tests/{ => php}/integration/AppInfo/ApplicationTest.php (100%) rename tests/{ => php}/unit/Controller/CollectionsControllerTest.php (100%) rename tests/{ => php}/unit/Controller/PageControllerTest.php (100%) rename tests/{ => php}/unit/Controller/SettingsControllerTest.php (100%) rename tests/{ => php}/unit/Service/CollectionsServiceTest.php (100%) rename tests/{ => php}/unit/Service/SettingsServiceTest.php (100%) diff --git a/phpunit.integration.xml b/phpunit.integration.xml index ac69de4c..91feb33c 100644 --- a/phpunit.integration.xml +++ b/phpunit.integration.xml @@ -1,12 +1,12 @@ - - ./tests/integration + ./tests/php/integration diff --git a/phpunit.xml b/phpunit.xml index 9b7e0f35..4a531f33 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,12 +1,12 @@ - - ./tests/unit + ./tests/php/unit diff --git a/tests/OC.js b/tests/javascript/unit/OC.js similarity index 100% rename from tests/OC.js rename to tests/javascript/unit/OC.js diff --git a/tests/components/Colorpicker.spec.js b/tests/javascript/unit/components/Colorpicker.spec.js similarity index 100% rename from tests/components/Colorpicker.spec.js rename to tests/javascript/unit/components/Colorpicker.spec.js diff --git a/tests/models/task.spec.js b/tests/javascript/unit/models/task.spec.js similarity index 98% rename from tests/models/task.spec.js rename to tests/javascript/unit/models/task.spec.js index 5f93f9e1..e3bbd717 100644 --- a/tests/models/task.spec.js +++ b/tests/javascript/unit/models/task.spec.js @@ -1,4 +1,4 @@ -import Task from '../../src/models/task' +import Task from '../../../../src/models/task' describe('task', () => { 'use strict' diff --git a/tests/setup.js b/tests/javascript/unit/setup.js similarity index 100% rename from tests/setup.js rename to tests/javascript/unit/setup.js diff --git a/tests/store/storeHelper.spec.js b/tests/javascript/unit/store/storeHelper.spec.js similarity index 94% rename from tests/store/storeHelper.spec.js rename to tests/javascript/unit/store/storeHelper.spec.js index 57131907..39c7a9f2 100644 --- a/tests/store/storeHelper.spec.js +++ b/tests/javascript/unit/store/storeHelper.spec.js @@ -1,6 +1,6 @@ import moment from 'moment' import MockDate from 'mockdate' -import { sort } from '../../src/store/storeHelper' +import { sort } from '../../../../src/store/storeHelper' global.moment = moment diff --git a/tests/bootstrap.php b/tests/php/bootstrap.php similarity index 80% rename from tests/bootstrap.php rename to tests/php/bootstrap.php index eb3bddc9..67c4d759 100644 --- a/tests/bootstrap.php +++ b/tests/php/bootstrap.php @@ -9,4 +9,4 @@ * @copyright Bernhard Posselt 2016 */ -require_once __DIR__ . '/../../../tests/bootstrap.php'; +require_once __DIR__ . '/../../../../tests/bootstrap.php'; diff --git a/tests/integration/AppInfo/ApplicationTest.php b/tests/php/integration/AppInfo/ApplicationTest.php similarity index 100% rename from tests/integration/AppInfo/ApplicationTest.php rename to tests/php/integration/AppInfo/ApplicationTest.php diff --git a/tests/unit/Controller/CollectionsControllerTest.php b/tests/php/unit/Controller/CollectionsControllerTest.php similarity index 100% rename from tests/unit/Controller/CollectionsControllerTest.php rename to tests/php/unit/Controller/CollectionsControllerTest.php diff --git a/tests/unit/Controller/PageControllerTest.php b/tests/php/unit/Controller/PageControllerTest.php similarity index 100% rename from tests/unit/Controller/PageControllerTest.php rename to tests/php/unit/Controller/PageControllerTest.php diff --git a/tests/unit/Controller/SettingsControllerTest.php b/tests/php/unit/Controller/SettingsControllerTest.php similarity index 100% rename from tests/unit/Controller/SettingsControllerTest.php rename to tests/php/unit/Controller/SettingsControllerTest.php diff --git a/tests/unit/Service/CollectionsServiceTest.php b/tests/php/unit/Service/CollectionsServiceTest.php similarity index 100% rename from tests/unit/Service/CollectionsServiceTest.php rename to tests/php/unit/Service/CollectionsServiceTest.php diff --git a/tests/unit/Service/SettingsServiceTest.php b/tests/php/unit/Service/SettingsServiceTest.php similarity index 100% rename from tests/unit/Service/SettingsServiceTest.php rename to tests/php/unit/Service/SettingsServiceTest.php