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>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
9090

9191
<!-- Assert Empty Mini Cart -->
92-
<seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
92+
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
9393
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
9494

9595
<!-- Register customer after checkout -->

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

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

7171
<!--Place order -->
7272
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
73-
<seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
73+
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
7474
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
7575

7676
<!-- Register customer after checkout -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
147147

148148
<!-- Assert empty Mini Cart -->
149-
<seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
149+
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
150150
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="orderId"/>
151151

152152
<!-- Open Order Index Page -->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
</actionGroup>
8686

8787
<!-- Check cart -->
88-
<click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickMiniCart2"/>
89-
<dontSeeElement selector="{{StorefrontMiniCartSection.quantity}}" stepKey="dontSeeCartItem"/>
88+
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickMiniCart2"/>
89+
<dontSeeElement selector="{{StorefrontMinicartSection.quantity}}" stepKey="dontSeeCartItem"/>
9090
</test>
9191
</tests>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
192192

193193
<!-- Assert empty Mini Cart -->
194-
<seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
194+
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
195195
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
196196

197197
<!-- Open Order Index Page -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
7070

7171
<!-- Assert empty Mini Cart -->
72-
<seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
72+
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
7373
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
7474

7575
<!-- Open Order Index Page -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
6464

6565
<!-- Assert empty Mini Cart -->
66-
<seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
66+
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
6767
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
6868

6969
<!-- Open Order Index Page -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
106106

107107
<!-- Assert empty Mini Cart -->
108-
<seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
108+
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
109109
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="orderId"/>
110110

111111
<!-- Login to Admin Page -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
5959

6060
<!-- Assert empty Mini Cart -->
61-
<seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
61+
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
6262
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
6363

6464
<!-- Open Order Index Page -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
7171

7272
<!-- Assert empty Mini Cart -->
73-
<seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
73+
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
7474
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
7575

7676
<!-- Open Order Index Page -->

‎app/code/Magento/Config/App/Config/Type/System.php

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
use Magento\Store\Model\Config\Processor\Fallback;
2121
use Magento\Framework\Encryption\Encryptor;
2222
use Magento\Store\Model\ScopeInterface as StoreScope;
23+
use Magento\Framework\App\Cache\StateInterface;
24+
use Magento\Framework\App\Cache\Type\Config;
2325

