Bring tests to green.

mikebronner · mikebronner · commit fde9ef135f44 · 2020-09-15T23:01:52.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,8 @@ language: php
 
 matrix:
   include:
-    - php: 7.2
     - php: 7.3
+    - php: 7.4
 
 before_script:
   - travis_retry composer self-update
diff --git a/composer.json b/composer.json
@@ -15,25 +15,28 @@
         }
     ],
     "require": {
-        "illuminate/support": "^7.0",
-        "ramsey/uuid": "^3.8",
+        "php": ">=7.3",
+        "illuminate/support": "^8.0",
+        "ramsey/uuid": "^4.0",
         "titasgailius/search-relations": "^1.0"
     },
     "require-dev": {
         "doctrine/dbal": "^2.9",
         "fzaninotto/faker": "^1.4",
-        "orchestra/testbench": "^5.0",
+        "laravel/legacy-factories": "^1.0",
+        "orchestra/testbench": "^6.0",
         "php-coveralls/php-coveralls": "^2.1",
-        "phpunit/phpunit": "^8.5",
+        "phpunit/phpunit": "^9.0",
         "symfony/thanks": "^1.2"
     },
     "autoload": {
         "classmap": [
-            "database/migrations",
-            "database/seeds"
+            "database/migrations"
         ],
         "psr-4": {
-            "GeneaLabs\\LaravelGovernor\\": "src/"
+            "GeneaLabs\\LaravelGovernor\\": "src/",
+            "GeneaLabs\\LaravelGovernor\\Database\\Factories\\": "database/factories/",
+            "GeneaLabs\\LaravelGovernor\\Database\\Seeders\\": "database/seeders/"
         }
     },
     "autoload-dev": {
diff --git a/database/seeders/LaravelGovernorActionsTableSeeder.php b/database/seeders/LaravelGovernorActionsTableSeeder.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace GeneaLabs\LaravelGovernor\Database\Seeders;
+
 use Illuminate\Database\Seeder;
 
 class LaravelGovernorActionsTableSeeder extends Seeder
diff --git a/database/seeders/LaravelGovernorAdminSeeder.php b/database/seeders/LaravelGovernorAdminSeeder.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace GeneaLabs\LaravelGovernor\Database\Seeders;
+
 use Illuminate\Database\Seeder;
 
 class LaravelGovernorAdminSeeder extends Seeder
diff --git a/database/seeders/LaravelGovernorDatabaseSeeder.php b/database/seeders/LaravelGovernorDatabaseSeeder.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace GeneaLabs\LaravelGovernor\Database\Seeders;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Seeder;
+
+class LaravelGovernorDatabaseSeeder extends Seeder
+{
+    public function run()
+    {
+        Model::unguard();
+
+        $this->call(LaravelGovernorEntitiesTableSeeder::class);
+        $this->call(LaravelGovernorActionsTableSeeder::class);
+        $this->call(LaravelGovernorOwnershipsTableSeeder::class);
+        $this->call(LaravelGovernorRolesTableSeeder::class);
+        $this->call(LaravelGovernorSuperAdminSeeder::class);
+        $this->call(LaravelGovernorAdminSeeder::class);
+
+        Model::reguard();
+    }
+}
diff --git a/database/seeders/LaravelGovernorEntitiesTableSeeder.php b/database/seeders/LaravelGovernorEntitiesTableSeeder.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace GeneaLabs\LaravelGovernor\Database\Seeders;
+
 use GeneaLabs\LaravelGovernor\Team;
 use Illuminate\Database\Seeder;
 
diff --git a/database/seeders/LaravelGovernorOwnershipsTableSeeder.php b/database/seeders/LaravelGovernorOwnershipsTableSeeder.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace GeneaLabs\LaravelGovernor\Database\Seeders;
+
 use Illuminate\Database\Seeder;
 
 class LaravelGovernorOwnershipsTableSeeder extends Seeder
diff --git a/database/seeders/LaravelGovernorPermissionsTableSeeder.php b/database/seeders/LaravelGovernorPermissionsTableSeeder.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace GeneaLabs\LaravelGovernor\Database\Seeders;
+
 use Illuminate\Database\Seeder;
 
 class LaravelGovernorPermissionsTableSeeder extends Seeder
diff --git a/database/seeders/LaravelGovernorRolesTableSeeder.php b/database/seeders/LaravelGovernorRolesTableSeeder.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace GeneaLabs\LaravelGovernor\Database\Seeders;
+
 use Illuminate\Database\Seeder;
 
 class LaravelGovernorRolesTableSeeder extends Seeder
diff --git a/database/seeders/LaravelGovernorSuperAdminSeeder.php b/database/seeders/LaravelGovernorSuperAdminSeeder.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace GeneaLabs\LaravelGovernor\Database\Seeders;
+
 use Illuminate\Database\Seeder;
 
 class LaravelGovernorSuperAdminSeeder extends Seeder
diff --git a/database/seeders/LaravelGovernorUpgradeTo0100.php b/database/seeders/LaravelGovernorUpgradeTo0100.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace GeneaLabs\LaravelGovernor\Database\Seeders;
+
 use GeneaLabs\LaravelGovernor\Entity;
 use GeneaLabs\LaravelGovernor\Permission;
 use GeneaLabs\LaravelGovernor\Role;
@@ -34,7 +36,7 @@ public function run()
                     ]);
                 });
         }
