Skip to content

Commit c2ee9f3

Browse files
RomaKisRomaKis
committed
Merge branch 'develop' into develop-pr4
2 parents 5450d52 + 5f7f226 commit c2ee9f3

File tree

13 files changed

+151
-65
lines changed

13 files changed

+151
-65
lines changed

‎app/code/Magento/Deploy/Package/Processor/PreProcessor/Less.php

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -127,23 +127,34 @@ private function hasOverrides(PackageFile $parentFile, Package $package)
127127
$parentFile->getPackage()->getPath(),
128128
$parentFile->getExtension()
129129
);
130-
$parentFiles = $this->collectFileMap($parentFile->getFileName(), $map);
131-
$currentPackageLessFiles = $package->getFilesByType('less');
132-
$currentPackageCssFiles = $package->getFilesByType('css');
133130
/** @var PackageFile[] $currentPackageFiles */
134-
$currentPackageFiles = array_merge($currentPackageLessFiles, $currentPackageCssFiles);
131+
$currentPackageFiles = array_merge($package->getFilesByType('less'), $package->getFilesByType('css'));
135132

136133
foreach ($currentPackageFiles as $file) {
137-
if (in_array($file->getDeployedFileName(), $parentFiles)) {
134+
if ($this->inParentFiles($file->getDeployedFileName(), $parentFile->getFileName(), $map)) {
138135
return true;
139136
}
140137
}
138+
return false;
139+
}
141140

142-
$intersections = array_intersect($parentFiles, array_keys($currentPackageFiles));
143-
if ($intersections) {
144-
return true;
141+
/**
142+
* @param string $fileName
143+
* @param string $parentFile
144+
* @param array $map
145+
* @return bool
146+
*/
147+
private function inParentFiles($fileName, $parentFile, $map)
148+
{
149+
if (isset($map[$parentFile])) {
150+
if (in_array($fileName, $map[$parentFile])) {
151+
return true;
152+
} else {
153+
foreach ($map[$parentFile] as $pFile) {
154+
return $this->inParentFiles($fileName, $pFile, $map);
155+
}
156+
}
145157
}
146-
147158
return false;
148159
}
149160

@@ -186,25 +197,6 @@ private function buildMap($filePath, $packagePath, $contentType)
186197
return $this->map;
187198
}
188199

