added support for laravel 8

padosoft · Oct 23, 2020 · 4da785b · 4da785b
1 parent 0eadd96
commit 4da785b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
     },
     "require-dev": {
         "ext-json": "*",
-        "orchestra/testbench": "^4.0|^5.0",
+        "orchestra/testbench": "^4.0|^5.0|^6.0",
         "phpunit/phpunit": "^8.0|^9.0"
     },
     "autoload": {

diff --git a/tests/ActivityModelTest.php b/tests/ActivityModelTest.php
@@ -120,7 +120,7 @@ public function it_provides_a_scope_to_get_all_log_items_related_to_subject()
         $this->assertCount(1, $activities);
 
 
-        $this->assertRegexp('/users":"'.$user2->id.'"/',json_encode($activities->first()->properties));
+        $this->assertMatchesRegularExpression('/users":"'.$user2->id.'"/',json_encode($activities->first()->properties));
         $this->assertEquals($causer->getKey(), $activities->first()->causer_id);
         $this->assertEquals(get_class($causer), $activities->first()->causer_type);
         $this->assertEquals($Article->getKey(), $activities->first()->subject_id);

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -72,12 +72,15 @@ protected function createActivityLogTable()
         include_once '__DIR__'.'/../vendor/spatie/laravel-activitylog/migrations/create_activity_log_table.php.stub';
 
         (new \CreateActivityLogTable())->up();
+        if (file_exists('__DIR__'.'/../vendor/spatie/laravel-activitylog/migrations/add_event_column_to_activity_log_table.php.stub')){
+            include_once '__DIR__'.'/../vendor/spatie/laravel-activitylog/migrations/add_event_column_to_activity_log_table.php.stub';
+            (new \AddEventColumnToActivityLogTable())->up();
+        }
 
-        include_once '__DIR__'.'/../vendor/spatie/laravel-activitylog/migrations/add_event_column_to_activity_log_table.php.stub';
 
-        (new \AddEventColumnToActivityLogTable())->up();
 
-        include_once '__DIR__'.'/..//migrations/enhance_activity_log_table.php.stub';
+
+        include_once '__DIR__'.'/../migrations/enhance_activity_log_table.php.stub';
 
         (new \EnhanceActivityLogTable())->up();
     }