-        
+
         if (Schema::hasTable('role_user')) {
             app("db")
                 ->table("role_user")
@@ -54,15 +56,15 @@ public function run()
         if (Schema::hasTable('permissions')) {
             Schema::drop('permissions');
         }
-        
+
         if (Schema::hasTable('roles')) {
             Schema::drop('roles');
         }
-        
+
         if (Schema::hasTable('actions')) {
             Schema::drop('actions');
         }
-        
+
         if (Schema::hasTable('entities')) {
             Schema::drop('entities');
         }
diff --git a/database/seeders/LaravelGovernorUpgradeTo0110.php b/database/seeders/LaravelGovernorUpgradeTo0110.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace GeneaLabs\LaravelGovernor\Database\Seeders;
+
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Collection;
diff --git a/database/seeders/LaravelGovernorUpgradeTo0115.php b/database/seeders/LaravelGovernorUpgradeTo0115.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace GeneaLabs\LaravelGovernor\Database\Seeders;
+
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Seeder;
 use GeneaLabs\LaravelOptimizedPostgres\Schema;
diff --git a/database/seeders/LaravelGovernorUpgradeTo0120.php b/database/seeders/LaravelGovernorUpgradeTo0120.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace GeneaLabs\LaravelGovernor\Database\Seeders;
+
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Seeder;
 
@@ -16,7 +18,7 @@ public function run()
                 ->change();
             $table->unsignedBigInteger('user_id')
                 ->change();
-            
+
             if (! Schema::hasColumn("governor_role_user", "created_at")) {
                 $table->timestamps();
             }
diff --git a/database/seeds/LaravelGovernorDatabaseSeeder.php b/database/seeds/LaravelGovernorDatabaseSeeder.php
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,38 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    backupGlobals="false"
-    backupStaticAttributes="false"
-    bootstrap="vendor/autoload.php"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    processIsolation="false"
-    stopOnFailure="false"
->
-    <testsuites>
-        <testsuite name="Setup">
-            <directory>./tests/AlwaysRunFirstTest.php</directory>
-        </testsuite>
-        <testsuite name="IntegrationTests">
-            <directory suffix="Test.php">./tests/Integration</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <env name="APP_ENV" value="testing"/>
-        <env name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
-        <env name="APP_DEBUG" value="true"/>
-        <env name="APP_LOG_LEVEL" value="debug"/>
-        <env name="CACHE_DRIVER" value="array"/>
-        <env name="SESSION_DRIVER" value="file"/>
-        <env name="QUEUE_DRIVER" value="sync"/>
-        <!-- <env name="DB_CONNECTION" value="sqlite"/>
-        <env name="DB_DATABASE" value=":memory:"/> -->
-        <!-- <env name="DB_DATABASE" value="test.sqlite"/> -->
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Setup">
+      <directory>./tests/AlwaysRunFirstTest.php</directory>
+    </testsuite>
+    <testsuite name="IntegrationTests">
+      <directory suffix="Test.php">./tests/Integration</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="APP_ENV" value="testing"/>
+    <env name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
+    <env name="APP_DEBUG" value="true"/>
+    <env name="APP_LOG_LEVEL" value="debug"/>
+    <env name="CACHE_DRIVER" value="array"/>
+    <env name="SESSION_DRIVER" value="file"/>
+    <env name="QUEUE_DRIVER" value="sync"/>
+    <env name="MAIL_MAILER" value="log"/>
+  </php>
 </phpunit>
diff --git a/tests/AlwaysRunFirstTest.php b/tests/AlwaysRunFirstTest.php
@@ -1,7 +1,8 @@
 <?php namespace GeneaLabs\LaravelGovernor\Tests;
 
-use GeneaLabs\LaravelGovernor\Tests\Fixtures\User;
 use Orchestra\Testbench\TestCase as BaseTestCase;
+use GeneaLabs\LaravelGovernor\Tests\Fixtures\User;
+use GeneaLabs\LaravelGovernor\Database\Seeders\LaravelGovernorDatabaseSeeder;
 
 class AlwaysRunFirstTest extends BaseTestCase
 {
@@ -53,7 +54,7 @@ public function setUp() : void
         $this->artisan('migrate');
         $this->artisan('db:seed', [
             "--database" => "sqlite",
-            '--class' => 'LaravelGovernorDatabaseSeeder',
+            '--class' => LaravelGovernorDatabaseSeeder::class,
             '--no-interaction' => true,
         ]);
     }
diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php
@@ -1,5 +1,6 @@
 <?php namespace GeneaLabs\LaravelGovernor\Tests;
 
+use GeneaLabs\LaravelGovernor\Database\Seeders\LaravelGovernorDatabaseSeeder;
 use GeneaLabs\LaravelGovernor\Tests\Fixtures\Author;
 use GeneaLabs\LaravelGovernor\Tests\Fixtures\Policies\Author as AuthorPolicy;
 use GeneaLabs\LaravelGovernor\Tests\Fixtures\Policies\User as UserPolicy;
@@ -12,7 +13,7 @@ protected function getEnvironmentSetUp($app)
     {
         Gate::policy(Author::class, AuthorPolicy::class);
         Gate::policy(User::class, UserPolicy::class);
-        
+
         $app['config']->set('database.default', 'testing');
         $app['config']->set('genealabs-laravel-governor.models.auth', User::class);
         $app["router"]->get('login', 'Auth\LoginController@showLoginForm')->name('login');
@@ -25,7 +26,7 @@ protected function getEnvironmentSetUp($app)
         $app["router"]->get('password/reset/{token}', 'Auth\ResetPasswordController@showResetForm');
         $app["router"]->post('password/reset', 'Auth\ResetPasswordController@reset');
     }
-    
+
     protected function getPackageProviders($app)
     {
         return [
@@ -35,18 +36,18 @@ protected function getPackageProviders($app)
             'GeneaLabs\LaravelGovernor\Providers\Nova',
         ];
     }
-    
+
     protected function setUp() : void
     {
         parent::setUp();
-        
+
         $this->withFactories(__DIR__ . "/database/factories");
         $this->loadLaravelMigrations();
         $this->loadMigrationsFrom(__DIR__ . "/../database/migrations");
         $this->loadMigrationsFrom(__DIR__ . "/database/migrations");
         $this->artisan('migrate');
         $this->artisan('db:seed', [
-            '--class' => 'LaravelGovernorDatabaseSeeder',
+            '--class' => LaravelGovernorDatabaseSeeder::class,
             '--no-interaction' => true
             ]);
     }
diff --git a/tests/Integration/ActionTest.php b/tests/Integration/ActionTest.php
@@ -1,4 +1,6 @@
-<?php namespace GeneaLabs\LaravelGovernor\Tests\Integration\Notifications;
+<?php
+
+namespace GeneaLabs\LaravelGovernor\Tests\Integration;
 
 use GeneaLabs\LaravelGovernor\Action;
 use GeneaLabs\LaravelGovernor\Permission;
diff --git a/tests/Integration/TeamTest.php b/tests/Integration/TeamTest.php
@@ -1,4 +1,6 @@
-<?php namespace GeneaLabs\LaravelGovernor\Tests\Integration\Notifications;
+<?php
+
+namespace GeneaLabs\LaravelGovernor\Tests\Integration;
 
 use GeneaLabs\LaravelGovernor\Permission;
 use GeneaLabs\LaravelGovernor\Team;
diff --git a/tests/Integration/Traits/GoverningTest.php b/tests/Integration/Traits/GoverningTest.php
@@ -1,4 +1,6 @@
-<?php namespace GeneaLabs\LaravelGovernor\Tests\Integration\Traits;
+<?php
+
+namespace GeneaLabs\LaravelGovernor\Tests\Integration\Traits;
 
 use GeneaLabs\LaravelGovernor\Permission;
 use GeneaLabs\LaravelGovernor\Team;
diff --git a/tests/Integration/Traits/GovernorOwnedByFieldTest.php b/tests/Integration/Traits/GovernorOwnedByFieldTest.php
@@ -1,4 +1,6 @@
-<?php namespace GeneaLabs\LaravelGovernor\Tests\Integration\Traits;
+<?php
+
+namespace GeneaLabs\LaravelGovernor\Tests\Integration\Traits;
 
 use GeneaLabs\LaravelGovernor\Tests\Fixtures\AuthorWithoutGovernable;
 use GeneaLabs\LaravelGovernor\Tests\Fixtures\Policies\Author as AuthorPolicy;
diff --git a/tests/database/database.sqlite b/tests/database/database.sqlite
