diff --git a/src/Illuminate/Testing/TestResponse.php b/src/Illuminate/Testing/TestResponse.php index 03b3aa164179..f5e9b39d5295 100644 --- a/src/Illuminate/Testing/TestResponse.php +++ b/src/Illuminate/Testing/TestResponse.php @@ -397,15 +397,11 @@ protected function getCookie($cookieName) */ public function assertSee($value, $escape = true) { - if (is_array($value)) { - $values = $escape ? array_map('e', ($value)) : $value; + $value = Arr::wrap($value); - foreach ($values as $value) { - PHPUnit::assertStringContainsString((string) $value, $this->getContent()); - } - } else { - $value = $escape ? e($value) : $value; + $values = $escape ? array_map('e', ($value)) : $value; + foreach ($values as $value) { PHPUnit::assertStringContainsString((string) $value, $this->getContent()); } @@ -437,19 +433,15 @@ public function assertSeeInOrder(array $values, $escape = true) */ public function assertSeeText($value, $escape = true) { - if (is_array($value)) { - $values = $escape ? array_map('e', ($value)) : $value; + $value = Arr::wrap($value); - tap(strip_tags($this->getContent()), function ($content) use ($values) { - foreach ($values as $value) { - PHPUnit::assertStringContainsString((string) $value, $content); - } - }); - } else { - $value = $escape ? e($value) : $value; + $values = $escape ? array_map('e', ($value)) : $value; - PHPUnit::assertStringContainsString((string) $value, strip_tags($this->getContent())); - } + tap(strip_tags($this->getContent()), function ($content) use ($values) { + foreach ($values as $value) { + PHPUnit::assertStringContainsString((string) $value, $content); + } + }); return $this; } @@ -479,15 +471,11 @@ public function assertSeeTextInOrder(array $values, $escape = true) */ public function assertDontSee($value, $escape = true) { - if (is_array($value)) { - $values = $escape ? array_map('e', ($value)) : $value; + $value = Arr::wrap($value); - foreach ($values as $value) { - PHPUnit::assertStringNotContainsString((string) $value, $this->getContent()); - } - } else { - $value = $escape ? e($value) : $value; + $values = $escape ? array_map('e', ($value)) : $value; + foreach ($values as $value) { PHPUnit::assertStringNotContainsString((string) $value, $this->getContent()); } @@ -503,19 +491,15 @@ public function assertDontSee($value, $escape = true) */ public function assertDontSeeText($value, $escape = true) { - if (is_array($value)) { - $values = $escape ? array_map('e', ($value)) : $value; + $value = Arr::wrap($value); - tap(strip_tags($this->getContent()), function ($content) use ($values) { - foreach ($values as $value) { - PHPUnit::assertStringNotContainsString((string) $value, $content); - } - }); - } else { - $value = $escape ? e($value) : $value; + $values = $escape ? array_map('e', ($value)) : $value; - PHPUnit::assertStringNotContainsString((string) $value, strip_tags($this->getContent())); - } + tap(strip_tags($this->getContent()), function ($content) use ($values) { + foreach ($values as $value) { + PHPUnit::assertStringNotContainsString((string) $value, $content); + } + }); return $this; }