Skip to content

Commit c7d2665

Browse files
ishakhsuvarovishakhsuvarov
authored
Merge pull request #8068 from magento-gl/Arrows_regression_issues_2_4_6_11jan22
Arrows_Regression_issues_2.4.6_11jan22
2 parents 03c2d71 + ff1e6e0 commit c7d2665

File tree

30 files changed

+88
-79
lines changed

30 files changed

+88
-79
lines changed

‎app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Export/FilterTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,6 @@ private function getAttributeMock(array $data): Attribute
333333
*/
334334
public function testPrepareForm()
335335
{
336-
$this->markTestIncomplete('This test has not been implemented yet.');
336+
$this->markTestSkipped('This test has not been implemented yet.');
337337
}
338338
}

‎app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Import/Edit/FormTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,6 @@ protected function setUp(): void
8383
*/
8484
public function testPrepareForm()
8585
{
86-
$this->markTestIncomplete('This test has not been implemented yet.');
86+
$this->markTestSkipped('This test has not been implemented yet.');
8787
}
8888
}

‎app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ public function testImportSourceException()
363363
*/
364364
public function testGetOperationResultMessages()
365365
{
366-
$this->markTestIncomplete('This test has not been implemented yet.');
366+
$this->markTestSkipped('This test has not been implemented yet.');
367367
}
368368

369369
/**
@@ -386,79 +386,79 @@ public function testGetAttributeType()
386386
*/
387387
public function testGetEntity()
388388
{
389-
$this->markTestIncomplete('This test has not been implemented yet.');
389+
$this->markTestSkipped('This test has not been implemented yet.');
390390
}
391391

392392
/**
393393
* @todo to implement it.
394394
*/
395395
public function testGetErrorsCount()
396396
{
397-
$this->markTestIncomplete('This test has not been implemented yet.');
397+
$this->markTestSkipped('This test has not been implemented yet.');
398398
}
399399

400400
/**
401401
* @todo to implement it.
402402
*/
403403
public function testGetErrorsLimit()
404404
{
405-
$this->markTestIncomplete('This test has not been implemented yet.');
405+
$this->markTestSkipped('This test has not been implemented yet.');
406406
}
407407

408408
/**
409409
* @todo to implement it.
410410
*/
411411
public function testGetInvalidRowsCount()
412412
{
413-
$this->markTestIncomplete('This test has not been implemented yet.');
413+
$this->markTestSkipped('This test has not been implemented yet.');
414414
}
415415

416416
/**
417417
* @todo to implement it.
418418
*/
419419
public function testGetNotices()
420420
{
421-
$this->markTestIncomplete('This test has not been implemented yet.');
421+
$this->markTestSkipped('This test has not been implemented yet.');
422422
}
423423

424424
/**
425425
* @todo to implement it.
426426
*/
427427
public function testGetProcessedEntitiesCount()
428428
{
429-
$this->markTestIncomplete('This test has not been implemented yet.');
429+
$this->markTestSkipped('This test has not been implemented yet.');
430430
}
431431

432432
/**
433433
* @todo to implement it.
434434
*/
435435
public function testGetProcessedRowsCount()
436436
{
437-
$this->markTestIncomplete('This test has not been implemented yet.');
437+
$this->markTestSkipped('This test has not been implemented yet.');
438438
}
439439

440440
/**
441441
* @todo to implement it.
442442
*/
443443
public function testGetWorkingDir()
444444
{
445-
$this->markTestIncomplete('This test has not been implemented yet.');
445+
$this->markTestSkipped('This test has not been implemented yet.');
446446
}
447447

448448
/**
449449
* @todo to implement it.
450450
*/
451451
public function testIsImportAllowed()
452452
{
453-
$this->markTestIncomplete('This test has not been implemented yet.');
453+
$this->markTestSkipped('This test has not been implemented yet.');
454454
}
455455

456456
/**
457457
* @todo to implement it.
458458
*/
459459
public function testUploadSource()
460460
{
461-
$this->markTestIncomplete('This test has not been implemented yet.');
461+
$this->markTestSkipped('This test has not been implemented yet.');
462462
}
463463

