Skip to content

Commit d8d0eb5

Browse files
andimovandimov
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-69846
2 parents 424864e + 100af87 commit d8d0eb5

File tree

21 files changed

+387
-65
lines changed

21 files changed

+387
-65
lines changed

‎app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ public function getCalendarDateHtml()
8181
$yearStart = $this->_catalogProductOptionTypeDate->getYearStart();
8282
$yearEnd = $this->_catalogProductOptionTypeDate->getYearEnd();
8383

84+
$dateFormat = $this->_localeDate->getDateFormat(\IntlDateFormatter::SHORT);
85+
/** Escape RTL characters which are present in some locales and corrupt formatting */
86+
$escapedDateFormat = preg_replace('/[^MmDdYy\/\.\-]/', '', $dateFormat);
8487
$calendar = $this->getLayout()->createBlock(
8588
\Magento\Framework\View\Element\Html\Date::class
8689
)->setId(
@@ -92,7 +95,7 @@ public function getCalendarDateHtml()
9295
)->setImage(
9396
$this->getViewFileUrl('Magento_Theme::calendar.png')
9497
)->setDateFormat(
95-
$this->_localeDate->getDateFormat(\IntlDateFormatter::SHORT)
98+
$escapedDateFormat
9699
)->setValue(
97100
$value
98101
)->setYearsRange(

‎app/code/Magento/Catalog/Model/Product/Option/Type/Date.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public function prepareForCart()
155155

156156
if ($this->_dateExists()) {
157157
if ($this->useCalendar()) {
158-
$timestamp += (new \DateTime($value['date']))->getTimestamp();
158+
$timestamp += $this->_localeDate->date($value['date'], null, true, false)->getTimestamp();
159159
} else {
160160
$timestamp += mktime(0, 0, 0, $value['month'], $value['day'], $value['year']);
161161
}

‎app/code/Magento/CatalogInventory/Model/ResourceModel/Product/StockStatusBaseSelectProcessor.php

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ class StockStatusBaseSelectProcessor implements BaseSelectProcessorInterface
2222
*/
2323
private $resource;
2424

25+
/**
26+
* @var \Magento\CatalogInventory\Api\StockConfigurationInterface
27+
*/
28+
private $stockConfig;
29+
2530
/**
2631
* @var \Magento\Indexer\Model\ResourceModel\FrontendResource
2732
*/
@@ -30,14 +35,18 @@ class StockStatusBaseSelectProcessor implements BaseSelectProcessorInterface
3035
/**
3136
* @param ResourceConnection $resource
3237
* @param null|\Magento\Indexer\Model\ResourceModel\FrontendResource $indexerStockFrontendResource
38+
* @param \Magento\CatalogInventory\Api\StockConfigurationInterface|null $stockConfig
3339
*/
3440
public function __construct(
3541
ResourceConnection $resource,
36-
\Magento\Indexer\Model\ResourceModel\FrontendResource $indexerStockFrontendResource = null
42+
\Magento\Indexer\Model\ResourceModel\FrontendResource $indexerStockFrontendResource = null,
43+
\Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfig = null
3744
) {
3845
$this->resource = $resource;
3946
$this->indexerStockFrontendResource = $indexerStockFrontendResource ?: ObjectManager::getInstance()
4047
->get(\Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\FrontendResource::class);
48+
$this->stockConfig = $stockConfig ?: ObjectManager::getInstance()
49+
->get(\Magento\CatalogInventory\Api\StockConfigurationInterface::class);
4150
}
4251

4352
/**
@@ -50,13 +59,15 @@ public function process(Select $select)
5059
{
5160
$stockStatusTable = $this->indexerStockFrontendResource->getMainTable();
5261

53-
/** @var Select $select */
54-
$select->join(
55-
['stock' => $stockStatusTable],
56-
sprintf('stock.product_id = %s.entity_id', BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS),
57-
[]
58-
)
59-
->where('stock.stock_status = ?', Stock::STOCK_IN_STOCK);
62+
if (!$this->stockConfig->isShowOutOfStock()) {
63+
/** @var Select $select */
64+
$select->join(
65+
['stock' => $stockStatusTable],
66+
sprintf('stock.product_id = %s.entity_id', BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS),
67+
[]
68+
)->where('stock.stock_status = ?', Stock::STOCK_IN_STOCK);
69+
}
70+
6071
return $select;
6172
}
6273
}

