From b8b6f3814f9d5d497384ee4c07cb93ce9b1db31f Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza Date: Fri, 20 Jul 2018 10:34:29 +0200 Subject: [PATCH 1/3] Fixed return value for getGraphQlClient --- .../Magento/TestFramework/TestCase/GraphQlAbstract.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php index af01e455fdd9..ba64a3e9eee8 100644 --- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php +++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php @@ -93,8 +93,8 @@ private function getGraphQlClient() { if ($this->graphQlClient === null) { return Bootstrap::getObjectManager()->get(\Magento\TestFramework\TestCase\GraphQl\Client::class); - } else { - $this->graphQlClient; } + + return $this->graphQlClient; } } From adbf6473b36e03703aa1fa612a31285abb38008d Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza Date: Tue, 24 Jul 2018 10:31:41 +0200 Subject: [PATCH 2/3] Added assignment instead of direct return --- .../Magento/TestFramework/TestCase/GraphQlAbstract.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php index ba64a3e9eee8..936cbfdb5106 100644 --- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php +++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php @@ -92,7 +92,7 @@ private function getAppCache() private function getGraphQlClient() { if ($this->graphQlClient === null) { - return Bootstrap::getObjectManager()->get(\Magento\TestFramework\TestCase\GraphQl\Client::class); + $this->graphQlClient = Bootstrap::getObjectManager()->get(\Magento\TestFramework\TestCase\GraphQl\Client::class); } return $this->graphQlClient; From d2ad2b99fc273cbc896e321b925ca9537ec8e9f6 Mon Sep 17 00:00:00 2001 From: Valeriy Nayda Date: Mon, 13 Aug 2018 16:19:24 +0300 Subject: [PATCH 3/3] GraphQL-127: Fixed return value for getGraphQlClient in API-functional tests -- Fix static tests --- .../Magento/TestFramework/TestCase/GraphQlAbstract.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php index 936cbfdb5106..84ac6360643c 100644 --- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php +++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php @@ -92,9 +92,10 @@ private function getAppCache() private function getGraphQlClient() { if ($this->graphQlClient === null) { - $this->graphQlClient = Bootstrap::getObjectManager()->get(\Magento\TestFramework\TestCase\GraphQl\Client::class); + $this->graphQlClient = Bootstrap::getObjectManager()->get( + \Magento\TestFramework\TestCase\GraphQl\Client::class + ); } - return $this->graphQlClient; } }