Skip to content

Commit 2b5567b

Browse files
VladimirZaetsVladimirZaets
authored
🔃 [Magento Community Engineering] Community Contributions - 2.3-develop latest changes
Accepted Community Pull Requests: - #25749: Resolve wrong Cursor icon when hover in "Images And Videos" small, thumbnail ... options (by @edenduong) - #25770: delete code which doesn't have any sense here (by @AndreyChorniy) - #25760: Update system.xml (by @Nagamaiah007) - #25756: Tests for: #25102, #25251, #25584. (by @p-bystritsky) - #25729: Need margin bottom to new Widget in Checkout/Cart Summary box (by @fabriciosobral) - #25693: Fix document elements check to prevent WYSIWYG error on IE (by @krzksz) - #25325: Add Cache-Control header to knockout partials (by @paveq) Fixed GitHub Issues: - #25715: Product listing time taken profiling dump (reported by @Detzler) has been fixed in #25770 by @AndreyChorniy in 2.3-develop branch Related commits: 1. ed92b99 - #25757: Link (terms and conditions) is not opening new tab. Missing target="_blank" for anchor tag. (reported by @Nagamaiah007) has been fixed in #25760 by @Nagamaiah007 in 2.3-develop branch Related commits: 1. e95fee4 - #25703: Need margin bottom to new Widget in Checkout/Cart Summary box (reported by @fabriciosobral) has been fixed in #25729 by @fabriciosobral in 2.3-develop branch Related commits: 1. 9b55f0e 2. 5a8e815 3. 1ab336b 4. c4a3e51 - #13209: Wysiwyg editor fails on IE11 (reported by @mihaifaget) has been fixed in #25693 by @krzksz in 2.3-develop branch Related commits: 1. ddb9acb
2 parents 6e5e383 + 181d264 commit 2b5567b

File tree

18 files changed

+205
-13
lines changed

18 files changed

+205
-13
lines changed

‎app/code/Magento/Analytics/etc/adminhtml/system.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<label>Advanced Reporting</label>
1616
<comment><![CDATA[This service provides a dynamic suite of reports with rich insights about your business.
1717
Your reports can be accessed securely on a personalized dashboard outside of the admin panel by clicking on the
18-
"Go to Advanced Reporting" link. </br> For more information, see our <a href="https://magento.com/legal/terms/cloud-terms">
18+
"Go to Advanced Reporting" link. </br> For more information, see our <a target="_blank" href="https://magento.com/legal/terms/cloud-terms">
1919
terms and conditions</a>.]]></comment>
2020
<field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
2121
<label>Advanced Reporting Service</label>

‎app/code/Magento/CardinalCommerce/Test/Mftf/Page/AdminThreeDSecurePage.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="AdminThreeDSecurePage" url="admin/system_config/edit/section/three_d_secure/" area="admin" module="Magento_CardinalCommerce">
12+
<section name="AdminCardinalCommerceSection"/>
13+
</page>
14+
</pages>

‎app/code/Magento/CardinalCommerce/Test/Mftf/Section/AdminCardinalCommerceSection.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminCardinalCommerceSection">
12+
<element name="head" type="button" selector="#three_d_secure_cardinal_config-link"/>
13+
<element name="enabled" type="input" selector="#three_d_secure_cardinal_config_enabled_authorize"/>
14+
<element name="environment" type="input" selector="#three_d_secure_cardinal_config_environment"/>
15+
</section>
16+
</sections>

‎app/code/Magento/CardinalCommerce/Test/Mftf/Test/AdminCardinalCommerceSettingsHiddenTest.xml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminCardinalCommerceSettingsHiddenTest">
11+
<annotations>
12+
<features value="CardinalCommerce"/>
13+
<title value="CardinalCommerce settings hidden" />
14+
<description value="CardinalCommerce config shouldn't be visible if the 3D secure is disabled for Authorize.Net."/>
15+
<severity value="MINOR"/>
16+
</annotations>
17+
<before>
18+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
19+
<magentoCLI command="config:set three_d_secure/cardinal/enabled_authorizenet 1" stepKey="enableCardinalCommerce"/>
20+
</before>
21+
22+
<after>
23+
<actionGroup ref="logout" stepKey="logout"/>
24+
<magentoCLI command="config:set three_d_secure/cardinal/enabled_authorizenet 0" stepKey="disableCardinalCommerce"/>
25+
</after>
26+
27+
<amOnPage url="{{AdminThreeDSecurePage.url}}" stepKey="openCurrencyOptionsPage" />
28+
<conditionalClick dependentSelector="{{AdminCardinalCommerceSection.enabled}}" visible="false" selector="{{AdminCardinalCommerceSection.head}}" stepKey="openCollapsibleBlock"/>
29+
<see selector="{{AdminCardinalCommerceSection.environment}}" userInput="Production" stepKey="seeEnvironmentProduction"/>
30+
<selectOption selector="{{AdminCardinalCommerceSection.enabled}}" userInput="0" stepKey="disableCardinalCommerceOption"/>
31+
<dontSeeElement selector="{{AdminCardinalCommerceSection.environment}}" stepKey="dontSeeEnvironmentProduction"/>
32+
</test>
33+
</tests>

