MAGETWO-61058: [Github] Wrong drop-down option labels for configurable products when using attributes with custom source

Author: Yaroslav Onischenko

app/code/Magento/ConfigurableProduct/Model/AttributeOptionProvider.php

@@ -52,11 +52,20 @@ public function getAttributeOptions(AbstractAttribute $superAttribute, $productI
     {
         $scope = $this->scopeResolver->getScope();
         $select = $this->getAttributeOptionsSelect($superAttribute, $productId, $scope);
-
         $data = $this->attributeResource->getConnection()->fetchAll($select);
+
         if ($superAttribute->getSourceModel()) {
+            $options = $superAttribute->getSource()->getAllOptions(false);
+
+            $optionLabels = [];
+            foreach ($options as $option) {
+                $optionLabels[$option['value']] = $option['label'];
+            }
+
             foreach ($data as $key => $value) {
-                $optionText = $superAttribute->getSource()->getOptionText($value['value_index']);
+                $optionText = isset($optionLabels[$value['value_index']])
+                    ? $optionLabels[$value['value_index']]
+                    : false;
                 $data[$key]['default_title'] = $optionText;
                 $data[$key]['option_title'] = $optionText;
             }

app/code/Magento/ConfigurableProduct/Test/Unit/Model/AttributeOptionProviderTest.php

@@ -199,15 +199,15 @@ public function testGetAttributeOptionsWithBackendModel(array $options)
 
         $source = $this->getMockBuilder(AbstractSource::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getOptionText'])
+            ->setMethods(['getAllOptions'])
             ->getMockForAbstractClass();
         $source->expects($this->any())
-            ->method('getOptionText')
-            ->willReturnCallback(
-                function ($optionIndex) {
-                    return 'Option Value for index ' . $optionIndex;
-                }
-            );
+            ->method('getAllOptions')
+            ->willReturn([
+                ['value' => 13, 'label' => 'Option Value for index 13'],
+                ['value' => 14, 'label' => 'Option Value for index 14'],
+                ['value' => 15, 'label' => 'Option Value for index 15']
+            ]);
 
         $this->abstractAttribute->expects($this->atLeastOnce())
             ->method('getSource')