Merge remote-tracking branch 'origin/AC-9340' into spartans_pr_06092023

Author: glo17720

app/code/Magento/Customer/Model/Address/AbstractAddress.php

@@ -453,6 +453,9 @@ public function getRegionId()
                 (string)$this->getRegionCode(),
                 (string)$this->getCountryId()
             );
+            if (empty($regionId)) {
+                $regionId = $this->getData('region_id');
+            }
             $this->setData('region_id', $regionId);
         }
 

app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php

@@ -162,6 +162,29 @@ public function testGetRegionCodeWithRegionId()
         $this->assertEquals('UK', $this->model->getRegionCode());
     }
 
+    /**
+     * Test regionid for empty value
+     *
+     * @inheritdoc
+     * @return void
+     */
+    public function testGetRegionId()
+    {
+        $this->model->setData('region_id', 0);
+        $this->model->setData('region', '');
+        $this->model->setData('country_id', 'GB');
+        $region = $this->getMockBuilder(Region::class)
+            ->addMethods(['getCountryId', 'getCode'])
+            ->onlyMethods(['__wakeup', 'load', 'loadByCode','getId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $region->method('loadByCode')
+            ->willReturnSelf();
+        $this->regionFactoryMock->method('create')
+            ->willReturn($region);
+        $this->assertEquals(0, $this->model->getRegionId());
+    }
+
     public function testGetRegionCodeWithRegion()
     {
         $countryId = 2;