Skip to content

Commit b2691aa

Browse files
avattam06avattam06
committed
Merge remote-tracking branch 'origin/2.3-develop' into MC-23217-urlrewrites-bug
2 parents 2800b62 + 2b5567b commit b2691aa

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>

‎app/code/Magento/Signifyd/Test/Mftf/Test/AdminSignifydConfigDependentOnActiveFieldTest.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="AdminSignifydConfigDependentOnActiveFieldTest">
11+
<annotations>
12+
<features value="Signifyd"/>
13+
<title value="Signifyd config dependent on active field" />
14+
<description value="Signifyd system configs dependent by Enable this Solution field."/>
15+
<severity value="MINOR"/>
16+
</annotations>
17+
<before>
18+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
19+
<magentoCLI command="config:set fraud_protection/signifyd/active 1" stepKey="enableSignifyd"/>
20+
</before>
21+
22+
<after>
23+
<actionGroup ref="logout" stepKey="logout"/>
24+
<magentoCLI command="config:set fraud_protection/signifyd/active 0" stepKey="disableSignifyd"/>
25+
</after>
26+
27+
<amOnPage url="{{AdminFraudProtectionPage.url}}" stepKey="openFraudProtectionPagePage" />
28+
<conditionalClick dependentSelector="{{AdminSignifydConfigurationSection.enabled}}" visible="false" selector="{{AdminSignifydConfigurationSection.head}}" stepKey="openCollapsibleBlock"/>
29+
<seeInField selector="{{AdminSignifydConfigurationSection.url}}" userInput="https://api.signifyd.com/v2/" stepKey="seeApiUrlField"/>
30+
<selectOption selector="{{AdminSignifydConfigurationSection.enabled}}" userInput="0" stepKey="disableSignifydOption"/>
31+
<dontSeeElement selector="{{AdminSignifydConfigurationSection.url}}" stepKey="dontSeeApiUrlField"/>
32+
</test>
33+
</tests>

‎app/design/adminhtml/Magento/backend/web/css/source/components/_media-gallery.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@
280280
.item-role {
281281
background: @color-gray89;
282282
color: @color-brownie;
283+
cursor: pointer;
283284
font-size: @font-size__s;
284285
line-height: 1;
285286
margin: 0 .4rem .4rem 0;

‎app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_cart.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,10 @@
346346

347347
.widget {
348348
float: left;
349+
350+
&.block {
351+
margin-bottom: @indent__base;
352+
}
349353
}
350354
}
351355

‎app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,10 @@
563563

564564
.widget {
565565
float: left;
566+
567+
&.block {
568+
margin-bottom: @indent__base;
569+
}
566570
}
567571
}
568572

‎lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,8 @@ define([
196196
}
197197
});
198198

199-
returnval += doc.head.innerHTML ?
200-
doc.head.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
201-
returnval += doc.body.innerHTML ?
202-
doc.body.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
199+
returnval += doc.head ? doc.head.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
200+
returnval += doc.body ? doc.body.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
203201

204202
return returnval ? returnval : content;
205203
},

‎lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,8 @@ define([
212212
widgetEl.parentNode.removeChild(widgetEl);
213213
});
214214

215-
returnval += doc.head.innerHTML ?
216-
doc.head.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
217-
returnval += doc.body.innerHTML ?
218-
doc.body.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
215+
returnval += doc.head ? doc.head.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
216+
returnval += doc.body ? doc.body.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
219217

220218
return returnval ? returnval : content;
221219
},

‎nginx.conf.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ location /static/ {
109109
rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last;
110110
}
111111

112-
location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2|json)$ {
112+
location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2|html|json)$ {
113113
add_header Cache-Control "public";
114114
add_header X-Frame-Options "SAMEORIGIN";
115115
expires +1y;

‎pub/static/.htaccess

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ AddType application/xml xml
7272

7373
<IfModule mod_headers.c>
7474

75-
<FilesMatch .*\.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2|json)$>
75+
<FilesMatch .*\.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2|html|json)$>
7676
Header append Cache-Control public
7777
</FilesMatch>
7878

0 commit comments

Comments
 (0)