MC-40836: Create automated test for: "Configure: Flat Rate Shipping Method, Multi Shipping Options, Shipping Origin"

Author: romadjelf

dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/Config/SaveTest.php

@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Config\Controller\Adminhtml\System;
+namespace Magento\Config\Controller\Adminhtml\System\Config;
 
 use Magento\Config\Model\Config\Loader;
 use Magento\Framework\App\Request\Http as HttpRequest;
@@ -41,17 +41,17 @@ public function setUp(): void
 
     /**
      * @dataProvider saveConfigDataProvider
+     * @magentoDbIsolation enabled
      * @param array $params
      * @param array $post
-     * @magentoDbIsolation enabled
      * @return void
      */
     public function testSaveConfig(array $params, array $post): void
     {
         $expectedPathValue = $this->prepareExpectedPathValue($params['section'], $post['groups']);
         $this->dispatchWithParams($params, $post);
         $this->assertSessionMessages(
-            $this->equalTo([(string)__('You saved the configuration.')]),
+            $this->containsEqual((string)__('You saved the configuration.')),
             MessageInterface::TYPE_SUCCESS
         );
         $this->assertPathValue($expectedPathValue);
@@ -120,7 +120,6 @@ public function saveConfigDataProvider(): array
      */
     private function prepareExpectedPathValue(string $section, array $groups): array
     {
-        $expectedData = [];
         foreach ($groups as $groupId => $groupData) {
             $groupPath = $section . '/' . $groupId;
             foreach ($groupData['fields'] as $fieldId => $fieldData) {
@@ -129,7 +128,7 @@ private function prepareExpectedPathValue(string $section, array $groups): array
             }
         }
 
-        return $expectedData;
+        return $expectedData ?? [];
     }
 
     /**
@@ -148,13 +147,18 @@ private function assertPathValue(array $expectedPathValue): void
                 $scope->getId(),
                 false
             );
-            $filteredActualPathValue = [];
             foreach ($groupData as $fieldPath => $fieldValue) {
-                if (isset($actualPathValue[$fieldPath])) {
-                    $filteredActualPathValue[$fieldPath] = $actualPathValue[$fieldPath];
-                }
+                $this->assertArrayHasKey(
+                    $fieldPath,
+                    $actualPathValue,
+                    sprintf('The expected config setting was not saved in the database. Path: %s', $fieldPath)
+                );
+                $this->assertEquals(
+                    $fieldValue,
+                    $actualPathValue[$fieldPath],
+                    sprintf('The expected value of the config setting is not correct. Path: %s', $fieldPath)
+                );
             }
-            $this->assertEquals($groupData, $filteredActualPathValue);
         }
     }