Merge remote-tracking branch 'engcom/ENGCOM-5263-magento-graphql-ce-709' into graphql-develop-prs-fast

Author: naydav

dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php

@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\Customer;
 
+use Exception;
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -133,7 +134,7 @@ public function testCreateCustomerAddress()
     }
 
     /**
-     * @expectedException \Exception
+     * @expectedException Exception
      * @expectedExceptionMessage The current customer isn't authorized.
      */
     public function testCreateCustomerAddressIfUserIsNotAuthorized()
@@ -169,7 +170,7 @@ public function testCreateCustomerAddressIfUserIsNotAuthorized()
      * with missing required Firstname attribute
      *
      * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
-     * @expectedException \Exception
+     * @expectedException Exception
      * @expectedExceptionMessage Required parameters are missing: firstname
      */
     public function testCreateCustomerAddressWithMissingAttribute()
@@ -267,6 +268,46 @@ public function testCreateCustomerAddressWithRedundantStreetLine()
         $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
     }
 
+    /**
+     * Create new address with invalid input
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
+     * @dataProvider invalidInputDataProvider
+     * @param string $input
+     * @param $exceptionMessage
+     * @throws Exception
+     */
+    public function testCreateCustomerAddressWithInvalidInput($input, $exceptionMessage)
+    {
+        $mutation
+            = <<<MUTATION
+mutation {
+  createCustomerAddress($input) {
+    id
+  }
+}
+MUTATION;
+
+        $userName = 'customer@example.com';
+        $password = 'password';
+
+        self::expectException(Exception::class);
+        self::expectExceptionMessage($exceptionMessage);
+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+    }
+
+    /**
+     * @return array
+     */
+    public function invalidInputDataProvider()
+    {
+        return [
+            ['', 'Syntax Error: Expected Name, found )'],
+            ['input: ""', 'Expected type CustomerAddressInput!, found "".'],
+            ['input: "foo"', 'Expected type CustomerAddressInput!, found "foo".']
+        ];
+    }
+
     /**
      * Verify the fields for Customer address
      *

dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php

@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\Customer;
 
+use Exception;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -33,13 +34,19 @@ class DeleteCustomerAddressTest extends GraphQlAbstract
      */
     private $addressRepository;
 
+    /**
+     * @var LockCustomer
+     */
+    private $lockCustomer;
+
     protected function setUp()
     {
         parent::setUp();
 
         $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
         $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
         $this->addressRepository = Bootstrap::getObjectManager()->get(AddressRepositoryInterface::class);
+        $this->lockCustomer = Bootstrap::getObjectManager()->get(LockCustomer::class);
     }
 
     /**
@@ -64,7 +71,7 @@ public function testDeleteCustomerAddress()
     }
 
     /**
-     * @expectedException \Exception
+     * @expectedException Exception
      * @expectedExceptionMessage The current customer isn't authorized.
      */
     public function testDeleteCustomerAddressIfUserIsNotAuthorized()
@@ -83,7 +90,7 @@ public function testDeleteCustomerAddressIfUserIsNotAuthorized()
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
      *
-     * @expectedException \Exception
+     * @expectedException Exception
      * @expectedExceptionMessage Customer Address 2 is set as default shipping address and can not be deleted
      */
     public function testDeleteDefaultShippingCustomerAddress()
@@ -109,7 +116,7 @@ public function testDeleteDefaultShippingCustomerAddress()
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
      *
-     * @expectedException \Exception
+     * @expectedException Exception
      * @expectedExceptionMessage Customer Address 2 is set as default billing address and can not be deleted
      */
     public function testDeleteDefaultBillingCustomerAddress()
@@ -134,7 +141,7 @@ public function testDeleteDefaultBillingCustomerAddress()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      *
-     * @expectedException \Exception
+     * @expectedException Exception
      * @expectedExceptionMessage Could not find a address with ID "9999"
      */
     public function testDeleteNonExistCustomerAddress()
@@ -150,6 +157,120 @@ public function testDeleteNonExistCustomerAddress()
         $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
     }
 
+    /**
+     * Delete address with missing ID input.
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
+     * @expectedException Exception
+     * @expectedExceptionMessage Syntax Error: Expected Name, found )
+     * @throws Exception
+     */
+    public function testDeleteCustomerAddressWithMissingData()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        $mutation
+            = <<<MUTATION
+mutation {
+  deleteCustomerAddress()
+}
+MUTATION;
+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+    }
+
+    /**
+     * Delete address with incorrect ID input type.
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
+     * @expectedException Exception
+     * @expectedExceptionMessage Expected type Int!, found "".
+     * @throws Exception
+     */
+    public function testDeleteCustomerAddressWithIncorrectIdType()
+    {
+        $this->markTestSkipped(
+            'Type validation returns wrong message https://github.com/magento/graphql-ce/issues/735'
+        );
+        $userName = 'customer@example.com';
+        $password = 'password';
+        $mutation
+            = <<<MUTATION
+mutation {
+  deleteCustomerAddress(id: "string")
+}
+MUTATION;
+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/two_customers.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     *
+     * @expectedException Exception
+     * @expectedExceptionMessage Current customer does not have permission to address with ID "2"
+     */
+    public function testDeleteAnotherCustomerAddress()
+    {
+        $userName = 'customer_two@example.com';
+        $password = 'password';
+        $addressId = 2;
+
+        $mutation
+            = <<<MUTATION
+mutation {
+  deleteCustomerAddress(id: {$addressId})
+}
+MUTATION;
+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/inactive_customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_confirmation_config_enable.php
+     *
+     * @expectedException Exception
+     * @expectedExceptionMessage The account sign-in was incorrect or your account is disabled temporarily.
+     */
+    public function testDeleteInactiveCustomerAddress()
+    {
+        $userName = 'customer@needAconfirmation.com';
+        $password = 'password';
+        $addressId = 2;
+
+        $mutation
+            = <<<MUTATION
+mutation {
+  deleteCustomerAddress(id: {$addressId})
+}
+MUTATION;
+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     *
+     * @expectedException Exception
+     * @expectedExceptionMessage The account is locked
+     */
+    public function testDeleteCustomerAddressIfAccountIsLocked()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        $addressId = 2;
+
+        $this->lockCustomer->execute(1);
+
+        $mutation
+            = <<<MUTATION
+mutation {
+  deleteCustomerAddress(id: {$addressId})
+}
+MUTATION;
+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+    }
+
     /**
      * @param string $email
      * @param string $password