- Update tests to Laravel 5.4

hootlex · hootlex · commit 2870f35a31cf · 2017-02-10T04:02:23.000+02:00
- Bugfix
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
   "autoload-dev": {
     "classmap": [
       "tests",
-      "vendor/laravel/laravel/tests/TestCase.php"
+      "vendor/laravel/laravel/tests"
     ]
   },
   "require": {
diff --git a/src/ModerationScope.php b/src/ModerationScope.php
@@ -98,14 +98,6 @@ public function extend(Builder $builder)
         foreach ($this->extensions as $extension) {
             $this->{"add{$extension}"}($builder);
         }
-
-        $builder->onDelete(function (Builder $builder) {
-            $column = $builder->getModel()->getModeratedAtColumn();
-
-            return $builder->update([
-                $column => $builder->getModel()->freshTimestampString(),
-            ]);
-        });
     }
 
     /**
diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php
@@ -1,6 +1,8 @@
 <?php
 
 use Hootlex\Moderation\Tests\Post;
+use Tests\TestCase;
+
 
 abstract class BaseTestCase extends TestCase
 {
@@ -14,7 +16,7 @@ function createPost($overrides = [], $amount = 1)
     {
         $posts = new \Illuminate\Database\Eloquent\Collection;
         for ($i = 0; $i < $amount; $i++) {
-            $post = Post::create(array_merge(['moderated_at' => 0], $overrides));
+            $post = Post::create(array_merge(['moderated_at' => \Carbon\Carbon::now()], $overrides));
             $posts->push($post);
         }
 
diff --git a/tests/ModerationScopeTest.php b/tests/ModerationScopeTest.php
@@ -157,7 +157,7 @@ public function it_approves_stories()
         (new Post)->newQueryWithoutScope(new ModerationScope)->whereIn('id', $postsIds)->approve();
 
         foreach ($postsIds as $postId) {
-            $this->seeInDatabase('posts', ['id' => $postId, $this->status_column => Status::APPROVED]);
+            $this->assertDatabaseHas('posts', ['id' => $postId, $this->status_column => Status::APPROVED]);
         }
     }
 
@@ -170,7 +170,7 @@ public function it_rejects_stories()
         (new Post)->newQueryWithoutScope(new ModerationScope)->whereIn('id', $postsIds)->reject();
 
         foreach ($postsIds as $postId) {
-            $this->seeInDatabase('posts', ['id' => $postId, $this->status_column => Status::REJECTED]);
+            $this->assertDatabaseHas('posts', ['id' => $postId, $this->status_column => Status::REJECTED]);
         }
     }
 
@@ -183,7 +183,7 @@ public function it_postpones_stories()
         (new Post)->newQueryWithoutScope(new ModerationScope)->whereIn('id', $postsIds)->postpone();
 
         foreach ($postsIds as $postId) {
-            $this->seeInDatabase('posts', ['id' => $postId, $this->status_column => Status::POSTPONED]);
+            $this->assertDatabaseHas('posts', ['id' => $postId, $this->status_column => Status::POSTPONED]);
         }
     }
 
@@ -194,7 +194,7 @@ public function it_approves_a_story_by_id()
 
         (new Post)->newQueryWithoutScope(new ModerationScope)->approve($post->id);
 
-        $this->seeInDatabase('posts',
+        $this->assertDatabaseHas('posts',
             [
                 'id' => $post->id,
                 $this->status_column => Status::APPROVED,
@@ -209,7 +209,7 @@ public function it_rejects_a_story_by_id()
 
         (new Post)->newQueryWithoutScope(new ModerationScope)->reject($post->id);
 
-        $this->seeInDatabase('posts',
+        $this->assertDatabaseHas('posts',
             [
                 'id' => $post->id,
                 $this->status_column => Status::REJECTED,
@@ -224,7 +224,7 @@ public function it_postpones_a_story_by_id()
 
         (new Post)->newQueryWithoutScope(new ModerationScope)->postpone($post->id);
 
-        $this->seeInDatabase('posts',
+        $this->assertDatabaseHas('posts',
             [
                 'id' => $post->id,
                 $this->status_column => Status::POSTPONED,
@@ -245,7 +245,7 @@ public function it_updates_moderated_by_column_on_status_update()
         (new Post)->newQueryWithoutScope(new ModerationScope)->where('id', '=', $posts[2]->id)->reject();
 
         foreach ($posts as $post) {
-            $this->seeInDatabase('posts',
+            $this->assertDatabaseHas('posts',
                 [
                     'id' => $post->id,
                     $this->moderated_by_column => \Auth::user()->id
@@ -266,7 +266,7 @@ public function it_updates_moderated_by_column_on_status_update_by_id()
         (new Post)->newQueryWithoutScope(new ModerationScope)->reject($posts[2]->id);
 
         foreach ($posts as $post) {
-            $this->seeInDatabase('posts',
+            $this->assertDatabaseHas('posts',
                 [
                     'id' => $post->id,
                     $this->moderated_by_column => \Auth::user()->id
diff --git a/tests/ModerationTraitTest.php b/tests/ModerationTraitTest.php
@@ -73,7 +73,7 @@ public function it_approves_a_story_by_id()
 
         Post::approve($post->id);
 
-        $this->seeInDatabase('posts',
+        $this->assertDatabaseHas('posts',
             ['id' => $post->id, $this->status_column => Status::APPROVED, $this->moderated_at_column => \Carbon\Carbon::now()]);
     }
 
@@ -84,7 +84,7 @@ public function it_rejects_a_story_by_id()
 
         Post::reject($post->id);
 
-        $this->seeInDatabase('posts',
+        $this->assertDatabaseHas('posts',
             ['id' => $post->id, $this->status_column => Status::REJECTED, $this->moderated_at_column => \Carbon\Carbon::now()]);
     }
 
@@ -95,7 +95,7 @@ public function it_postpones_a_story_by_id()
 
         Post::postpone($post->id);
 
-        $this->seeInDatabase('posts',
+        $this->assertDatabaseHas('posts',
             ['id' => $post->id, $this->status_column => Status::POSTPONED, $this->moderated_at_column => \Carbon\Carbon::now()]);
     }
 
@@ -106,7 +106,7 @@ public function it_pendings_a_story_by_id()
 
         Post::pend($post->id);
 
-        $this->seeInDatabase('posts',
+        $this->assertDatabaseHas('posts',
             ['id' => $post->id, $this->status_column => Status::PENDING, $this->moderated_at_column => \Carbon\Carbon::now()]);
     }
 
@@ -178,7 +178,7 @@ public function it_deletes_rejected_resources(){
         $postDel = Post::withRejected()->where('id', $post->id)->first();
         $postDel->delete();
 
-        $this->dontSeeInDatabase('posts',['id' => $post->id]);
+        $this->assertDatabaseMissing('posts',['id' => $post->id]);
     }
 
     /** @test */
