Skip to content

Commit 89f5293

Browse files
committed
ACP2E-3407: Gift Card Product | Cart Merge is merging Gift Cards
1 parent 1c2573f commit 89f5293

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

app/code/Magento/Quote/Model/Quote/Item/Compare.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2014 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Quote\Model\Quote\Item;
77

app/code/Magento/Quote/Test/Unit/Model/Quote/Item/CompareTest.php

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -236,19 +236,4 @@ public function testCompareItemWithoutOptionWithCompared()
236236
->willReturn([]);
237237
$this->assertFalse($this->helper->compare($this->itemMock, $this->comparedMock));
238238
}
239-
240-
/**
241-
* test compare two items- when configurable products has assigned sku of its selected variant
242-
*/
243-
public function testCompareConfigurableProductAndItsVariant()
244-
{
245-
$this->itemMock->expects($this->exactly(2))
246-
->method('getSku')
247-
->willReturn('cr1-r');
248-
$this->comparedMock->expects($this->once())
249-
->method('getSku')
250-
->willReturn('cr1-r');
251-
252-
$this->assertTrue($this->helper->compare($this->itemMock, $this->comparedMock));
253-
}
254239
}

0 commit comments

Comments
 (0)