From 75b6b88527869d8b3034d6ea3f26bf811da8d983 Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@adobe.com>
Date: Tue, 27 Aug 2019 09:48:35 -0500
Subject: [PATCH 1/2] MQE-1514: Failure For seeCurrentUrlEquals Action Does Not
 Show Actual & Expected Results in Allure

- Added Allure firing of attachment to steps
---
 .../Module/MagentoWebDriver.php               | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php b/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php
index d268e23b4..0c8f632b3 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, $url);
     }
 
     /**
@@ -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);
     }
 
     /**

From beec38835e3e38b60e881bc7a504b980984b2d5d Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@adobe.com>
Date: Wed, 28 Aug 2019 13:12:09 -0500
Subject: [PATCH 2/2] MQE-1514: Failure For seeCurrentUrlEquals Action Does Not
 Show Actual & Expected Results in Allure

- bugfix for variable name
---
 .../FunctionalTestingFramework/Module/MagentoWebDriver.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php b/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php
index 0c8f632b3..830fd40c4 100644
--- a/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php
+++ b/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php
@@ -283,7 +283,7 @@ public function seeCurrentUrlMatches($regex)
         $actualUrl = $this->webDriver->getCurrentURL();
         $comparison = "Expected: $regex\nActual: $actualUrl";
         Allure::lifecycle()->fire(new AddAttachmentEvent($comparison, 'Comparison'));
-        $this->assertRegExp($regex, $url);
+        $this->assertRegExp($regex, $actualUrl);
     }
 
     /**