189-
/**
190-
* Flatten map tree into simple array
191-
*
192-
* Original map file information structure in form of tree,
193-
* and to have checking of overridden files simpler we need to flatten that tree
194-
*
195-
* @param string $fileName
196-
* @param array $map
197-
* @return array
198-
*/
199-
private function collectFileMap($fileName, array $map)
200-
{
201-
$result = isset($map[$fileName]) ? $map[$fileName] : [];
202-
foreach ($result as $fName) {
203-
$result = array_merge($result, $this->collectFileMap($fName, $map));
204-
}
205-
return array_unique($result);
206-
}
207-
208200
/**
209201
* Return normalized path
210202
*

‎app/code/Magento/Deploy/Process/Queue.php

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -187,24 +187,15 @@ private function assertAndExecute($name, array & $packages, array $packageJob)
187187
{
188188
/** @var Package $package */
189189
$package = $packageJob['package'];
190-
$parentPackagesDeployed = true;
191190
if ($package->getParent() && $package->getParent() !== $package) {
192-
if (!$this->isDeployed($package->getParent())) {
193-
$parentPackagesDeployed = false;
194-
} else {
195-
$dependencies = $packageJob['dependencies'];
196-
foreach ($dependencies as $parentPackage) {
197-
if (!$this->isDeployed($parentPackage)) {
198-
$parentPackagesDeployed = false;
199-
break;
200-
}
191+
foreach ($packageJob['dependencies'] as $dependencyName => $dependency) {
192+
if (!$this->isDeployed($dependency)) {
193+
$this->assertAndExecute($dependencyName, $packages, $packages[$dependencyName]);
201194
}
202195
}
203196
}
204-
if (
205-
$parentPackagesDeployed
206-
&& ($this->maxProcesses < 2 || (count($this->inProgress) < $this->maxProcesses))
207-
) {
197+
if (!$this->isDeployed($package)
198+
&& ($this->maxProcesses < 2 || (count($this->inProgress) < $this->maxProcesses))) {
208199
unset($packages[$name]);
209200
$this->execute($package);
210201
}

‎app/code/Magento/Deploy/Service/DeployRequireJsConfig.php

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66
namespace Magento\Deploy\Service;
77

8+
use Magento\Framework\Locale\ResolverInterfaceFactory;
9+
use Magento\Framework\Locale\ResolverInterface;
810
use Magento\RequireJs\Model\FileManagerFactory;
911
use Magento\Framework\View\DesignInterfaceFactory;
1012
use Magento\Framework\View\Design\Theme\ListInterface;
@@ -46,6 +48,11 @@ class DeployRequireJsConfig
4648
*/
4749
private $requireJsConfigFactory;
4850

51+
/**
52+
* @var ResolverInterfaceFactory
53+
*/
54+
private $localeFactory;
55+
4956
/**
5057
* DeployRequireJsConfig constructor
5158
*
@@ -54,31 +61,40 @@ class DeployRequireJsConfig
5461
* @param RepositoryFactory $assetRepoFactory
5562
* @param FileManagerFactory $fileManagerFactory
5663
* @param ConfigFactory $requireJsConfigFactory
64+
* @param ResolverInterfaceFactory $localeFactory
5765
*/
5866
public function __construct(
5967
ListInterface $themeList,
6068
DesignInterfaceFactory $designFactory,
6169
RepositoryFactory $assetRepoFactory,
6270
FileManagerFactory $fileManagerFactory,
63-
ConfigFactory $requireJsConfigFactory
71+
ConfigFactory $requireJsConfigFactory,
72+
ResolverInterfaceFactory $localeFactory
6473
) {
6574
$this->themeList = $themeList;
6675
$this->designFactory = $designFactory;
6776
$this->assetRepoFactory = $assetRepoFactory;
6877
$this->fileManagerFactory = $fileManagerFactory;
6978
$this->requireJsConfigFactory = $requireJsConfigFactory;
79+
$this->localeFactory = $localeFactory;
7080
}
7181

7282
/**
7383
* @param string $areaCode
7484
* @param string $themePath
85+
* @param string $localeCode
7586
* @return bool true on success
7687
*/
77-
public function deploy($areaCode, $themePath)
88+
public function deploy($areaCode, $themePath, $localeCode)
7889
{
7990
/** @var \Magento\Framework\View\Design\ThemeInterface $theme */
8091
$theme = $this->themeList->getThemeByFullPath($areaCode . '/' . $themePath);
92+
/** @var \Magento\Theme\Model\View\Design $design */
8193
$design = $this->designFactory->create()->setDesignTheme($theme, $areaCode);
94+
/** @var ResolverInterface $locale */
95+
$locale = $this->localeFactory->create();
96+
$locale->setLocale($localeCode);
97+
$design->setLocale($locale);
8298

8399
$assetRepo = $this->assetRepoFactory->create(['design' => $design]);
84100
/** @var \Magento\RequireJs\Model\FileManager $fileManager */

‎app/code/Magento/Deploy/Service/DeployStaticContent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public function deploy(array $options)
120120
]);
121121
foreach ($packages as $package) {
122122
if (!$package->isVirtual()) {
123-
$deployRjsConfig->deploy($package->getArea(), $package->getTheme());
123+
$deployRjsConfig->deploy($package->getArea(), $package->getTheme(), $package->getLocale());
124124
$deployI18n->deploy($package->getArea(), $package->getTheme(), $package->getLocale());
125125
$deployBundle->deploy($package->getArea(), $package->getTheme(), $package->getLocale());
126126
}

‎app/code/Magento/Deploy/Test/Unit/Process/QueueTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ public function testAdd()
113113
public function testProcess()
114114
{
115115
$package = $this->getMock(Package::class, [], [], '', false);
116-
$package->expects($this->any())->method('getState')->willReturn(1);
117-
$package->expects($this->once())->method('getParent')->willReturn(null);
116+
$package->expects($this->any())->method('getState')->willReturn(0);
117+
$package->expects($this->exactly(2))->method('getParent')->willReturn(true);
118118
$package->expects($this->any())->method('getArea')->willReturn('area');
119119
$package->expects($this->any())->method('getPath')->willReturn('path');
120120
$package->expects($this->any())->method('getFiles')->willReturn([]);

‎app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public function testDeploy($options, $expectedContentVersion)
123123
$package->expects($this->exactly(1))->method('isVirtual')->willReturn(false);
124124
$package->expects($this->exactly(3))->method('getArea')->willReturn('area');
125125
$package->expects($this->exactly(3))->method('getTheme')->willReturn('theme');
126-
$package->expects($this->exactly(2))->method('getLocale')->willReturn('locale');
126+
$package->expects($this->exactly(3))->method('getLocale')->willReturn('locale');
127127
}
128128
$packages = ['package' => $package];
129129

‎app/code/Magento/Theme/Model/View/Design.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,16 @@ public function getLocale()
256256
return $this->_locale->getLocale();
257257
}
258258

259+
/**
260+
* @param \Magento\Framework\Locale\ResolverInterface $locale
261+
* @return $this
262+
*/
263+
public function setLocale(\Magento\Framework\Locale\ResolverInterface $locale)
264+
{
265+
$this->_locale = $locale;
266+
return $this;
267+
}
268+
259269
/**
260270
* {@inheritdoc}
261271
*/

‎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/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

‎dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
<constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertProductTierPriceOnProductPage" />
171171
</variation>
172172
<variation name="CreateConfigurableProductEntityTestVariation11" summary="Create Configurable Product with out of stock child" ticketId="MAGETWO-65660">
173-
<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, stable:no</data>
173+
<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
174174
<data name="product/data/configurable_attributes_data/dataset" xsi:type="string">with_out_of_stock_item</data>
175175
<data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
176176
<data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
@@ -188,7 +188,7 @@
188188
<constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" />
189189
</variation>
190190
<variation name="CreateConfigurableProductEntityTestVariation12" summary="Create Configurable Product with disabled child" ticketId="MAGETWO-65661">
191-
<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, stable:no</data>
191+
<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
192192
<data name="product/data/configurable_attributes_data/dataset" xsi:type="string">with_disabled_item</data>
193193
<data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
194194
<data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
@@ -206,7 +206,7 @@
206206
<constraint name="Magento\Catalog\Test\Constraint\AssertProductNotVisibleInCategory" />
207207
</variation>
208208
<variation name="CreateConfigurableProductEntityTestVariation13" summary="Create Configurable Product with one disabled child and with one out of stock child" ticketId="MAGETWO-65662">
209-
<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, stable:no</data>
209+
<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
210210
<data name="product/data/configurable_attributes_data/dataset" xsi:type="string">with_one_disabled_item_and_one_out_of_stock_item</data>
211211
<data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
212212
<data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>

0 commit comments

Comments
 (0)