Store Url fixes

Author: kandy

dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoresTest.php

@@ -48,24 +48,13 @@ protected function setUp(): void
 
     /**
      * @magentoConfigFixture default_store web/seo/use_rewrites 1
-     * @magentoApiDataFixture Magento/Store/_files/store.php
-     * @magentoApiDataFixture Magento/Store/_files/inactive_store.php
+     * @magentoConfigFixture default_store web/unsecure/base_url http://example.com/
+     * @magentoConfigFixture default_store web/unsecure/base_link_url http://example.com/
+     * @magentoApiDataFixture Magento/Store/_files/second_website_with_two_stores.php
      */
-    public function testDefaultWebsiteAvailableStoreConfigs(): void
+    public function testNonDefaultWebsiteAvailableStoreConfigs(): void
     {
-        $storeConfigs = $this->storeConfigManager->getStoreConfigs();
-
-        $expectedAvailableStores = [];
-        $expectedAvailableStoreCodes = [
-            'default',
-            'test'
-        ];
-
-        foreach ($storeConfigs as $storeConfig) {
-            if (in_array($storeConfig->getCode(), $expectedAvailableStoreCodes)) {
-                $expectedAvailableStores[] = $storeConfig;
-            }
-        }
+        $storeConfigs = $this->storeConfigManager->getStoreConfigs(['fixture_second_store', 'fixture_third_store']);
 
         $query
             = <<<QUERY
@@ -101,21 +90,37 @@ public function testDefaultWebsiteAvailableStoreConfigs(): void
   }
 }
 QUERY;
-        $response = $this->graphQlQuery($query);
+        $headerMap = ['Store' => 'fixture_second_store'];
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
 
         $this->assertArrayHasKey('availableStores', $response);
-        foreach ($expectedAvailableStores as $key => $storeConfig) {
+        foreach ($storeConfigs as $key => $storeConfig) {
             $this->validateStoreConfig($storeConfig, $response['availableStores'][$key]);
         }
     }
 
     /**
      * @magentoConfigFixture default_store web/seo/use_rewrites 1
-     * @magentoApiDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     * @magentoConfigFixture default_store web/unsecure/base_url http://example.com/
+     * @magentoConfigFixture default_store web/unsecure/base_link_url http://example.com/
+     * @magentoApiDataFixture Magento/Store/_files/store.php
+     * @magentoApiDataFixture Magento/Store/_files/inactive_store.php
      */
-    public function testNonDefaultWebsiteAvailableStoreConfigs(): void
+    public function testDefaultWebsiteAvailableStoreConfigs(): void
     {
-        $storeConfigs = $this->storeConfigManager->getStoreConfigs(['fixture_second_store', 'fixture_third_store']);
+        $storeConfigs = $this->storeConfigManager->getStoreConfigs();
+
+        $expectedAvailableStores = [];
+        $expectedAvailableStoreCodes = [
+            'default',
+            'test'
+        ];
+
+        foreach ($storeConfigs as $storeConfig) {
+            if (in_array($storeConfig->getCode(), $expectedAvailableStoreCodes)) {
+                $expectedAvailableStores[] = $storeConfig;
+            }
+        }
 
         $query
             = <<<QUERY
@@ -151,11 +156,10 @@ public function testNonDefaultWebsiteAvailableStoreConfigs(): void
   }
 }
 QUERY;
-        $headerMap = ['Store' => 'fixture_second_store'];
-        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $response = $this->graphQlQuery($query);
 
         $this->assertArrayHasKey('availableStores', $response);
-        foreach ($storeConfigs as $key => $storeConfig) {
+        foreach ($expectedAvailableStores as $key => $storeConfig) {
             $this->validateStoreConfig($storeConfig, $response['availableStores'][$key]);
         }
     }
@@ -209,6 +213,8 @@ private function validateStoreConfig(StoreConfigInterface $storeConfig, array $r
 
     /**
      * @magentoConfigFixture default_store web/seo/use_rewrites 1
+     * @magentoConfigFixture default_store web/unsecure/base_url http://example.com/
+     * @magentoConfigFixture default_store web/unsecure/base_link_url http://example.com/
      * @magentoApiDataFixture Magento/Store/_files/second_website_with_four_stores_divided_in_groups.php
      * @magentoConfigFixture web/url/use_store 1
      */
@@ -270,6 +276,8 @@ public function testAllStoreConfigsWithCodeInUrlEnabled(): void
 
     /**
      * @magentoConfigFixture default_store web/seo/use_rewrites 1
+     * @magentoConfigFixture default_store web/unsecure/base_url http://example.com/
+     * @magentoConfigFixture default_store web/unsecure/base_link_url http://example.com/
      * @magentoApiDataFixture Magento/Store/_files/second_website_with_four_stores_divided_in_groups.php
      */
     public function testCurrentGroupStoreConfigs(): void