Merge pull request #18 from JoeBocock/develop

Pull in develop
JoeBocock · Apr 25, 2021 · 036e608 · 036e608
2 parents d1db58b + 25af405
commit 036e608
Show file tree

Hide file tree

Showing 10 changed files with 149 additions and 83 deletions.
diff --git a/.env.example b/.env.example
@@ -8,11 +8,11 @@ LOG_CHANNEL=stack
 LOG_LEVEL=debug
 
 DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
+DB_HOST=mariadb
 DB_PORT=3306
 DB_DATABASE=knockt
-DB_USERNAME=root
-DB_PASSWORD=
+DB_USERNAME=sail
+DB_PASSWORD=password
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file

diff --git a/database/factories/RowFactory.php b/database/factories/RowFactory.php
@@ -2,6 +2,7 @@
 
 namespace Database\Factories;
 
+use App\Models\Machine;
 use App\Models\Row;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -23,7 +24,7 @@ public function definition()
     {
         return [
             'name' => $this->faker->word(),
-            'machine_id' => rand(1, 10),
+            'machine_id' => Machine::factory(),
         ];
     }
-}
+}
diff --git a/database/factories/SlotFactory.php b/database/factories/SlotFactory.php
@@ -2,6 +2,8 @@
 
 namespace Database\Factories;
 
+use App\Models\Product;
+use App\Models\Row;
 use App\Models\Slot;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -23,8 +25,8 @@ public function definition()
     {
         return [
             'name' => $this->faker->bothify('#?'),
-            'row_id' => rand(1, 30),
-            'product_id' => rand(1, 100),
+            'row_id' => Row::factory(),
+            'product_id' => Product::factory(),
         ];
     }
-}
+}
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
     laravel.test:
         build:
-            context: ./vendor/laravel/sail/runtimes/8.0
+            context: ./vendor/laravel/sail/runtimes/7.4
             dockerfile: Dockerfile
             args:
                 WWWGROUP: '${WWWGROUP}'
@@ -18,11 +18,10 @@ services:
         networks:
             - sail
         depends_on:
-            - mysql
+            - mariadb
             - redis
-            - selenium
-    mysql:
-        image: 'mysql:8.0'
+    mariadb:
+        image: 'mariadb'
         ports:
             - '${FORWARD_DB_PORT:-3306}:3306'
         environment:
@@ -47,27 +46,6 @@ services:
             - sail
         healthcheck:
           test: ["CMD", "redis-cli", "ping"]
-    meilisearch:
-        image: 'getmeili/meilisearch:latest'
-        ports:
-            - '${FORWARD_MEILISEARCH_PORT:-7700}:7700'
-        volumes:
-            - 'sailmeilisearch:/data.ms'
-        networks:
-            - sail
-    mailhog:
-        image: 'mailhog/mailhog:latest'
-        ports:
-            - '${FORWARD_MAILHOG_PORT:-1025}:1025'
-            - '${FORWARD_MAILHOG_DASHBOARD_PORT:-8025}:8025'
-        networks:
-            - sail
-    selenium:
-       image: 'selenium/standalone-chrome'
-       volumes:
-            - '/dev/shm:/dev/shm'
-       networks:
-           - sail
 networks:
     sail:
         driver: bridge
@@ -76,5 +54,3 @@ volumes:
         driver: local
     sailredis:
         driver: local
