Skip to content

Commit 428c70e

Browse files
IndraniksIndraniks
committed
AC-7686:Merged latest code and resolved conflicts
2 parents 3e727b7 + c7d2665 commit 428c70e

File tree

69 files changed

+415
-276
lines changed

Some content is hidden

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

69 files changed

+415
-276
lines changed

‎app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ public function testMoveWhenCannotFindParentCategory(): void
214214
{
215215
$this->expectException('Magento\Framework\Exception\LocalizedException');
216216
$this->expectExceptionMessage('Sorry, but we can\'t find the new parent category you selected.');
217-
$this->markTestIncomplete('MAGETWO-31165');
217+
$this->markTestSkipped('MAGETWO-31165');
218218
$parentCategory = $this->createPartialMock(
219219
Category::class,
220220
['getId', 'setStoreId', 'load']
@@ -260,7 +260,7 @@ public function testMoveWhenParentCategoryIsSameAsChildCategory(): void
260260
$this->expectExceptionMessage(
261261
'We can\'t move the category because the parent category name matches the child category name.'
262262
);
263-
$this->markTestIncomplete('MAGETWO-31165');
263+
$this->markTestSkipped('MAGETWO-31165');
264264
$parentCategory = $this->createPartialMock(
265265
Category::class,
266266
['getId', 'setStoreId', 'load']

‎app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,8 @@ private function buildSearchCriteria(array $args, ResolveInfo $info): SearchCrit
186186
{
187187
$productFields = (array)$info->getFieldSelection(1);
188188
$includeAggregations = isset($productFields['filters']) || isset($productFields['aggregations']);
189-
$processedArgs = $this->argsSelection->process((string) $info->fieldName, $args);
189+
$fieldName = $info->fieldName ?? "";
190+
$processedArgs = $this->argsSelection->process((string) $fieldName, $args);
190191
$searchCriteria = $this->searchCriteriaBuilder->build($processedArgs, $includeAggregations);
191192

192193
return $searchCriteria;

‎app/code/Magento/Fedex/Test/Unit/Model/Source/GenericTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ protected function setUp(): void
5555
* @return void
5656
* @dataProvider toOptionArrayDataProvider
5757
*/
58-
public function testToOptionArray($code, $methods, $result): void
58+
public function testToOptionArray($methods, $result): void
5959
{
60-
$this->model->code = $code;
6160
$this->shippingFedexMock->expects($this->once())
6261
->method('getCode')
6362
->willReturn($methods);
@@ -74,7 +73,6 @@ public function toOptionArrayDataProvider(): array
7473
{
7574
return [
7675
[
77-
'method',
7876
[
7977
'FEDEX_GROUND' => __('Ground'),
8078
'FIRST_OVERNIGHT' => __('First Overnight')
@@ -85,7 +83,6 @@ public function toOptionArrayDataProvider(): array
8583
]
8684
],
8785
[
88-
'',
8986
false,
9087
[]
9188
]

‎app/code/Magento/GraphQl/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"magento/module-webapi": "*",
1010
"magento/module-new-relic-reporting": "*",
1111
"magento/module-authorization": "*",
12-
"webonyx/graphql-php": "^14.11"
12+
"webonyx/graphql-php": "^15.0"
1313
},
1414
"suggest": {
1515
"magento/module-graph-ql-cache": "*"

‎app/code/Magento/GroupedProduct/Test/Unit/Model/ProductTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ protected function setUp(): void
349349
*/
350350
public function testGetProductLinks(): void
351351
{
352-
$this->markTestIncomplete('Skipped due to https://jira.corp.x.com/browse/MAGETWO-36926');
352+
$this->markTestSkipped('Skipped due to https://jira.corp.x.com/browse/MAGETWO-36926');
353353
$linkTypes = ['related' => 1, 'upsell' => 4, 'crosssell' => 5, 'associated' => 3];
354354
$this->linkTypeProviderMock->expects($this->once())->method('getLinkTypes')->willReturn($linkTypes);
355355

‎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/Helper/ReportTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ protected function setUp(): void
153153
*/
154154
public function testGetExecutionTime()
155155
{
156-
$this->markTestIncomplete('Invalid mocks used for DateTime object. Investigate later.');
156+
$this->markTestSkipped('Invalid mocks used for DateTime object. Investigate later.');
157157

158158
$startDate = '2000-01-01 01:01:01';
159159
$endDate = '2000-01-01 02:03:04';

‎app/code/Magento/ImportExport/Test/Unit/Model/Import/Source/ZipTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected function setUp(): void
4242
*/
4343
public function testConstructorFileDestinationMatch($fileName, $expectedfileName): void
4444
{
45-
$this->markTestIncomplete('The implementation of constructor has changed. Rewrite test to cover changes.');
45+
$this->markTestSkipped('The implementation of constructor has changed. Rewrite test to cover changes.');
4646

4747
$this->directory->method('getRelativePath')
4848
->withConsecutive([$fileName], [$expectedfileName]);

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

0 commit comments

Comments
 (0)