From f4a4a340b4983ad80a5ede504993ed8d753c5f9d Mon Sep 17 00:00:00 2001 From: Alex Taranovsky Date: Wed, 24 Apr 2019 12:31:05 +0300 Subject: [PATCH] magento/graphql-ce#387: Test coverage of getting IDs of CMS page/blocks by GraphQL API --- .../CmsGraphQl/Model/Resolver/DataProvider/Block.php | 1 - .../Model/Resolver/DataProvider/PageDataProvider.php | 1 - app/code/Magento/CmsGraphQl/etc/schema.graphqls | 4 +--- .../testsuite/Magento/GraphQl/Cms/CmsBlockTest.php | 5 ----- .../testsuite/Magento/GraphQl/Cms/CmsPageTest.php | 8 ++------ 5 files changed, 3 insertions(+), 16 deletions(-) diff --git a/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php b/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php index fa4944381b858..47a2439c4fad0 100644 --- a/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php +++ b/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php @@ -59,7 +59,6 @@ public function getData(string $blockIdentifier): array $renderedContent = $this->widgetFilter->filter($block->getContent()); $blockData = [ - BlockInterface::BLOCK_ID => $block->getId(), BlockInterface::IDENTIFIER => $block->getIdentifier(), BlockInterface::TITLE => $block->getTitle(), BlockInterface::CONTENT => $renderedContent, diff --git a/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/PageDataProvider.php b/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/PageDataProvider.php index fdcd0c88cd60c..47fa4c08a9c31 100644 --- a/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/PageDataProvider.php +++ b/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/PageDataProvider.php @@ -96,7 +96,6 @@ private function convertPageData(PageInterface $page) $pageData = [ 'url_key' => $page->getIdentifier(), - PageInterface::PAGE_ID => $page->getId(), PageInterface::IDENTIFIER => $page->getIdentifier(), PageInterface::TITLE => $page->getTitle(), PageInterface::CONTENT => $renderedContent, diff --git a/app/code/Magento/CmsGraphQl/etc/schema.graphqls b/app/code/Magento/CmsGraphQl/etc/schema.graphqls index 8c0cb80f34269..85bff91dea8a2 100644 --- a/app/code/Magento/CmsGraphQl/etc/schema.graphqls +++ b/app/code/Magento/CmsGraphQl/etc/schema.graphqls @@ -12,7 +12,7 @@ type StoreConfig @doc(description: "The type contains information about a store type Query { cmsPage ( - id: Int @doc(description: "Id of the CMS page") + id: Int @doc(description: "Id of the CMS page") @deprecated(reason: "Use `identifier`") @doc(description: "The CMS page query returns information about a CMS page") identifier: String @doc(description: "Identifier of the CMS page") ): CmsPage @resolver(class: "Magento\\CmsGraphQl\\Model\\Resolver\\Page") @doc(description: "The CMS page query returns information about a CMS page") cmsBlocks ( @@ -21,7 +21,6 @@ type Query { } type CmsPage @doc(description: "CMS page defines all CMS page information") { - page_id: Int @doc(description: "Entity ID of CMS page") identifier: String @doc(description: "Identifier of the CMS page") url_key: String @doc(description: "URL key of CMS page") title: String @doc(description: "CMS page title") @@ -38,7 +37,6 @@ type CmsBlocks @doc(description: "CMS blocks information") { } type CmsBlock @doc(description: "CMS block defines all CMS block information") { - block_id: Int @doc(description: "Entity ID of CMS block") identifier: String @doc(description: "CMS block identifier") title: String @doc(description: "CMS block title") content: String @doc(description: "CMS block content") diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsBlockTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsBlockTest.php index 6e07f8cd7876a..542b00d434db0 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsBlockTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsBlockTest.php @@ -47,7 +47,6 @@ public function testGetCmsBlock() { cmsBlocks(identifiers: "enabled_block") { items { - block_id identifier title content @@ -60,7 +59,6 @@ public function testGetCmsBlock() self::assertArrayHasKey('cmsBlocks', $response); self::assertArrayHasKey('items', $response['cmsBlocks']); - self::assertEquals($cmsBlockData['block_id'], $response['cmsBlocks']['items'][0]['block_id']); self::assertEquals($cmsBlockData['identifier'], $response['cmsBlocks']['items'][0]['identifier']); self::assertEquals($cmsBlockData['title'], $response['cmsBlocks']['items'][0]['title']); self::assertEquals($renderedContent, $response['cmsBlocks']['items'][0]['content']); @@ -83,7 +81,6 @@ public function testGetCmsBlockByBlockId() { cmsBlocks(identifiers: "$blockId") { items { - block_id identifier title content @@ -95,8 +92,6 @@ public function testGetCmsBlockByBlockId() self::assertArrayHasKey('cmsBlocks', $response); self::assertArrayHasKey('items', $response['cmsBlocks']); - - self::assertEquals($blockId, $response['cmsBlocks']['items'][0]['block_id']); self::assertEquals($cmsBlockData['identifier'], $response['cmsBlocks']['items'][0]['identifier']); self::assertEquals($cmsBlockData['title'], $response['cmsBlocks']['items'][0]['title']); self::assertEquals($renderedContent, $response['cmsBlocks']['items'][0]['content']); diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsPageTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsPageTest.php index 8abcee8f22403..53e47185c9866 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsPageTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsPageTest.php @@ -58,22 +58,18 @@ public function testGetCmsPageById() public function testGetCmsPageByIdentifier() { $cmsPageIdentifier = 'page100'; - $storeId = 0; - - $cmsPage = ObjectManager::getInstance()->get(GetPageByIdentifier::class)->execute($cmsPageIdentifier, $storeId); - $pageId = $cmsPage->getPageId(); $query = <<graphQlQuery($query); - $this->assertEquals($pageId, $response['cmsPage']['page_id']); + $this->assertEquals($cmsPageIdentifier, $response['cmsPage']['identifier']); } /**