From 9d207ca94c3b5647e17931757b38fdf4b38e8c17 Mon Sep 17 00:00:00 2001 From: Tavo Nieves J Date: Wed, 3 Feb 2021 03:32:36 -0500 Subject: [PATCH] Use AssertSame instead of AssertEquals --- src/Codeception/Module/Symfony/ConsoleAssertionsTrait.php | 2 +- src/Codeception/Module/Symfony/DoctrineAssertionsTrait.php | 2 +- src/Codeception/Module/Symfony/FormAssertionsTrait.php | 6 ++++-- src/Codeception/Module/Symfony/RouterAssertionsTrait.php | 6 +++--- src/Codeception/Module/Symfony/SessionAssertionsTrait.php | 4 ++-- src/Codeception/Module/Symfony/TwigAssertionsTrait.php | 4 ++-- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/Codeception/Module/Symfony/ConsoleAssertionsTrait.php b/src/Codeception/Module/Symfony/ConsoleAssertionsTrait.php index de61419d..1aa9c36d 100644 --- a/src/Codeception/Module/Symfony/ConsoleAssertionsTrait.php +++ b/src/Codeception/Module/Symfony/ConsoleAssertionsTrait.php @@ -37,7 +37,7 @@ public function runSymfonyConsoleCommand(string $command, array $parameters = [] $exitCode = $commandTester->execute($parameters); $output = $commandTester->getDisplay(); - $this->assertEquals( + $this->assertSame( $expectedExitCode, $exitCode, 'Command did not exit with code '.$expectedExitCode diff --git a/src/Codeception/Module/Symfony/DoctrineAssertionsTrait.php b/src/Codeception/Module/Symfony/DoctrineAssertionsTrait.php index aead5a56..c67653ff 100644 --- a/src/Codeception/Module/Symfony/DoctrineAssertionsTrait.php +++ b/src/Codeception/Module/Symfony/DoctrineAssertionsTrait.php @@ -118,7 +118,7 @@ public function seeNumRecords(int $expectedNum, string $className, array $criter { $currentNum = $this->grabNumRecords($className, $criteria); - $this->assertEquals( + $this->assertSame( $expectedNum, $currentNum, sprintf( diff --git a/src/Codeception/Module/Symfony/FormAssertionsTrait.php b/src/Codeception/Module/Symfony/FormAssertionsTrait.php index 1ce10023..4a14af3c 100644 --- a/src/Codeception/Module/Symfony/FormAssertionsTrait.php +++ b/src/Codeception/Module/Symfony/FormAssertionsTrait.php @@ -24,9 +24,11 @@ public function dontSeeFormErrors(): void { $formCollector = $this->grabFormCollector(__FUNCTION__); - $this->assertEquals( + $errors = (int) $formCollector->getData()->offsetGet('nb_errors'); + + $this->assertSame( 0, - $formCollector->getData()->offsetGet('nb_errors'), + $errors, 'Expecting that the form does not have errors, but there were!' ); } diff --git a/src/Codeception/Module/Symfony/RouterAssertionsTrait.php b/src/Codeception/Module/Symfony/RouterAssertionsTrait.php index dafbd87f..97c39736 100644 --- a/src/Codeception/Module/Symfony/RouterAssertionsTrait.php +++ b/src/Codeception/Module/Symfony/RouterAssertionsTrait.php @@ -140,7 +140,7 @@ public function seeCurrentRouteIs(string $routeName, array $params = []): void $expected = array_merge(['_route' => $routeName], $params); $intersection = array_intersect_assoc($expected, $match); - $this->assertEquals($expected, $intersection); + $this->assertSame($expected, $intersection); } /** @@ -163,12 +163,12 @@ public function seeInCurrentRoute(string $routeName): void $uri = explode('?', $this->grabFromCurrentUrl())[0]; try { - $matchedRouteName = $router->match($uri)['_route']; + $matchedRouteName = (string) $router->match($uri)['_route']; } catch (ResourceNotFoundException $e) { $this->fail(sprintf('The "%s" url does not match with any route', $uri)); } - $this->assertEquals($matchedRouteName, $routeName); + $this->assertSame($matchedRouteName, $routeName); } protected function grabRouterService(): RouterInterface diff --git a/src/Codeception/Module/Symfony/SessionAssertionsTrait.php b/src/Codeception/Module/Symfony/SessionAssertionsTrait.php index 7af446ec..b0fb11dc 100644 --- a/src/Codeception/Module/Symfony/SessionAssertionsTrait.php +++ b/src/Codeception/Module/Symfony/SessionAssertionsTrait.php @@ -76,7 +76,7 @@ public function dontSeeInSession(string $attribute, $value = null): void } } else { - $this->assertNotEquals($value, $session->get($attribute)); + $this->assertNotSame($value, $session->get($attribute)); } } @@ -133,7 +133,7 @@ public function seeInSession(string $attribute, $value = null): void } if (null !== $value) { - $this->assertEquals($value, $session->get($attribute)); + $this->assertSame($value, $session->get($attribute)); } } diff --git a/src/Codeception/Module/Symfony/TwigAssertionsTrait.php b/src/Codeception/Module/Symfony/TwigAssertionsTrait.php index 56eaeb94..71969d42 100644 --- a/src/Codeception/Module/Symfony/TwigAssertionsTrait.php +++ b/src/Codeception/Module/Symfony/TwigAssertionsTrait.php @@ -47,9 +47,9 @@ public function seeCurrentTemplateIs(string $expectedTemplate): void $twigCollector = $this->grabTwigCollector(__FUNCTION__); $templates = (array) $twigCollector->getTemplates(); - $actualTemplate = array_key_first($templates); + $actualTemplate = (string) array_key_first($templates); - $this->assertEquals( + $this->assertSame( $expectedTemplate, $actualTemplate, "Actual template {$actualTemplate} does not match expected template {$expectedTemplate}."