Skip to content

Commit f182ac3

Browse files
slavvkaslavvka
committed
Merge remote-tracking branch 'origin/MAGETWO-31369' into MAGETWO-30789
Conflicts: dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php dev/tests/unit/testsuite/Magento/Cookie/Model/Config/Backend/DomainTest.php dev/tests/unit/testsuite/Magento/Framework/View/Layout/Reader/BlockTest.php dev/tests/unit/testsuite/Magento/Framework/View/Layout/ScheduledStructureTest.php dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php dev/tests/unit/testsuite/Magento/Theme/Model/Theme/Domain/StagingTest.php dev/tests/unit/testsuite/Magento/Theme/Model/Theme/Domain/VirtualTest.php dev/tests/unit/testsuite/Magento/Theme/Model/Theme/Image/PathTest.php dev/tests/unit/testsuite/Magento/Theme/Model/ThemeTest.php
2 parents 6c33fd1 + a3d60ef commit f182ac3

File tree

204 files changed

+3481
-876
lines changed

Some content is hidden

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

204 files changed

+3481
-876
lines changed

‎app/code/Magento/Theme/Model/CopyService.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,10 @@ protected function _copyFilesRecursively($baseDir, $sourceDir, $targetDir)
197197
*/
198198
protected function _deleteFilesRecursively($targetDir)
199199
{
200-
if (!$this->_directory->isExist($targetDir)) {
201-
return;
202-
}
203-
foreach ($this->_directory->read($targetDir) as $path) {
204-
$this->_directory->delete($path);
200+
if ($this->_directory->isExist($targetDir)) {
201+
foreach ($this->_directory->read($targetDir) as $path) {
202+
$this->_directory->delete($path);
203+
}
205204
}
206205
}
207206
}

‎dev/tests/unit/testsuite/Magento/Backend/App/Action/Plugin/MassactionKeyTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ protected function setUp()
3838
}
3939

4040
/**
41-
* @covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundDispatch
41+
* covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundDispatch
4242
*
4343
* @param $postData array|string
4444
* @param array $convertedData
@@ -72,7 +72,7 @@ public function aroundDispatchDataProvider()
7272
}
7373

7474
/**
75-
* @covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundDispatch
75+
* covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundDispatch
7676
*/
7777
public function testAroundDispatchWhenMassactionPrepareKeyRequestNotExists()
7878
{

‎dev/tests/unit/testsuite/Magento/Backend/App/Router/NoRouteHandlerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected function setUp()
3737
}
3838

3939
/**
40-
* @covers Magento\Backend\App\Router\NoRouteHandler::process
40+
* covers Magento\Backend\App\Router\NoRouteHandler::process
4141
*/
4242
public function testProcessWithBackendAreaFrontName()
4343
{
@@ -86,7 +86,7 @@ public function testProcessWithBackendAreaFrontName()
8686
}
8787

8888
/**
89-
* @covers Magento\Backend\App\Router\NoRouteHandler::process
89+
* covers Magento\Backend\App\Router\NoRouteHandler::process
9090
*/
9191
public function testProcessWithoutAreaFrontName()
9292
{

‎dev/tests/unit/testsuite/Magento/Backend/Block/Page/System/Config/Robots/ResetTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ protected function setUp()
3535
}
3636

3737
/**
38-
* @covers \Magento\Backend\Block\Page\System\Config\Robots\Reset::getRobotsDefaultCustomInstructions
38+
* covers \Magento\Backend\Block\Page\System\Config\Robots\Reset::getRobotsDefaultCustomInstructions
3939
*/
4040
public function testGetRobotsDefaultCustomInstructions()
4141
{

‎dev/tests/unit/testsuite/Magento/Backend/Block/System/Config/Form/Field/ImageTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected function setUp()
5353
}
5454

5555
/**
56-
* @covers \Magento\Backend\Block\System\Config\Form\Field\Image::_getUrl
56+
* covers \Magento\Backend\Block\System\Config\Form\Field\Image::_getUrl
5757
*/
5858
public function testGetElementHtmlWithValue()
5959
{

‎dev/tests/unit/testsuite/Magento/Backend/Block/Widget/ButtonTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected function tearDown()
5151
}
5252

5353
/**
54-
* @covers \Magento\Backend\Block\Widget\Button::getAttributesHtml
54+
* covers \Magento\Backend\Block\Widget\Button::getAttributesHtml
5555
* @dataProvider getAttributesHtmlDataProvider
5656
*/
5757
public function testGetAttributesHtml($data, $expect)

‎dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Column/Renderer/CurrencyTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ protected function tearDown()
109109
}
110110

111111
/**
112-
* @covers \Magento\Backend\Block\Widget\Grid\Column\Renderer\Currency::render
112+
* covers \Magento\Backend\Block\Widget\Grid\Column\Renderer\Currency::render
113113
*/
114114
public function testRenderWithDefaultCurrency()
115115
{

‎dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/ColumnTest.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ public function getSortableDataProvider()
9797
}
9898