‎app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
?>
1818
<?php
19-
$start = microtime(true);
2019
$_productCollection = $block->getLoadedProductCollection();
2120
$_helper = $this->helper(Magento\Catalog\Helper\Output::class);
2221
?>
@@ -98,4 +97,3 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
9897
</div>
9998
<?= $block->getToolbarHtml() ?>
10099
<?php endif; ?>
101-
<?= $time_taken = microtime(true) - $start ?>

‎app/code/Magento/Directory/Test/Mftf/Page/AdminCurrencySetupPage.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="AdminCurrencySetupPage" url="admin/system_config/edit/section/currency/" area="admin" module="Magento_Directory">
12+
<section name="AdminScheduledImportSettingsSection"/>
13+
</page>
14+
</pages>

‎app/code/Magento/Directory/Test/Mftf/Section/AdminScheduledImportSettingsSection.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminScheduledImportSettingsSection">
12+
<element name="head" type="button" selector="#currency_import-head"/>
13+
<element name="enabled" type="input" selector="#currency_import_enabled"/>
14+
<element name="service" type="input" selector="#currency_import_service"/>
15+
</section>
16+
</sections>

‎app/code/Magento/Directory/Test/Mftf/Test/AdminScheduledImportSettingsHiddenTest.xml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminScheduledImportSettingsHiddenTest">
11+
<annotations>
12+
<features value="Directory"/>
13+
<title value="Scheduled import settings hidden" />
14+
<description value="Scheduled Import Settings' should hide fields when 'Enabled' is 'No'"/>
15+
<severity value="MINOR"/>
16+
</annotations>
17+
<before>
18+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
19+
<magentoCLI command="config:set currency/import/enabled 1" stepKey="enableCurrencyImport"/>
20+
</before>
21+
22+
<after>
23+
<actionGroup ref="logout" stepKey="logout"/>
24+
<magentoCLI command="config:set currency/import/enabled 0" stepKey="disableCurrencyImport"/>
25+
</after>
26+
27+
<amOnPage url="{{AdminCurrencySetupPage.url}}" stepKey="openCurrencyOptionsPage" />
28+
<conditionalClick dependentSelector="{{AdminScheduledImportSettingsSection.enabled}}" visible="false" selector="{{AdminScheduledImportSettingsSection.head}}" stepKey="openCollapsibleBlock"/>
29+
<see selector="{{AdminScheduledImportSettingsSection.service}}" userInput="Fixer.io" stepKey="seeServiceFixerIo"/>
30+
<selectOption selector="{{AdminScheduledImportSettingsSection.enabled}}" userInput="0" stepKey="disableCurrencyImportOption"/>
31+
<dontSeeElement selector="{{AdminScheduledImportSettingsSection.service}}" stepKey="dontSeeServiceFixerIo"/>
32+
</test>
33+
</tests>

‎app/code/Magento/Signifyd/Test/Mftf/Page/AdminFraudProtectionPage.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="AdminFraudProtectionPage" url="admin/system_config/edit/section/fraud_protection/" area="admin" module="Magento_Signifyd">
12+
<section name="AdminSignifydConfigurationSection"/>
13+
</page>
14+
</pages>

‎app/code/Magento/Signifyd/Test/Mftf/Section/AdminSignifydConfigurationSection.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminSignifydConfigurationSection">
12+
<element name="head" type="button" selector="#fraud_protection_signifyd_config-head"/>
13+
<element name="enabled" type="input" selector="#fraud_protection_signifyd_config_active"/>
14+
<element name="url" type="text" selector="#fraud_protection_signifyd_config_api_url"/>
15+
</section>
16+
</sections>

0 commit comments

Comments
 (0)