@@ -192,9 +192,9 @@ public function it_deletes_resources_of_any_status(){
             $post->delete();
         }
 
-        $this->dontSeeInDatabase('posts',['id' => $posts[0]->id]);
-        $this->dontSeeInDatabase('posts',['id' => $posts[1]->id]);
-        $this->dontSeeInDatabase('posts',['id' => $posts[2]->id]);
+        $this->assertDatabaseMissing('posts',['id' => $posts[0]->id]);
+        $this->assertDatabaseMissing('posts',['id' => $posts[1]->id]);
+        $this->assertDatabaseMissing('posts',['id' => $posts[2]->id]);
     }
 
     /** @test */
@@ -206,7 +206,7 @@ public function it_marks_as_approved_an_instance()
 
         $this->assertEquals(Status::APPROVED, $post->status);
 
-        $this->seeInDatabase('posts',
+        $this->assertDatabaseHas('posts',
             ['id' => $post->id, $this->status_column => Status::APPROVED, $this->moderated_at_column => \Carbon\Carbon::now()]);
     }
 
@@ -219,7 +219,7 @@ public function it_marks_as_rejected_an_instance()
 
         $this->assertEquals(Status::REJECTED, $post->status);
 
-        $this->seeInDatabase('posts',
+        $this->assertDatabaseHas('posts',
             ['id' => $post->id, $this->status_column => Status::REJECTED, $this->moderated_at_column => \Carbon\Carbon::now()]);
     }
 
