Merge remote-tracking branch '38073/fix-for-issue-37953' into bt_comm_pr_247beta3

Author: Indraniks

app/code/Magento/Eav/Model/Entity/Attribute.php

@@ -489,7 +489,7 @@ public function getStoreLabels()
      */
     public function getStoreLabel($storeId = null)
     {
-        if ($this->hasData('store_label')) {
+        if ($this->hasData('store_label') && $storeId === null) {
             return $this->getData('store_label');
         }
         $store = $this->_storeManager->getStore($storeId);

app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeTest.php

@@ -11,6 +11,8 @@
 use Magento\Eav\Model\Entity\Attribute\FrontendLabel;
 use Magento\Eav\Model\Entity\Attribute\FrontendLabelFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -41,6 +43,28 @@ protected function tearDown(): void
         $this->_model = null;
     }
 
+    /**
+     * @return void
+     */
+    public function testGetStoreLabel(): void
+    {
+        $objectManager = new ObjectManager($this);
+        $storeMock = $this->createMock(StoreInterface::class);
+        $storeManagerMock = $this->createMock(StoreManagerInterface::class);
+        $storeManagerMock->method('getStore')->willReturn($storeMock);
+        $resource = $this->getMockBuilder(\Magento\Eav\Model\ResourceModel\Entity\Attribute::class)
+            ->setMethods(['getStoreLabelsByAttributeId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $arguments = [
+            '_resource' => $resource,
+            'storeManager' => $storeManagerMock,
+        ];
+        $this->_model = $objectManager->getObject(Attribute::class, $arguments);
+
+        $this->assertEmpty($this->_model->getStoreLabel());
+    }
+
     /**
      * @param string $givenFrontendInput
      * @param string $expectedBackendType