[WIP] 1.2 Test Split - Modules own tests

.github/workflows/tests.yml

@@ -24,12 +24,13 @@ jobs:
             node-version: 12
 
       - name: Install Node dependencies
-        working-directory: ./tests/js
+        working-directory: ./modules/system/tests/js
         run: npm install
 
       - name: Run tests
-        working-directory: ./tests/js
+        working-directory: ./modules/system/tests/js
         run: npm run test
+
   phpUnitTests:
     strategy:
       max-parallel: 8
@@ -117,5 +118,5 @@ jobs:
 
       - name: Run Linting and Tests
         run: |
-          ./vendor/bin/parallel-lint --exclude vendor --exclude storage --exclude tests/fixtures/plugins/testvendor/goto/Plugin.php .
+          composer lint
           ./vendor/bin/phpunit

.gitignore

@@ -32,4 +32,4 @@ package-lock.json
 /node_modules
 
 # Ignore generated public directory from `winter:mirror public`
-public
+public

composer.json

@@ -45,14 +45,6 @@
         "php-parallel-lint/php-parallel-lint": "^1.0",
         "dms/phpunit-arraysubset-asserts": "^0.1.0|^0.2.1"
     },
-    "autoload-dev": {
-        "classmap": [
-            "tests/concerns/InteractsWithAuthentication.php",
-            "tests/fixtures/backend/models/UserFixture.php",
-            "tests/TestCase.php",
-            "tests/PluginTestCase.php"
-        ]
-    },
     "scripts": {
         "post-create-project-cmd": [
             "@php artisan key:generate",
@@ -66,7 +58,7 @@
             "phpunit --stop-on-failure"
         ],
         "lint": [
-            "parallel-lint --exclude vendor --exclude storage --exclude tests/fixtures/plugins/testvendor/goto/Plugin.php ."
+            "parallel-lint --exclude vendor --exclude storage --exclude modules/system/tests/fixtures/plugins/testvendor/goto/Plugin.php ."
         ],
         "sniff": [
             "phpcs --colors -nq --report=\"full\" --extensions=\"php\""

config/testing/cms.php

@@ -96,7 +96,7 @@
     |
     */
 
-    'pluginsPathLocal' => base_path('tests/fixtures/plugins'),
+    'pluginsPathLocal' => base_path('modules/system/tests/fixtures/plugins'),
 
     /*
     |--------------------------------------------------------------------------
@@ -107,7 +107,7 @@
     |
     */
 
-    'themesPathLocal' => base_path('tests/fixtures/themes'),
+    'themesPathLocal' => base_path('modules/cms/tests/fixtures/themes'),
 
     /*
     |--------------------------------------------------------------------------
@@ -149,20 +149,20 @@
         'uploads' => [
             'disk'            => 'local',
             'folder'          => 'uploads',
-            'path'            => '/tests/storage/app/uploads',
+            'path'            => '/storage/tests/app/uploads',
             'temporaryUrlTTL' => 3600,
         ],
 
         'media' => [
             'disk'   => 'local',
             'folder' => 'media',
-            'path'   => '/tests/storage/app/media',
+            'path'   => '/storage/tests/app/media',
         ],
 
         'resized' => [
             'disk'   => 'local',
             'folder' => 'resized',
-            'path'   => '/tests/storage/app/resized',
+            'path'   => '/storage/tests/app/resized',
         ],
 
     ],

config/testing/filesystems.php

@@ -45,8 +45,8 @@
 
         'local' => [
             'driver' => 'local',
-            'root'   => base_path('tests/storage/app'),
-            'url'    => '/tests/storage/app',
+            'root'   => base_path('storage/tests/app'),
+            'url'    => '/storage/tests/app',
         ],
 
         's3' => [

modules/backend/.eslintignore

@@ -12,3 +12,6 @@ controllers/**/*.js
 formwidgets/**/*.js
 reportwidgets/**/*.js
 widgets/**/*.js
+
+# Ignore test fixtures
+tests

tests/unit/phpunit.xml → modules/backend/phpunit.xml

@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="../bootstrap.php"
+         bootstrap="../system/tests/bootstrap/app.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
 >
     <testsuites>
-        <testsuite name="Winter Test Suite">
-            <directory>./</directory>
+        <testsuite name="Winter Backend Module">
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
     <php>
         <env name="APP_ENV" value="testing" />
         <env name="CACHE_DRIVER" value="array" />
         <env name="SESSION_DRIVER" value="array" />
     </php>
-</phpunit>
+</phpunit>

tests/unit/backend/classes/AuthManagerTest.php → modules/backend/tests/classes/AuthManagerTest.php

@@ -1,6 +1,10 @@
 <?php
-use Backend\Classes\AuthManager;
+
+namespace Backend\Tests\Classes;
+
+use System\Tests\Bootstrap\TestCase;
 use Winter\Storm\Exception\SystemException;
+use Backend\Classes\AuthManager;
 
 class AuthManagerTest extends TestCase
 {

tests/unit/backend/classes/NavigationManagerTest.php → modules/backend/tests/classes/NavigationManagerTest.php

@@ -1,6 +1,8 @@
 <?php
 
-use Backend\Classes\Controller;
+namespace Backend\Tests\Classes;
+
+use System\Tests\Bootstrap\TestCase;
 use Backend\Classes\NavigationManager;
 
 class NavigationManagerTest extends TestCase
@@ -13,10 +15,10 @@ public function testRegisterMenuItems()
 
         $manager->registerMenuItems('Winter.Test', [
             'dashboard' => [
-                'label'       => 'Dashboard',
-                'icon'        => 'icon-dashboard',
-                'url'         => 'http://example.com',
-                'order'       => 100
+                'label' => 'Dashboard',
+                'icon' => 'icon-dashboard',
+                'url' => 'http://example.com',
+                'order' => 100
             ]
         ]);
 
@@ -175,9 +177,9 @@ public function testAddSideMenuItems()
 
         $manager->addSideMenuItems('Winter.Tester', 'blog', [
             'foo' => [
-                'label'       => 'Bar',
-                'icon'        => 'icon-derp',
-                'url'         => 'http://google.com',
+                'label' => 'Bar',
+                'icon' => 'icon-derp',
+                'url' => 'http://google.com',
                 'permissions' => [
                     'winter.tester.access_foo',
                     'winter.tester.access_bar'
@@ -213,9 +215,9 @@ public function testAddSideMenuItemsWithAlias()
 
         $manager->addSideMenuItems('Winter.Tester', 'blog', [
             'foo' => [
-                'label'       => 'Bar',
-                'icon'        => 'icon-derp',
-                'url'         => 'http://google.com',
+                'label' => 'Bar',
+                'icon' => 'icon-derp',
+                'url' => 'http://google.com',
                 'permissions' => [
                     'winter.tester.access_foo',
                     'winter.tester.access_bar'

tests/unit/backend/classes/WidgetManagerTest.php → modules/backend/tests/classes/WidgetManagerTest.php

@@ -1,6 +1,8 @@
 <?php
 
-use Backend\Classes\Controller;
+namespace Backend\Tests\Classes;
+
+use System\Tests\Bootstrap\TestCase;
 use Backend\Classes\WidgetManager;
 
 class WidgetManagerTest extends TestCase

tests/concerns/InteractsWithAuthentication.php → modules/backend/tests/concerns/InteractsWithAuthentication.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Winter\Tests\Concerns;
+namespace Backend\Tests\Concerns;
 
 use Illuminate\Contracts\Auth\Authenticatable as UserContract;
 

tests/fixtures/backend/models/UserFixture.php → modules/backend/tests/fixtures/models/UserFixture.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Winter\Tests\Fixtures\Backend\Models;
+namespace Backend\Tests\Fixtures\Models;
 
 use Backend\Models\User;
 

tests/unit/backend/helpers/BackendHelperTest.php → modules/backend/tests/helpers/BackendHelperTest.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace Backend\Tests\Helpers;
+
+use System\Tests\Bootstrap\TestCase;
 use Backend\Helpers\Backend;
 use Backend\Helpers\Exception\DecompileException;
 
@@ -8,7 +11,7 @@ class BackendHelperTest extends TestCase
     public function testDecompileAssets()
     {
         $backendHelper = new Backend;
-        $assets = $backendHelper->decompileAsset('tests/fixtures/backend/assets/compilation.js');
+        $assets = $backendHelper->decompileAsset('modules/backend/tests/fixtures/assets/compilation.js');
 
         $this->assertCount(2, $assets);
         $this->assertStringContainsString('file1.js', $assets[0]);
@@ -20,6 +23,6 @@ public function testDecompileMissingFile()
         $this->expectException(DecompileException::class);
 
         $backendHelper = new Backend;
-        $assets = $backendHelper->decompileAsset('tests/fixtures/backend/assets/missing.js');
+        $assets = $backendHelper->decompileAsset('modules/backend/tests/fixtures/assets/missing.js');
     }
 }

tests/unit/backend/models/ExportModelTest.php → modules/backend/tests/models/ExportModelTest.php

@@ -1,6 +1,10 @@
 <?php
 
+namespace Backend\Tests\Models;
+
+use System\Tests\Bootstrap\TestCase;
 use Backend\Models\ExportModel;
+use Illuminate\Http\Request;
 
 if (!class_exists('Model')) {
     class_alias('Winter\Storm\Database\Model', 'Model');
@@ -56,7 +60,7 @@ public function testDownload()
 
         $response = $model->download($csvName);
 
-        $request = new Illuminate\Http\Request();
+        $request = new Request();
 
         $response->prepare($request);
 
@@ -72,9 +76,9 @@ public function testDownload()
         $response->send();
         $output = ob_get_clean();
 
-        $utf8BOM = chr(239).chr(187).chr(191);
+        $utf8BOM = chr(239) . chr(187) . chr(191);
 
-        $this->assertEquals($utf8BOM."title,title2\nbar,foo\nbar2,foo2\n", $output, "CSV is not right!");
+        $this->assertEquals($utf8BOM . "title,title2\nbar,foo\nbar2,foo2\n", $output, "CSV is not right!");
 
         $filePath = temp_path($csvName);
 

tests/unit/backend/models/ImportModelTest.php → modules/backend/tests/models/ImportModelTest.php

@@ -1,6 +1,10 @@
 <?php
 
+namespace Backend\Tests\Models;
+
+use System\Tests\Bootstrap\PluginTestCase;
 use Backend\Models\ImportModel;
+use System\Models\File as FileModel;
 
 if (!class_exists('Model')) {
     class_alias('Winter\Storm\Database\Model', 'Model');
@@ -16,7 +20,7 @@ public function importData($results, $sessionKey = null)
     }
 }
 
-class ImportModelTest extends TestCase
+class ImportModelTest extends PluginTestCase
 {
 
     //
@@ -38,4 +42,29 @@ public function testDecodeArrayValue()
         $result = self::callProtectedMethod($model, 'decodeArrayValue', [$data, '-']);
         $this->assertEquals(['art direction', 'roman empire', 'sci-fi'], $result);
     }
+
+    public function testGetImportFilePath()
+    {
+        $model = new ExampleImportModel;
+        $sessionKey = uniqid('session_key', true);
+
+        $file1 = FileModel::create([
+            'data' => base_path().'/modules/backend/tests/fixtures/reference/file1.txt',
+            'is_public' => false,
+        ]);
+
+        $file2 = FileModel::create([
+            'data' => base_path().'/modules/backend/tests/fixtures/reference/file2.txt',
+            'is_public' => false,
+        ]);
+
+        $model->import_file()->add($file1, $sessionKey);
+        $model->import_file()->add($file2, $sessionKey);
+
+        $this->assertEquals(
+            $file2->getLocalPath(),
+            $model->getImportFilePath($sessionKey),
+            'ImportModel::getImportFilePath() should return the last uploaded file.'
+        );
+    }
 }

tests/unit/backend/traits/WidgetMakerTest.php → modules/backend/tests/traits/WidgetMakerTest.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace Backend\Tests\Traits;
+
+use System\Tests\Bootstrap\TestCase;
 use Backend\Classes\Controller;
 
 class ExampleTraitClass
@@ -28,7 +31,7 @@ class WidgetMakerTest extends TestCase
      *
      * @return void
      */
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 

tests/unit/backend/widgets/FilterWidgetTest.php → modules/backend/tests/widgets/FilterWidgetTest.php

@@ -1,8 +1,12 @@
 <?php
 
+namespace Backend\Tests\Widgets;
+
+use System\Tests\Bootstrap\PluginTestCase;
+use Backend\Tests\Fixtures\Models\UserFixture;
 use Backend\Widgets\Filter;
+use ApplicationException;
 use Backend\Models\User;
-use Winter\Tests\Fixtures\Backend\Models\UserFixture;
 
 class FilterWidgetTest extends PluginTestCase
 {