Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 2be7da9

Browse files
bordeoMastiuhin Oleksandr
authored andcommitted
fix test for cataloginvetory qty validation
1 parent 2596ad5 commit 2be7da9

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

app/code/Magento/CatalogInventory/Test/Unit/Block/Plugin/ProductViewTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected function setUp()
2828

2929
$this->stockItem = $this->getMockBuilder(\Magento\CatalogInventory\Model\Stock\Item::class)
3030
->disableOriginalConstructor()
31-
->setMethods(['getMinSaleQty', 'getQtyMaxAllowed', 'getQtyIncrements'])
31+
->setMethods(['getMinSaleQty', 'getMaxSaleQty', 'getQtyIncrements'])
3232
->getMock();
3333

3434
$this->stockRegistry = $this->getMockBuilder(\Magento\CatalogInventory\Api\StockRegistryInterface::class)
@@ -74,7 +74,7 @@ public function testAfterGetQuantityValidators()
7474
->with('productId', 'websiteId')
7575
->willReturn($this->stockItem);
7676
$this->stockItem->expects($this->once())->method('getMinSaleQty')->willReturn(0.5);
77-
$this->stockItem->expects($this->any())->method('getQtyMaxAllowed')->willReturn(5);
77+
$this->stockItem->expects($this->any())->method('getMaxSaleQty')->willReturn(5);
7878
$this->stockItem->expects($this->any())->method('getQtyIncrements')->willReturn(3);
7979

8080
$this->assertEquals($result, $this->block->afterGetQuantityValidators($productViewBlock, $validators));

app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -910,6 +910,7 @@ define([
910910
'validate-item-quantity': [
911911
function (value, params) {
912912
var validator = this,
913+
result = false,
913914
// obtain values for validation
914915
qty = utils.parseNumber(value),
915916
isMinAllowedValid = typeof params.minAllowed === 'undefined' ||
@@ -919,15 +920,15 @@ define([
919920
isQtyIncrementsValid = typeof params.qtyIncrements === 'undefined' ||
920921
qty % utils.parseNumber(params.qtyIncrements) === 0;
921922

922-
var result = qty > 0;
923+
result = qty > 0;
923924

924925
if (result === false) {
925926
validator.itemQtyErrorMessage = $.mage.__("Please enter a quantity greater than 0.");//eslint-disable-line max-len
926927

927928
return result;
928929
}
929930

930-
var result = isMinAllowedValid;
931+
result = isMinAllowedValid;
931932

932933
if (result === false) {
933934
validator.itemQtyErrorMessage = $.mage.__("The fewest you may purchase is %1.").replace('%1', params.minAllowed);//eslint-disable-line max-len

lib/web/mage/validation.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,6 +1567,7 @@
15671567
'validate-item-quantity': [
15681568
function (value, element, params) {
15691569
var validator = this,
1570+
result = false,
15701571
// obtain values for validation
15711572
qty = $.mage.parseNumber(value),
15721573
isMinAllowedValid = typeof params.minAllowed === 'undefined' ||
@@ -1576,15 +1577,15 @@
15761577
isQtyIncrementsValid = typeof params.qtyIncrements === 'undefined' ||
15771578
qty % $.mage.parseNumber(params.qtyIncrements) === 0;
15781579

1579-
var result = qty > 0;
1580+
result = qty > 0;
15801581

15811582
if (result === false) {
15821583
validator.itemQtyErrorMessage = $.mage.__("Please enter a quantity greater than 0.");//eslint-disable-line max-len
15831584

15841585
return result;
15851586
}
15861587

1587-
var result = isMinAllowedValid;
1588+
result = isMinAllowedValid;
15881589

15891590
if (result === false) {
15901591
validator.itemQtyErrorMessage = $.mage.__("The fewest you may purchase is %1.").replace('%1', params.minAllowed);//eslint-disable-line max-len

0 commit comments

Comments
 (0)