2426
/**
2527
* System configuration type
@@ -98,6 +100,12 @@ class System implements ConfigTypeInterface
98100
private $lockQuery;
99101

100102
/**
103+
* @var StateInterface
104+
*/
105+
private $cacheState;
106+
107+
/**
108+
* System constructor.
101109
* @param ConfigSourceInterface $source
102110
* @param PostProcessorInterface $postProcessor
103111
* @param Fallback $fallback
@@ -110,6 +118,7 @@ class System implements ConfigTypeInterface
110118
* @param Encryptor|null $encryptor
111119
* @param LockManagerInterface|null $locker
112120
* @param LockGuardedCacheLoader|null $lockQuery
121+
* @param StateInterface|null $cacheState
113122
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
114123
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
115124
*/
@@ -125,7 +134,8 @@ public function __construct(
125134
Reader $reader = null,
126135
Encryptor $encryptor = null,
127136
LockManagerInterface $locker = null,
128-
LockGuardedCacheLoader $lockQuery = null
137+
LockGuardedCacheLoader $lockQuery = null,
138+
StateInterface $cacheState = null
129139
) {
130140
$this->postProcessor = $postProcessor;
131141
$this->cache = $cache;
@@ -136,6 +146,8 @@ public function __construct(
136146
?: ObjectManager::getInstance()->get(Encryptor::class);
137147
$this->lockQuery = $lockQuery
138148
?: ObjectManager::getInstance()->get(LockGuardedCacheLoader::class);
149+
$this->cacheState = $cacheState
150+
?: ObjectManager::getInstance()->get(StateInterface::class);
139151
}
140152

141153
/**
@@ -220,6 +232,10 @@ private function getWithParts($path)
220232
*/
221233
private function loadAllData()
222234
{
235+
if (!$this->cacheState->isEnabled(Config::TYPE_IDENTIFIER)) {
236+
return $this->readData();
237+
}
238+
223239
$loadAction = function () {
224240
$cachedData = $this->cache->load($this->configType);
225241
$data = false;
@@ -245,6 +261,10 @@ private function loadAllData()
245261
*/
246262
private function loadDefaultScopeData($scopeType)
247263
{
264+
if (!$this->cacheState->isEnabled(Config::TYPE_IDENTIFIER)) {
265+
return $this->readData();
266+
}
267+
248268
$loadAction = function () use ($scopeType) {
249269
$cachedData = $this->cache->load($this->configType . '_' . $scopeType);
250270
$scopeData = false;
@@ -271,6 +291,10 @@ private function loadDefaultScopeData($scopeType)
271291
*/
272292
private function loadScopeData($scopeType, $scopeId)
273293
{
294+
if (!$this->cacheState->isEnabled(Config::TYPE_IDENTIFIER)) {
295+
return $this->readData();
296+
}
297+
274298
$loadAction = function () use ($scopeType, $scopeId) {
275299
$cachedData = $this->cache->load($this->configType . '_' . $scopeType . '_' . $scopeId);
276300
$scopeData = false;
@@ -393,6 +417,10 @@ public function clean()
393417
$this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [self::CACHE_TAG]);
394418
};
395419

420+
if (!$this->cacheState->isEnabled(Config::TYPE_IDENTIFIER)) {
421+
return $cleanAction();
422+
}
423+
396424
$this->lockQuery->lockedCleanData(
397425
self::$lockName,
398426
$cleanAction

‎app/code/Magento/Config/etc/di.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@
9797
<virtualType name="systemConfigQueryLocker" type="Magento\Framework\Cache\LockGuardedCacheLoader">
9898
<arguments>
9999
<argument name="locker" xsi:type="object">Magento\Framework\Lock\Backend\Cache</argument>
100-
<argument name="lockTimeout" xsi:type="number">42000</argument>
101-
<argument name="delayTimeout" xsi:type="number">100</argument>
102100
</arguments>
103101
</virtualType>
104102

‎app/code/Magento/Cookie/Test/Mftf/ActionGroup/AdminFillCookieLifetimeActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="AdminFillCookieLifetimeActionGroup">
12+
<annotations>
13+
<description>Fills the cookie lifetime field with sample data.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="cookieLifetime" type="string"/>
17+
</arguments>
18+
<fillField selector="{{AdminDefaultCookieSettingsSection.DefaultCookieLifetime}}" userInput="{{cookieLifetime}}" stepKey="fillFieldCookieLifetime"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Cookie/Test/Mftf/ActionGroup/AdminNavigateToDefaultCookieSettingsActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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="AdminNavigateToDefaultCookieSettingsActionGroup">
12+
<amOnPage url="{{AdminConfigurationDefaultCookieSettingsPage.url}}" stepKey="navigateToDefaultCookieSettings"/>
13+
<waitForPageLoad stepKey="waitForWebConfigurationPageLoad"/>
14+
<scrollTo selector="{{AdminDefaultCookieSettingsSection.DefaultCookieSettingsTab}}" x="-150" y="-150" stepKey="scrollToDefaultCookieSettingsSection"/>
15+
<conditionalClick stepKey="expandDefaultCookieSettingsTab" selector="{{AdminDefaultCookieSettingsSection.DefaultCookieSettingsTab}}" dependentSelector="{{AdminDefaultCookieSettingsSection.DefaultCookieLifetime}}" visible="false"/>
16+
<waitForElementVisible selector="{{AdminDefaultCookieSettingsSection.DefaultCookieSettingsTab}}" stepKey="waitForElementsAppeared"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Cookie/Test/Mftf/Page/AdminConfigurationDefaultCookieSettingsPage.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+
<page name="AdminConfigurationDefaultCookieSettingsPage" url="admin/system_config/edit/section/web/" module="Cookie" area="admin">
12+
<section name="AdminDefaultCookieSettingsSection"/>
13+
</page>
14+
</pages>

0 commit comments

Comments
 (0)