-    sailmeilisearch:
-        driver: local
diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Tests\Unit;
+
+use Tests\TestCase;
+
+class ExampleTest extends TestCase
+{
+    /**
+     * Assert True.
+     *
+     * @test
+     *
+     * @return void
+     */
+    public function it_tests(): void
+    {
+        $this->assertTrue(true);
+    }
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -9,6 +9,4 @@ abstract class TestCase extends BaseTestCase
 {
     use CreatesApplication;
     use RefreshDatabase;
-
-    protected $seed = true;
 }
diff --git a/tests/Unit/MachineTest.php b/tests/Unit/MachineTest.php
@@ -14,11 +14,14 @@ class MachineTest extends TestCase
      *
      * @return void
      */
-    public function theyCanBeRetrieved(): void
+    public function they_can_be_retrieved(): void
     {
+        Machine::factory()->create();
+
         $response = $this->get('/api/machines');
 
         $response->assertStatus(200);
+        $this->assertNotEmpty($response['data']);
     }
 
     /**
@@ -28,11 +31,12 @@ public function theyCanBeRetrieved(): void
      *
      * @return void
      */
-    public function itCanBeStored(): void
+    public function it_can_be_stored(): void
     {
         $response = $this->post('/api/machines', Machine::factory()->raw());
 
         $response->assertStatus(201);
+        $this->assertNotEmpty($response['data']);
     }
 
     /**
@@ -42,11 +46,14 @@ public function itCanBeStored(): void
      *
      * @return void
      */
-    public function itCanBeRetrieved(): void
+    public function it_can_be_retrieved(): void
     {
-        $response = $this->get('/api/machines/'.Machine::first()->id);
+        $machine = Machine::factory()->create();
+
+        $response = $this->get("/api/machines/{$machine->id}");
 
         $response->assertStatus(200);
+        $this->assertEquals($machine->name, $response['data']['name']);
     }
 
     /**
@@ -56,11 +63,15 @@ public function itCanBeRetrieved(): void
      *
      * @return void
      */
-    public function itCanBeUpdated(): void
+    public function it_can_be_updated(): void
     {
-        $response = $this->put('/api/machines/'.Machine::first()->id, Machine::factory()->raw());
+        $machine = Machine::factory()->create();
+
+        $response = $this->put("/api/machines/{$machine->id}", Machine::factory()->raw());
 
         $response->assertStatus(200);
+        $this->assertEquals($machine->id, $response['data']['id']);
+        $this->assertNotEquals($machine->name, $response['data']['name']);
     }
 
     /**
@@ -70,10 +81,13 @@ public function itCanBeUpdated(): void
      *
      * @return void
      */
-    public function itCanBeDestroyed(): void
+    public function it_can_be_destroyed(): void
     {
-        $response = $this->delete('/api/machines/'.Machine::first()->id);
+        $machine = Machine::factory()->create();
+
+        $response = $this->delete("/api/machines/{$machine->id}");
 
         $response->assertStatus(204);
+        $this->assertDatabaseMissing('machines', ['id' => $machine->id]);
     }
-}
+}
diff --git a/tests/Unit/ProductTest.php b/tests/Unit/ProductTest.php
@@ -14,11 +14,14 @@ class ProductTest extends TestCase
      *
      * @return void
      */
-    public function theyCanBeRetrieved(): void
+    public function they_can_be_retrieved(): void
     {
-        $response = $this->call('GET', '/api/products');
+        Product::factory()->create();
+
+        $response = $this->get('/api/products');
 
         $response->assertStatus(200);
+        $this->assertNotEmpty($response['data']);
     }
 
     /**
@@ -28,11 +31,12 @@ public function theyCanBeRetrieved(): void
      *
      * @return void
      */
-    public function itCanBeStored(): void
+    public function it_can_be_stored(): void
     {
         $response = $this->post('/api/products', Product::factory()->raw());
 
         $response->assertStatus(201);
+        $this->assertNotEmpty($response['data']);
     }
 
     /**
@@ -42,11 +46,14 @@ public function itCanBeStored(): void
      *
      * @return void
      */
-    public function itCanBeRetrieved(): void
+    public function it_can_be_retrieved(): void
     {
-        $response = $this->call('GET', '/api/products/'.Product::first()->id);
+        $product = Product::factory()->create();
+
+        $response = $this->get("/api/products/{$product->id}");
 
         $response->assertStatus(200);
+        $this->assertEquals($product->name, $response['data']['name']);
     }
 
     /**
@@ -56,11 +63,15 @@ public function itCanBeRetrieved(): void
      *
      * @return void
      */
