Skip to content

Commit e6f7bd2

Browse files
viktorpetrykviktorpetryk
committed
Merge remote-tracking branch 'origin/2.3-develop' into MC-30167
2 parents 46a17ed + 5ee3788 commit e6f7bd2

File tree

84 files changed

+5531
-497
lines changed

Some content is hidden

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

84 files changed

+5531
-497
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@
9292
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
9393
<seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductBigQty.urlKey}}" stepKey="seeUrlKey"/>
9494

95+
<!--Run full reindex and clear caches -->
96+
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
97+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
98+
9599
<!--Verify customer see created virtual product on category page -->
96100
<amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
97101
<waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
98102
<see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{virtualProductBigQty.name}}" stepKey="seeVirtualProductNameOnCategoryPage"/>
99103

100-
<!--Run full reindex and clear caches -->
101-
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
102-
<magentoCLI command="cache:flush" stepKey="flushCache"/>
103-
104104
<!-- Verify customer see created virtual product with tier price(from above step) on storefront page and is searchable by sku -->
105105
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefront"/>
106106
<waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>

‎app/code/Magento/CatalogInventory/Model/Source/Stock.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function getAllOptions()
4343
public function addValueSortToCollection($collection, $dir = \Magento\Framework\Data\Collection::SORT_ORDER_DESC)
4444
{
4545
$collection->getSelect()->joinLeft(
46-
['stock_item_table' => 'cataloginventory_stock_item'],
46+
['stock_item_table' => $collection->getTable('cataloginventory_stock_item')],
4747
"e.entity_id=stock_item_table.product_id",
4848
[]
4949
);

‎app/code/Magento/CatalogInventory/Test/Unit/Model/Source/StockTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public function testAddValueSortToCollection()
2525
$selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
2626
$collectionMock = $this->createMock(\Magento\Eav\Model\Entity\Collection\AbstractCollection::class);
2727
$collectionMock->expects($this->atLeastOnce())->method('getSelect')->willReturn($selectMock);
28+
$collectionMock->expects($this->atLeastOnce())->method('getTable')->willReturn('cataloginventory_stock_item');
2829

2930
$selectMock->expects($this->once())
3031
->method('joinLeft')

‎app/code/Magento/CatalogRule/Test/Mftf/Section/AdminCatalogPriceRuleStagingSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
<section name="AdminCatalogPriceRuleStagingSection">
1212
<element name="status" type="select" selector=".modal-component [data-index='is_active'] select"/>
1313
<element name="isActive" type="select" selector=".modals-wrapper input[name='is_active']+label"/>
14+
<element name="activeIsEnabled" type="checkbox" selector=".modals-wrapper input[name='is_active'][value='1']+label"/>
1415
</section>
1516
</sections>

‎app/code/Magento/Indexer/Test/Mftf/Section/AdminIndexManagementSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<element name="massActionSubmit" type="button" selector="#gridIndexer_massaction-form button"/>
1616
<element name="indexerSelect" type="select" selector="//select[contains(@class,'action-select-multiselect')]"/>
1717
<element name="indexerStatus" type="text" selector="//tr[descendant::td[contains(., '{{status}}')]]//*[contains(@class, 'col-indexer_status')]/span" parameterized="true"/>
18-
<element name="successMessage" type="text" selector="//*[@data-ui-id='messages-message-success']"/>
18+
<element name="successMessage" type="text" selector="//*[@data-ui-id='messages-message-success']" timeout="120"/>
1919
<element name="selectMassAction" type="select" selector="#gridIndexer_massaction-mass-select"/>
2020
</section>
2121
</sections>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
<useCaseId value="MAGETWO-99691"/>
1919
<group value="sales"/>
2020
<group value="catalogRule"/>
21-
<skip>
22-
<issueId value="MC-17140"/>
23-
</skip>
2421
</annotations>
2522
<before>
2623
<!--Create the catalog price rule -->

‎app/code/Magento/Ui/view/base/web/js/modal/modal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ define([
191191
* @param {String} title
192192
*/
193193
setTitle: function (title) {
194-
var $title = $(this.options.modalTitle),
194+
var $title = this.modal.find(this.options.modalTitle),
195195
$subTitle = this.modal.find(this.options.modalSubTitle);
196196

197197
$title.text(title);

‎dev/tests/integration/framework/Magento/TestFramework/Catalog/Block/Product/View/Options/DateGroupDataProvider.php

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
namespace Magento\TestFramework\Catalog\Block\Product\View\Options;
99

1010
use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
11+
use Magento\Catalog\Model\Config\Source\ProductPriceOptionsInterface;
1112
use Magento\Catalog\Model\Product\Option;
1213

1314
/**
@@ -31,7 +32,7 @@ public function getData(): array
3132
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE,
3233
Option::KEY_IS_REQUIRE => 1,
3334
Option::KEY_PRICE => 10,
34-
Option::KEY_PRICE_TYPE => 'fixed',
35+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
3536
Option::KEY_SKU => 'test-option-date-title-1',
3637
],
3738
[
@@ -46,7 +47,7 @@ public function getData(): array
4647
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE,
4748
Option::KEY_IS_REQUIRE => 0,
4849
Option::KEY_PRICE => 10,
49-
Option::KEY_PRICE_TYPE => 'fixed',
50+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
5051
Option::KEY_SKU => 'test-option-date-title-2',
5152
],
5253
[
@@ -61,7 +62,7 @@ public function getData(): array
6162
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE,
6263
Option::KEY_IS_REQUIRE => 0,
6364
Option::KEY_PRICE => 50,
64-
Option::KEY_PRICE_TYPE => 'fixed',
65+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
6566
Option::KEY_SKU => 'test-option-date-title-3',
6667
],
6768
[
@@ -76,7 +77,7 @@ public function getData(): array
7677
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE,
7778
Option::KEY_IS_REQUIRE => 0,
7879
Option::KEY_PRICE => 50,
79-
Option::KEY_PRICE_TYPE => 'percent',
80+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_PERCENT,
8081
Option::KEY_SKU => 'test-option-date-title-4',
8182
],
8283
[
@@ -91,7 +92,7 @@ public function getData(): array
9192
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME,
9293
Option::KEY_IS_REQUIRE => 1,
9394
Option::KEY_PRICE => 10,
94-
Option::KEY_PRICE_TYPE => 'fixed',
95+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
9596
Option::KEY_SKU => 'test-option-date-and-time-title-1',
9697
],
9798
[
@@ -106,7 +107,7 @@ public function getData(): array
106107
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME,
107108
Option::KEY_IS_REQUIRE => 0,
108109
Option::KEY_PRICE => 10,
109-
Option::KEY_PRICE_TYPE => 'fixed',
110+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
110111
Option::KEY_SKU => 'test-option-date-and-time-title-2',
111112
],
112113
[
@@ -121,7 +122,7 @@ public function getData(): array
121122
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME,
122123
Option::KEY_IS_REQUIRE => 0,
123124
Option::KEY_PRICE => 50,
124-
Option::KEY_PRICE_TYPE => 'fixed',
125+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
125126
Option::KEY_SKU => 'test-option-date-and-time-title-3',
126127
],
127128
[
@@ -136,7 +137,7 @@ public function getData(): array
136137
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME,
137138
Option::KEY_IS_REQUIRE => 0,
138139
Option::KEY_PRICE => 50,
139-
Option::KEY_PRICE_TYPE => 'percent',
140+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_PERCENT,
140141
Option::KEY_SKU => 'test-option-date-and-time-title-4',
141142
],
142143
[
@@ -151,7 +152,7 @@ public function getData(): array
151152
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_TIME,
152153
Option::KEY_IS_REQUIRE => 1,
153154
Option::KEY_PRICE => 10,
154-
Option::KEY_PRICE_TYPE => 'fixed',
155+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
155156
Option::KEY_SKU => 'test-option-time-title-1',
156157
],
157158
[
@@ -166,7 +167,7 @@ public function getData(): array
166167
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_TIME,
167168
Option::KEY_IS_REQUIRE => 0,
168169
Option::KEY_PRICE => 10,
169-
Option::KEY_PRICE_TYPE => 'fixed',
170+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
170171
Option::KEY_SKU => 'test-option-time-title-2',
171172
],
172173
[
@@ -181,7 +182,7 @@ public function getData(): array
181182
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_TIME,
182183
Option::KEY_IS_REQUIRE => 0,
183184
Option::KEY_PRICE => 50,
184-
Option::KEY_PRICE_TYPE => 'fixed',
185+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
185186
Option::KEY_SKU => 'test-option-time-title-3',
186187
],
187188
[
@@ -196,7 +197,7 @@ public function getData(): array
196197
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_TIME,
197198
Option::KEY_IS_REQUIRE => 0,
198199
Option::KEY_PRICE => 50,
199-
Option::KEY_PRICE_TYPE => 'percent',
200+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_PERCENT,
200201
Option::KEY_SKU => 'test-option-time-title-4',
201202
],
202203
[

‎dev/tests/integration/framework/Magento/TestFramework/Catalog/Block/Product/View/Options/FileGroupDataProvider.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
namespace Magento\TestFramework\Catalog\Block\Product\View\Options;
99

1010
use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
11+
use Magento\Catalog\Model\Config\Source\ProductPriceOptionsInterface;
1112
use Magento\Catalog\Model\Product\Option;
1213

1314
/**
@@ -31,7 +32,7 @@ public function getData(): array
3132
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_FILE,
3233
Option::KEY_IS_REQUIRE => 1,
3334
Option::KEY_PRICE => 10,
34-
Option::KEY_PRICE_TYPE => 'fixed',
35+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
3536
Option::KEY_SKU => 'test-option-file-title-1',
3637
Option::KEY_SORT_ORDER => 1,
3738
Option::KEY_FILE_EXTENSION => 'png, jpg',
@@ -51,7 +52,7 @@ public function getData(): array
5152
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_FILE,
5253
Option::KEY_IS_REQUIRE => 0,
5354
Option::KEY_PRICE => 10,
54-
Option::KEY_PRICE_TYPE => 'fixed',
55+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
5556
Option::KEY_SKU => 'test-option-file-title-2',
5657
Option::KEY_SORT_ORDER => 1,
5758
Option::KEY_FILE_EXTENSION => 'png, jpg',
@@ -71,7 +72,7 @@ public function getData(): array
7172
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_FILE,
7273
Option::KEY_IS_REQUIRE => 0,
7374
Option::KEY_PRICE => 50,
74-
Option::KEY_PRICE_TYPE => 'fixed',
75+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
7576
Option::KEY_SKU => 'test-option-file-title-3',
7677
Option::KEY_SORT_ORDER => 1,
7778
Option::KEY_FILE_EXTENSION => 'png, jpg',
@@ -91,7 +92,7 @@ public function getData(): array
9192
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_FILE,
9293
Option::KEY_IS_REQUIRE => 0,
9394
Option::KEY_PRICE => 50,
94-
Option::KEY_PRICE_TYPE => 'percent',
95+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_PERCENT,
9596
Option::KEY_SKU => 'test-option-file-title-4',
9697
Option::KEY_SORT_ORDER => 1,
9798
Option::KEY_FILE_EXTENSION => 'png, jpg',
@@ -111,7 +112,7 @@ public function getData(): array
111112
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_FILE,
112113
Option::KEY_IS_REQUIRE => 0,
113114
Option::KEY_PRICE => 50,
114-
Option::KEY_PRICE_TYPE => 'percent',
115+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
115116
Option::KEY_SKU => 'test-option-file-title-5',
116117
Option::KEY_SORT_ORDER => 1,
117118
Option::KEY_FILE_EXTENSION => 'png, jpg',
@@ -122,7 +123,7 @@ public function getData(): array
122123
'block_with_required_class' => '<div class="field file">',
123124
'label_for_created_option' => '<label class="label" for="options_%s_file"',
124125
'title' => '<span>Test option file title 5</span>',
125-
'price' => 'data-price-amount="5"',
126+
'price' => 'data-price-amount="50"',
126127
'required_element' => '/<input type="file"/',
127128
'file_extension' => '<strong>png, jpg</strong>',
128129
'file_width' => '/%s:.*<strong>10 px.<\/strong>/',

0 commit comments

Comments
 (0)