Skip to content

Commit 59d8f94

Browse files
committed
PWA-2137: [GraphQL] Need to bypass webonyx type validation
- fix failing tests
1 parent 0941fc9 commit 59d8f94

File tree

1 file changed

+25
-17
lines changed

1 file changed

+25
-17
lines changed

dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,14 @@
2323
*/
2424
class GraphQlConfigTest extends \PHPUnit\Framework\TestCase
2525
{
26+
/** @var ObjectManagerInterface */
27+
private $objectManager;
28+
2629
/** @var \Magento\Framework\GraphQl\Config */
2730
private $model;
2831

29-
protected function setUp(): void
30-
{
31-
/** @var ObjectManagerInterface $objectManager */
32-
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
33-
/** @var Cache $cache */
34-
$cache = $objectManager->get(Cache::class);
35-
$cache->clean();
32+
public function __construct() {
33+
$this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
3634
$fileResolverMock = $this->getMockBuilder(
3735
\Magento\Framework\Config\FileResolverInterface::class
3836
)->disableOriginalConstructor()->getMock();
@@ -43,21 +41,31 @@ protected function setUp(): void
4341
$filePath2 => file_get_contents($filePath2)
4442
];
4543
$fileResolverMock->expects($this->any())->method('get')->willReturn($fileList);
46-
$graphQlReader = $objectManager->create(
44+
$graphQlReader = $this->objectManager->create(
4745
\Magento\Framework\GraphQlSchemaStitching\GraphQlReader::class,
4846
['fileResolver' => $fileResolverMock]
4947
);
50-
$reader = $objectManager->create(
51-
// phpstan:ignore
48+
$reader = $this->objectManager->create(
49+
// phpstan:ignore
5250
\Magento\Framework\GraphQlSchemaStitching\Reader::class,
5351
['readers' => ['graphql_reader' => $graphQlReader]]
5452
);
55-
$data = $objectManager->create(
56-
// phpstan:ignore
57-
\Magento\Framework\GraphQl\Config\Data ::class,
53+
$data = $this->objectManager->create(
54+
// phpstan:ignore
55+
\Magento\Framework\GraphQl\Config\Data::class,
5856
['reader' => $reader]
5957
);
60-
$this->model = $objectManager->create(\Magento\Framework\GraphQl\Config::class, ['data' =>$data]);
58+
$this->model = $this->objectManager->create(\Magento\Framework\GraphQl\Config::class, ['data' =>$data]);
59+
parent::__construct();
60+
}
61+
62+
protected function setUp(): void
63+
{
64+
/** @var ObjectManagerInterface $objectManager */
65+
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
66+
/** @var Cache $cache */
67+
$cache = $objectManager->get(Cache::class);
68+
$cache->clean();
6169
}
6270

6371
/**
@@ -87,7 +95,7 @@ public function testGraphQlTypeAndFieldConfigStructure()
8795
]
8896
];
8997
$this->assertResponseFields($expectedOutputArray['Query']['fields'][$fieldKey], $fieldAssertionMap);
90-
/** @var \Magento\Framework\GraphQl\Config\Element\Argument $queryFieldArguments */
98+
/** @var \Magento\Framework\GraphQl\Config\Element\Argument[] $queryFieldArguments */
9199
$queryFieldArguments = $queryFields[$fieldKey]->getArguments();
92100
foreach (array_keys($queryFieldArguments) as $argumentKey) {
93101
$argumentAssertionMap = [
@@ -121,7 +129,7 @@ public function testGraphQlEnumTypeConfigStructure()
121129
$queryEnum = 'PriceAdjustmentDescriptionEnum';
122130
/** @var \Magento\Framework\GraphQl\Config\Element\Enum $outputEnum */
123131
$outputEnum = $this->model->getConfigElement($queryEnum);
124-
/** @var EnumValue $outputEnumValues */
132+
/** @var EnumValue[] $outputEnumValues */
125133
$outputEnumValues = $outputEnum->getValues();
126134
$expectedOutputArray = require __DIR__ . '/_files/query_array_output.php';
127135
$this->assertEquals($outputEnum->getName(), $queryEnum);
@@ -154,7 +162,7 @@ public function testGraphQlTypeThatImplementsInterface()
154162
$expectedOutputArray = require __DIR__ . '/_files/query_array_output.php';
155163
$this->assertEquals($outputInterface->getName(), $typeThatImplements);
156164
$outputInterfaceValues = $outputInterface->getInterfaces();
157-
/** @var \Magento\Framework\GraphQl\Config\Element\Field $outputInterfaceFields */
165+
/** @var \Magento\Framework\GraphQl\Config\Element\Field[] $outputInterfaceFields */
158166
$outputInterfaceFields =$outputInterface->getFields();
159167
foreach (array_keys($outputInterfaceValues) as $outputInterfaceValue) {
160168
$this->assertEquals(

0 commit comments

Comments
 (0)