Skip to content

Commit 9717ac4

Browse files
committed
ACP2E-1784: fix static and unit tests' errors
1 parent 5977001 commit 9717ac4

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

app/code/Magento/Wishlist/Helper/Data.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Magento\Framework\App\ObjectManager;
1414
use Magento\Framework\DataObject;
1515
use Magento\Framework\Escaper;
16+
use Magento\Framework\Exception\LocalizedException;
1617
use Magento\Framework\Exception\NoSuchEntityException;
1718
use Magento\Wishlist\Controller\WishlistProviderInterface;
1819
use Magento\Wishlist\Model\Item;
@@ -643,11 +644,12 @@ public function isDisplayQty()
643644
/**
644645
* Retrieve URL to item Product
645646
*
646-
* @param \Magento\Wishlist\Model\Item|\Magento\Catalog\Model\Product $item
647-
* @param array $additional
647+
* @param Item|Product $item
648648
* @return string
649+
* @throws NoSuchEntityException
650+
* @throws LocalizedException
649651
*/
650-
public function getProductUrl($item, $additional = [])
652+
public function getProductUrl($item): string
651653
{
652654
if ($item instanceof \Magento\Catalog\Model\Product) {
653655
$product = $item;
@@ -669,6 +671,8 @@ public function getProductUrl($item, $additional = [])
669671
}
670672

671673
/**
674+
* Generate query params from product options
675+
*
672676
* @param Item|Product $item
673677
* @return array
674678
* @throws NoSuchEntityException

app/code/Magento/Wishlist/Test/Unit/Helper/DataTest.php

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Magento\Framework\App\Helper\Context;
1414
use Magento\Framework\App\RequestInterface;
1515
use Magento\Framework\Data\Helper\PostHelper;
16+
use Magento\Framework\DataObject;
1617
use Magento\Framework\Registry;
1718
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
1819
use Magento\Framework\Url\EncoderInterface;
@@ -186,11 +187,27 @@ public function testGetConfigureUrl()
186187
{
187188
$url = 'http://magento2ce/wishlist/index/configure/id/4/product_id/30/qty/1000';
188189

190+
$buyRequest = $this->getMockBuilder(DataObject::class)
191+
->addMethods(['getSuperAttribute', 'getQty'])
192+
->disableOriginalConstructor()
193+
->getMock();
194+
$buyRequest->expects($this->once())
195+
->method('getSuperAttribute')
196+
->willReturn(['100' => '10']);
197+
$buyRequest->expects($this->exactly(2))
198+
->method('getQty')
199+
->willReturn('1000');
200+
189201
/** @var WishlistItem|MockObject $wishlistItem */
190202
$wishlistItem = $this->getMockBuilder(WishlistItem::class)
191203
->addMethods(['getWishlistItemId', 'getProductId', 'getQty'])
204+
->onlyMethods(['getBuyRequest'])
192205
->disableOriginalConstructor()
193206
->getMock();
207+
$wishlistItem
208+
->expects($this->once())
209+
->method('getBuyRequest')
210+
->willReturn($buyRequest);
194211
$wishlistItem
195212
->expects($this->once())
196213
->method('getWishlistItemId')
@@ -209,7 +226,7 @@ public function testGetConfigureUrl()
209226
->with('wishlist/index/configure', ['id' => 4, 'product_id' => 30, 'qty' => 1000])
210227
->willReturn($url);
211228

212-
$this->assertEquals($url, $this->model->getConfigureUrl($wishlistItem));
229+
$this->assertEquals($url . '#100=10', $this->model->getConfigureUrl($wishlistItem));
213230
}
214231

215232
public function testGetWishlist()

0 commit comments

Comments
 (0)