‎app/code/Magento/CatalogWidget/Block/Product/ProductsList.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,12 @@ public function createCollection()
237237
$conditions->collectValidatedAttributes($collection);
238238
$this->sqlBuilder->attachConditionToCollection($collection, $conditions);
239239

240+
/**
241+
* Prevent retrieval of duplicate records. This may occur when multiselect product attribute matches
242+
* several allowed values from condition simultaneously
243+
*/
244+
$collection->distinct(true);
245+
240246
return $collection;
241247
}
242248

‎app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ public function testCreateCollection($pagerEnable, $productsCount, $productsPerP
269269
'addStoreFilter',
270270
'setPageSize',
271271
'setCurPage',
272+
'distinct'
272273
])->disableOriginalConstructor()
273274
->getMock();
274275
$collection->expects($this->once())->method('setVisibility')
@@ -282,6 +283,7 @@ public function testCreateCollection($pagerEnable, $productsCount, $productsPerP
282283
$collection->expects($this->once())->method('addStoreFilter')->willReturnSelf();
283284
$collection->expects($this->once())->method('setPageSize')->with($expectedPageSize)->willReturnSelf();
284285
$collection->expects($this->once())->method('setCurPage')->willReturnSelf();
286+
$collection->expects($this->once())->method('distinct')->willReturnSelf();
285287

286288
$this->collectionFactory->expects($this->once())->method('create')->willReturn($collection);
287289
$this->productsList->setData('conditions_encoded', 'some_serialized_conditions');

‎app/code/Magento/User/Setup/UpgradeSchema.php

Lines changed: 41 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,27 @@ class UpgradeSchema implements UpgradeSchemaInterface
2121
*/
2222
public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
2323
{
24-
$installer = $setup;
25-
$installer->startSetup();
26-
$tableAdmins = $installer->getTable('admin_user');
24+
$setup->startSetup();
2725

28-
$installer->getConnection()->addColumn(
26+
if (version_compare($context->getVersion(), '2.0.1', '<')) {
27+
$this->addFailuresToAdminUserTable($setup);
28+
$this->createAdminPasswordsTable($setup);
29+
}
30+
31+
$setup->endSetup();
32+
}
33+
34+
/**
35+
* Adds 'failures_num', 'first_failure', and 'lock_expires' columns to 'admin_user' table
36+
*
37+
* @param SchemaSetupInterface $setup
38+
* @return void
39+
*/
40+
private function addFailuresToAdminUserTable(SchemaSetupInterface $setup)
41+
{
42+
$tableAdmins = $setup->getTable('admin_user');
43+
44+
$setup->getConnection()->addColumn(
2945
$tableAdmins,
3046
'failures_num',
3147
[
@@ -35,28 +51,38 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
3551
'comment' => 'Failure Number'
3652
]
3753
);
38-
$installer->getConnection()->addColumn(
54+
$setup->getConnection()->addColumn(
3955
$tableAdmins,
4056
'first_failure',
4157
[
4258
'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
4359
'comment' => 'First Failure'
4460
]
4561
);
46-
$installer->getConnection()->addColumn(
62+
$setup->getConnection()->addColumn(
4763
$tableAdmins,
4864
'lock_expires',
4965
[
5066
'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
5167
'comment' => 'Expiration Lock Dates'
5268
]
5369
);
70+
}
71+
72+
/**
73+
* Create table 'admin_passwords'
74+
*
75+
* @param SchemaSetupInterface $setup
76+
* @return void
77+
*/
78+
private function createAdminPasswordsTable(SchemaSetupInterface $setup)
79+
{
80+
if ($setup->tableExists($setup->getTable('admin_passwords'))) {
81+
return;
82+
}
5483

55-
/**
56-
* Create table 'admin_passwords'
57-
*/
58-
$table = $installer->getConnection()->newTable(
59-
$installer->getTable('admin_passwords')
84+
$table = $setup->getConnection()->newTable(
85+
$setup->getTable('admin_passwords')
6086
)->addColumn(
6187
'password_id',
6288
\Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
@@ -88,19 +114,17 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
88114
['unsigned' => true, 'nullable' => false, 'default' => '0'],
89115
'Last Updated'
90116
)->addIndex(
91-
$installer->getIdxName('admin_passwords', ['user_id']),
117+
$setup->getIdxName('admin_passwords', ['user_id']),
92118
['user_id']
93119
)->addForeignKey(
94-
$installer->getFkName('admin_passwords', 'user_id', 'admin_user', 'user_id'),
120+
$setup->getFkName('admin_passwords', 'user_id', 'admin_user', 'user_id'),
95121
'user_id',
96-
$installer->getTable('admin_user'),
122+
$setup->getTable('admin_user'),
97123
'user_id',
98124
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
99125
)->setComment(
100126
'Admin Passwords'
101127
);
102-
$installer->getConnection()->createTable($table);
103-
104-
$installer->endSetup();
128+
$setup->getConnection()->createTable($table);
105129
}
106130
}

‎dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertBIEssentialsLink.php

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,23 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
namespace Magento\Analytics\Test\Constraint;
78

89
use Magento\Mtf\Client\BrowserInterface;
910
use Magento\Mtf\Constraint\AbstractConstraint;
11+
use Magento\Backend\Test\Page\Adminhtml\Dashboard;
1012

1113
/**
1214
* Assert BI Essentials Sign Up page is opened by admin menu link
1315
*/
1416
class AssertBIEssentialsLink extends AbstractConstraint
1517
{
18+
/**
19+
* Count of try for choose menu item.
20+
*/
21+
const MAX_TRY_COUNT = 2;
22+
1623
/**
1724
* Browser instance.
1825
*
@@ -25,19 +32,46 @@ class AssertBIEssentialsLink extends AbstractConstraint
2532
*
2633
* @param BrowserInterface $browser
2734
* @param string $businessIntelligenceLink
35+
* @param Dashboard $dashboard
36+
* @param string $menuItem
37+
* @param bool $waitMenuItemNotVisible
2838
* @return void
2939
*/
30-
public function processAssert(BrowserInterface $browser, $businessIntelligenceLink)
31-
{
40+
public function processAssert(
41+
BrowserInterface $browser,
42+
$businessIntelligenceLink,
43+
Dashboard $dashboard,
44+
$menuItem,
45+
$waitMenuItemNotVisible = false
46+
) {
47+
/**
48+
* In the parallel run case new windows that adding to selenium grid windows handler
49+
* are in competition with another windows in another browsers in the same selenium grid.
50+
* During this case need to have some algorithm for retrying some operations that changed
51+
* current window for browser, because it's some times happens.
52+
*/
3253
$this->browser = $browser;
33-
$this->browser->selectWindow();
34-
\PHPUnit_Framework_Assert::assertTrue(
35-
$this->browser->waitUntil(
36-
function () use ($businessIntelligenceLink) {
54+
$count = 0;
55+
$isVisible = false;
56+
do {
57+
try {
58+
$this->browser->selectWindow();
59+
$isVisible = $this->browser->waitUntil(function () use ($businessIntelligenceLink) {
3760
return ($this->browser->getUrl() === $businessIntelligenceLink) ?: null;
38-
}
39-
),
40-
'BI Essentials Sign Up page was not opened by link.'
61+
});
62+
break;
63+
} catch (\Throwable $e) {
64+
$dashboard->open();
65+
$dashboard->getMenuBlock()->navigate($menuItem, $waitMenuItemNotVisible);
66+
$count++;
67+
}
68+
} while ($count < self::MAX_TRY_COUNT);
69+
70+
\PHPUnit_Framework_Assert::assertTrue(
71+
$isVisible,
72+
"BI Essentials Sign Up page was not opened by link.\n
73+
Actual link is '{$this->browser->getUrl()}'\n
74+
Expected link is '$businessIntelligenceLink'"
4175
);
4276
}
4377

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/ProductDetails/CategoryIds.php

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,6 @@ class CategoryIds extends MultisuggestElement
4646
*/
4747
protected $advancedInventoryButton = '[data-index="advanced_inventory_button"]';
4848

49-
/**
50-
* Locator for MultiSelect element.
51-
*
52-
* @var string
53-
*/
54-
private $multiSelectElement = '.admin__action-multiselect-menu-inner-item';
55-
5649
/**
5750
* @constructor
5851
* @param BrowserInterface $browser
@@ -93,14 +86,15 @@ public function setValue($values)
9386
if ($value == '') {
9487
continue;
9588
}
96-
$this->keys([$value]);
97-
98-
// wait when some element of multiSelect will be visible.
99-
$this->waitUntil(function () {
100-
return $this->find($this->multiSelectElement)->isVisible() ? true : null;
101-
});
10289

90+
$this->keys([$value]);
10391
$searchedItem = $this->find(sprintf($this->resultItem, $value), Locator::SELECTOR_XPATH);
92+
$searchedCountElements = $this->find($this->searchedCount);
93+
$this->waitUntil(
94+
function () use ($searchedCountElements) {
95+
return $searchedCountElements->isVisible() ? true : null;
96+
}
97+
);
10498
$searchedItem->click();
10599

106100
$closeButton = $this->find($this->closeButton);

‎dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Section/Variations/Config/Attribute.php

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,13 @@ class Attribute extends Form
174174
*/
175175
private $attributesGridSpinner = '.productFormConfigurable [data-role="spinner"]';
176176

177+
/**
178+
* CSS Selector for attribute grid.
179+
*
180+
* @var string
181+
*/
182+
private $attributesGridSelector = '#variation-steps-wizard_step1 .admin__data-grid-outer-wrap';
183+
177184
/**
178185
* Fill attributes
179186
*
@@ -192,6 +199,7 @@ public function fillAttributes(array $attributes, ConfigurableAttributesData $at
192199
}
193200

194201
//select attributes
202+
$this->waitAttributesGridLoad();
195203
$this->getAttributesGrid()->resetFilter();
196204
$this->getAttributesGrid()->waitForElementNotVisible($this->attributesGridSpinner);
197205
$this->getTemplateBlock()->waitLoader();
@@ -220,14 +228,25 @@ public function fillAttributes(array $attributes, ConfigurableAttributesData $at
220228
$this->browser->find($this->nextButton)->click();
221229
}
222230

231+
/**
232+
* Wait for 'Attributes Grid' loaded.
233+
*
234+
* @return void
235+
*/
236+
private function waitAttributesGridLoad()
237+
{
238+
$this->waitForElementVisible($this->attributesGridSelector);
239+
$this->waitForElementNotVisible($this->attributesGridSpinner);
240+
}
241+
223242
/**
224243
* @return \Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\AttributesGrid
225244
*/
226245
public function getAttributesGrid()
227246
{
228247
return $this->blockFactory->create(
229248
\Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\AttributesGrid::class,
230-
['element' => $this->browser->find('#variation-steps-wizard_step1 .admin__data-grid-outer-wrap')]
249+
['element' => $this->browser->find($this->attributesGridSelector)]
231250
);
232251
}
233252

0 commit comments

Comments
 (0)