9999
/**
100-
* @covers \Magento\Backend\Block\Widget\Grid\Column::getFilter
101-
* @covers \Magento\Backend\Block\Widget\Grid\Column::setFilterType
100+
* covers \Magento\Backend\Block\Widget\Grid\Column::getFilter
101+
* covers \Magento\Backend\Block\Widget\Grid\Column::setFilterType
102102
*/
103103
public function testGetFilterWithSetEmptyCustomFilterType()
104104
{
@@ -108,7 +108,7 @@ public function testGetFilterWithSetEmptyCustomFilterType()
108108
}
109109

110110
/**
111-
* @covers \Magento\Backend\Block\Widget\Grid\Column::getFilter
111+
* covers \Magento\Backend\Block\Widget\Grid\Column::getFilter
112112
*/
113113
public function testGetFilterWithInvalidFilterTypeWhenUseDefaultFilter()
114114
{
@@ -128,7 +128,7 @@ public function testGetFilterWithInvalidFilterTypeWhenUseDefaultFilter()
128128
}
129129

130130
/**
131-
* @covers \Magento\Backend\Block\Widget\Grid\Column::getFilter
131+
* covers \Magento\Backend\Block\Widget\Grid\Column::getFilter
132132
*/
133133
public function testGetFilterWhenUseCustomFilter()
134134
{
@@ -149,8 +149,8 @@ public function testGetFilterWhenUseCustomFilter()
149149
}
150150

151151
/**
152-
* @covers \Magento\Backend\Block\Widget\Grid\Column::getFilter
153-
* @covers \Magento\Backend\Block\Widget\Grid\Column::setFilter
152+
* covers \Magento\Backend\Block\Widget\Grid\Column::getFilter
153+
* covers \Magento\Backend\Block\Widget\Grid\Column::setFilter
154154
*/
155155
public function testGetFilterWhenFilterWasSetPreviously()
156156
{
@@ -213,7 +213,7 @@ public function testGetRendererWhenRendererIsSet()
213213
}
214214

215215
/**
216-
* @covers \Magento\Backend\Block\Widget\Grid\Column::getRenderer
216+
* covers \Magento\Backend\Block\Widget\Grid\Column::getRenderer
217217
*/
218218
public function testGetRendererWheRendererSetFalse()
219219
{
@@ -235,8 +235,8 @@ public function testGetRendererWheRendererSetFalse()
235235
}
236236

237237
/**
238-
* @covers \Magento\Backend\Block\Widget\Grid\Column::getRenderer
239-
* @covers \Magento\Backend\Block\Widget\Grid\Column::setRendererType
238+
* covers \Magento\Backend\Block\Widget\Grid\Column::getRenderer
239+
* covers \Magento\Backend\Block\Widget\Grid\Column::setRendererType
240240
*/
241241
public function testGetRendererWhenUseCustomRenderer()
242242
{
@@ -259,8 +259,8 @@ public function testGetRendererWhenUseCustomRenderer()
259259
}
260260

261261
/**
262-
* @covers \Magento\Backend\Block\Widget\Grid\Column::getRenderer
263-
* @covers \Magento\Backend\Block\Widget\Grid\Column::setRenderer
262+
* covers \Magento\Backend\Block\Widget\Grid\Column::getRenderer
263+
* covers \Magento\Backend\Block\Widget\Grid\Column::setRenderer
264264
*/
265265
public function testGetRendererWhenRendererWasSetPreviously()
266266
{

‎dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/EncryptedTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function testProcessValue()
8585
}
8686

8787
/**
88-
* @covers \Magento\Backend\Model\Config\Backend\Encrypted::beforeSave
88+
* covers \Magento\Backend\Model\Config\Backend\Encrypted::beforeSave
8989
* @dataProvider beforeSaveDataProvider
9090
*
9191
* @param $value

‎dev/tests/unit/testsuite/Magento/Backend/Model/Locale/ManagerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function switchBackendInterfaceLocaleDataProvider()
6767
/**
6868
* @param string $locale
6969
* @dataProvider switchBackendInterfaceLocaleDataProvider
70-
* @covers \Magento\Backend\Model\Locale\Manager::switchBackendInterfaceLocale
70+
* covers \Magento\Backend\Model\Locale\Manager::switchBackendInterfaceLocale
7171
*/
7272
public function testSwitchBackendInterfaceLocale($locale)
7373
{
@@ -81,7 +81,7 @@ public function testSwitchBackendInterfaceLocale($locale)
8181
}
8282

8383
/**
84-
* @covers \Magento\Backend\Model\Locale\Manager::getUserInterfaceLocale
84+
* covers \Magento\Backend\Model\Locale\Manager::getUserInterfaceLocale
8585
*/
8686
public function testGetUserInterfaceLocaleDefault()
8787
{
@@ -91,7 +91,7 @@ public function testGetUserInterfaceLocaleDefault()
9191
}
9292

9393
/**
94-
* @covers \Magento\Backend\Model\Locale\Manager::getUserInterfaceLocale
94+
* covers \Magento\Backend\Model\Locale\Manager::getUserInterfaceLocale
9595
*/
9696
public function testGetUserInterfaceLocale()
9797
{

0 commit comments

Comments
 (0)