Code clean up

luezoidtechnologies · May 24, 2023 · 7e9493d · 7e9493d
1 parent fb487c1
commit 7e9493d
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 50 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ vendor/*
 composer.lock
 .idea/*
 .phpunit.result.cache
+storage/*
diff --git a/composer.json b/composer.json
@@ -36,7 +36,9 @@
     "require-dev": {
         "laravel/framework": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0",
         "orchestra/testbench": "^8.5",
-        "phpunit/phpunit": "^10.1"
+        "phpunit/phpunit": "^10.1",
+        "ext-gd": "*",
+        "ext-sqlite3": "*"
     },
     "autoload": {
         "psr-4": {

diff --git a/examples/.DS_Store b/examples/.DS_Store
diff --git a/examples/tests/TestCase.php b/examples/tests/TestCase.php
@@ -11,7 +11,6 @@
 
 require_once __DIR__.'/../Controllers/MinionController.php';
 require_once __DIR__.'/../Repositories/MinionRepository.php';
-require_once __DIR__.'/../Requests/MinionCreateRequest.php';
 
 class TestCase extends \Orchestra\Testbench\TestCase
 {
@@ -32,8 +31,8 @@ protected function getPackageProviders($app): array
     public function defineEnvironment($app)
     {
         tap($app->make('config'), function (Repository $config) {
-            $config->set('database.default', 'testbench');
-            $config->set('database.connections.testbench', [
+            $config->set('database.default', 'test');
+            $config->set('database.connections.test', [
                 'driver'   => 'sqlite',
                 'database' => ':memory:',
                 'prefix'   => '',
@@ -44,13 +43,13 @@ public function defineEnvironment($app)
     protected function defineRoutes($router)
     {
         Route::resource('api/minions', MinionController::class, ['parameters' => ['minions' => 'id']]);
-        Route::post('api/files',FileController::class.'@store');
+        Route::post('api/files',[FileController::class, 'store']);
     }
 
     protected function defineDatabaseMigrations()
     {
         $this->loadMigrationsFrom(__DIR__ . '/../migrations');
-        $this->artisan('migrate', ['--database' => 'testbench'])->run();
+        $this->artisan('migrate', ['--database' => 'test'])->run();
     }
 
 

diff --git a/examples/tests/suite/DeleteAPISuccessTest.php b/examples/tests/suite/DeleteAPISuccessTest.php
@@ -2,7 +2,6 @@
 
 namespace Tests\Suite;
 
-use Luezoid\Models\Minion;
 use Tests\TestCase;
 require_once __DIR__ . '/../TestCase.php';
 require_once __DIR__ . '/../../Models/Minion.php';
@@ -22,8 +21,8 @@ public function test_delete_minion()
             'hasHairs' => true,
         ];
         // Create a minion.
-        $minion = $this->postJson('/api/minions', $payload);
-        $minion = Minion::where('id', 1)->first();
+        $this->postJson('/api/minions', $payload);
+
         // Make the request.
         $response = $this->deleteJson('/api/minions/1');
         // Assert that the response is successful.
@@ -32,11 +31,11 @@ public function test_delete_minion()
         $response->assertJson([
             'message' =>"Resource deleted successfully",
             'data' => [
-                'id' => $minion->id,
-                'name' => $minion->name,
-                'totalEyes' => $minion->total_eyes,
-                'favouriteSound' => $minion->favourite_sound,
-                'hasHairs' => $minion->has_hairs
+                'id' => 1,
+                'name' => 'Stuart',
+                'totalEyes' => 2,
+                'favouriteSound' => 'Grrrrrrrrrrr',
+                'hasHairs' => true
             ],
             'type' => null,
         ]);

diff --git a/examples/tests/suite/FileAPISuccessTest.php b/examples/tests/suite/FileAPISuccessTest.php
@@ -4,6 +4,9 @@
 
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Storage;
+use Luezoid\Laravelcore\Contracts\IFile;
+use Luezoid\Laravelcore\Files\Services\LocalFileUploadService;
+use Luezoid\Laravelcore\Files\Services\SaveFileToS3Service;
 use Tests\TestCase;
 require_once __DIR__.'/../TestCase.php';
 require_once __DIR__.'/../../../src/Models/File.php';
@@ -23,11 +26,11 @@ public function testFileUpload()
 
         $file = UploadedFile::fake()->image('test-image.jpg'); // Create a fake test file
 
-        $this->app->bind(\Luezoid\Laravelcore\Contracts\IFile::class, function ($app) {
+        $this->app->bind(IFile::class, function ($app) {
             if (config('file.is_local')) {
-                return $app->make(\Luezoid\Laravelcore\Files\Services\LocalFileUploadService::class);
+                return $app->make(LocalFileUploadService::class);
             }
-            return $app->make(\Luezoid\Laravelcore\Files\Services\SaveFileToS3Service::class);
+            return $app->make(SaveFileToS3Service::class);
         });
 
         $response = $this->post('/api/files', [

diff --git a/examples/tests/suite/GetAPISuccessTest.php b/examples/tests/suite/GetAPISuccessTest.php
@@ -2,7 +2,6 @@
 
 namespace Tests\Suite;
 
-use Luezoid\Models\Minion;
 use Tests\TestCase;
 require_once __DIR__ . '/../TestCase.php';
 require_once __DIR__ . '/../../Models/Minion.php';
@@ -21,8 +20,8 @@ public function test_get_minion()
             'hasHairs' => true,
         ];
         // Create a minion.
-        $minion = $this->postJson('/api/minions', $payload);
-        $minion = Minion::where('id', 1)->first();
+        $this->postJson('/api/minions', $payload);
+
         // Make the request.
         $response = $this->getJson('/api/minions/1');
 
@@ -33,11 +32,11 @@ public function test_get_minion()
         $response->assertJson([
             'message' => null,
             'data' => [
-                'id' => $minion->id,
-                'name' => $minion->name,
-                'totalEyes' => $minion->total_eyes,
-                'favouriteSound' => $minion->favourite_sound,
-                'hasHairs' => $minion->has_hairs
+                'id' => 1,
+                'name' => 'Stuart',
+                'totalEyes' => 2,
+                'favouriteSound' => 'Grrrrrrrrrrr',
+                'hasHairs' => true
             ],
             'type' => null,
         ]);

diff --git a/examples/tests/suite/IndexAPISuccessTest.php b/examples/tests/suite/IndexAPISuccessTest.php
@@ -1,7 +1,6 @@
 <?php
 
 namespace Tests\Suite;
-use Luezoid\Models\Minion;
 use Tests\TestCase;
 
 require_once __DIR__ . '/../TestCase.php';
@@ -21,8 +20,7 @@ public function test_index_minion(): void
             'hasHairs' => true,
         ];
         // Create a minion.
-        $minion = $this->postJson('/api/minions', $payload);
-        $minion = Minion::where('id', 1)->first();
+        $this->postJson('/api/minions', $payload);
 
         // Make the request.
         $response = $this->getJson('/api/minions');
@@ -35,11 +33,11 @@ public function test_index_minion(): void
             'data' => [
                 'items' => [
                     [
-                        'id' => $minion->id,
-                        'name' => $minion->name,
-                        'totalEyes' => $minion->total_eyes,
-                        'favouriteSound' => $minion->favourite_sound,
-                        'hasHairs' => $minion->has_hairs
+                        'id' => 1,
+                        'name' => 'Stuart',
+                        'totalEyes' => 2,
+                        'favouriteSound' => 'Grrrrrrrrrrr',
+                        'hasHairs' => true
                     ]
                 ],
                 'page' => 1,

diff --git a/examples/tests/suite/PutAPISuccessTest.php b/examples/tests/suite/PutAPISuccessTest.php
@@ -2,7 +2,6 @@
 
 namespace Tests\Suite;
 
-use Luezoid\Models\Minion;
 use Tests\TestCase;
 require_once __DIR__ . '/../TestCase.php';
 require_once __DIR__ . '/../../Models/Minion.php';
@@ -16,14 +15,13 @@ class PutAPISuccessTest extends TestCase
     public function test_update_minion()
     {
         // Create a minion.
-        $minion = $this->postJson('/api/minions', [
+        $this->postJson('/api/minions', [
             'name' => 'Stuart',
             'totalEyes' => 2,
             'favouriteSound' => 'Grrrrrrrrrrr',
             'hasHairs' => true,
         ]);
-        // Get the minion.
-        $minion = Minion::where('id', 1)->first();
+
         // Prepare the request payload.
         $payload = [
             'name' => 'Stuart',
@@ -42,11 +40,11 @@ public function test_update_minion()
         $response->assertJson([
             'message' => 'Resource Updated successfully',
             'data' => [
-                'id' => $minion->id,
-                'name' => $payload['name'],
-                'totalEyes' => $payload['totalEyes'],
-                'favouriteSound' => $payload['favouriteSound'],
-                'hasHairs' => $payload['hasHairs'],
+                'id' => 1,
+                'name' => 'Stuart',
+                'totalEyes' => 2,
+                'favouriteSound' => 'Hrrrrrrrrrrr',
+                'hasHairs' => true
             ],
             'type' => null,
         ]);

diff --git a/phpunit.xml b/phpunit.xml
@@ -6,19 +6,14 @@
 >
     <testsuites>
         <testsuite name="Unit">
-            <directory suffix="Test.php">./examples/tests/suite</directory>
+            <directory>./examples/tests/suite</directory>
         </testsuite>
     </testsuites>
-    <source>
-        <include>
-            <directory suffix=".php">./app</directory>
-        </include>
-    </source>
     <php>
-        <env name="APP_ENV" value="testbench"/>
+        <env name="APP_ENV" value="test"/>
         <env name="BCRYPT_ROUNDS" value="4"/>
         <env name="CACHE_DRIVER" value="array"/>
-        <env name="DB_CONNECTION" value="testbench"/>
+        <env name="DB_CONNECTION" value="test"/>
         <env name="DB_DATABASE" value=":memory:"/>
         <env name="MAIL_MAILER" value="array"/>
         <env name="QUEUE_CONNECTION" value="sync"/>

diff --git a/storage/examples/5e1904a8-2cf2-497b-9c3e-a27dd1ffd51e.jpg b/storage/examples/5e1904a8-2cf2-497b-9c3e-a27dd1ffd51e.jpg