diff --git a/.gitignore b/.gitignore index fb4aab981..56b9aaf7d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,6 @@ composer.phar node_modules .DS_Store Thumbs.db -/tests/tmp +/tests/integration/tmp .vagrant .idea/* diff --git a/tests/Test/Concerns/CreatesForum.php b/tests/integration/CreatesForum.php similarity index 94% rename from tests/Test/Concerns/CreatesForum.php rename to tests/integration/CreatesForum.php index 643afe5b1..9d2838057 100644 --- a/tests/Test/Concerns/CreatesForum.php +++ b/tests/integration/CreatesForum.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Tests\Test\Concerns; +namespace Flarum\Tests\integration; use Flarum\Database\DatabaseMigrationRepository; use Flarum\Database\Migrator; @@ -57,9 +57,9 @@ trait CreatesForum protected function createsSite() { $paths = [ - 'base' => __DIR__.'/../../tmp', - 'public' => __DIR__.'/../../tmp/public', - 'storage' => __DIR__.'/../../tmp/storage', + 'base' => __DIR__.'/tmp', + 'public' => __DIR__.'/tmp/public', + 'storage' => __DIR__.'/tmp/storage', ]; if ($this->isInstalled) { diff --git a/tests/Test/Concerns/MakesApiRequests.php b/tests/integration/MakesApiRequests.php similarity index 94% rename from tests/Test/Concerns/MakesApiRequests.php rename to tests/integration/MakesApiRequests.php index c7f165d97..7bbfc2ee3 100644 --- a/tests/Test/Concerns/MakesApiRequests.php +++ b/tests/integration/MakesApiRequests.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Tests\Test\Concerns; +namespace Flarum\Tests\integration; use Flarum\Api\Client; use Flarum\User\Guest; diff --git a/tests/Test/Concerns/ManagesContent.php b/tests/integration/ManagesContent.php similarity index 96% rename from tests/Test/Concerns/ManagesContent.php rename to tests/integration/ManagesContent.php index 80437c7fc..2be3562ae 100644 --- a/tests/Test/Concerns/ManagesContent.php +++ b/tests/integration/ManagesContent.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Tests\Test\Concerns; +namespace Flarum\Tests\integration; use Flarum\Post\CommentPost; use Flarum\Post\Event\Posted; diff --git a/tests/Test/Concerns/RetrievesAuthorizedUsers.php b/tests/integration/RetrievesAuthorizedUsers.php similarity index 95% rename from tests/Test/Concerns/RetrievesAuthorizedUsers.php rename to tests/integration/RetrievesAuthorizedUsers.php index 07f33b693..31b685a9a 100644 --- a/tests/Test/Concerns/RetrievesAuthorizedUsers.php +++ b/tests/integration/RetrievesAuthorizedUsers.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Tests\Test\Concerns; +namespace Flarum\Tests\integration; use Flarum\User\User; diff --git a/tests/Test/TestCase.php b/tests/integration/TestCase.php similarity index 84% rename from tests/Test/TestCase.php rename to tests/integration/TestCase.php index 21dbfff7b..b313f533e 100644 --- a/tests/Test/TestCase.php +++ b/tests/integration/TestCase.php @@ -9,14 +9,14 @@ * file that was distributed with this source code. */ -namespace Flarum\Tests\Test; +namespace Flarum\Tests\integration; use PHPUnit\Framework\TestCase as Test; abstract class TestCase extends Test { - use Concerns\CreatesForum, - Concerns\MakesApiRequests; + use CreatesForum, + MakesApiRequests; public function setUp() { diff --git a/tests/Api/Auth/AuthenticateWithApiKeyTest.php b/tests/integration/api/Auth/AuthenticateWithApiKeyTest.php similarity index 96% rename from tests/Api/Auth/AuthenticateWithApiKeyTest.php rename to tests/integration/api/Auth/AuthenticateWithApiKeyTest.php index 0d2f179a5..a2463b58c 100644 --- a/tests/Api/Auth/AuthenticateWithApiKeyTest.php +++ b/tests/integration/api/Auth/AuthenticateWithApiKeyTest.php @@ -9,13 +9,13 @@ * file that was distributed with this source code. */ -namespace Flarum\Tests\Api\Auth; +namespace Flarum\Tests\integration\api\Auth; use Carbon\Carbon; use Flarum\Api\ApiKey; use Flarum\Api\Controller\CreateGroupController; -use Flarum\Tests\Test\Concerns\RetrievesAuthorizedUsers; -use Flarum\Tests\Test\TestCase; +use Flarum\Tests\integration\RetrievesAuthorizedUsers; +use Flarum\Tests\integration\TestCase; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\MiddlewareInterface; diff --git a/tests/Api/Controller/ApiControllerTestCase.php b/tests/integration/api/Controller/ApiControllerTestCase.php similarity index 88% rename from tests/Api/Controller/ApiControllerTestCase.php rename to tests/integration/api/Controller/ApiControllerTestCase.php index 6e3028d1a..d00446db1 100644 --- a/tests/Api/Controller/ApiControllerTestCase.php +++ b/tests/integration/api/Controller/ApiControllerTestCase.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Flarum\Tests\Api\Controller; +namespace Flarum\Tests\integration\api\Controller; -use Flarum\Tests\Test\Concerns\RetrievesAuthorizedUsers; -use Flarum\Tests\Test\TestCase; +use Flarum\Tests\integration\RetrievesAuthorizedUsers; +use Flarum\Tests\integration\TestCase; use Flarum\User\User; use Illuminate\Support\Arr; use Psr\Http\Message\ResponseInterface; diff --git a/tests/Api/Controller/CreateDiscussionControllerTest.php b/tests/integration/api/Controller/CreateDiscussionControllerTest.php similarity index 97% rename from tests/Api/Controller/CreateDiscussionControllerTest.php rename to tests/integration/api/Controller/CreateDiscussionControllerTest.php index 9fdfb4a41..af658a801 100644 --- a/tests/Api/Controller/CreateDiscussionControllerTest.php +++ b/tests/integration/api/Controller/CreateDiscussionControllerTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Tests\Api\Controller; +namespace Flarum\Tests\integration\api\Controller; use Flarum\Api\Controller\CreateDiscussionController; use Flarum\Discussion\Discussion; diff --git a/tests/Api/Controller/CreateGroupControllerTest.php b/tests/integration/api/Controller/CreateGroupControllerTest.php similarity index 97% rename from tests/Api/Controller/CreateGroupControllerTest.php rename to tests/integration/api/Controller/CreateGroupControllerTest.php index 36425435a..402950480 100644 --- a/tests/Api/Controller/CreateGroupControllerTest.php +++ b/tests/integration/api/Controller/CreateGroupControllerTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Tests\Api\Controller; +namespace Flarum\Tests\integration\api\Controller; use Flarum\Api\Controller\CreateGroupController; use Flarum\Group\Group; diff --git a/tests/Api/Controller/CreatePostControllerTest.php b/tests/integration/api/Controller/CreatePostControllerTest.php similarity index 95% rename from tests/Api/Controller/CreatePostControllerTest.php rename to tests/integration/api/Controller/CreatePostControllerTest.php index 523b7e75b..541d8a1ce 100644 --- a/tests/Api/Controller/CreatePostControllerTest.php +++ b/tests/integration/api/Controller/CreatePostControllerTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Tests\Api\Controller; +namespace Flarum\Tests\integration\api\Controller; use Flarum\Api\Controller\CreatePostController; use Flarum\Discussion\Discussion; diff --git a/tests/Api/Controller/CreateTokenControllerTest.php b/tests/integration/api/Controller/CreateTokenControllerTest.php similarity index 95% rename from tests/Api/Controller/CreateTokenControllerTest.php rename to tests/integration/api/Controller/CreateTokenControllerTest.php index 24c0cf7dd..eb6e6beb7 100644 --- a/tests/Api/Controller/CreateTokenControllerTest.php +++ b/tests/integration/api/Controller/CreateTokenControllerTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Tests\Api\Controller; +namespace Flarum\Tests\integration\api\Controller; use Flarum\Api\Controller\CreateTokenController; use Flarum\Http\AccessToken; diff --git a/tests/Api/Controller/CreateUserControllerTest.php b/tests/integration/api/Controller/CreateUserControllerTest.php similarity index 97% rename from tests/Api/Controller/CreateUserControllerTest.php rename to tests/integration/api/Controller/CreateUserControllerTest.php index d7ca4a83c..14feb6055 100644 --- a/tests/Api/Controller/CreateUserControllerTest.php +++ b/tests/integration/api/Controller/CreateUserControllerTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Tests\Api\Controller; +namespace Flarum\Tests\integration\api\Controller; use Flarum\Api\Controller\CreateUserController; use Flarum\Settings\SettingsRepositoryInterface; diff --git a/tests/Api/Controller/DeleteDiscussionControllerTest.php b/tests/integration/api/Controller/DeleteDiscussionControllerTest.php similarity index 94% rename from tests/Api/Controller/DeleteDiscussionControllerTest.php rename to tests/integration/api/Controller/DeleteDiscussionControllerTest.php index bd174d73e..9d7f87f93 100644 --- a/tests/Api/Controller/DeleteDiscussionControllerTest.php +++ b/tests/integration/api/Controller/DeleteDiscussionControllerTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Tests\Api\Controller; +namespace Flarum\Tests\integration\api\Controller; use Flarum\Api\Controller\DeleteDiscussionController; use Flarum\Discussion\Discussion; diff --git a/tests/Api/Controller/ListDiscussionsControllerTest.php b/tests/integration/api/Controller/ListDiscussionsControllerTest.php similarity index 95% rename from tests/Api/Controller/ListDiscussionsControllerTest.php rename to tests/integration/api/Controller/ListDiscussionsControllerTest.php index c7d2abe93..3471f3444 100644 --- a/tests/Api/Controller/ListDiscussionsControllerTest.php +++ b/tests/integration/api/Controller/ListDiscussionsControllerTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Tests\Api\Controller; +namespace Flarum\Tests\integration\api\Controller; use Flarum\Api\Controller\ListDiscussionsController; use Flarum\Discussion\Discussion; diff --git a/tests/Api/Controller/ListGroupsControllerTest.php b/tests/integration/api/Controller/ListGroupsControllerTest.php similarity index 93% rename from tests/Api/Controller/ListGroupsControllerTest.php rename to tests/integration/api/Controller/ListGroupsControllerTest.php index 34d945a90..cd0cdc6a4 100644 --- a/tests/Api/Controller/ListGroupsControllerTest.php +++ b/tests/integration/api/Controller/ListGroupsControllerTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Tests\Api\Controller; +namespace Flarum\Tests\integration\api\Controller; use Flarum\Api\Controller\ListGroupsController; use Flarum\Group\Group; diff --git a/tests/Api/Controller/ListNotificationsControllerTest.php b/tests/integration/api/Controller/ListNotificationsControllerTest.php similarity index 94% rename from tests/Api/Controller/ListNotificationsControllerTest.php rename to tests/integration/api/Controller/ListNotificationsControllerTest.php index f269b8da8..5f64d7b54 100644 --- a/tests/Api/Controller/ListNotificationsControllerTest.php +++ b/tests/integration/api/Controller/ListNotificationsControllerTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Tests\Api\Controller; +namespace Flarum\Tests\integration\api\Controller; use Flarum\Api\Controller\ListNotificationsController; diff --git a/tests/Api/Controller/ListUsersControllerTest.php b/tests/integration/api/Controller/ListUsersControllerTest.php similarity index 94% rename from tests/Api/Controller/ListUsersControllerTest.php rename to tests/integration/api/Controller/ListUsersControllerTest.php index 34350db87..c6e6e0551 100644 --- a/tests/Api/Controller/ListUsersControllerTest.php +++ b/tests/integration/api/Controller/ListUsersControllerTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Tests\Api\Controller; +namespace Flarum\Tests\integration\api\Controller; use Flarum\Api\Controller\ListUsersController; diff --git a/tests/Api/Controller/ShowDiscussionControllerTest.php b/tests/integration/api/Controller/ShowDiscussionControllerTest.php similarity index 95% rename from tests/Api/Controller/ShowDiscussionControllerTest.php rename to tests/integration/api/Controller/ShowDiscussionControllerTest.php index 5c4b8ae28..6931e7d9b 100644 --- a/tests/Api/Controller/ShowDiscussionControllerTest.php +++ b/tests/integration/api/Controller/ShowDiscussionControllerTest.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Flarum\Tests\Api\Controller; +namespace Flarum\Tests\integration\api\Controller; use Flarum\Api\Controller\ShowDiscussionController; use Flarum\Discussion\Discussion; -use Flarum\Tests\Test\Concerns\ManagesContent; +use Flarum\Tests\integration\ManagesContent; class ShowDiscussionControllerTest extends ApiControllerTestCase { diff --git a/tests/Api/Controller/UpdateUserControllerTest.php b/tests/integration/api/Controller/UpdateUserControllerTest.php similarity index 96% rename from tests/Api/Controller/UpdateUserControllerTest.php rename to tests/integration/api/Controller/UpdateUserControllerTest.php index 2ea9ecb3e..a42562b62 100644 --- a/tests/Api/Controller/UpdateUserControllerTest.php +++ b/tests/integration/api/Controller/UpdateUserControllerTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Tests\Api\Controller; +namespace Flarum\Tests\integration\api\Controller; use Flarum\Api\Controller\UpdateUserController; diff --git a/tests/Install/DefaultInstallationTest.php b/tests/integration/installer/DefaultInstallationTest.php similarity index 100% rename from tests/Install/DefaultInstallationTest.php rename to tests/integration/installer/DefaultInstallationTest.php diff --git a/tests/tmp/public/assets/.gitkeep b/tests/integration/tmp/public/assets/.gitkeep similarity index 100% rename from tests/tmp/public/assets/.gitkeep rename to tests/integration/tmp/public/assets/.gitkeep diff --git a/tests/tmp/storage/.gitkeep b/tests/integration/tmp/storage/.gitkeep similarity index 100% rename from tests/tmp/storage/.gitkeep rename to tests/integration/tmp/storage/.gitkeep diff --git a/tests/tmp/storage/formatter/.gitkeep b/tests/integration/tmp/storage/formatter/.gitkeep similarity index 100% rename from tests/tmp/storage/formatter/.gitkeep rename to tests/integration/tmp/storage/formatter/.gitkeep diff --git a/tests/tmp/storage/sessions/.gitkeep b/tests/integration/tmp/storage/sessions/.gitkeep similarity index 100% rename from tests/tmp/storage/sessions/.gitkeep rename to tests/integration/tmp/storage/sessions/.gitkeep diff --git a/tests/tmp/vendor/composer/installed.json b/tests/integration/tmp/vendor/composer/installed.json similarity index 100% rename from tests/tmp/vendor/composer/installed.json rename to tests/integration/tmp/vendor/composer/installed.json