Skip to content

Commit 63550be

Browse files
mrtuvnmrtuvn
committed
Merge remote-tracking branch 'upstream/2.4-develop' into 2.4-develop
2 parents 0e84ed4 + bb7e08f commit 63550be

File tree

56 files changed

+504
-330
lines changed

Some content is hidden

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

56 files changed

+504
-330
lines changed

‎app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml renamed to ‎app/code/Magento/Backup/Test/Mftf/ActionGroup/AdminBackupDeleteActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="deleteBackup">
11+
<actionGroup name="AdminBackupDeleteActionGroup">
1212
<annotations>
1313
<description>Deletes a Backup using provided Backup Entity.</description>
1414
</annotations>

‎app/code/Magento/Backup/Test/Mftf/ActionGroup/AdminBackupIndexPageOpenActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminBackupIndexPageOpenActionGroup">
11+
<amOnPage url="{{AdminBackupIndexPage.url}}" stepKey="navigateToBackupIndexPage"/>
12+
<waitForPageLoad stepKey="waitForBackupIndexPageLoad"/>
13+
</actionGroup>
14+
</actionGroups>

‎app/code/Magento/Backup/Test/Mftf/ActionGroup/deleteBackupActionGroup.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="deleteBackup" extends="AdminBackupDeleteActionGroup" deprecated="Use DeleteBackupActionGroup"/>
12+
</actionGroups>

‎app/code/Magento/Backup/Test/Mftf/Page/BackupIndexPage.xml renamed to ‎app/code/Magento/Backup/Test/Mftf/Page/AdminBackupIndexPage.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
11-
<page name="BackupIndexPage" url="/backup/index/" area="admin" module="Magento_Backup">
11+
<page name="AdminBackupIndexPage" url="/backup/index/" area="admin" module="Magento_Backup">
1212
<section name="AdminMainActionsSection"/>
1313
<section name="AdminGridTableSection"/>
1414
<section name="AdminCreateBackupFormSection"/>

‎app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2727

2828
<!--Go to backup index page-->
29-
<amOnPage url="{{BackupIndexPage.url}}" stepKey="goToBackupPage"/>
30-
<waitForPageLoad stepKey="waitForBackupPage"/>
29+
<actionGroup ref="AdminBackupIndexPageOpenActionGroup" stepKey="navigateToBackupPage"/>
3130

3231
<!--Create system backup-->
3332
<actionGroup ref="CreateSystemBackupActionGroup" stepKey="createSystemBackup"/>
@@ -39,17 +38,17 @@
3938
<actionGroup ref="CreateDatabaseBackupActionGroup" stepKey="createDatabaseBackup"/>
4039

4140
<!--Delete system backup-->
42-
<actionGroup ref="deleteBackup" stepKey="deleteSystemBackup">
41+
<actionGroup ref="AdminBackupDeleteActionGroup" stepKey="deleteSystemBackup">
4342
<argument name="backup" value="SystemBackup"/>
4443
</actionGroup>
4544

4645
<!--Delete database/media backup-->
47-
<actionGroup ref="deleteBackup" stepKey="deleteMediaBackup">
46+
<actionGroup ref="AdminBackupDeleteActionGroup" stepKey="deleteMediaBackup">
4847
<argument name="backup" value="MediaBackup"/>
4948
</actionGroup>
5049

5150
<!--Delete database backup-->
52-
<actionGroup ref="deleteBackup" stepKey="deleteDatabaseBackup">
51+
<actionGroup ref="AdminBackupDeleteActionGroup" stepKey="deleteDatabaseBackup">
5352
<argument name="backup" value="DatabaseBackup"/>
5453
</actionGroup>
5554

‎app/code/Magento/Catalog/Model/Product.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
7373
const STORE_ID = 'store_id';
7474

7575
/**
76-
* @var string
76+
* @var string|bool
7777
*/
78-
protected $_cacheTag = self::CACHE_TAG;
78+
protected $_cacheTag = false;
7979

8080
/**
8181
* @var string
@@ -878,7 +878,6 @@ public function getAttributes($groupId = null, $skipSuper = false)
878878
*/
879879
public function beforeSave()
880880
{
881-
$this->cleanCache();
882881
$this->setTypeHasOptions(false);
883882
$this->setTypeHasRequiredOptions(false);
884883
$this->setHasOptions(false);

‎app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMiniCartSection.xml

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromSimpleProductTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<see selector="{{StorefrontMinicartSection.productPriceByName($$createProduct1.name$$)}}" userInput="$$createProduct1.price$$" stepKey="seeCorrectProductPrice1"/>
8585

8686
<!-- Assert that the rule isn't present on the Checkout page -->
87-
<click selector="{{StorefrontMiniCartSection.goToCheckout}}" stepKey="goToCheckout1"/>
87+
<click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout1"/>
8888
<conditionalClick selector="{{CheckoutCartSummarySection.expandShoppingCartSummary}}" dependentSelector="{{CheckoutCartSummarySection.expandShoppingCartSummary}}" visible="true" stepKey="expandShoppingCartSummary1"/>
8989
<see selector="{{CheckoutCartProductSection.ProductRegularPriceByName($$createProduct1.name$$)}}" userInput="$$createProduct1.price$$" stepKey="seeCorrectProductPriceOnCheckout1"/>
9090
</test>

‎app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml renamed to ‎app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<element name="itemDiscount" type="text" selector="//tr[@class='totals']//td[@class='amount']/span"/>
3737
<element name="subtotal" type="text" selector="//tr[@class='totals sub']//td[@class='amount']/span"/>
3838
<element name="emptyCart" type="text" selector=".counter.qty.empty"/>
39+
<element name="emptyMiniCart" type="text" selector="//div[@class='minicart-wrapper']//span[@class='counter qty empty']/../.."/>
3940
<element name="minicartContent" type="block" selector="#minicart-content-wrapper"/>
4041
<element name="messageEmptyCart" type="text" selector="//*[@id='minicart-content-wrapper']//*[contains(@class,'subtitle empty')]"/>
4142
<element name="visibleItemsCountText" type="text" selector="//div[@class='items-total']"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878

7979
<!-- Verify mini cart is empty -->
8080
<actionGroup ref="AssertStorefrontSeeElementActionGroup" stepKey="assertEmptryCart">
81-
<argument name="selector" value="{{StorefrontMiniCartSection.emptyMiniCart}}"/>
81+
<argument name="selector" value="{{StorefrontMinicartSection.emptyMiniCart}}"/>
8282
</actionGroup>
8383
</test>
8484
</tests>

0 commit comments

Comments
 (0)