Skip to content

Commit 1838951

Browse files
committed
ACP2E-331: For products that do not have a category, the catalog price rule fails on condition, not in specific category.
1 parent b91b4cc commit 1838951

File tree

2 files changed

+23
-9
lines changed

2 files changed

+23
-9
lines changed

dev/tests/integration/testsuite/Magento/CatalogRule/Model/ResourceModel/Product/ConditionsToCollectionApplierTest.php

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,8 @@ private function conditionProvider()
247247
'simple-product-9',
248248
'simple-product-10',
249249
'simple-product-11',
250-
'simple-product-12'
250+
'simple-product-12',
251+
'simple-product-13',
251252
]
252253
],
253254

@@ -272,7 +273,8 @@ private function conditionProvider()
272273
'simple-product-9',
273274
'simple-product-10',
274275
'simple-product-11',
275-
'simple-product-12'
276+
'simple-product-12',
277+
'simple-product-13',
276278
]
277279
],
278280

@@ -386,7 +388,8 @@ private function conditionProvider()
386388
'simple-product-9',
387389
'simple-product-10',
388390
'simple-product-11',
389-
'simple-product-12'
391+
'simple-product-12',
392+
'simple-product-13',
390393
]
391394
],
392395

@@ -416,20 +419,18 @@ private function conditionProvider()
416419
'simple-product-9',
417420
'simple-product-10',
418421
'simple-product-11',
419-
'simple-product-12'
422+
'simple-product-12',
423+
'simple-product-13',
420424
]
421425
],
422426

423427
// test filter for case "If ALL/ANY of these conditions are FALSE" with multiple levels
424428
'variation 22' => [
425429
'condition' => $this->getConditionsForVariation22(),
426430
'expected-sku' => [
427-
'simple-product-1',
428-
'simple-product-2',
429-
'simple-product-3',
430-
'simple-product-4',
431431
'simple-product-7',
432-
'simple-product-8'
432+
'simple-product-8',
433+
'simple-product-13',
433434
]
434435
],
435436
];

dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/products.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,19 @@
173173
'qty' => 42,
174174
'categories' => ['Category 1.1.1'],
175175
],
176+
[
177+
'type-id' => 'simple',
178+
'attribute-set-id' => $attributeSetGuardians->getId(),
179+
'website-ids' => [1],
180+
'name' => 'Simple Product 13',
181+
'sku' => 'simple-product-13',
182+
'price' => 10,
183+
'visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH,
184+
'status' => \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED,
185+
'stock-data' => ['use_config_manage_stock' => 1, 'qty' => 22, 'is_in_stock' => 1],
186+
'qty' => 42,
187+
'categories' => [],
188+
],
176189
];
177190

178191
foreach ($productsData as $productData) {

0 commit comments

Comments
 (0)