Skip to content

Commit 78b4547

Browse files
vpelipenkovpelipenko
committed
Merge remote-tracking branch 'mainline/develop' into prs
2 parents 21f1ebd + 1bcfc0f commit 78b4547

File tree

188 files changed

+671
-719
lines changed

Some content is hidden

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

188 files changed

+671
-719
lines changed

‎app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected function setUp()
4949
}
5050

5151
/**
52-
* covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundDispatch
52+
* @covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundDispatch
5353
*
5454
* @param $postData array|string
5555
* @param array $convertedData
@@ -84,7 +84,7 @@ public function aroundDispatchDataProvider()
8484
}
8585

8686
/**
87-
* covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundDispatch
87+
* @covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundDispatch
8888
*/
8989
public function testAroundDispatchWhenMassactionPrepareKeyRequestNotExists()
9090
{

‎app/code/Magento/Backend/Test/Unit/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
{

‎app/code/Magento/Backend/Test/Unit/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
{

‎app/code/Magento/Backend/Test/Unit/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)

‎app/code/Magento/Backend/Test/Unit/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
{

‎app/code/Magento/Backend/Test/Unit/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
{

‎app/code/Magento/Backend/Test/Unit/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
{

‎app/code/Magento/Bundle/Test/Unit/Helper/Catalog/Product/ConfigurationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function testGetSelectionQtyIfCustomOptionIsNotSet()
7070
}
7171

7272
/**
73-
* covers \Magento\Bundle\Helper\Catalog\Product\Configuration::getSelectionFinalPrice
73+
* @covers \Magento\Bundle\Helper\Catalog\Product\Configuration::getSelectionFinalPrice
7474
*/
7575
public function testGetSelectionFinalPrice()
7676
{

‎app/code/Magento/Bundle/Test/Unit/Model/OptionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected function setUp()
5858
}
5959

6060
/**
61-
* covers \Magento\Bundle\Model\Option::addSelection
61+
* @covers \Magento\Bundle\Model\Option::addSelection
6262
*/
6363
public function testAddSelection()
6464
{

‎app/code/Magento/Bundle/Test/Unit/Model/Product/Attribute/Source/Price/ViewTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function testGetAllOptions()
6868
}
6969

7070
/**
71-
* covers \Magento\Bundle\Model\Product\Attribute\Source\Price\View::getOptionText
71+
* @covers \Magento\Bundle\Model\Product\Attribute\Source\Price\View::getOptionText
7272
*/
7373
public function testGetOptionTextForExistLabel()
7474
{
@@ -78,7 +78,7 @@ public function testGetOptionTextForExistLabel()
7878
}
7979

8080
/**
81-
* covers \Magento\Bundle\Model\Product\Attribute\Source\Price\View::getOptionText
81+
* @covers \Magento\Bundle\Model\Product\Attribute\Source\Price\View::getOptionText
8282
*/
8383
public function testGetOptionTextForNotExistLabel()
8484
{

0 commit comments

Comments
 (0)