Issue-230: adding varnish

- fixing messages

Author: cpartica

app/code/Magento/DirectoryGraphQl/Controller/HttpRequestValidator/CurrencyValidator.php

@@ -48,14 +48,14 @@ public function validate(HttpRequestInterface $request): void
                 $currentStore = $this->storeManager->getStore();
                 if (!in_array($headerCurrency, $currentStore->getAvailableCurrencyCodes(true))) {
                     throw new GraphQlInputException(
-                        __('Currency not allowed for store %1', [$currentStore->getCode()])
+                        __('Please correct the target currency')
                     );
                 }
             }
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
             $this->storeManager->setCurrentStore(null);
             throw new GraphQlInputException(
-                __("The store that was requested wasn't found. Verify the store and try again.")
+                __("Requested store is not found")
             );
         }
     }

app/code/Magento/StoreGraphQl/Controller/HttpRequestValidator/StoreValidator.php

@@ -48,7 +48,7 @@ public function validate(HttpRequestInterface $request): void
                 if (strtolower($storeCode) !== 'default') {
                     $this->storeManager->setCurrentStore(null);
                     throw new GraphQlInputException(
-                        __("The store that was requested wasn't found. Verify the store and try again.")
+                        __("Requested store is not found")
                     );
                 }
             }

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php

@@ -97,7 +97,7 @@ public function testProductFromSpecificAndDefaultStore()
         $nonExistingStoreCode = "non_existent_store";
         $headerMapInvalidStoreCode = ['Store' => $nonExistingStoreCode];
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('The store that was requested wasn\'t found. Verify the store and try again.');
+        $this->expectExceptionMessage('Requested store is not found');
         $this->graphQlQuery($query, [], '', $headerMapInvalidStoreCode);
     }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php

@@ -118,7 +118,7 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrencyNonExisti
 
         //test non existing currency
         $headerMap = ['Store' => 'default', 'Content-Currency' => 'someNonExistentCurrency'];
-        $this->expectExceptionMessage('GraphQL response contains errors: Currency not allowed for store default');
+        $this->expectExceptionMessage('GraphQL response contains errors: Please correct the target currency');
         $this->graphQlQuery($query, [], '', $headerMap);
     }
 
@@ -166,7 +166,7 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrencyNotAllowe
         //test not allowed existing currency
         $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'CAD'];
         $this->expectExceptionMessage(
-            "GraphQL response contains errors: Currency not allowed for store {$storeCodeFromFixture}"
+            'GraphQL response contains errors: Please correct the target currency'
         );
         $this->graphQlQuery($query, [], '', $headerMap);
     }
@@ -315,7 +315,7 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
         // test cached response store + currency header with non existing currency, and no valid response, no cache
         $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'SOMECURRENCY'];
         $this->expectExceptionMessage(
-            "GraphQL response contains errors: Currency not allowed for store {$storeCodeFromFixture}"
+            'GraphQL response contains errors: Please correct the target currency'
         );
         $this->graphQlQuery($query, [], '', $headerMap);
     }

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

@@ -163,7 +163,7 @@ public function testGetCartWithWrongStore()
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote_customer_not_default_store.php
      *
      * @expectedException \Exception
-     * @expectedExceptionMessage The store that was requested wasn't found. Verify the store and try again.
+     * @expectedExceptionMessage Requested store is not found
      */
     public function testGetCartWithNotExistingStore()
     {

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php

@@ -133,7 +133,7 @@ public function testGetCartWithWrongStore()
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote_guest_not_default_store.php
      *
      * @expectedException \Exception
-     * @expectedExceptionMessage The store that was requested wasn't found. Verify the store and try again.
+     * @expectedExceptionMessage Requested store is not found
      */
     public function testGetCartWithNotExistingStore()
     {