Skip to content

Commit afcf6d0

Browse files
VeronikaYaratsVeronikaYarats
committed
Merge remote-tracking branch 'remotes/github/2.3-develop' into EPAM-PR-80
2 parents 7395c1d + 3cbe632 commit afcf6d0

File tree

46 files changed

+380
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+380
-158
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenProductPageActionGroup.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,15 @@
1818
<amOnPage url="{{StorefrontProductPage.url(productUrl)}}" stepKey="openProductPage"/>
1919
<waitForPageLoad stepKey="waitForProductPageLoaded"/>
2020
</actionGroup>
21+
<actionGroup name="StorefrontOpenProductPageOnSecondStore">
22+
<annotations>
23+
<description>Goes to the Storefront Product page for the provided store code and Product URL.</description>
24+
</annotations>
25+
<arguments>
26+
<argument name="storeCode" type="string"/>
27+
<argument name="productUrl" type="string"/>
28+
</arguments>
29+
30+
<amOnPage url="{{StorefrontStoreViewProductPage.url(storeCode,productUrl)}}" stepKey="openProductPage"/>
31+
</actionGroup>
2132
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Data/CatalogConfigurationData.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<!-- Catalog > Price -->
12+
<entity name="GlobalCatalogPriceScopeConfigData">
13+
<!-- Default configuration -->
14+
<data key="path">catalog/price/scope</data>
15+
<data key="scope_id">0</data>
16+
<data key="label">Global</data>
17+
<data key="value">0</data>
18+
</entity>
19+
<entity name="WebsiteCatalogPriceScopeConfigData">
20+
<data key="path">catalog/price/scope</data>
21+
<data key="scope_id">0</data>
22+
<data key="label">Website</data>
23+
<data key="value">1</data>
24+
</entity>
25+
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,4 +1224,13 @@
12241224
<requiredEntity type="product_extension_attribute">EavStock1</requiredEntity>
12251225
<requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
12261226
</entity>
1227+
<entity name="SimpleProductUpdatePrice11" type="product2">
1228+
<data key="price">11.00</data>
1229+
</entity>
1230+
<entity name="SimpleProductUpdatePrice14" type="product2">
1231+
<data key="price">14.00</data>
1232+
</entity>
1233+
<entity name="SimpleProductUpdatePrice16" type="product2">
1234+
<data key="price">16.00</data>
1235+
</entity>
12271236
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Page/StorefrontStoreViewProductPage.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
11+
<!-- It is created to open product page with store code setting-->
12+
<page name="StorefrontStoreViewProductPage" url="/{{storeCode}}/{{productUrlKey}}.html" area="storefront" module="Magento_Catalog" parameterized="true">
13+
</page>
14+
</pages>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontMiniCartItemsActionGroup.xml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,24 @@
1818
<argument name="cartSubtotal" type="string"/>
1919
<argument name="qty" type="string"/>
2020
</arguments>
21-
22-
<see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{productName}}" stepKey="seeProductNameInMiniCart"/>
23-
<see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{productPrice}}" stepKey="seeProductPriceInMiniCart"/>
21+
22+
<see selector="{{StorefrontMinicartSection.productPriceByName(productName)}}" userInput="{{productPrice}}" stepKey="seeProductPriceInMiniCart"/>
2423
<seeElement selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="seeCheckOutButtonInMiniCart"/>
2524
<seeElement selector="{{StorefrontMinicartSection.productQuantity(productName, qty)}}" stepKey="seeProductQuantity1"/>
2625
<seeElement selector="{{StorefrontMinicartSection.productImage}}" stepKey="seeProductImage"/>
2726
<see selector="{{StorefrontMinicartSection.productSubTotal}}" userInput="{{cartSubtotal}}" stepKey="seeSubTotal"/>
2827
</actionGroup>
28+
29+
<actionGroup name="AssertStorefrontMiniCartProductDetailsAbsentActionGroup">
30+
<annotations>
31+
<description>Validates that the provided Product details (Name, Price) are
32+
not present in the Storefront Mini Shopping Cart.</description>
33+
</annotations>
34+
<arguments>
35+
<argument name="productName" type="string"/>
36+
<argument name="productPrice" type="string"/>
37+
</arguments>
38+
39+
<dontSee selector="{{StorefrontMinicartSection.productPriceByName(productName)}}" userInput="{{productPrice}}" stepKey="dontSeeProductPriceInMiniCart"/>
40+
</actionGroup>
2941
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckCartDiscountAndSummaryActionGroup.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@
1717
<argument name="total" type="string"/>
1818
<argument name="discount" type="string"/>
1919
</arguments>
20-
2120
<waitForPageLoad stepKey="waitForPageLoad"/>
22-
<waitForLoadingMaskToDisappear stepKey="waitForPrices"/>
21+
<waitForElement time="30" selector="{{CheckoutCartSummarySection.estimateShippingAndTaxForm}}" stepKey="waitForEstimateShippingAndTaxForm"/>
22+
<waitForElement time="30" selector="{{CheckoutCartSummarySection.shippingMethodForm}}" stepKey="waitForShippingMethodForm"/>
23+
<waitForElementVisible time="30" selector="{{CheckoutCartSummarySection.total}}" stepKey="waitForTotalElement"/>
24+
<see selector="{{CheckoutCartSummarySection.total}}" userInput="${{total}}" stepKey="assertTotal"/>
25+
<waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>
2326
<see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-${{discount}}" stepKey="assertDiscount"/>
24-
<wait time="10" stepKey="waitForTotalPrice"/>
25-
<reloadPage stepKey="reloadPage" after="waitForTotalPrice" />
26-
<waitForPageLoad after="reloadPage" stepKey="WaitForPageLoaded" />
27-
<see selector="{{CheckoutCartSummarySection.total}}" userInput="${{total}}" stepKey="assertTotal" after="WaitForPageLoaded"/>
2827
</actionGroup>
2928
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@
3333
<element name="methodName" type="text" selector="#co-shipping-method-form label"/>
3434
<element name="shippingPrice" type="text" selector="#co-shipping-method-form span .price"/>
3535
<element name="shippingMethodElementId" type="radio" selector="#s_method_{{carrierCode}}_{{methodCode}}" parameterized="true"/>
36+
<element name="estimateShippingAndTaxForm" type="block" selector="#shipping-zip-form"/>
3637
</section>
3738
</sections>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartItemDisplayWhenMoreItemsAddedToTheCartThanDefaultDisplayLimitTest.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
<testCaseId value="MC-14720"/>
1616
<severity value="CRITICAL"/>
1717
<group value="mtf_migrated"/>
18-
<skip>
19-
<issueId value="MC-17140"/>
20-
</skip>
2118
</annotations>
2219

