Skip to content

Commit f7758bf

Browse files
author
Maksym Savich
committed
Merge remote-tracking branch 'upstream/develop' into MAGETWO-32074-core-helpers
2 parents 4ab2f70 + 51750d9 commit f7758bf

File tree

663 files changed

+5733
-12279
lines changed

Some content is hidden

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

663 files changed

+5733
-12279
lines changed

‎app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,9 @@
186186
display: inline-block;
187187
vertical-align: top;
188188
}
189+
.type {
190+
margin-right: @indent__xs;
191+
}
189192
}
190193
&.overview {
191194
margin: @indent__base 0;

‎app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,15 @@ body {
254254
.navigation ul {
255255
padding: 0 8px;
256256
}
257+
257258
.header {
258259
&.panel {
259260
> .header.links {
260261
float: right;
262+
font-size: 0;
261263
.list-inline();
262264
> li {
265+
font-size: @font-size__base;
263266
margin: 0 0 0 15px;
264267
&.welcome,
265268
a {
@@ -275,7 +278,7 @@ body {
275278
}
276279
}
277280
&.content {
278-
padding: 30px 20px 0;
281+
padding: @indent__l @indent__base 0;
279282
&:extend(.abs-add-clearfix-desktop all);
280283
}
281284
}
@@ -287,8 +290,8 @@ body {
287290
border-bottom: 1px solid @secondary__color;
288291
}
289292
.header.panel {
290-
padding-top: 10px;
291-
padding-bottom: 10px;
293+
padding-top: @indent__s;
294+
padding-bottom: @indent__s;
292295
&:extend(.abs-add-clearfix-desktop all);
293296
}
294297
.switcher {

‎app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@
223223
&.sku {
224224
.type {
225225
font-weight: normal;
226+
margin-right: @indent__xs;
226227
&:after {
227228
content: '#:';
228229
}

‎app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,11 @@
101101
> .header.links {
102102
.list-inline();
103103
float: right;
104+
font-size: 0;
104105
margin-left: auto;
105106
margin-right: @indent__base;
106107
> li {
108+
font-size: @font-size__base;
107109
margin: 0 0 0 15px;
108110
> a {
109111
.link(

‎dev/tests/functional/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"magento/mtf": "1.0.0-rc18",
3+
"magento/mtf": "1.0.0-rc19",
44
"php": "~5.5.0|~5.6.0",
55
"phpunit/phpunit": "4.1.0",
66
"phpunit/phpunit-selenium": ">=1.2",

‎dev/tests/functional/etc/di.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
9-
<preference for="Magento\Mtf\Util\Generate\Fixture\FieldsProviderInterface" type="Magento\Mtf\Util\Generate\Fixture\FieldsProvider" />
10-
<preference for="Magento\Mtf\Util\Generate\Repository\CollectionProviderInterface" type="Magento\Mtf\Util\Generate\Repository\CollectionProvider" />
119
<virtualType name="Magento\Mtf\Config\SchemaLocator\Config" type="Magento\Mtf\Config\SchemaLocator">
1210
<arguments>
1311
<argument name="schemaPath" xsi:type="string">etc/config.xsd</argument>

‎dev/tests/functional/lib/Magento/Mtf/ObjectManagerFactory.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,17 @@ public function create(array $sharedInstances = [])
5252
$argInterpreter = $this->createArgumentInterpreter(new BooleanUtils());
5353
$argumentMapper = new \Magento\Mtf\ObjectManager\Config\Mapper\Dom($argInterpreter);
5454

55+
$autoloader = new \Magento\Mtf\Code\Generator\Autoloader(
56+
new \Magento\Mtf\Code\Generator(
57+
[
58+
'page' => 'Magento\Mtf\Util\Generate\Page',
59+
'repository' => 'Magento\Mtf\Util\Generate\Repository',
60+
'fixture' => 'Magento\Mtf\Util\Generate\Fixture'
61+
]
62+
)
63+
);
64+
spl_autoload_register([$autoloader, 'load']);
65+
5566
$sharedInstances['Magento\Mtf\Data\Argument\InterpreterInterface'] = $argInterpreter;
5667
$sharedInstances['Magento\Mtf\ObjectManager\Config\Mapper\Dom'] = $argumentMapper;
5768
$objectManager = new $this->locatorClassName($factory, $diConfig, $sharedInstances);

‎dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,16 @@ public function launch()
6060

6161
return $this->objectManager->get('Magento\Framework\App\ResponseInterface');
6262
}
63+
64+
/**
65+
* Generate single class.
66+
*
67+
* @param string $className
68+
* @return bool
69+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
70+
*/
71+
public function generate($className)
72+
{
73+
return false;
74+
}
6375
}

‎dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/FieldsProvider.php

Lines changed: 0 additions & 191 deletions
This file was deleted.

0 commit comments

Comments
 (0)