From fb5b5e138d448b7a74415b5cd3e37aaf03a9fa7b Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Mon, 24 May 2021 16:16:58 +0100 Subject: [PATCH] Updated existing tag tests away from browserkit testing --- tests/Entity/TagTest.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/Entity/TagTest.php b/tests/Entity/TagTest.php index b1217f959..62ebf5f1b 100644 --- a/tests/Entity/TagTest.php +++ b/tests/Entity/TagTest.php @@ -35,12 +35,12 @@ class TagTest extends TestCase $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'county'])); $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'planet'])); $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'plans'])); - $page = $this->getEntityWithTags(Page::class, $attrs); + $page = $this->getEntityWithTags(Page::class, $attrs->all()); - $this->asAdmin()->get('/ajax/tags/suggest/names?search=dog')->seeJsonEquals([]); - $this->get('/ajax/tags/suggest/names?search=co')->seeJsonEquals(['color', 'country', 'county']); - $this->get('/ajax/tags/suggest/names?search=cou')->seeJsonEquals(['country', 'county']); - $this->get('/ajax/tags/suggest/names?search=pla')->seeJsonEquals(['planet', 'plans']); + $this->asAdmin()->get('/ajax/tags/suggest/names?search=dog')->assertExactJson([]); + $this->get('/ajax/tags/suggest/names?search=co')->assertExactJson(['color', 'country', 'county']); + $this->get('/ajax/tags/suggest/names?search=cou')->assertExactJson(['country', 'county']); + $this->get('/ajax/tags/suggest/names?search=pla')->assertExactJson(['planet', 'plans']); } public function test_tag_value_suggestions() @@ -53,12 +53,12 @@ class TagTest extends TestCase $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'county', 'value' => 'dog'])); $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'planet', 'value' => 'catapult'])); $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'plans', 'value' => 'dodgy'])); - $page = $this->getEntityWithTags(Page::class, $attrs); + $page = $this->getEntityWithTags(Page::class, $attrs->all()); - $this->asAdmin()->get('/ajax/tags/suggest/values?search=ora')->seeJsonEquals([]); - $this->get('/ajax/tags/suggest/values?search=cat')->seeJsonEquals(['cats', 'cattery', 'catapult']); - $this->get('/ajax/tags/suggest/values?search=do')->seeJsonEquals(['dog', 'dodgy']); - $this->get('/ajax/tags/suggest/values?search=cas')->seeJsonEquals(['castle']); + $this->asAdmin()->get('/ajax/tags/suggest/values?search=ora')->assertExactJson([]); + $this->get('/ajax/tags/suggest/values?search=cat')->assertExactJson(['cats', 'cattery', 'catapult']); + $this->get('/ajax/tags/suggest/values?search=do')->assertExactJson(['dog', 'dodgy']); + $this->get('/ajax/tags/suggest/values?search=cas')->assertExactJson(['castle']); } public function test_entity_permissions_effect_tag_suggestions() @@ -67,18 +67,18 @@ class TagTest extends TestCase $attrs = collect(); $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'country'])); $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'color'])); - $page = $this->getEntityWithTags(Page::class, $attrs); + $page = $this->getEntityWithTags(Page::class, $attrs->all()); - $this->asAdmin()->get('/ajax/tags/suggest/names?search=co')->seeJsonEquals(['color', 'country']); - $this->asEditor()->get('/ajax/tags/suggest/names?search=co')->seeJsonEquals(['color', 'country']); + $this->asAdmin()->get('/ajax/tags/suggest/names?search=co')->assertExactJson(['color', 'country']); + $this->asEditor()->get('/ajax/tags/suggest/names?search=co')->assertExactJson(['color', 'country']); // Set restricted permission the page $page->restricted = true; $page->save(); $page->rebuildPermissions(); - $this->asAdmin()->get('/ajax/tags/suggest/names?search=co')->seeJsonEquals(['color', 'country']); - $this->asEditor()->get('/ajax/tags/suggest/names?search=co')->seeJsonEquals([]); + $this->asAdmin()->get('/ajax/tags/suggest/names?search=co')->assertExactJson(['color', 'country']); + $this->asEditor()->get('/ajax/tags/suggest/names?search=co')->assertExactJson([]); } public function test_tags_shown_on_search_listing()