Merge branch 'ACP2E-1700' of https://github.com/magento-l3/magento2ce into PR-L3-03132023

Author: chittima

app/code/Magento/Config/Model/Config.php

@@ -182,6 +182,10 @@ public function save()
             return $this;
         }
 
+        /**
+         * Reload config to make sure config data is consistent with the database at this point.
+         */
+        $this->_appConfig->reinit();
         $oldConfig = $this->_getConfig(true);
 
         /** @var \Magento\Framework\DB\Transaction $deleteTransaction */

app/code/Magento/Config/Test/Unit/Model/ConfigTest.php

@@ -175,6 +175,8 @@ protected function setUp(): void
      */
     public function testSaveDoesNotDoAnythingIfGroupsAreNotPassed(): void
     {
+        $this->appConfigMock->expects($this->never())
+            ->method('reinit');
         $this->configLoaderMock->expects($this->never())->method('getConfigByPath');
         $this->model->save();
     }
@@ -184,6 +186,8 @@ public function testSaveDoesNotDoAnythingIfGroupsAreNotPassed(): void
      */
     public function testSaveEmptiesNonSetArguments(): void
     {
+        $this->appConfigMock->expects($this->never())
+            ->method('reinit');
         $this->structureReaderMock->expects($this->never())->method('getConfiguration');
         $this->assertNull($this->model->getSection());
         $this->assertNull($this->model->getWebsite());
@@ -199,6 +203,8 @@ public function testSaveEmptiesNonSetArguments(): void
      */
     public function testSaveToCheckAdminSystemConfigChangedSectionEvent(): void
     {
+        $this->appConfigMock->expects($this->exactly(2))
+            ->method('reinit');
         $transactionMock = $this->createMock(Transaction::class);
 
         $this->transFactoryMock->expects($this->any())->method('create')->willReturn($transactionMock);
@@ -227,6 +233,8 @@ public function testSaveToCheckAdminSystemConfigChangedSectionEvent(): void
      */
     public function testDoNotSaveReadOnlyFields(): void
     {
+        $this->appConfigMock->expects($this->exactly(2))
+            ->method('reinit');
         $transactionMock = $this->createMock(Transaction::class);
         $this->transFactoryMock->expects($this->any())->method('create')->willReturn($transactionMock);
 
@@ -265,6 +273,8 @@ public function testDoNotSaveReadOnlyFields(): void
      */
     public function testSaveToCheckScopeDataSet(): void
     {
+        $this->appConfigMock->expects($this->exactly(2))
+            ->method('reinit');
         $transactionMock = $this->createMock(Transaction::class);
         $this->transFactoryMock->expects($this->any())->method('create')->willReturn($transactionMock);