-    public function itCanBeUpdated(): void
+    public function it_can_be_updated(): void
     {
-        $response = $this->put('/api/products/'.Product::first()->id, Product::factory()->raw());
+        $product = Product::factory()->create();
+
+        $response = $this->put("/api/products/{$product->id}", Product::factory()->raw());
 
         $response->assertStatus(200);
+        $this->assertEquals($product->id, $response['data']['id']);
+        $this->assertNotEquals($product->name, $response['data']['name']);
     }
 
     /**
@@ -70,10 +81,13 @@ public function itCanBeUpdated(): void
      *
      * @return void
      */
-    public function itCanBeDestroyed(): void
+    public function it_can_be_destroyed(): void
     {
-        $response = $this->delete('/api/products/'.Product::first()->id);
+        $product = Product::factory()->create();
+
+        $response = $this->delete("/api/products/{$product->id}");
 
         $response->assertStatus(204);
+        $this->assertDatabaseMissing('products', ['id' => $product->id]);
     }
-}
+}
diff --git a/tests/Unit/RowTest.php b/tests/Unit/RowTest.php
@@ -15,11 +15,14 @@ class RowTest extends TestCase
      *
      * @return void
      */
-    public function theyCanBeRetrieved(): void
+    public function they_can_be_retrieved(): void
     {
-        $response = $this->call('GET', '/api/rows', ['machine_id' => Machine::first()->id]);
+        $row = Row::factory()->create();
+
+        $response = $this->call('GET', '/api/rows', ['machine_id' => $row->machine_id]);
 
         $response->assertStatus(200);
+        $this->assertNotEmpty($response['data']);
     }
 
     /**
@@ -29,14 +32,17 @@ public function theyCanBeRetrieved(): void
      *
      * @return void
      */
-    public function itCanBeStored(): void
+    public function it_can_be_stored(): void
     {
+        $machine = Machine::factory()->create();
+
         $response = $this->post('/api/rows', array_merge(
             Row::factory()->raw(),
-            ['machine_id' => Row::first()->machine_id]
+            ['machine_id' => $machine->id]
         ));
 
         $response->assertStatus(201);
+        $this->assertNotEmpty($response['data']);
     }
 
     /**
@@ -46,11 +52,14 @@ public function itCanBeStored(): void
      *
      * @return void
      */
-    public function itCanBeRetrieved(): void
+    public function it_can_be_retrieved(): void
     {
-        $response = $this->call('GET', '/api/rows/'.Row::first()->id);
+        $row = Row::factory()->create();
+
+        $response = $this->call('GET', "/api/rows/{$row->id}");
 
         $response->assertStatus(200);
+        $this->assertEquals($row->name, $response['data']['name']);
     }
 
     /**
@@ -60,11 +69,15 @@ public function itCanBeRetrieved(): void
      *
      * @return void
      */
-    public function itCanBeUpdated(): void
+    public function it_can_be_updated(): void
     {
-        $response = $this->put('/api/rows/'.Row::first()->id, Row::factory()->raw());
+        $row = Row::factory()->create();
+
+        $response = $this->put("/api/rows/{$row->id}", Row::factory()->raw());
 
         $response->assertStatus(200);
+        $this->assertEquals($row->id, $response['data']['id']);
+        $this->assertNotEquals($row->name, $response['data']['name']);
     }
 
     /**
@@ -74,10 +87,13 @@ public function itCanBeUpdated(): void
      *
      * @return void
      */
-    public function itCanBeDestroyed(): void
+    public function it_can_be_destroyed(): void
     {
-        $response = $this->delete('/api/rows/'.Row::first()->id);
+        $row = Row::factory()->create();
+
+        $response = $this->delete("/api/rows/{$row->id}");
 
         $response->assertStatus(204);
+        $this->assertDatabaseMissing('rows', ['id' => $row->id]);
     }
-}
+}