MC-29423: GraphQL Send Friend is still sending emails when disabled

- rename storeConfig fields

Author: danielrenaud

app/code/Magento/SendFriendGraphQl/Model/Resolver/SendFriendConfiguration.php

@@ -39,8 +39,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $storeId = $store->getId();
 
         return [
-            'enabled' => $this->sendFriendHelper->isEnabled($storeId),
-            'allow_guest' => $this->sendFriendHelper->isAllowForGuest($storeId)
+            'enabled_for_customers' => $this->sendFriendHelper->isEnabled($storeId),
+            'enabled_for_guests' => $this->sendFriendHelper->isAllowForGuest($storeId)
         ];
     }
 }

app/code/Magento/SendFriendGraphQl/etc/schema.graphqls

@@ -39,10 +39,10 @@ type SendEmailToFriendRecipient {
 }
 
 type StoreConfig {
-    sendFriend: SendFriendConfiguration @resolver(class: "\\Magento\\SendFriendGraphQl\\Model\\Resolver\\SendFriendConfiguration") @doc(description: "Config for 'Email to a Friend' feature")
+    sendFriend: SendFriendConfiguration @resolver(class: "\\Magento\\SendFriendGraphQl\\Model\\Resolver\\SendFriendConfiguration") @doc(description: "Email to a Friend configuration.")
 }
 
 type SendFriendConfiguration {
-    enabled: Boolean! @doc(description: "Indicates whether or not the feature is enabled.")
-    allow_guest: Boolean! @doc(description: "Indicates whether or not the feature is allowed for guest customers.")
+    enabled_for_customers: Boolean! @doc(description: "Indicates whether the Email to a Friend feature is enabled.")
+    enabled_for_guests: Boolean! @doc(description: "Indicates whether the Email to a Friend feature is enabled for guests.")
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/SendFriend/StoreConfigTest.php

@@ -16,26 +16,26 @@ class StoreConfigTest extends GraphQlAbstract
 {
     public function testSendFriendFieldsAreReturnedWithoutError()
     {
-        $query = $this->getQuery();
+        $query = $this->getStoreConfigQuery();
 
         $response = $this->graphQlQuery($query);
         $this->assertArrayNotHasKey('errors', $response);
         $this->assertArrayHasKey('sendFriend', $response['storeConfig']);
-        $this->assertArrayHasKey('enabled', $response['storeConfig']['sendFriend']);
-        $this->assertArrayHasKey('allow_guest', $response['storeConfig']['sendFriend']);
-        $this->assertNotNull($response['storeConfig']['sendFriend']['enabled']);
-        $this->assertNotNull($response['storeConfig']['sendFriend']['allow_guest']);
+        $this->assertArrayHasKey('enabled_for_customers', $response['storeConfig']['sendFriend']);
+        $this->assertArrayHasKey('enabled_for_guests', $response['storeConfig']['sendFriend']);
+        $this->assertNotNull($response['storeConfig']['sendFriend']['enabled_for_customers']);
+        $this->assertNotNull($response['storeConfig']['sendFriend']['enabled_for_guests']);
     }
 
     /**
      * @magentoConfigFixture default_store sendfriend/email/enabled 0
      */
     public function testSendFriendDisabled()
     {
-        $response = $this->graphQlQuery($this->getQuery());
+        $response = $this->graphQlQuery($this->getStoreConfigQuery());
 
         $this->assertResponse(
-            ['enabled' => false, 'allow_guest' => false],
+            ['enabled_for_customers' => false, 'enabled_for_guests' => false],
             $response
         );
     }
@@ -46,10 +46,10 @@ public function testSendFriendDisabled()
      */
     public function testSendFriendEnabledGuestDisabled()
     {
-        $response = $this->graphQlQuery($this->getQuery());
+        $response = $this->graphQlQuery($this->getStoreConfigQuery());
 
         $this->assertResponse(
-            ['enabled' => true, 'allow_guest' => false],
+            ['enabled_for_customers' => true, 'enabled_for_guests' => false],
             $response
         );
     }
@@ -60,10 +60,10 @@ public function testSendFriendEnabledGuestDisabled()
      */
     public function testSendFriendEnabledGuestEnabled()
     {
-        $response = $this->graphQlQuery($this->getQuery());
+        $response = $this->graphQlQuery($this->getStoreConfigQuery());
 
         $this->assertResponse(
-            ['enabled' => true, 'allow_guest' => true],
+            ['enabled_for_customers' => true, 'enabled_for_guests' => true],
             $response
         );
     }
@@ -78,26 +78,26 @@ private function assertResponse(array $expectedValues, array $response)
     {
         $this->assertArrayNotHasKey('errors', $response);
         $this->assertArrayHasKey('sendFriend', $response['storeConfig']);
-        $this->assertArrayHasKey('enabled', $response['storeConfig']['sendFriend']);
-        $this->assertArrayHasKey('allow_guest', $response['storeConfig']['sendFriend']);
-        $this->assertEquals($expectedValues['enabled'], $response['storeConfig']['sendFriend']['enabled']);
-        $this->assertEquals($expectedValues['allow_guest'], $response['storeConfig']['sendFriend']['allow_guest']);
+        $this->assertArrayHasKey('enabled_for_customers', $response['storeConfig']['sendFriend']);
+        $this->assertArrayHasKey('enabled_for_guests', $response['storeConfig']['sendFriend']);
+        $this->assertEquals($expectedValues['enabled_for_customers'], $response['storeConfig']['sendFriend']['enabled_for_customers']);
+        $this->assertEquals($expectedValues['enabled_for_guests'], $response['storeConfig']['sendFriend']['enabled_for_guests']);
     }
 
     /**
      * Return simple storeConfig query to get sendFriend configuration
      *
      * @return string
      */
-    private function getQuery()
+    private function getStoreConfigQuery()
     {
         return <<<QUERY
 {
     storeConfig{
         id
         sendFriend {
-            enabled
-            allow_guest
+            enabled_for_customers
+            enabled_for_guests
         }
     }
 }