@@ -232,7 +232,7 @@ public function it_marks_as_postponed_an_instance()
 
         $this->assertEquals(Status::POSTPONED, $post->status);
 
-        $this->seeInDatabase('posts',
+        $this->assertDatabaseHas('posts',
             ['id' => $post->id, $this->status_column => Status::POSTPONED, $this->moderated_at_column => \Carbon\Carbon::now()]);
     }
 
@@ -245,7 +245,7 @@ public function it_marks_as_pending_an_instance()
 
         $this->assertEquals(Status::PENDING, $post->status);
 
-        $this->seeInDatabase('posts',
+        $this->assertDatabaseHas('posts',
             ['id' => $post->id, $this->status_column => Status::PENDING, $this->moderated_at_column => \Carbon\Carbon::now()]);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`"autoload-dev": {`
`13`	`13`	`"classmap": [`
`14`	`14`	`"tests",`
`15`		`- "vendor/laravel/laravel/tests/TestCase.php"`
	`15`	`+ "vendor/laravel/laravel/tests"`
`16`	`16`	`]`
`17`	`17`	`},`
`18`	`18`	`"require": {`
Original file line number	Diff line number	Diff line change
`@@ -98,14 +98,6 @@ public function extend(Builder $builder)`
`98`	`98`	`foreach ($this->extensions as $extension) {`
`99`	`99`	`$this->{"add{$extension}"}($builder);`
`100`	`100`	`}`
`101`		`-`
`102`		`- $builder->onDelete(function (Builder $builder) {`
`103`		`- $column = $builder->getModel()->getModeratedAtColumn();`
`104`		`-`
`105`		`- return $builder->update([`
`106`		`- $column => $builder->getModel()->freshTimestampString(),`
`107`		`- ]);`
`108`		`- });`
`109`	`101`	`}`
`110`	`102`
`111`	`103`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`use Hootlex\Moderation\Tests\Post;`
	`4`	`+use Tests\TestCase;`
	`5`	`+`
`4`	`6`
`5`	`7`	`abstract class BaseTestCase extends TestCase`
`6`	`8`	`{`
`@@ -14,7 +16,7 @@ function createPost($overrides = [], $amount = 1)`
`14`	`16`	`{`
`15`	`17`	`$posts = new \Illuminate\Database\Eloquent\Collection;`
`16`	`18`	`for ($i = 0; $i < $amount; $i++) {`
`17`		`- $post = Post::create(array_merge(['moderated_at' => 0], $overrides));`
	`19`	`+ $post = Post::create(array_merge(['moderated_at' => \Carbon\Carbon::now()], $overrides));`
`18`	`20`	`$posts->push($post);`
`19`	`21`	`}`
`20`	`22`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public function it_approves_stories()`
`157`	`157`	`(new Post)->newQueryWithoutScope(new ModerationScope)->whereIn('id', $postsIds)->approve();`
`158`	`158`
`159`	`159`	`foreach ($postsIds as $postId) {`
`160`		`- $this->seeInDatabase('posts', ['id' => $postId, $this->status_column => Status::APPROVED]);`
	`160`	`+ $this->assertDatabaseHas('posts', ['id' => $postId, $this->status_column => Status::APPROVED]);`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`
`@@ -170,7 +170,7 @@ public function it_rejects_stories()`
`170`	`170`	`(new Post)->newQueryWithoutScope(new ModerationScope)->whereIn('id', $postsIds)->reject();`
`171`	`171`
`172`	`172`	`foreach ($postsIds as $postId) {`
`173`		`- $this->seeInDatabase('posts', ['id' => $postId, $this->status_column => Status::REJECTED]);`
	`173`	`+ $this->assertDatabaseHas('posts', ['id' => $postId, $this->status_column => Status::REJECTED]);`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`
`@@ -183,7 +183,7 @@ public function it_postpones_stories()`
`183`	`183`	`(new Post)->newQueryWithoutScope(new ModerationScope)->whereIn('id', $postsIds)->postpone();`
`184`	`184`
`185`	`185`	`foreach ($postsIds as $postId) {`
`186`		`- $this->seeInDatabase('posts', ['id' => $postId, $this->status_column => Status::POSTPONED]);`
	`186`	`+ $this->assertDatabaseHas('posts', ['id' => $postId, $this->status_column => Status::POSTPONED]);`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`
`@@ -194,7 +194,7 @@ public function it_approves_a_story_by_id()`
`194`	`194`
`195`	`195`	`(new Post)->newQueryWithoutScope(new ModerationScope)->approve($post->id);`
`196`	`196`
`197`		`- $this->seeInDatabase('posts',`
	`197`	`+ $this->assertDatabaseHas('posts',`
`198`	`198`	`[`
`199`	`199`	`'id' => $post->id,`
`200`	`200`	`$this->status_column => Status::APPROVED,`
`@@ -209,7 +209,7 @@ public function it_rejects_a_story_by_id()`
`209`	`209`
`210`	`210`	`(new Post)->newQueryWithoutScope(new ModerationScope)->reject($post->id);`
`211`	`211`
`212`		`- $this->seeInDatabase('posts',`
	`212`	`+ $this->assertDatabaseHas('posts',`
`213`	`213`	`[`
`214`	`214`	`'id' => $post->id,`
`215`	`215`	`$this->status_column => Status::REJECTED,`
`@@ -224,7 +224,7 @@ public function it_postpones_a_story_by_id()`
`224`	`224`
`225`	`225`	`(new Post)->newQueryWithoutScope(new ModerationScope)->postpone($post->id);`
`226`	`226`
`227`		`- $this->seeInDatabase('posts',`
	`227`	`+ $this->assertDatabaseHas('posts',`
`228`	`228`	`[`
`229`	`229`	`'id' => $post->id,`
`230`	`230`	`$this->status_column => Status::POSTPONED,`
`@@ -245,7 +245,7 @@ public function it_updates_moderated_by_column_on_status_update()`
`245`	`245`	`(new Post)->newQueryWithoutScope(new ModerationScope)->where('id', '=', $posts[2]->id)->reject();`
`246`	`246`
`247`	`247`	`foreach ($posts as $post) {`
`248`		`- $this->seeInDatabase('posts',`
	`248`	`+ $this->assertDatabaseHas('posts',`
`249`	`249`	`[`
`250`	`250`	`'id' => $post->id,`
`251`	`251`	`$this->moderated_by_column => \Auth::user()->id`
`@@ -266,7 +266,7 @@ public function it_updates_moderated_by_column_on_status_update_by_id()`
`266`	`266`	`(new Post)->newQueryWithoutScope(new ModerationScope)->reject($posts[2]->id);`
`267`	`267`
`268`	`268`	`foreach ($posts as $post) {`
`269`		`- $this->seeInDatabase('posts',`
	`269`	`+ $this->assertDatabaseHas('posts',`
`270`	`270`	`[`
`271`	`271`	`'id' => $post->id,`
`272`	`272`	`$this->moderated_by_column => \Auth::user()->id`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function it_approves_a_story_by_id()`
`73`	`73`
`74`	`74`	`Post::approve($post->id);`
`75`	`75`
`76`		`- $this->seeInDatabase('posts',`
	`76`	`+ $this->assertDatabaseHas('posts',`
`77`	`77`	`['id' => $post->id, $this->status_column => Status::APPROVED, $this->moderated_at_column => \Carbon\Carbon::now()]);`
`78`	`78`	`}`
`79`	`79`
`@@ -84,7 +84,7 @@ public function it_rejects_a_story_by_id()`
`84`	`84`
`85`	`85`	`Post::reject($post->id);`
`86`	`86`
`87`		`- $this->seeInDatabase('posts',`
	`87`	`+ $this->assertDatabaseHas('posts',`
`88`	`88`	`['id' => $post->id, $this->status_column => Status::REJECTED, $this->moderated_at_column => \Carbon\Carbon::now()]);`
`89`	`89`	`}`
`90`	`90`
`@@ -95,7 +95,7 @@ public function it_postpones_a_story_by_id()`
`95`	`95`
`96`	`96`	`Post::postpone($post->id);`
`97`	`97`
`98`		`- $this->seeInDatabase('posts',`
	`98`	`+ $this->assertDatabaseHas('posts',`
`99`	`99`	`['id' => $post->id, $this->status_column => Status::POSTPONED, $this->moderated_at_column => \Carbon\Carbon::now()]);`
`100`	`100`	`}`
`101`	`101`
`@@ -106,7 +106,7 @@ public function it_pendings_a_story_by_id()`
`106`	`106`
`107`	`107`	`Post::pend($post->id);`
`108`	`108`
`109`		`- $this->seeInDatabase('posts',`
	`109`	`+ $this->assertDatabaseHas('posts',`
`110`	`110`	`['id' => $post->id, $this->status_column => Status::PENDING, $this->moderated_at_column => \Carbon\Carbon::now()]);`
`111`	`111`	`}`
`112`	`112`
`@@ -178,7 +178,7 @@ public function it_deletes_rejected_resources(){`
`178`	`178`	`$postDel = Post::withRejected()->where('id', $post->id)->first();`
`179`	`179`	`$postDel->delete();`
`180`	`180`
`181`		`- $this->dontSeeInDatabase('posts',['id' => $post->id]);`
	`181`	`+ $this->assertDatabaseMissing('posts',['id' => $post->id]);`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`/** @test */`
`@@ -192,9 +192,9 @@ public function it_deletes_resources_of_any_status(){`
`192`	`192`	`$post->delete();`
`193`	`193`	`}`
`194`	`194`
`195`		`- $this->dontSeeInDatabase('posts',['id' => $posts[0]->id]);`
`196`		`- $this->dontSeeInDatabase('posts',['id' => $posts[1]->id]);`
`197`		`- $this->dontSeeInDatabase('posts',['id' => $posts[2]->id]);`
	`195`	`+ $this->assertDatabaseMissing('posts',['id' => $posts[0]->id]);`
	`196`	`+ $this->assertDatabaseMissing('posts',['id' => $posts[1]->id]);`
	`197`	`+ $this->assertDatabaseMissing('posts',['id' => $posts[2]->id]);`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`/** @test */`
`@@ -206,7 +206,7 @@ public function it_marks_as_approved_an_instance()`
`206`	`206`
`207`	`207`	`$this->assertEquals(Status::APPROVED, $post->status);`
`208`	`208`
`209`		`- $this->seeInDatabase('posts',`
	`209`	`+ $this->assertDatabaseHas('posts',`
`210`	`210`	`['id' => $post->id, $this->status_column => Status::APPROVED, $this->moderated_at_column => \Carbon\Carbon::now()]);`
`211`	`211`	`}`
`212`	`212`
`@@ -219,7 +219,7 @@ public function it_marks_as_rejected_an_instance()`
`219`	`219`
`220`	`220`	`$this->assertEquals(Status::REJECTED, $post->status);`
`221`	`221`
`222`		`- $this->seeInDatabase('posts',`
	`222`	`+ $this->assertDatabaseHas('posts',`
`223`	`223`	`['id' => $post->id, $this->status_column => Status::REJECTED, $this->moderated_at_column => \Carbon\Carbon::now()]);`
`224`	`224`	`}`
`225`	`225`
`@@ -232,7 +232,7 @@ public function it_marks_as_postponed_an_instance()`
`232`	`232`
`233`	`233`	`$this->assertEquals(Status::POSTPONED, $post->status);`
`234`	`234`
`235`		`- $this->seeInDatabase('posts',`
	`235`	`+ $this->assertDatabaseHas('posts',`
`236`	`236`	`['id' => $post->id, $this->status_column => Status::POSTPONED, $this->moderated_at_column => \Carbon\Carbon::now()]);`
`237`	`237`	`}`
`238`	`238`
`@@ -245,7 +245,7 @@ public function it_marks_as_pending_an_instance()`
`245`	`245`
`246`	`246`	`$this->assertEquals(Status::PENDING, $post->status);`
`247`	`247`
`248`		`- $this->seeInDatabase('posts',`
	`248`	`+ $this->assertDatabaseHas('posts',`
`249`	`249`	`['id' => $post->id, $this->status_column => Status::PENDING, $this->moderated_at_column => \Carbon\Carbon::now()]);`
`250`	`250`	`}`
`251`	`251`