Skip to content

Commit 2878eef

Browse files
author
Oleksandr Iegorov
committed
Merge branch '2.3-develop' of github.com:magento/magento2ce into 2.3-PR-4
2 parents faf485d + c804fc0 commit 2878eef

File tree

25 files changed

+558
-23
lines changed

25 files changed

+558
-23
lines changed

‎app/code/Magento/Backend/etc/adminhtml/di.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,4 +159,9 @@
159159
</argument>
160160
</arguments>
161161
</type>
162+
<type name="Magento\Framework\View\Layout\Generator\Block">
163+
<arguments>
164+
<argument name="defaultClass" xsi:type="string">Magento\Backend\Block\Template</argument>
165+
</arguments>
166+
</type>
162167
</config>

‎app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/IndexTableRowSizeEstimatorTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ protected function setUp()
3838

3939
public function testEstimateRowSize()
4040
{
41-
$this->markTestSkipped('Unskip after MAGETWO-89738');
42-
$expectedValue = 2400000;
41+
$expectedValue = 4000000;
4342

4443
$this->websiteManagementMock->expects($this->once())->method('getCount')->willReturn(100);
4544
$collectionMock = $this->createMock(\Magento\Customer\Model\ResourceModel\Group\Collection::class);

‎app/code/Magento/ReleaseNotification/Ui/DataProvider/Modifier/Notifications.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,9 @@ private function hideNotification(array $meta)
192192
*/
193193
private function getNotificationContent()
194194
{
195-
$version = $this->getTargetVersion();
196-
$edition = $this->productMetadata->getEdition();
197-
$locale = $this->session->getUser()->getInterfaceLocale();
195+
$version = strtolower($this->getTargetVersion());
196+
$edition = strtolower($this->productMetadata->getEdition());
197+
$locale = strtolower($this->session->getUser()->getInterfaceLocale());
198198

199199
$cacheKey = self::$cachePrefix . $version . "-" . $edition . "-" . $locale;
200200
$modalContent = $this->cacheStorage->load($cacheKey);

‎app/code/Magento/ReleaseNotification/etc/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<default>
1010
<system>
1111
<release_notification>
12-
<content_url>raw.githubusercontent.com/magento-arcticfoxes/release-notification/master</content_url>
12+
<content_url>magento.com/release_notifications</content_url>
1313
<use_https>1</use_https>
1414
</release_notification>
1515
</system>

‎app/code/Magento/Ui/view/base/web/js/form/element/url-input.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ define([
133133
createChildUrlInputComponent: function (value) {
134134
var elementConfig;
135135

136-
if (_.isUndefined(this.linkedElementInstances[value])) {
136+
if (!_.isEmpty(value) && _.isUndefined(this.linkedElementInstances[value])) {
137137
elementConfig = this.urlTypes[value];
138138
layout([elementConfig]);
139139
this.linkedElementInstances[value] = this.requestModule(elementConfig.name);

‎app/code/Magento/Ui/view/base/web/js/lib/key-codes.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ define([], function () {
2020
39: 'pageRightKey',
2121
17: 'ctrlKey',
2222
18: 'altKey',
23-
16: 'shiftKey'
23+
16: 'shiftKey',
24+
66: 'bKey',
25+
73: 'iKey',
26+
85: 'uKey'
2427
};
2528
});

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminSwitchWYSIWYGOptionsCest.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
<title value="Admin are able to switch between versions of TinyMCE."/>
1717
<description value="Admin are able to switch between versions of TinyMCE."/>
1818
<severity value="CRITICAL"/>
19-
<group value="skip"/>
20-
<!-- Skipped; see MAGETWO-89417 -->
2119
<testCaseId value="MAGETWO-82936"/>
2220
<!--Skip because of issue MAGETWO-89417-->
2321
<group value="skip"/>
@@ -27,6 +25,7 @@
2725
<actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
2826
</before>
2927
<amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage1"/>
28+
<waitForPageLoad stepKey="wait1"/>
3029
<conditionalClick stepKey="expandWYSIWYGOptions1" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
3130
<waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox1" />
3231
<uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue1"/>
@@ -35,7 +34,7 @@
3534
<click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions1" />
3635
<click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig1" />
3736
<amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage1"/>
38-
<waitForPageLoad stepKey="wait1"/>
37+
<waitForPageLoad stepKey="wait2"/>
3938
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle1"/>
4039
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab1" />
4140
<waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
@@ -54,6 +53,7 @@
5453
<!--see widget on Storefront-->
5554
<see userInput="Hello TinyMCE4!" stepKey="seeContent1"/>
5655
<amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage2"/>
56+
<waitForPageLoad stepKey="wait4"/>
5757
<conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
5858
<waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox2" />
5959
<uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue2"/>
@@ -62,7 +62,7 @@
6262
<click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions2" />
6363
<click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig2" />
6464
<amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage2"/>
65-
<waitForPageLoad stepKey="wait2"/>
65+
<waitForPageLoad stepKey="wait5"/>
6666
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle2"/>
6767
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab2" />
6868
<waitForElementVisible selector="{{TinyMCESection.TinyMCE3}}" stepKey="waitForTinyMCE3"/>
@@ -77,7 +77,7 @@
7777
<click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage2"/>
7878
<!-- Go to storefront cms page, assert cms content -->
7979
<amOnPage url="{{simpleCmsPage.identifier}}" stepKey="amOnPageTestPage2"/>
80-
<waitForPageLoad stepKey="wait4" />
80+
<waitForPageLoad stepKey="wait6" />
8181
<!--see widget on Storefront-->
8282
<see userInput="Hello TinyMCE3!" stepKey="seeContent2"/>
8383
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/AdminCreateCustomerTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<testCaseId value="MAGETWO-72095"/>
1919
<group value="customer"/>
2020
<group value="create"/>
21+
<group value="skip"/>
2122
</annotations>
2223
<after>
2324
<amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,5 +335,32 @@
335335
<field name="is_required" xsi:type="string">No</field>
336336
<field name="is_used_for_promo_rules" xsi:type="string">Yes</field>
337337
</dataset>
338+
339+
<dataset name="sizes_S_M_L_Filterable">
340+
<field name="frontend_label" xsi:type="string">size_%isolation%</field>
341+
<field name="attribute_code" xsi:type="string">size_%isolation%</field>
342+
<field name="frontend_input" xsi:type="string">Dropdown</field>
343+
<field name="is_required" xsi:type="string">No</field>
344+
<field name="is_searchable" xsi:type="string">Yes</field>
345+
<field name="is_filterable" xsi:type="string">Filterable (with results)</field>
346+
<field name="is_filterable_in_search" xsi:type="string">Yes</field>
347+
<field name="options" xsi:type="array">
348+
<item name="0" xsi:type="array">
349+
<item name="is_default" xsi:type="string">No</item>
350+
<item name="admin" xsi:type="string">SIZE_S</item>
351+
<item name="view" xsi:type="string">SIZE_S</item>
352+
</item>
353+
<item name="1" xsi:type="array">
354+
<item name="is_default" xsi:type="string">No</item>
355+
<item name="admin" xsi:type="string">SIZE_M</item>
356+
<item name="view" xsi:type="string">SIZE_M</item>
357+
</item>
358+
<item name="2" xsi:type="array">
359+
<item name="is_default" xsi:type="string">No</item>
360+
<item name="admin" xsi:type="string">SIZE_L</item>
361+
<item name="view" xsi:type="string">SIZE_L</item>
362+
</item>
363+
</field>
364+
</dataset>
338365
</repository>
339366
</config>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2156,5 +2156,59 @@
21562156
</field>
21572157
<field name="url_key" xsi:type="string">simple-product-%isolation%</field>
21582158
</dataset>
2159+
2160+
<dataset name="product_to_match">
2161+
<field name="attribute_set_id" xsi:type="array">
2162+
<item name="dataset" xsi:type="string">default</item>
2163+
</field>
2164+
<field name="name" xsi:type="string">Matching Product</field>
2165+
<field name="sku" xsi:type="string">sku_matching_product</field>
2166+
<field name="product_has_weight" xsi:type="string">This item has weight</field>
2167+
<field name="weight" xsi:type="string">1</field>
2168+
<field name="quantity_and_stock_status" xsi:type="array">
2169+
<item name="qty" xsi:type="string">25</item>
2170+
<item name="is_in_stock" xsi:type="string">In Stock</item>
2171+
</field>
2172+
<field name="price" xsi:type="array">
2173+
<item name="value" xsi:type="string">60</item>
2174+
</field>
2175+
<field name="tax_class_id" xsi:type="array">
2176+
<item name="dataset" xsi:type="string">taxable_goods</item>
2177+
</field>
2178+
<field name="website_ids" xsi:type="array">
2179+
<item name="0" xsi:type="array">
2180+
<item name="dataset" xsi:type="string">default</item>
2181+
</item>
2182+
</field>
2183+
<field name="visibility" xsi:type="string">Catalog, Search</field>
2184+
<field name="url_key" xsi:type="string">matching-product</field>
2185+
</dataset>
2186+
2187+
<dataset name="product_to_display">
2188+
<field name="attribute_set_id" xsi:type="array">
2189+
<item name="dataset" xsi:type="string">default</item>
2190+
</field>
2191+
<field name="name" xsi:type="string">Displayed Product</field>
2192+
<field name="sku" xsi:type="string">sku_displayed_product</field>
2193+
<field name="product_has_weight" xsi:type="string">This item has weight</field>
2194+
<field name="weight" xsi:type="string">2</field>
2195+
<field name="quantity_and_stock_status" xsi:type="array">
2196+
<item name="qty" xsi:type="string">35</item>
2197+
<item name="is_in_stock" xsi:type="string">In Stock</item>
2198+
</field>
2199+
<field name="price" xsi:type="array">
2200+
<item name="value" xsi:type="string">70</item>
2201+
</field>
2202+
<field name="tax_class_id" xsi:type="array">
2203+
<item name="dataset" xsi:type="string">taxable_goods</item>
2204+
</field>
2205+
<field name="website_ids" xsi:type="array">
2206+
<item name="0" xsi:type="array">
2207+
<item name="dataset" xsi:type="string">default</item>
2208+
</item>
2209+
</field>
2210+
<field name="visibility" xsi:type="string">Catalog, Search</field>
2211+
<field name="url_key" xsi:type="string">displayed-product</field>
2212+
</dataset>
21592213
</repository>
21602214
</config>

0 commit comments

Comments
 (0)