2320
<before>
@@ -280,7 +277,9 @@
280277
</actionGroup>
281278

282279
<!-- Verify Product11 is not displayed in Mini Cart -->
283-
<dontSee selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="$$simpleProduct11.name$$" stepKey="dontSeeProduct11NameInMiniCart"/>
284-
<dontSee selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="110" stepKey="dontSeeProduct11PriceInMiniCart"/>
280+
<actionGroup ref="AssertStorefrontMiniCartProductDetailsAbsentActionGroup" stepKey="assertSimpleProduct11IsNotInMiniCart">
281+
<argument name="productName" value="$$simpleProduct11.name$$"/>
282+
<argument name="productPrice" value="$110.00"/>
283+
</actionGroup>
285284
</test>
286285
</tests>

‎app/code/Magento/ConfigurableProductGraphQl/Model/Cart/BuyRequest/SuperAttributeDataProvider.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
use Magento\Catalog\Api\Data\ProductInterface;
1111
use Magento\Framework\Exception\NoSuchEntityException;
12+
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
1213
use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
1314
use Magento\Framework\Stdlib\ArrayManager;
1415
use Magento\QuoteGraphQl\Model\Cart\BuyRequest\BuyRequestDataProviderInterface;
@@ -76,6 +77,10 @@ public function execute(array $cartItemData): array
7677
} catch (NoSuchEntityException $e) {
7778
throw new GraphQlNoSuchEntityException(__('Could not find specified product.'));
7879
}
80+
$configurableProductLinks = $parentProduct->getExtensionAttributes()->getConfigurableProductLinks();
81+
if (!in_array($product->getId(), $configurableProductLinks)) {
82+
throw new GraphQlInputException(__('Could not find specified product.'));
83+
}
7984
$linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
8085
$this->optionCollection->addProductId((int)$parentProduct->getData($linkField));
8186
$options = $this->optionCollection->getAttributesByProductId((int)$parentProduct->getData($linkField));

‎app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,16 @@ public function execute(CustomerInterface $customer): array
101101
}
102102
}
103103
$customerData = array_merge($customerData, $customAttributes);
104-
//Field is deprecated and should not be exposed on storefront.
104+
//Fields are deprecated and should not be exposed on storefront.
105105
$customerData['group_id'] = null;
106-
$customerData['model'] = $customer;
107106
$customerData['id'] = null;
108107

108+
$customerData['model'] = $customer;
109+
110+
//'dob' is deprecated, 'date_of_birth' is used instead.
111+
if (!empty($customerData['dob'])) {
112+
$customerData['date_of_birth'] = $customerData['dob'];
113+
}
109114
return $customerData;
110115
}
111116
}

0 commit comments

Comments
 (0)