Rename the routes file to api and enable the storing of the hooks data

Author: tvbeek

phpunit.xml.dist

@@ -4,7 +4,6 @@
          bootstrap="vendor/autoload.php"
          cacheResultFile=".phpunit.cache/test-results"
          executionOrder="depends,defects"
-         forceCoversAnnotation="true"
          beStrictAboutCoversAnnotation="true"
          beStrictAboutOutputDuringTests="true"
          beStrictAboutTodoAnnotatedTests="true"

routes/web.php routes/api.phproutes/web.php renamed to routes/api.php

@@ -6,11 +6,12 @@
 
 use Illuminate\Support\Arr;
 use JsonException;
+use TJVB\GitLabWebhooks\Contracts\Actions\InComingWebhookRequestStoring;
 use TJVB\GitLabWebhooks\Exceptions\InvalidInputException;
 use TJVB\GitLabWebhooks\Http\Requests\GitLabWebhookRequest;
 use TJVB\GitLabWebhooks\Models\GitLabHook;
 
-class StoreInComingWebhookRequestData implements \TJVB\GitLabWebhooks\Contracts\Actions\InComingWebhookRequestStoring
+class StoreInComingWebhookRequestData implements InComingWebhookRequestStoring
 {
 
     public function handle(GitLabWebhookRequest $request): void
@@ -21,11 +22,11 @@ public function handle(GitLabWebhookRequest $request): void
         } catch (JsonException $jsonException) {
             throw InvalidInputException::fromJsonException($jsonException);
         }
-        $hook = $this->createHook();
+        $hook = $this->createHook($body, $request);
         unset($hook);
     }
 
-    private function createHook(string $body, GitLabWebhookRequest $request)
+    private function createHook(array $body, GitLabWebhookRequest $request)
     {
         $data = [
             'body' => $body,

src/Actions/StoreInComingWebhookRequestData.php

@@ -21,7 +21,7 @@ public function boot(): void
             __DIR__ . '/../database/migrations/' => database_path('migrations')
         ], 'migrations');
 
-        $this->loadRoutesFrom(__DIR__ . '/../routes/web.php');
+        $this->loadRoutesFrom(__DIR__ . '/../routes/api.php');
         $this->loadMigrationsFrom(__DIR__ . '/../database/migrations');
 
         if ($this->app->runningInConsole()) {

src/GitLabWebhooksServiceProvider.php

@@ -11,6 +11,16 @@ class GitLabHook extends Model
 {
     use SoftDeletes;
 
+    /**
+     * The attributes that should be cast.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'body' => 'array',
+        'system_hook' => 'boolean',
+    ];
+
     /**
      * The attributes that are mass assignable.
      *

src/Models/GitLabHook.php

@@ -15,4 +15,15 @@ protected function getPackageProviders($app): array
             GitLabWebhooksServiceProvider::class,
         ];
     }
+
+    protected function getEnvironmentSetUp($app): void
+    {
+        # Setup default database to use sqlite :memory:
+        $app['config']->set('database.default', 'testbench');
+        $app['config']->set('database.connections.testbench', [
+            'driver'   => 'sqlite',
+            'database' => ':memory:',
+            'prefix'   => '',
+        ]);
+    }
 }

tests/TestCase.php

@@ -4,8 +4,12 @@
 
 namespace TJVB\GitLabWebhooks\Tests;
 
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Http\Response;
+
 class WebhookReceiverTest extends TestCase
 {
+    use DatabaseMigrations;
 
     /**
      * @test
@@ -23,20 +27,21 @@ public function weCanStoreAValidRequest(): void
     /**
      * @test
      */
-    public function weGetABadRequestIfWeHaveInvallidData(): void
+    public function weGetABadRequestIfWeHaveInvalidData(): void
     {
-        $this->markTestIncomplete('TODO');
         // setup / mock
 
         // run
+        $response = $this->post(config('gitlab-webhooks-receiver.url', '/gitlabwebhook'), ['invalidjson']);
 
         // verify/assert
+        $response->assertStatus(Response::HTTP_BAD_REQUEST);
     }
 
     /**
      * @test
      */
-    public function weGetAnInternalServerErrorIfWeHaveAnUnkownError(): void
+    public function weGetAnInternalServerErrorIfWeHaveAnUnknownError(): void
     {
         $this->markTestIncomplete('TODO');
         // setup / mock