Merge pull request mateusjunges#98 from mateusjunges/issue-78

Fixes tests

Author: Mateus Junges

.travis.yml

@@ -10,13 +10,9 @@ matrix:
   allow_failures:
     - php: 7.4snapshot
 
-services:
-  - postgresql
-
 before_script:
-  - psql -c 'create database laravel_acl_tests;' -U postgres
   - travis_retry composer self-update
   - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
 
 script:
-  - vendor/bin/phpunit tests --coverage-text --coverage-clover=coverage.clover
+  - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover

phpunit.xml

@@ -9,26 +9,19 @@
          processIsolation="false"
          stopOnFailure="false">
     <testsuites>
-        <testsuite name="Unit">
-            <directory suffix="Test.php">./tests/Unit</directory>
-        </testsuite>
-
-        <testsuite name="Feature">
-            <directory suffix="Test.php">./tests/Feature</directory>
+        <testsuite name="Laravel ACL Tests">
+            <directory suffix="Test.php">tests</directory>
         </testsuite>
     </testsuites>
     <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./app</directory>
+        <whitelist>
+            <directory suffix=".php">src/</directory>
         </whitelist>
     </filter>
     <php>
-        <server name="APP_ENV" value="testing"/>
-        <server name="BCRYPT_ROUNDS" value="4"/>
-        <server name="CACHE_DRIVER" value="array"/>
-        <server name="MAIL_DRIVER" value="array"/>
-        <server name="QUEUE_CONNECTION" value="sync"/>
-        <server name="SESSION_DRIVER" value="array"/>
+        <env name="APP_ENV" value="testing"/>
+        <env name="DB_CONNECTION" value="sqlite"/>
+        <env name="DB_DATABASE" value=":memory:"/>
     </php>
 </phpunit>
 

src/Console/Commands/CreateGroup.php

