Skip to content

Commit 995ddbe

Browse files
author
Oleksandr Gorkun
committed
MC-18685: Remove custom layout updates from admin
1 parent 7220be4 commit 995ddbe

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

dev/tests/integration/testsuite/Magento/Sales/Cron/CleanExpiredQuotesTest.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,14 @@ protected function setUp()
5353
*/
5454
public function testExecute()
5555
{
56-
$this->cleanExpiredQuotes->execute();
5756
$searchCriteria = $this->searchCriteriaBuilder->create();
58-
$totalCount = $this->quoteRepository->getList($searchCriteria)->getTotalCount();
57+
//Initial count - should be equal to stores number.
58+
$this->assertEquals(2, $this->quoteRepository->getList($searchCriteria)->getTotalCount());
5959

60+
//Deleting expired quotes
61+
$this->cleanExpiredQuotes->execute();
62+
$totalCount = $this->quoteRepository->getList($searchCriteria)->getTotalCount();
63+
//Only 1 will be deleted for the store that has all of them expired by config (default_store)
6064
$this->assertEquals(
6165
1,
6266
$totalCount

dev/tests/integration/testsuite/Magento/Sales/_files/quotes.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,31 @@
77

88
use Magento\Quote\Model\QuoteFactory;
99
use Magento\Quote\Model\QuoteRepository;
10+
use Magento\Store\Model\Store;
11+
use Magento\Store\Model\StoreFactory;
1012
use Magento\TestFramework\Helper\Bootstrap;
1113
use Magento\TestFramework\ObjectManager;
1214

13-
require dirname(dirname(__DIR__)) . '/Store/_files/second_store.php';
15+
require __DIR__ . '/../../Store/_files/second_store.php';
1416

1517
/** @var $objectManager ObjectManager */
1618
$objectManager = Bootstrap::getObjectManager();
1719
/** @var QuoteFactory $quoteFactory */
1820
$quoteFactory = $objectManager->get(QuoteFactory::class);
1921
/** @var QuoteRepository $quoteRepository */
2022
$quoteRepository = $objectManager->get(QuoteRepository::class);
23+
/** @var StoreFactory $storeFactory */
24+
$storeFactory = $objectManager->get(StoreFactory::class);
25+
/** @var Store $secondStore */
26+
$secondStore = $storeFactory->create();
27+
$secondStore->load('fixture_second_store', 'code');
2128

2229
$quotes = [
2330
'quote for first store' => [
2431
'store' => 1,
2532
],
2633
'quote for second store' => [
27-
'store' => 2,
34+
'store' => $secondStore->getId(),
2835
],
2936
];
3037

0 commit comments

Comments
 (0)