Merge branch 'master' into 9.x

dmitry-ivanov · Aug 21, 2022 · 0990aaa · 0990aaa
2 parents 1221ca2 + a6c6b30
commit 0990aaa
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 195 deletions.
diff --git a/README.md b/README.md
@@ -97,13 +97,6 @@ Laravel-specific Testing Helpers and Assertions.
   - [dontSeeLogFile](#dontseelogfile)
   - [seeInLogFile](#seeinlogfile)
   - [dontSeeInLogFile](#dontseeinlogfile)
-- [ReflectionAsserts](#reflectionasserts)
-  - [assertSubclassOf](#assertsubclassof)
-  - [assertNotSubclassOf](#assertnotsubclassof)
-  - [assertTraitUsed](#asserttraitused)
-  - [assertTraitNotUsed](#asserttraitnotused)
-  - [assertMethodExists](#assertmethodexists)
-  - [assertMethodNotExists](#assertmethodnotexists)
 - [ScheduleAsserts](#scheduleasserts)
   - [seeScheduleCount](#seeschedulecount)
   - [dontSeeScheduleCount](#dontseeschedulecount)
@@ -307,56 +300,6 @@ $this->dontSeeInLogFile('example.log', [
 ]);
 ```
 
-### ReflectionAsserts
-
-#### `assertSubclassOf()`
-
-Assert that class is a subclass of the given parent:
-
-```php
-$this->assertSubclassOf(Post::class, Model::class);
-```
-
-#### `assertNotSubclassOf()`
-
-Assert that class is not a subclass of the given parent:
-
-```php
-$this->assertNotSubclassOf(Post::class, Command::class);
-```
-
-#### `assertTraitUsed()`
-
-Assert that class uses the given trait:
-
-```php
-$this->assertTraitUsed(User::class, Notifiable::class);
-```
-
-#### `assertTraitNotUsed()`
-
-Assert that class doesn't use the given trait:
-
-```php
-$this->assertTraitNotUsed(Post::class, Notifiable::class);
-```
-
-#### `assertMethodExists()`
-
-Assert that object has the given method:
-
-```php
-$this->assertMethodExists(Post::class, 'save');
-```
-
-#### `assertMethodNotExists()`
-
-Assert that object doesn't have the given method:
-
-```php
-$this->assertMethodNotExists(Post::class, 'fly');
-```
-
 ### ScheduleAsserts
 
 #### `seeScheduleCount()`

diff --git a/src/Asserts/ReflectionAsserts.php b/src/Asserts/ReflectionAsserts.php
diff --git a/src/TestingTools.php b/src/TestingTools.php
@@ -6,7 +6,6 @@
 use Illuminated\Testing\Asserts\DatabaseAsserts;
 use Illuminated\Testing\Asserts\FilesystemAsserts;
 use Illuminated\Testing\Asserts\LogFileAsserts;
-use Illuminated\Testing\Asserts\ReflectionAsserts;
 use Illuminated\Testing\Asserts\ScheduleAsserts;
 use Illuminated\Testing\Asserts\ServiceProviderAsserts;
 use Illuminated\Testing\Helpers\ApplicationHelpers;
@@ -21,7 +20,6 @@ trait TestingTools
     use DatabaseAsserts;
     use FilesystemAsserts;
     use LogFileAsserts;
-    use ReflectionAsserts;
     use ScheduleAsserts;
     use ServiceProviderAsserts;
 }
diff --git a/tests/Asserts/ReflectionAssertsTest.php b/tests/Asserts/ReflectionAssertsTest.php
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -78,4 +78,13 @@ protected function resolveApplicationConsoleKernel($app)
 
         app(KernelContract::class);
     }
+
+    /**
+     * Assert that class uses the given trait.
+     */
+    protected function assertTraitUsed(string $class, string $trait): void
+    {
+        $message = "Failed asserting that class `{$class}` is using trait `{$trait}`.";
+        $this->assertContains($trait, class_uses($class), $message);
+    }
 }
diff --git a/tests/TestingToolsTest.php b/tests/TestingToolsTest.php
@@ -6,7 +6,6 @@
 use Illuminated\Testing\Asserts\DatabaseAsserts;
 use Illuminated\Testing\Asserts\FilesystemAsserts;
 use Illuminated\Testing\Asserts\LogFileAsserts;
-use Illuminated\Testing\Asserts\ReflectionAsserts;
 use Illuminated\Testing\Asserts\ScheduleAsserts;
 use Illuminated\Testing\Asserts\ServiceProviderAsserts;
 use Illuminated\Testing\Helpers\ApplicationHelpers;
@@ -27,7 +26,6 @@ public function it_is_using_all_testing_tools_asserts()
         $this->assertTraitUsed(TestingTools::class, DatabaseAsserts::class);
         $this->assertTraitUsed(TestingTools::class, FilesystemAsserts::class);
         $this->assertTraitUsed(TestingTools::class, LogFileAsserts::class);
-        $this->assertTraitUsed(TestingTools::class, ReflectionAsserts::class);
         $this->assertTraitUsed(TestingTools::class, ScheduleAsserts::class);
         $this->assertTraitUsed(TestingTools::class, ServiceProviderAsserts::class);
     }

diff --git a/tests/fixture/app/Commentable.php b/tests/fixture/app/Commentable.php
diff --git a/tests/fixture/app/Post.php b/tests/fixture/app/Post.php
@@ -7,13 +7,10 @@
 
 class Post extends Model
 {
-    use Commentable;
     use HasFactory;
 
     /**
      * The table associated with the model.
-     *
-     * @var string
      */
     protected $table = 'posts';
 }
diff --git a/tests/fixture/database/factories/PostFactory.php b/tests/fixture/database/factories/PostFactory.php
@@ -9,8 +9,6 @@ class PostFactory extends Factory
 {
     /**
      * The name of the factory's corresponding model.
-     *
-     * @var string
      */
     protected $model = Post::class;
 
@@ -21,7 +19,6 @@ public function definition(): array
     {
         return [
             'title' => $this->faker->sentence,
-            'publish_at' => $this->faker->dateTimeThisYear,
         ];
     }
 }
diff --git a/tests/fixture/database/migrations/2016_11_01_131415_create_posts_table.php b/tests/fixture/database/migrations/2016_11_01_131415_create_posts_table.php
@@ -14,16 +14,7 @@ public function up(): void
         Schema::create('posts', function (Blueprint $table) {
             $table->increments('id');
             $table->string('title');
-            $table->dateTime('publish_at');
             $table->timestamps();
         });
     }
-
-    /**
-     * Rollback the migration.
-     */
-    public function down(): void
-    {
-        Schema::drop('posts');
-    }
 };