@@ -40,23 +40,21 @@ public function handle()
     {
         try {
             $groupModel = app(config('acl.models.group'));
-            if ($this->confirm("Do you want to create a group with the name '"
-                .$this->argument('name')."' and slug '"
-                .$this->argument('slug')."'?")) {
+            try {
                 $group = $groupModel->where('slug', $this->argument('slug'))
                     ->orWhere('name', $this->argument('name'))
                     ->first();
                 if (! is_null($group)) {
                     throw GroupAlreadyExistsException::create();
                 }
                 $groupModel->create([
-                   'name'        => $this->argument('name'),
-                   'slug'        => $this->argument('slug'),
-                   'description' => $this->argument('description'),
+                    'name'        => $this->argument('name'),
+                    'slug'        => $this->argument('slug'),
+                    'description' => $this->argument('description'),
                 ]);
                 $this->info('Group created successfully!');
-            } else {
-                $this->info('Group was not created.');
+            } catch (\Exception $exception) {
+                $this->error('Group was not created!');
             }
         } catch (\Exception $exception) {
             $this->error($exception->getMessage());

src/Console/Commands/CreatePermission.php

@@ -41,23 +41,21 @@ public function handle()
         try {
             $permissionModel = app(config('acl.models.permission'));
 
-            if ($this->confirm("Do you want to create a permission named '"
-                .$this->argument('name')."' and with slug '"
-                .$this->argument('slug')."'?")) {
+            try {
                 $permission = $permissionModel->where('slug', $this->argument('slug'))
                     ->orWhere('name', $this->argument('name'))
                     ->first();
                 if (! is_null($permission)) {
                     throw PermissionAlreadyExistsException::create();
                 }
                 $permissionModel->create([
-                   'name'        => $this->argument('name'),
-                   'slug'        => $this->argument('slug'),
-                   'description' => $this->argument('description'),
+                    'name'        => $this->argument('name'),
+                    'slug'        => $this->argument('slug'),
+                    'description' => $this->argument('description'),
                 ]);
                 $this->info('Permission created successfully!');
-            } else {
-                $this->info('Permission was not created.');
+            } catch (\Exception $exception) {
+                $this->error('Permission was not created!');
             }
         } catch (\Exception $exception) {
             $this->error($exception->getMessage());

tests/CommandsTest.php

@@ -2,7 +2,10 @@
 
 namespace Junges\Tests;
 
+use Junges\ACL\Test\Group;
 use Junges\ACL\Test\TestCase;
+use Junges\ACL\Test\Permission;
+use Illuminate\Support\Facades\Artisan;
 
 class CommandsTest extends TestCase
 {
@@ -19,22 +22,27 @@ public function setUp()
      */
     public function it_can_create_a_permission()
     {
-        $this->artisan('permission:create', [
+        $permission = Artisan::call('permission:create', [
             'name' => 'Command test permission',
             'slug' => 'command-test-permission',
             'description' => 'Command test',
-        ])->assertExitCode(0);
+        ]);
+
+        $this->assertCount(1, Permission::where('slug', 'command-test-permission')->get());
+        $this->assertEquals(0, $permission);
     }
 
     /**
      * @test
      */
     public function it_can_create_a_group()
     {
-        $this->artisan('group:create', [
+        $group = Artisan::call('group:create', [
             'name' => 'Command test group',
             'slug' => 'command-test-group',
             'description' => 'Test command group',
-        ])->assertExitCode(0);
+        ]);
+        $this->assertEquals(0, $group);
+        $this->assertCount(1, Group::where('slug', 'command-test-group')->get());
     }
 }

tests/TestCase.php

@@ -2,7 +2,6 @@
 
 namespace Junges\ACL\Test;
 
-use Illuminate\Support\Facades\DB;
 use Junges\ACL\ACLServiceProvider;
 use Junges\ACL\ACLAuthServiceProvider;
 use Illuminate\Database\Schema\Blueprint;
@@ -104,15 +103,11 @@ public function getPackageProviders($app)
      */
     public function getEnvironmentSetUp($app)
     {
-        $app['config']->set('database.default', 'pgsql');
-        $app['config']->set('database.connections.pgsql', [
-            'driver'   => 'pgsql',
-            'username' => 'postgres',
-            'port'     => '5432',
-            'host'     => '127.0.0.1',
-            'password' => env('DB_PASSWORD', ''),
-            'database' => 'laravel_acl_tests',
-            'prefix'   => '',
+        $app['config']->set('database.default', 'sqlite');
+        $app['config']->set('database.connections.sqlite', [
+           'driver'   => 'sqlite',
+           'database' => ':memory:',
+           'prefix'   => '',
         ]);
         $app['config']->set('views.path', [__DIR__.'/resources/views']);
 
@@ -126,13 +121,6 @@ public function getEnvironmentSetUp($app)
      */
     public function configureDatabase($app)
     {
-        DB::statement('DROP TABLE IF EXISTS test_permissions CASCADE;');
-        DB::statement('DROP TABLE IF EXISTS test_users CASCADE;');
-        DB::statement('DROP TABLE IF EXISTS test_groups CASCADE;');
-        DB::statement('DROP TABLE IF EXISTS test_user_has_permissions CASCADE;');
-        DB::statement('DROP TABLE IF EXISTS test_user_has_groups CASCADE;');
-        DB::statement('DROP TABLE IF EXISTS test_group_has_permissions CASCADE;');
-
         /*
          * Set up the tables for testing proposes
          */
@@ -169,11 +157,6 @@ public function configureDatabase($app)
         /*
          * Create the tables on the database
          */
-        (new \CreatePermissionsTable())->down();
-        (new \CreateGroupsTable())->down();
-        (new \CreateGroupHasPermissionsTable())->down();
-        (new \CreateUserHasPermissionsTable())->down();
-        (new \CreateUserHasGroupsTable())->down();
         (new \CreatePermissionsTable())->up();
         (new \CreateGroupsTable())->up();
         (new \CreateGroupHasPermissionsTable())->up();