ACP2E-3399: GraphQL Response for Order placement does not include the exception message

Author: aplapana

dev/tests/integration/testsuite/Magento/Rule/Model/Condition/Sql/BuilderTest.php

@@ -10,9 +10,10 @@
 use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitation;
 use Magento\Catalog\Setup\CategorySetup;
 use Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend;
-use Magento\Eav\Test\Fixture\AttributeOption as AttributeOptionFixture;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\TestFramework\Fixture\DataFixtureStorage;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Fixture\DataFixture;
 use Magento\Catalog\Test\Fixture\MultiselectAttribute;
@@ -21,6 +22,7 @@
 use Magento\CatalogWidget\Model\Rule\Condition\Combine as CombineCondition;
 use Magento\CatalogWidget\Model\Rule\Condition\Product as ProductCondition;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\TestFramework\Helper\Bootstrap as BootstrapHelper;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -33,20 +35,26 @@ class BuilderTest extends TestCase
      */
     private Builder $model;
 
+    /**
+     * @var DataFixtureStorage
+     */
+    private DataFixtureStorage $fixtures;
+
     /**
      * @inheritDoc
      */
     protected function setUp(): void
     {
         $this->model = Bootstrap::getObjectManager()->create(Builder::class);
+        $this->fixtures = BootstrapHelper::getObjectManager()->get(DataFixtureStorageManager::class)->getStorage();
     }
 
     /**
      * @param array $conditions
      * @param string $expectedWhere
      * @param string $expectedOrder
      * @return void
-     * @throws LocalizedException
+     * @throws LocalizedException|\PHPUnit\Framework\MockObject\Exception
      * @dataProvider attachConditionToCollectionDataProvider
      */
     #[
@@ -61,27 +69,9 @@ protected function setUp(): void
                 'frontend_input' => 'multiselect',
                 'backend_type' => 'text',
                 'attribute_model' => Attribute::class,
+                'options' => ['red', 'white']
             ],
             'multiselect'
-        ),
-        DataFixture(
-            AttributeOptionFixture::class,
-            [
-                'attribute_code' => 'multiselect.attribute_code$',
-                'label' => 'red',
-                'sort_order' => 20
-            ],
-            'multiselect_custom_attribute_option_1'
-        ),
-        DataFixture(
-            AttributeOptionFixture::class,
-            [
-                'attribute_code' => 'multiselect.attribute_code$',
-                'sort_order' => 10,
-                'label' => 'white',
-                'is_default' => true
-            ],
-            'multiselect_custom_attribute_option_2'
         )
     ]
     public function testAttachConditionToCollection(
@@ -94,23 +84,11 @@ public function testAttachConditionToCollection(
         $collection = $collectionFactory->create();
         foreach ($conditions as $key => $condition) {
             if (isset($condition['attribute']) && $condition['attribute'] === 'multi_select_attr') {
-                $multiselect = Bootstrap::getObjectManager()->create(
-                    Attribute::class
-                );
-                $multiselect->load('multi_select_attr', 'attribute_code');
-                $multiselectAttributeOptionIds = [];
-                $optionIndex = 1;
-                foreach ($multiselect->getOptions() as $option) {
-                    if ($option->getValue()) {
-                        $multiselectAttributeOptionIds[] = $option->getValue();
-                        $expectedWhere = str_replace(
-                            "#optionAtrId$optionIndex#",
-                            $option->getValue(),
-                            $expectedWhere
-                        );
-                        $optionIndex++;
-                    }
-                }
+                $multiselectAttributeOptionIds = [
+                    $this->fixtures->get('multiselect')->getData('red'),
+                    $this->fixtures->get('multiselect')->getData('white')
+                ];
+                $expectedWhere = str_replace(["red", "white"], $multiselectAttributeOptionIds, $expectedWhere);
 
                 $conditions[$key]['value'] = $multiselectAttributeOptionIds;
             }
@@ -215,9 +193,9 @@ public static function attachConditionToCollectionDataProvider(): array
                 "(((`e`.`entity_id` IN (SELECT `catalog_category_product`.`product_id` FROM " .
                 "`catalog_category_product` WHERE (category_id IN ('3')))) " .
                 "AND(`e`.`sku` IN ('sku1', 'sku2', 'sku3')) AND(`at_multi_select_attr`.`value` IN " .
-                "('#optionAtrId1#', '#optionAtrId2#') OR " .
-                "(FIND_IN_SET ('#optionAtrId1#', `at_multi_select_attr`.`value`) > 0) OR " .
-                "(FIND_IN_SET ('#optionAtrId2#', `at_multi_select_attr`.`value`) > 0))",
+                "('red', 'white') OR " .
+                "(FIND_IN_SET ('red', `at_multi_select_attr`.`value`) > 0) OR " .
+                "(FIND_IN_SET ('white', `at_multi_select_attr`.`value`) > 0))",
                 "ORDER BY (FIELD(`e`.`sku`, 'sku1', 'sku2', 'sku3'))"
             ]
         ];