Skip to content

Commit 16045c8

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/imported-magento-magento2-32693' into 2.4-develop-pr142
2 parents 327dc98 + 2aadbc7 commit 16045c8

File tree

3 files changed

+146
-38
lines changed

3 files changed

+146
-38
lines changed

‎app/code/Magento/CatalogRule/Model/Rule.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ protected function _invalidateCache()
589589
*/
590590
public function afterSave()
591591
{
592-
if (!$this->getIsActive()) {
592+
if (!$this->getIsActive() && !$this->getOrigData(self::IS_ACTIVE)) {
593593
return parent::afterSave();
594594
}
595595

@@ -601,6 +601,7 @@ public function afterSave()
601601
} else {
602602
$this->_ruleProductProcessor->getIndexer()->invalidate();
603603
}
604+
604605
return parent::afterSave();
605606
}
606607

‎app/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php

Lines changed: 67 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
use Magento\Catalog\Model\Product;
1111
use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
12+
use Magento\CatalogRule\Api\Data\RuleInterface;
1213
use Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor;
1314
use Magento\CatalogRule\Model\Rule;
1415
use Magento\CatalogRule\Model\Rule\Condition\CombineFactory;
@@ -31,46 +32,60 @@
3132
*/
3233
class RuleTest extends TestCase
3334
{
34-
/** @var Rule */
35-
protected $rule;
35+
/**
36+
* @var Rule
37+
*/
38+
private $rule;
3639

37-
/** @var ObjectManager */
40+
/**
41+
* @var ObjectManager
42+
*/
3843
private $objectManager;
3944

40-
/** @var StoreManagerInterface|MockObject */
41-
protected $storeManager;
45+
/**
46+
* @var StoreManagerInterface|MockObject
47+
*/
48+
private $storeManager;
4249

43-
/** @var MockObject */
44-
protected $combineFactory;
50+
/**
51+
* @var CombineFactory|MockObject
52+
*/
53+
private $combineFactory;
4554

46-
/** @var Store|MockObject */
47-
protected $storeModel;
55+
/**
56+
* @var Store|MockObject
57+
*/
58+
private $storeModel;
4859

49-
/** @var Website|MockObject */
50-
protected $websiteModel;
60+
/**
61+
* @var Website|MockObject
62+
*/
63+
private $websiteModel;
5164

52-
/** @var Combine|MockObject */
53-
protected $condition;
65+
/**
66+
* @var Combine|MockObject
67+
*/
68+
private $condition;
5469

5570
/**
5671
* @var RuleProductProcessor|MockObject
5772
*/
58-
protected $_ruleProductProcessor;
73+
private $_ruleProductProcessor;
5974

6075
/**
6176
* @var CollectionFactory|MockObject
6277
*/
63-
protected $_productCollectionFactory;
78+
private $_productCollectionFactory;
6479

6580
/**
6681
* @var Iterator|MockObject
6782
*/
68-
protected $_resourceIterator;
83+
private $_resourceIterator;
6984

7085
/**
7186
* @var Product|MockObject
7287
*/
73-
protected $productModel;
88+
private $productModel;
7489

7590
/**
7691
* Set up before test
@@ -85,15 +100,15 @@ protected function setUp(): void
85100
$this->combineFactory = $this->createPartialMock(
86101
CombineFactory::class,
87102
[
88-
'create'
103+
'create',
89104
]
90105
);
91106
$this->productModel = $this->createPartialMock(
92107
Product::class,
93108
[
94109
'__wakeup',
95110
'getId',
96-
'setData'
111+
'setData',
97112
]
98113
);
99114
$this->condition = $this->getMockBuilder(Combine::class)
@@ -106,7 +121,7 @@ protected function setUp(): void
106121
[
107122
'__wakeup',
108123
'getId',
109-
'getDefaultStore'
124+
'getDefaultStore',
110125
]
111126
);
112127
$this->_ruleProductProcessor = $this->createMock(
@@ -192,7 +207,7 @@ public function testCallbackValidateProduct($validate)
192207
'has_options' => '0',
193208
'required_options' => '0',
194209
'created_at' => '2014-06-25 13:14:30',
195-
'updated_at' => '2014-06-25 14:37:15'
210+
'updated_at' => '2014-06-25 14:37:15',
196211
];
197212
$this->storeManager->expects($this->any())->method('getWebsites')->with(false)
198213
->willReturn([$this->websiteModel, $this->websiteModel]);
@@ -263,14 +278,14 @@ public function validateDataDataProvider()
263278
'simple_action' => 'by_fixed',
264279
'discount_amount' => '123',
265280
],
266-
true
281+
true,
267282
],
268283
[
269284
[
270285
'simple_action' => 'by_percent',
271286
'discount_amount' => '9,99',
272287
],
273-
true
288+
true,
274289
],
275290
[
276291
[
@@ -279,7 +294,7 @@ public function validateDataDataProvider()
279294
],
280295
[
281296
'Percentage discount should be between 0 and 100.',
282-
]
297+
],
283298
],
284299
[
285300
[
@@ -288,7 +303,7 @@ public function validateDataDataProvider()
288303
],
289304
[
290305
'Percentage discount should be between 0 and 100.',
291-
]
306+
],
292307
],
293308
[
294309
[
@@ -297,7 +312,7 @@ public function validateDataDataProvider()
297312
],
298313
[
299314
'Discount value should be 0 or greater.',
300-
]
315+
],
301316
],
302317
[
303318
[
@@ -306,7 +321,7 @@ public function validateDataDataProvider()
306321
],
307322
[
308323
'Unknown action.',
309-
]
324+
],
310325
],
311326
];
312327
}
@@ -325,33 +340,48 @@ public function testAfterDelete()
325340
}
326341

327342
/**
328-
* Test after update action for inactive rule
343+
* Test after update action for active and deactivated rule.
329344
*
345+
* @dataProvider afterUpdateDataProvider
346+
* @param int $active
330347
* @return void
331348
*/
332-
public function testAfterUpdateInactive()
349+
public function testAfterUpdate(int $active)
333350
{
334351
$this->rule->isObjectNew(false);
335-
$this->rule->setIsActive(0);
336-
$this->_ruleProductProcessor->expects($this->never())->method('getIndexer');
352+
$this->rule->setIsActive($active);
353+
$this->rule->setOrigData(RuleInterface::IS_ACTIVE, 1);
354+
$indexer = $this->getMockForAbstractClass(IndexerInterface::class);
355+
$indexer->expects($this->once())->method('invalidate');
356+
$this->_ruleProductProcessor->expects($this->once())->method('getIndexer')->willReturn($indexer);
337357
$this->rule->afterSave();
338358
}
339359

340360
/**
341-
* Test after update action for active rule
361+
* Test after update action for inactive rule.
342362
*
343363
* @return void
344364
*/
345-
public function testAfterUpdateActive()
365+
public function testAfterUpdateInactiveRule()
346366
{
347367
$this->rule->isObjectNew(false);
348-
$this->rule->setIsActive(1);
349-
$indexer = $this->getMockForAbstractClass(IndexerInterface::class);
350-
$indexer->expects($this->once())->method('invalidate');
351-
$this->_ruleProductProcessor->expects($this->once())->method('getIndexer')->willReturn($indexer);
368+
$this->rule->setIsActive(0);
369+
$this->rule->setOrigData(RuleInterface::IS_ACTIVE, 0);
370+
$this->_ruleProductProcessor->expects($this->never())->method('getIndexer');
352371
$this->rule->afterSave();
353372
}
354373

374+
/**
375+
* @return array
376+
*/
377+
public function afterUpdateDataProvider(): array
378+
{
379+
return [
380+
['active' => 0],
381+
['active' => 1],
382+
];
383+
}
384+
355385
/**
356386
* Test isRuleBehaviorChanged action
357387
*

‎dev/tests/integration/testsuite/Magento/CatalogRule/Model/CatalogRuleRepositoryTest.php

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\CatalogRule\Model;
9+
10+
use Magento\CatalogRule\Api\CatalogRuleRepositoryInterface;
11+
use Magento\CatalogRule\Api\Data\RuleInterface;
12+
use Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor;
13+
use Magento\CatalogRule\Model\ResourceModel\RuleFactory as ResourceRuleFactory;
14+
use Magento\Framework\Indexer\StateInterface;
15+
use Magento\TestFramework\Helper\Bootstrap;
16+
use PHPUnit\Framework\TestCase;
17+
18+
/**
19+
* Covers with test catalog rule repository functionality.
20+
*/
21+
class CatalogRuleRepositoryTest extends TestCase
22+
{
23+
/**
24+
* @var CatalogRuleRepositoryInterface
25+
*/
26+
private $catalogRuleRepository;
27+
28+
/**
29+
* @inheridoc
30+
*/
31+
protected function setUp(): void
32+
{
33+
$this->catalogRuleRepository = Bootstrap::getObjectManager()->get(CatalogRuleRepositoryInterface::class);
34+
}
35+
36+
/**
37+
* Verify index become invalid in case rule become inactive and stays active in case inactive rule has been saved.
38+
*
39+
* @magentoDataFixture Magento/CatalogRule/_files/catalog_rule_25_customer_group_all.php
40+
* @magentoDbIsolation disabled
41+
*
42+
* @return void
43+
*/
44+
public function testIndexInvalidationAfterInactiveRuleSave(): void
45+
{
46+
$ruleProductProcessor = Bootstrap::getObjectManager()->get(RuleProductProcessor::class);
47+
$state = $ruleProductProcessor->getIndexer()->getState();
48+
$state->setStatus(StateInterface::STATUS_VALID);
49+
$ruleProductProcessor->getIndexer()->setState($state);
50+
$rule = $this->getRuleByName('Test Catalog Rule With 25 Percent Off');
51+
$rule->setIsActive(0);
52+
$this->catalogRuleRepository->save($rule);
53+
self::assertEquals(StateInterface::STATUS_INVALID, $ruleProductProcessor->getIndexer()->getStatus());
54+
$state = $ruleProductProcessor->getIndexer()->getState();
55+
$state->setStatus(StateInterface::STATUS_VALID);
56+
$ruleProductProcessor->getIndexer()->setState($state);
57+
$this->catalogRuleRepository->save($rule);
58+
self::assertEquals(StateInterface::STATUS_VALID, $ruleProductProcessor->getIndexer()->getStatus());
59+
}
60+
61+
/**
62+
* Retrieve catalog rule by name from db.
63+
*
64+
* @param string $name
65+
* @return RuleInterface
66+
*/
67+
private function getRuleByName(string $name): RuleInterface
68+
{
69+
$catalogRuleResource = Bootstrap::getObjectManager()->get(ResourceRuleFactory::class)->create();
70+
$select = $catalogRuleResource->getConnection()->select();
71+
$select->from($catalogRuleResource->getMainTable(), RuleInterface::RULE_ID);
72+
$select->where(RuleInterface::NAME . ' = ?', $name);
73+
$ruleId = $catalogRuleResource->getConnection()->fetchOne($select);
74+
75+
return $this->catalogRuleRepository->get((int)$ruleId);
76+
}
77+
}

0 commit comments

Comments
 (0)