464464
/**
@@ -704,7 +704,7 @@ public function unknownEntitiesProvider()
704704
*/
705705
public function testGetUniqueEntityBehaviors()
706706
{
707-
$this->markTestIncomplete('This test has not been implemented yet.');
707+
$this->markTestSkipped('This test has not been implemented yet.');
708708
}
709709

710710
/**

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/UserDeletesFolderFromMediaGalleryTest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323

2424
<!-- Step2 Disabled Old Media Gallery and Page Builder -->
2525
<magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="disabledOldMediaGallery"/>
26-
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
26+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="disablePageBuilder"/>
2727
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
2828
</before>
2929
<after>
3030
<magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="enableOldMediaGallery"/>
31-
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
31+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="enablePageBuilder"/>
3232
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
3333
</after>
3434

‎app/code/Magento/Paypal/Test/Unit/Controller/ExpressTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ abstract class ExpressTest extends TestCase
3232
/** @var Express */
3333
protected $model;
3434

35+
/** @var string */
3536
protected $name = '';
3637

3738
/** @var Session|MockObject */
@@ -75,7 +76,7 @@ abstract class ExpressTest extends TestCase
7576

7677
protected function setUp(): void
7778
{
78-
$this->markTestIncomplete();
79+
$this->markTestSkipped();
7980
$this->messageManager = $this->getMockForAbstractClass(ManagerInterface::class);
8081
$this->config = $this->createMock(Config::class);
8182
$this->request = $this->createMock(Http::class);

‎app/code/Magento/Sales/Test/Unit/Block/Reorder/SidebarTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class SidebarTest extends TestCase
8383
*/
8484
protected function setUp(): void
8585
{
86-
$this->markTestIncomplete('MAGETWO-36789');
86+
$this->markTestSkipped('MAGETWO-36789');
8787
$this->objectManagerHelper = new ObjectManager($this);
8888
$this->context = $this->createMock(\Magento\Framework\View\Element\Template\Context::class);
8989
$this->httpContext = $this->createPartialMock(\Magento\Framework\App\Http\Context::class, ['getValue']);

‎app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/ShippingTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public function testCollectDoesNotCalculateTaxIfThereIsNoItemsRelatedToGivenAddr
134134

135135
public function testCollect()
136136
{
137-
$this->markTestIncomplete('Target code is not unit testable. Refactoring is required.');
137+
$this->markTestSkipped('Target code is not unit testable. Refactoring is required.');
138138
}
139139

140140
/**

‎app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/TaxTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
*/
4949
class TaxTest extends TestCase
5050
{
51-
const TAX = 0.2;
51+
public const TAX = 0.2;
5252

5353
/**
5454
* Tests the specific method
@@ -72,7 +72,7 @@ public function testCollect(
7272
$addressData,
7373
$verifyData
7474
) {
75-
$this->markTestIncomplete('Source code is not testable. Need to be refactored before unit testing');
75+
$this->markTestSkipped('Source code is not testable. Need to be refactored before unit testing');
7676
$shippingAssignmentMock = $this->getMockForAbstractClass(ShippingAssignmentInterface::class);
7777
$totalsMock = $this->createMock(Total::class);
7878
$objectManager = new ObjectManager($this);

‎app/code/Magento/User/Test/Mftf/Test/AdminUpdateUserRoleTest.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
<testCaseId value="MC-27895"/>
1919
<group value="user"/>
2020
<group value="mtf_migrated"/>
21-
<skip>
22-
<issueId value="AC-7467"/>
23-
</skip>
2421
</annotations>
2522
<before>
2623
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -31,6 +28,7 @@
3128
<!--Create New Role-->
3229
<actionGroup ref="AdminStartCreateUserRoleActionGroup" stepKey="startCreateUserRole">
3330
<argument name="roleName" value="{{roleSales.name}}"/>
31+
<argument name="userPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
3432
</actionGroup>
3533
<actionGroup ref="AdminSaveUserRoleActionGroup" stepKey="saveNewRole"/>
3634
</before>

‎composer.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)