- bismillah

.github/workflows/run-tests.yml

@@ -30,7 +30,6 @@ jobs:
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
-
     services:
       mysql:
         image: mysql:8.0
@@ -44,10 +43,7 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
 
-
-
     steps:
-
       - name: Verify Mysql connection
         run: |
           mysql --version

tests/Models/ExampleShapelyFlexyModel.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace AuroraWebSoftware\FlexyField\Tests\Models;
+
+use AuroraWebSoftware\FlexyField\Contracts\FlexyModelContract;
+use AuroraWebSoftware\FlexyField\Traits\Flexy;
+use Illuminate\Database\Eloquent\Model;
+
+class ExampleShapelyFlexyModel extends Model implements FlexyModelContract
+{
+    use Flexy;
+
+    protected $table = 'ff_example_flexy_models';
+
+    protected $guarded = [];
+}

tests/PackageTest.php

@@ -4,6 +4,7 @@
 use AuroraWebSoftware\FlexyField\Exceptions\FlexyFieldIsNotInShape;
 use AuroraWebSoftware\FlexyField\Models\Shape;
 use AuroraWebSoftware\FlexyField\Tests\Models\ExampleFlexyModel;
+use AuroraWebSoftware\FlexyField\Tests\Models\ExampleShapelyFlexyModel;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Schema;
@@ -81,40 +82,42 @@
 });
 
 it('can get exception when shape is mandatory', function () {
-    $flexyModel1 = ExampleFlexyModel::create(['name' => 'ExampleFlexyModel 1']);
-    ExampleFlexyModel::$hasShape = true;
+    $flexyModel1 = ExampleShapelyFlexyModel::create(['name' => 'ExampleFlexyModel 1']);
+    ExampleShapelyFlexyModel::$hasShape = true;
     $flexyModel1->flexy->a = '1';
     $flexyModel1->save();
 })->expectException(FlexyFieldIsNotInShape::class);
 
 it('can create shape for a model and save', function () {
-    $flexyModel1 = ExampleFlexyModel::create(['name' => 'ExampleFlexyModel 1']);
-    ExampleFlexyModel::$hasShape = true;
+    $flexyModel1 = ExampleShapelyFlexyModel::create(['name' => 'ExampleFlexyModel 1']);
+    ExampleShapelyFlexyModel::$hasShape = true;
 
-    ExampleFlexyModel::setFlexyShape('a', FlexyFieldType::STRING, 1);
+    ExampleShapelyFlexyModel::setFlexyShape('a', FlexyFieldType::STRING, 1);
 
     $flexyModel1->flexy->a = 'a';
     $flexyModel1->save();
+
+    expect(ExampleShapelyFlexyModel::getFlexyShape('a'))->toBeInstanceOf(Shape::class);
 });
 
 it('can create shape for a model and validate and throws', function () {
-    $flexyModel1 = ExampleFlexyModel::create(['name' => 'ExampleFlexyModel 1']);
-    ExampleFlexyModel::$hasShape = true;
+    $flexyModel1 = ExampleShapelyFlexyModel::create(['name' => 'ExampleFlexyModel 1']);
+    ExampleShapelyFlexyModel::$hasShape = true;
 
-    ExampleFlexyModel::setFlexyShape('a', FlexyFieldType::INTEGER, 1, 'numeric|max:1');
+    ExampleShapelyFlexyModel::setFlexyShape('a', FlexyFieldType::INTEGER, 1, 'numeric|max:1');
 
     $flexyModel1->flexy->a = 'a';
     $flexyModel1->save();
 })->expectException(ValidationException::class);
 
 it('can create shape for a model and validate and save', function () {
-    $flexyModel1 = ExampleFlexyModel::create(['name' => 'ExampleFlexyModel 1']);
-    ExampleFlexyModel::$hasShape = true;
+    $flexyModel1 = ExampleShapelyFlexyModel::create(['name' => 'ExampleFlexyModel 1']);
+    ExampleShapelyFlexyModel::$hasShape = true;
 
-    ExampleFlexyModel::setFlexyShape('a', FlexyFieldType::INTEGER, 1, 'numeric|max:7');
+    ExampleShapelyFlexyModel::setFlexyShape('a', FlexyFieldType::INTEGER, 1, 'numeric|max:7');
 
     $flexyModel1->flexy->a = 5;
     $flexyModel1->save();
 
-    expect(ExampleFlexyModel::where('flexy_a', 5)->get())->toHaveCount(1);
+    expect(ExampleShapelyFlexyModel::where('flexy_a', 5)->get())->toHaveCount(1);
 });