diff --git a/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php b/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php index d268e23b4..830fd40c4 100644 --- a/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php +++ b/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php @@ -9,6 +9,7 @@ use Codeception\Module\WebDriver; use Codeception\Test\Descriptor; use Codeception\TestInterface; +use Yandex\Allure\Adapter\Allure; use Facebook\WebDriver\Interactions\WebDriverActions; use Codeception\Exception\ModuleConfigException; use Codeception\Exception\ModuleException; @@ -18,6 +19,8 @@ use Magento\FunctionalTestingFramework\Util\Protocol\CurlTransport; use Magento\FunctionalTestingFramework\Util\Protocol\CurlInterface; use Magento\FunctionalTestingFramework\Util\ConfigSanitizerUtil; +use Yandex\Allure\Adapter\Event\AddAttachmentEvent; +use Yandex\Allure\Adapter\Event\AddParameterEvent; use Yandex\Allure\Adapter\Support\AttachmentSupport; use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException; @@ -198,7 +201,10 @@ public function _getCurrentUri() */ public function dontSeeCurrentUrlEquals($url) { - $this->assertNotEquals($url, $this->webDriver->getCurrentURL()); + $actualUrl = $this->webDriver->getCurrentURL(); + $comparison = "Expected: $url\nActual: $actualUrl"; + Allure::lifecycle()->fire(new AddAttachmentEvent($comparison, 'Comparison')); + $this->assertNotEquals($url, $actualUrl); } /** @@ -209,7 +215,10 @@ public function dontSeeCurrentUrlEquals($url) */ public function dontSeeCurrentUrlMatches($regex) { - $this->assertNotRegExp($regex, $this->webDriver->getCurrentURL()); + $actualUrl = $this->webDriver->getCurrentURL(); + $comparison = "Expected: $regex\nActual: $actualUrl"; + Allure::lifecycle()->fire(new AddAttachmentEvent($comparison, 'Comparison')); + $this->assertNotRegExp($regex, $actualUrl); } /** @@ -220,7 +229,10 @@ public function dontSeeCurrentUrlMatches($regex) */ public function dontSeeInCurrentUrl($needle) { - $this->assertNotContains($needle, $this->webDriver->getCurrentURL()); + $actualUrl = $this->webDriver->getCurrentURL(); + $comparison = "Expected: $needle\nActual: $actualUrl"; + Allure::lifecycle()->fire(new AddAttachmentEvent($comparison, 'Comparison')); + $this->assertNotContains($needle, $actualUrl); } /** @@ -254,7 +266,10 @@ public function grabFromCurrentUrl($regex = null) */ public function seeCurrentUrlEquals($url) { - $this->assertEquals($url, $this->webDriver->getCurrentURL()); + $actualUrl = $this->webDriver->getCurrentURL(); + $comparison = "Expected: $url\nActual: $actualUrl"; + Allure::lifecycle()->fire(new AddAttachmentEvent($comparison, 'Comparison')); + $this->assertEquals($url, $actualUrl); } /** @@ -265,7 +280,10 @@ public function seeCurrentUrlEquals($url) */ public function seeCurrentUrlMatches($regex) { - $this->assertRegExp($regex, $this->webDriver->getCurrentURL()); + $actualUrl = $this->webDriver->getCurrentURL(); + $comparison = "Expected: $regex\nActual: $actualUrl"; + Allure::lifecycle()->fire(new AddAttachmentEvent($comparison, 'Comparison')); + $this->assertRegExp($regex, $actualUrl); } /** @@ -276,7 +294,10 @@ public function seeCurrentUrlMatches($regex) */ public function seeInCurrentUrl($needle) { - $this->assertContains($needle, $this->webDriver->getCurrentURL()); + $actualUrl = $this->webDriver->getCurrentURL(); + $comparison = "Expected: $needle\nActual: $actualUrl"; + Allure::lifecycle()->fire(new AddAttachmentEvent($comparison, 'Comparison')); + $this->assertContains($needle, $actualUrl); } /**