Moved relationship-tests from src/ to tests/

spatie · Mar 2, 2022 · 12ab30b · 12ab30b
1 parent d7bd6ba
commit 12ab30b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -27,6 +27,7 @@
         "spatie/laravel-package-tools": "^1.9.2"
     },
     "require-dev": {
+        "doctrine/dbal": "^3.3",
         "orchestra/testbench": "^6.23|^7.0",
         "phpunit/phpunit": "^9.4",
         "vimeo/psalm": "^4.12"

diff --git a/database/migrations/create_stats_tables.php.stub b/database/migrations/create_stats_tables.php.stub
@@ -8,16 +8,10 @@ class CreateStatsTables extends Migration
 {
     public function up()
     {
-        Schema::create('stats', function (Blueprint $table) {
-            $table->id();
-            $table->timestamps();
-        });
-
         Schema::create('stats_events', function (Blueprint $table) {
             $table->id();
 
-            $table->string('stat_id')->nullable();
-            $table->string('name')->nullable();
+            $table->string('name');
             $table->string('type');
             $table->bigInteger('value');
 

diff --git a/tests/StatsQueryTest.php b/tests/StatsQueryTest.php
@@ -4,12 +4,12 @@
 
 use Carbon\Carbon;
 use Spatie\Stats\DataPoint;
-use Spatie\Stats\Models\Stat;
 use Spatie\Stats\Models\StatsEvent;
 use Spatie\Stats\StatsQuery;
 use Spatie\Stats\StatsWriter;
 use Spatie\Stats\Tests\Stats\CustomerStats;
 use Spatie\Stats\Tests\Stats\OrderStats;
+use Spatie\Stats\Tests\TestClasses\Models\Stat;
 
 class StatsQueryTest extends TestCase
 {

diff --git a/tests/StatsWriterTest.php b/tests/StatsWriterTest.php
@@ -3,11 +3,11 @@
 namespace Spatie\Stats\Tests;
 
 use Carbon\Carbon;
-use Spatie\Stats\Models\Stat;
 use Spatie\Stats\Models\StatsEvent;
 use Spatie\Stats\StatsWriter;
 use Spatie\Stats\Tests\Stats\CustomerStats;
 use Spatie\Stats\Tests\Stats\OrderStats;
+use Spatie\Stats\Tests\TestClasses\Models\Stat;
 
 class StatsWriterTest extends TestCase
 {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -3,6 +3,7 @@
 namespace Spatie\Stats\Tests;
 
 use CreateStatsTables;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Orchestra\Testbench\TestCase as Orchestra;
 use Spatie\Stats\StatsServiceProvider;
@@ -29,6 +30,16 @@ public function setupDatabase()
     {
         include_once __DIR__.'/../database/migrations/create_stats_tables.php.stub';
 
+        $this->app['db']->connection()->getSchemaBuilder()->create('stats', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+        });
+
         (new CreateStatsTables())->up();
+
+        $this->app['db']->connection()->getSchemaBuilder()->table('stats_events', function (Blueprint $table) {
+            $table->string('stat_id')->nullable()->after('id');
+            $table->string('name')->nullable()->change();
+        });
     }
 }
diff --git a/src/Models/Stat.php → tests/TestClasses/Models/Stat.php b/src/Models/Stat.php → tests/TestClasses/Models/Stat.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Spatie\Stats\Models;
+namespace Spatie\Stats\Tests\TestClasses\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Spatie\Stats\Models\StatsEvent;
 
 class Stat extends Model
 {