Skip to content

Commit aedf9da

Browse files
author
Joan He
committed
Merge remote-tracking branch 'origin/MAGETWO-95659' into testPR
2 parents 605ba0f + dda4f8a commit aedf9da

File tree

3 files changed

+51
-12
lines changed

3 files changed

+51
-12
lines changed

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

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

78
namespace Magento\Checkout\Test\Constraint;
89

9-
use Magento\Checkout\Test\Fixture\Cart;
1010
use Magento\Checkout\Test\Page\CheckoutCart;
1111
use Magento\Mtf\Client\BrowserInterface;
1212
use Magento\Mtf\Constraint\AbstractConstraint;
@@ -30,8 +30,10 @@ class AssertCartIsEmpty extends AbstractConstraint
3030
* @param BrowserInterface $browser
3131
* @return void
3232
*/
33-
public function processAssert(CheckoutCart $checkoutCart, BrowserInterface $browser)
34-
{
33+
public function processAssert(
34+
CheckoutCart $checkoutCart,
35+
BrowserInterface $browser
36+
): void {
3537
$checkoutCart->open();
3638
$cartEmptyBlock = $checkoutCart->getCartEmptyBlock();
3739

@@ -42,10 +44,12 @@ public function processAssert(CheckoutCart $checkoutCart, BrowserInterface $brow
4244
);
4345

4446
$cartEmptyBlock->clickLinkToMainPage();
45-
\PHPUnit\Framework\Assert::assertEquals(
47+
$this->assertUrlEqual(
4648
$_ENV['app_frontend_url'],
4749
$browser->getUrl(),
48-
'Wrong link to main page on empty cart page.'
50+
true,
51+
'Wrong link to main page on empty cart page: expected - ' . $_ENV['app_frontend_url']
52+
. ', actual - ' . $browser->getUrl()
4953
);
5054
}
5155

@@ -58,4 +62,31 @@ public function toString()
5862
{
5963
return 'Shopping Cart is empty.';
6064
}
65+
66+
/**
67+
* Asserts that two urls are equal
68+
*
69+
* @param string $expectedUrl
70+
* @param string $actualUrl
71+
* @param bool $ignoreScheme
72+
* @param string $message
73+
* @return void
74+
*/
75+
private function assertUrlEqual(
76+
string $expectedUrl,
77+
string $actualUrl,
78+
bool $ignoreScheme = false,
79+
string $message = ''
80+
): void {
81+
$urlArray1 = parse_url($expectedUrl);
82+
$urlArray2 = parse_url($actualUrl);
83+
if ($ignoreScheme) {
84+
unset($urlArray1['scheme']);
85+
unset($urlArray2['scheme']);
86+
}
87+
\PHPUnit\Framework\Assert::assertTrue(
88+
$urlArray1 === $urlArray2,
89+
$message
90+
);
91+
}
6192
}

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutOfflinePaymentMethodsTest.xml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
2323
</variation>
2424
<variation name="OnePageCheckoutUsingRegisterLink" summary="Customer is redirected to checkout on login if guest is disabled, flow with registration new Customer" ticketId="MAGETWO-49917">
25-
<data name="issue" xsi:type="string">MAGETWO-59816: Redirect works improperly in a browser incognito mode</data>
2625
<data name="tag" xsi:type="string">severity:S1</data>
2726
<data name="products/0" xsi:type="string">catalogProductSimple::default</data>
2827
<data name="customer/dataset" xsi:type="string">register_customer</data>
@@ -57,7 +56,7 @@
5756
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
5857
</variation>
5958
<variation name="OnePageCheckoutTestVariation2" summary="US customer during checkout using coupon for all customer groups">
60-
<data name="tag" xsi:type="string">stable:no, severity:S0</data>
59+
<data name="tag" xsi:type="string">severity:S0</data>
6160
<data name="products/0" xsi:type="string">catalogProductSimple::default</data>
6261
<data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups</data>
6362
<data name="customer/dataset" xsi:type="string">default</data>
@@ -79,7 +78,7 @@
7978
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
8079
</variation>
8180
<variation name="OnePageCheckoutTestVariation3" summary="Checkout as UK guest with simple product" ticketId="MAGETWO-42603, MAGETWO-43282, MAGETWO-43318">
82-
<data name="tag" xsi:type="string">severity:S1, stable:no</data>
81+
<data name="tag" xsi:type="string">severity:S1</data>
8382
<data name="products/0" xsi:type="string">catalogProductSimple::product_with_qty_25</data>
8483
<data name="expectedQty/0" xsi:type="string">0</data>
8584
<data name="expectedStockStatus/0" xsi:type="string">out of stock</data>
@@ -92,7 +91,7 @@
9291
<item name="grandTotal" xsi:type="string">375.00</item>
9392
</data>
9493
<data name="payment/method" xsi:type="string">banktransfer</data>
95-
<data name="status" xsi:type="string">Precessing</data>
94+
<data name="status" xsi:type="string">Processing</data>
9695
<data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Cancel, Hold, Invoice, Edit</data>
9796
<data name="configData" xsi:type="string">banktransfer_specificcountry_gb, can_subtract_and_can_back_in_stock</data>
9897
<constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
@@ -102,10 +101,8 @@
102101
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
103102
<constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
104103
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
105-
<data name="issue" xsi:type="string">MAGETWO-66737: Magento\Checkout\Test\TestCase\OnePageCheckoutTest with OnePageCheckoutTestVariation3 and 4 is not stable</data>
106104
</variation>
107105
<variation name="OnePageCheckoutTestVariation4" summary="One Page Checkout Products with Special Prices" ticketId="MAGETWO-12429">
108-
<data name="issue" xsi:type="string">MAGETWO-95659: Fix and Unskip MTF OnePageCheckoutOfflinePaymentMethodsTest</data>
109106
<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S0</data>
110107
<data name="products/0" xsi:type="string">catalogProductSimple::product_with_special_price</data>
111108
<data name="products/1" xsi:type="string">configurableProduct::product_with_special_price</data>
@@ -211,7 +208,7 @@
211208
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
212209
</variation>
213210
<variation name="OnePageCheckoutTestVariation9" summary="One Page Checkout Products with different shipping/billing address and Tier Prices" ticketId="MAGETWO-42604">
214-
<data name="tag" xsi:type="string">stable:no, severity:S1</data>
211+
<data name="tag" xsi:type="string">severity:S1</data>
215212
<data name="products/0" xsi:type="string">catalogProductSimple::simple_with_tier_price_and_order_qty_3</data>
216213
<data name="customer/dataset" xsi:type="string">default</data>
217214
<data name="checkoutMethod" xsi:type="string">login</data>

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,21 @@ class SelectCheckoutMethodStep implements TestStepInterface
5959
*/
6060
private $customerAccountCreatePage;
6161

62+
/**
63+
* Proceed to checkout from minicart step
64+
*
65+
* @var proceedToCheckoutFromMiniShoppingCartStep
66+
*/
67+
private $proceedToCheckoutFromMiniShoppingCartStep;
68+
6269
/**
6370
* @constructor
6471
* @param CheckoutOnepage $checkoutOnepage
6572
* @param CustomerAccountCreate $customerAccountCreatePage
6673
* @param Customer $customer
6774
* @param LogoutCustomerOnFrontendStep $logoutCustomerOnFrontend
6875
* @param ClickProceedToCheckoutStep $clickProceedToCheckoutStep
76+
* @param ProceedToCheckoutFromMiniShoppingCartStep $proceedToCheckoutFromMiniShoppingCartStep
6977
* @param string $checkoutMethod
7078
*/
7179
public function __construct(
@@ -74,6 +82,7 @@ public function __construct(
7482
Customer $customer,
7583
LogoutCustomerOnFrontendStep $logoutCustomerOnFrontend,
7684
ClickProceedToCheckoutStep $clickProceedToCheckoutStep,
85+
ProceedToCheckoutFromMiniShoppingCartStep $proceedToCheckoutFromMiniShoppingCartStep,
7786
$checkoutMethod
7887
) {
7988
$this->checkoutOnepage = $checkoutOnepage;
@@ -82,6 +91,7 @@ public function __construct(
8291
$this->logoutCustomerOnFrontend = $logoutCustomerOnFrontend;
8392
$this->clickProceedToCheckoutStep = $clickProceedToCheckoutStep;
8493
$this->checkoutMethod = $checkoutMethod;
94+
$this->proceedToCheckoutFromMiniShoppingCartStep = $proceedToCheckoutFromMiniShoppingCartStep;
8595
}
8696

8797
/**
@@ -129,6 +139,7 @@ private function processRegister()
129139
if ($this->checkoutMethod === 'register_before_checkout') {
130140
$this->checkoutOnepage->getAuthenticationPopupBlock()->createAccount();
131141
$this->customerAccountCreatePage->getRegisterForm()->registerCustomer($this->customer);
142+
$this->proceedToCheckoutFromMiniShoppingCartStep->run();
132143
}
133144
}
134145

0 commit comments

Comments
 (0)