Skip to content

Commit 9498e05

Browse files
committed
MAGETWO-95659: Fix and Unskip MTF OnePageCheckoutOfflinePaymentMethodsTest
1 parent 8da64ab commit 9498e05

File tree

1 file changed

+27
-3
lines changed

1 file changed

+27
-3
lines changed

dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
namespace Magento\Checkout\Test\Constraint;
88

9-
use Magento\Checkout\Test\Fixture\Cart;
109
use Magento\Checkout\Test\Page\CheckoutCart;
1110
use Magento\Mtf\Client\BrowserInterface;
1211
use Magento\Mtf\Constraint\AbstractConstraint;
@@ -42,10 +41,12 @@ public function processAssert(CheckoutCart $checkoutCart, BrowserInterface $brow
4241
);
4342

4443
$cartEmptyBlock->clickLinkToMainPage();
45-
\PHPUnit\Framework\Assert::assertEquals(
44+
$this->assertUrlEqual(
4645
$_ENV['app_frontend_url'],
4746
$browser->getUrl(),
48-
'Wrong link to main page on empty cart page.'
47+
true,
48+
'Wrong link to main page on empty cart page: expected - ' . $_ENV['app_frontend_url']
49+
. ', actural - ' . $browser->getUrl()
4950
);
5051
}
5152

@@ -58,4 +59,27 @@ public function toString()
5859
{
5960
return 'Shopping Cart is empty.';
6061
}
62+
63+
/**
64+
* Asserts that two urls are equal
65+
*
66+
* @param string $url1
67+
* @param string $url2
68+
* @param bool $ignoreScheme
69+
* @param string $message
70+
* @return void
71+
*/
72+
private function assertUrlEqual($expectedUrl, $actualUrl, $ignoreScheme = false, $message = '')
73+
{
74+
$urlArray1 = parse_url($expectedUrl);
75+
$urlArray2 = parse_url($actualUrl);
76+
if ($ignoreScheme) {
77+
unset($urlArray1['scheme']);
78+
unset($urlArray2['scheme']);
79+
}
80+
\PHPUnit\Framework\Assert::assertTrue(
81+
$urlArray1 === $urlArray2,
82+
$message
83+
);
84+
}
6185
}

0 commit comments

Comments
 (0)