diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js b/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
index 2d6fa460ef66d26d106ad9417ffdf8d3548a3d00..3ec34cd96574bc90e5b0f8bd3bf552a877444ab0 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
@@ -44,6 +44,13 @@ define(
addressData.region.region_code = region['code'];
addressData.region.region = region['name'];
}
+ } else if (
+ !addressData.region_id
+ && countryData()[addressData.country_id]
+ && countryData()[addressData.country_id]['regions']
+ ) {
+ addressData.region.region_code = '';
+ addressData.region.region = '';
}
delete addressData.region_id;
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js b/app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js
index bee4480b0dfb1c9db669d53f5091bb1d3564237a..9a3685b212b435e8c03adb7be2cd7a182e591b87 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js
@@ -22,7 +22,7 @@ define([], function () {
return {
email: addressData.email,
countryId: addressData['country_id'] || addressData.countryId || window.checkoutConfig.defaultCountryId,
- regionId: regionId,
+ regionId: regionId || addressData.regionId,
regionCode: (addressData.region) ? addressData.region.region_code : null,
region: (addressData.region) ? addressData.region.region : null,
customerId: addressData.customer_id,
@@ -30,7 +30,7 @@ define([], function () {
company: addressData.company,
telephone: addressData.telephone,
fax: addressData.fax,
- postcode: addressData.postcode ? addressData.postcode : window.checkoutConfig.defaultPostcode,
+ postcode: addressData.postcode ? addressData.postcode : window.checkoutConfig.defaultPostcode || undefined,
city: addressData.city,
firstname: addressData.firstname,
lastname: addressData.lastname,
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
index 420d50b83478a91ab38b6a333a681f119b6db49e..c49960ecfb91dec735239c8bc1cc88f7ffebfab0 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
@@ -176,7 +176,7 @@ define(
address;
if (this.validateAddressData(addressFlat)) {
- addressFlat = $.extend(true, {}, quote.shippingAddress(), addressFlat);
+ addressFlat = uiRegistry.get('checkoutProvider').shippingAddress;
address = addressConverter.formAddressDataToQuoteAddress(addressFlat);
selectShippingAddress(address);
}
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index 3cdcf70cf24266ae7613e7e6f790c4b6777ff23b..f84ca33b436f91e4afca6cae6f52c8b975cf4289 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -2157,6 +2157,12 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
{
if (!$this->getReservedOrderId()) {
$this->setReservedOrderId($this->_getResource()->getReservedOrderId($this));
+ } else {
+ //checking if reserved order id was already used for some order
+ //if yes reserving new one if not using old one
+ if ($this->_getResource()->isOrderIncrementIdUsed($this->getReservedOrderId())) {
+ $this->setReservedOrderId($this->_getResource()->getReservedOrderId($this));
+ }
}
return $this;
}
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
index f1660c9f9d6427fb617c2de9d87ae2a8026be3aa..7d8946661476cb851f2488405708847530e99673 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
@@ -59,10 +59,8 @@ class Shipping extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
$addressWeight = $address->getWeight();
$freeMethodWeight = $address->getFreeMethodWeight();
+ $addressFreeShipping = $address->getFreeShipping();
- $address->setFreeShipping(
- $this->freeShipping->isFreeShipping($quote, $shippingAssignment->getItems())
- );
$total->setTotalAmount($this->getCode(), 0);
$total->setBaseTotalAmount($this->getCode(), 0);
@@ -98,7 +96,7 @@ class Shipping extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
$itemQty = $child->getTotalQty();
$rowWeight = $itemWeight * $itemQty;
$addressWeight += $rowWeight;
- if ($address->getFreeShipping() || $child->getFreeShipping() === true) {
+ if ($addressFreeShipping || $child->getFreeShipping() === true) {
$rowWeight = 0;
} elseif (is_numeric($child->getFreeShipping())) {
$freeQty = $child->getFreeShipping();
@@ -116,7 +114,7 @@ class Shipping extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
$itemWeight = $item->getWeight();
$rowWeight = $itemWeight * $item->getQty();
$addressWeight += $rowWeight;
- if ($address->getFreeShipping() || $item->getFreeShipping() === true) {
+ if ($addressFreeShipping || $item->getFreeShipping() === true) {
$rowWeight = 0;
} elseif (is_numeric($item->getFreeShipping())) {
$freeQty = $item->getFreeShipping();
@@ -136,7 +134,7 @@ class Shipping extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
$itemWeight = $item->getWeight();
$rowWeight = $itemWeight * $item->getQty();
$addressWeight += $rowWeight;
- if ($address->getFreeShipping() || $item->getFreeShipping() === true) {
+ if ($addressFreeShipping || $item->getFreeShipping() === true) {
$rowWeight = 0;
} elseif (is_numeric($item->getFreeShipping())) {
$freeQty = $item->getFreeShipping();
@@ -157,6 +155,10 @@ class Shipping extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
$address->setWeight($addressWeight);
$address->setFreeMethodWeight($freeMethodWeight);
+ $address->setFreeShipping(
+ $this->freeShipping->isFreeShipping($quote, $shippingAssignment->getItems())
+ );
+
$address->collectShippingRates();
if ($method) {
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote.php b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
index 241f0d6b272fc33f6b29ff4e2c069ca088c5073b..6113a1ba56ac184d59a6d0e37bd696455dce31cd 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
@@ -172,6 +172,29 @@ class Quote extends AbstractDb
->getNextValue();
}
+ /**
+ * Check if order increment ID is already used.
+ * Method can be used to avoid collisions of order IDs.
+ *
+ * @param int $orderIncrementId
+ * @return bool
+ */
+ public function isOrderIncrementIdUsed($orderIncrementId)
+ {
+ /** @var \Magento\Framework\DB\Adapter\AdapterInterface $adapter */
+ $adapter = $this->getConnection();
+ $bind = [':increment_id' => $orderIncrementId];
+ /** @var \Magento\Framework\DB\Select $select */
+ $select = $adapter->select();
+ $select->from($this->getTable('sales_order'), 'entity_id')->where('increment_id = :increment_id');
+ $entity_id = $adapter->fetchOne($select, $bind);
+ if ($entity_id > 0) {
+ return true;
+ }
+
+ return false;
+ }
+
/**
* Mark quotes - that depend on catalog price rules - to be recollected on demand
*
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
index 5165f299d45a96b7aa9b130a03747fad38955084..b54ce84fe1ac45fbee2d1b2c89a99c8546a11cab 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
@@ -314,7 +314,10 @@ class QuoteTest extends \PHPUnit_Framework_TestCase
'customerRepository' => $this->customerRepositoryMock,
'objectCopyService' => $this->objectCopyServiceMock,
'extensionAttributesJoinProcessor' => $this->extensionAttributesJoinProcessorMock,
- 'customerDataFactory' => $this->customerDataFactoryMock
+ 'customerDataFactory' => $this->customerDataFactoryMock,
+ 'data' => [
+ 'reserved_order_id' => 1000001
+ ]
]
);
}
@@ -1237,4 +1240,30 @@ class QuoteTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($itemResult, $this->quote->getAllItems());
}
+
+ /**
+ * Test to verify if existing reserved_order_id in use
+ *
+ * @param bool $isReservedOrderIdExist
+ * @param int $reservedOrderId
+ * @dataProvider reservedOrderIdDataProvider
+ */
+ public function testReserveOrderId($isReservedOrderIdExist, $reservedOrderId)
+ {
+ $this->resourceMock
+ ->expects($this->once())
+ ->method('isOrderIncrementIdUsed')
+ ->with(1000001)->willReturn($isReservedOrderIdExist);
+ $this->resourceMock->expects($this->any())->method('getReservedOrderId')->willReturn($reservedOrderId);
+ $this->quote->reserveOrderId();
+ $this->assertEquals($reservedOrderId, $this->quote->getReservedOrderId());
+ }
+
+ public function reservedOrderIdDataProvider()
+ {
+ return [
+ 'id_already_in_use' => [true, 100002],
+ 'id_not_in_use' => [false, 1000001]
+ ];
+ }
}
diff --git a/app/code/Magento/Quote/Test/Unit/Model/ResourceModel/QuoteTest.php b/app/code/Magento/Quote/Test/Unit/Model/ResourceModel/QuoteTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..15c58073c2e26a4921f771e6c4097fafc9275c91
--- /dev/null
+++ b/app/code/Magento/Quote/Test/Unit/Model/ResourceModel/QuoteTest.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Quote\Test\Unit\Model\ResourceModel;
+
+class QuoteTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Quote\Model\ResourceModel\Quote
+ */
+ private $model;
+
+ /**
+ * @var \Magento\Framework\App\ResourceConnection
+ */
+ private $resourceMock;
+
+ /**
+ * @var \Magento\Framework\DB\Adapter\Pdo\Mysql
+ */
+ private $adapterMock;
+
+ /**
+ * @var \Magento\Framework\DB\Select
+ */
+ private $selectMock;
+
+ protected function setUp()
+ {
+ $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $this->selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->selectMock->expects($this->any())->method('from')->will($this->returnSelf());
+ $this->selectMock->expects($this->any())->method('where');
+
+ $this->adapterMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\Pdo\Mysql::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->adapterMock->expects($this->any())->method('select')->will($this->returnValue($this->selectMock));
+
+ $this->resourceMock = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->resourceMock->expects(
+ $this->any()
+ )->method(
+ 'getConnection'
+ )->will(
+ $this->returnValue($this->adapterMock)
+ );
+
+ $this->model = $objectManagerHelper->getObject(
+ \Magento\Quote\Model\ResourceModel\Quote::class,
+ [
+ 'resource' => $this->resourceMock
+ ]
+ );
+ }
+
+ /**
+ * Unit test to verify if isOrderIncrementIdUsed method works with different types increment ids
+ *
+ * @param array $value
+ * @dataProvider isOrderIncrementIdUsedDataProvider
+ */
+ public function testIsOrderIncrementIdUsed($value)
+ {
+ $expectedBind = [':increment_id' => $value];
+ $this->adapterMock->expects($this->once())->method('fetchOne')->with($this->selectMock, $expectedBind);
+ $this->model->isOrderIncrementIdUsed($value);
+ }
+
+ /**
+ * @return array
+ */
+ public function isOrderIncrementIdUsedDataProvider()
+ {
+ return [[100000001], ['10000000001'], ['M10000000001']];
+ }
+}
diff --git a/app/code/Magento/Wishlist/Controller/Index/Cart.php b/app/code/Magento/Wishlist/Controller/Index/Cart.php
index f15e89d16c9b4f9bba2adbe2a23621417e255f1a..a907abcd1c56c829dedaddbd065fff3cc1fede08 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Cart.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Cart.php
@@ -113,6 +113,7 @@ class Cart extends \Magento\Wishlist\Controller\AbstractIndex
* @return \Magento\Framework\Controller\ResultInterface
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function execute()
{
@@ -137,6 +138,10 @@ class Cart extends \Magento\Wishlist\Controller\AbstractIndex
// Set qty
$qty = $this->getRequest()->getParam('qty');
+ $postQty = $this->getRequest()->getPostValue('qty');
+ if ($postQty !== null && $qty !== $postQty) {
+ $qty = $postQty;
+ }
if (is_array($qty)) {
if (isset($qty[$itemId])) {
$qty = $qty[$itemId];
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php
index e1a7cd448569f05060d9995ee5d02de41630f680..743fc39e4b43d7819af97fc97c84efb9f3f38013 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php
@@ -159,7 +159,7 @@ class CartTest extends \PHPUnit_Framework_TestCase
$this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
->disableOriginalConstructor()
- ->setMethods(['getParams', 'getParam', 'isAjax'])
+ ->setMethods(['getParams', 'getParam', 'isAjax', 'getPostValue'])
->getMockForAbstractClass();
$this->redirectMock = $this->getMockBuilder(\Magento\Framework\App\Response\RedirectInterface::class)
@@ -916,4 +916,176 @@ class CartTest extends \PHPUnit_Framework_TestCase
$this->assertSame($this->resultRedirectMock, $this->model->execute());
}
+
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function testExecuteWithEditQuantity()
+ {
+ $itemId = 2;
+ $wishlistId = 1;
+ $qty = 1;
+ $postQty = 2;
+ $productId = 4;
+ $indexUrl = 'index_url';
+ $configureUrl = 'configure_url';
+ $options = [5 => 'option'];
+ $params = ['item' => $itemId, 'qty' => $qty];
+
+ $this->formKeyValidator->expects($this->once())
+ ->method('validate')
+ ->with($this->requestMock)
+ ->willReturn(true);
+
+ $itemMock = $this->getMockBuilder(\Magento\Wishlist\Model\Item::class)
+ ->disableOriginalConstructor()
+ ->setMethods(
+ [
+ 'load',
+ 'getId',
+ 'getWishlistId',
+ 'setQty',
+ 'setOptions',
+ 'getBuyRequest',
+ 'mergeBuyRequest',
+ 'addToCart',
+ 'getProduct',
+ 'getProductId',
+ ]
+ )
+ ->getMock();
+
+ $this->requestMock->expects($this->at(0))
+ ->method('getParam')
+ ->with('item', null)
+ ->willReturn($itemId);
+ $this->itemFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($itemMock);
+
+ $itemMock->expects($this->once())
+ ->method('load')
+ ->with($itemId, null)
+ ->willReturnSelf();
+ $itemMock->expects($this->exactly(2))
+ ->method('getId')
+ ->willReturn($itemId);
+ $itemMock->expects($this->once())
+ ->method('getWishlistId')
+ ->willReturn($wishlistId);
+
+ $wishlistMock = $this->getMockBuilder(\Magento\Wishlist\Model\Wishlist::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->wishlistProviderMock->expects($this->once())
+ ->method('getWishlist')
+ ->with($wishlistId)
+ ->willReturn($wishlistMock);
+
+ $this->requestMock->expects($this->at(1))
+ ->method('getParam')
+ ->with('qty', null)
+ ->willReturn($qty);
+
+ $this->requestMock->expects($this->once())
+ ->method('getPostValue')
+ ->with('qty')
+ ->willReturn($postQty);
+
+ $this->quantityProcessorMock->expects($this->once())
+ ->method('process')
+ ->with($postQty)
+ ->willReturnArgument(0);
+
+ $itemMock->expects($this->once())
+ ->method('setQty')
+ ->with($postQty)
+ ->willReturnSelf();
+
+ $this->urlMock->expects($this->at(0))
+ ->method('getUrl')
+ ->with('*/*', null)
+ ->willReturn($indexUrl);
+
+ $itemMock->expects($this->once())
+ ->method('getProductId')
+ ->willReturn($productId);
+
+ $this->urlMock->expects($this->at(1))
+ ->method('getUrl')
+ ->with('*/*/configure/', ['id' => $itemId, 'product_id' => $productId])
+ ->willReturn($configureUrl);
+
+ $optionMock = $this->getMockBuilder(\Magento\Wishlist\Model\Item\Option::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->optionFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($optionMock);
+
+ $optionsMock = $this->getMockBuilder(\Magento\Wishlist\Model\ResourceModel\Item\Option\Collection::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $optionMock->expects($this->once())
+ ->method('getCollection')
+ ->willReturn($optionsMock);
+
+ $optionsMock->expects($this->once())
+ ->method('addItemFilter')
+ ->with([$itemId])
+ ->willReturnSelf();
+ $optionsMock->expects($this->once())
+ ->method('getOptionsByItem')
+ ->with($itemId)
+ ->willReturn($options);
+
+ $itemMock->expects($this->once())
+ ->method('setOptions')
+ ->with($options)
+ ->willReturnSelf();
+
+ $this->requestMock->expects($this->once())
+ ->method('getParams')
+ ->willReturn($params);
+
+ $buyRequestMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $itemMock->expects($this->once())
+ ->method('getBuyRequest')
+ ->willReturn($buyRequestMock);
+
+ $this->productHelperMock->expects($this->once())
+ ->method('addParamsToBuyRequest')
+ ->with($params, ['current_config' => $buyRequestMock])
+ ->willReturn($buyRequestMock);
+
+ $itemMock->expects($this->once())
+ ->method('mergeBuyRequest')
+ ->with($buyRequestMock)
+ ->willReturnSelf();
+ $itemMock->expects($this->once())
+ ->method('addToCart')
+ ->with($this->checkoutCartMock, true)
+ ->willThrowException(new \Magento\Framework\Exception\LocalizedException(__('message')));
+
+ $this->messageManagerMock->expects($this->once())
+ ->method('addNotice')
+ ->with('message', null)
+ ->willReturnSelf();
+
+ $this->helperMock->expects($this->once())
+ ->method('calculate')
+ ->willReturnSelf();
+
+ $this->resultRedirectMock->expects($this->once())
+ ->method('setUrl')
+ ->with($configureUrl)
+ ->willReturnSelf();
+
+ $this->assertSame($this->resultRedirectMock, $this->model->execute());
+ }
}
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml
index dbb680f8f25806508e44ef31724899149ca2b6ce..b08816a6728eb54b79ec806084f4a4e684702a29 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml
@@ -22,7 +22,7 @@
template="Magento_Catalog::product/view/addto.phtml" cacheable="false">
<block class="Magento\Wishlist\Block\Item\Configure" name="view.addto.wishlist.bundle" after="view.addto.requisition"
template="item/configure/addto/wishlist.phtml" />
- <block class="Magento\Catalog\Block\Product\View\Addto\Compare" name="view.addto.compare.bundle" after="view.addto.wishlist"
+ <block class="Magento\Catalog\Block\Product\View\AddTo\Compare" name="view.addto.compare.bundle" after="view.addto.wishlist"
template="Magento_Catalog::product/view/addto/compare.phtml" />
</block>
</block>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml
index ecd68593b08cc252e67a144ccd2a9610ac88f22d..e1cbc1a1d8ba2dba7f3be971b3f1b456f6e7d02a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml
@@ -1233,5 +1233,35 @@
<field name="url_key" xsi:type="string">overnight-duffle</field>
</dataset>
+ <dataset name="simple_with_weight_10_for_salesrule">
+ <field name="attribute_set_id" xsi:type="array">
+ <item name="dataset" xsi:type="string">default</item>
+ </field>
+ <field name="name" xsi:type="string">Simple Product %isolation%</field>
+ <field name="sku" xsi:type="string">sku_simple_product_%isolation%</field>
+ <field name="product_has_weight" xsi:type="string">This item has weight</field>
+ <field name="weight" xsi:type="string">10</field>
+ <field name="quantity_and_stock_status" xsi:type="array">
+ <item name="qty" xsi:type="string">25</item>
+ <item name="is_in_stock" xsi:type="string">In Stock</item>
+ </field>
+ <field name="price" xsi:type="array">
+ <item name="value" xsi:type="string">560</item>
+ </field>
+ <field name="tax_class_id" xsi:type="array">
+ <item name="dataset" xsi:type="string">taxable_goods</item>
+ </field>
+ <field name="website_ids" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="dataset" xsi:type="string">default</item>
+ </item>
+ </field>
+ <field name="visibility" xsi:type="string">Catalog, Search</field>
+ <field name="url_key" xsi:type="string">simple-product-%isolation%</field>
+ <field name="checkout_data" xsi:type="array">
+ <item name="dataset" xsi:type="string">simple_order_default</item>
+ </field>
+ </dataset>
+
</repository>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
index 697733fd3c33d8856f5d775452aca8ad977e77e9..fac0f811be2616675e85e3f34927731f13ea16b1 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
@@ -99,6 +99,13 @@ class Cart extends Block
*/
protected $preloaderSpinner = '#preloaderSpinner';
+ /**
+ * Cart item class name.
+ *
+ * @var string
+ */
+ protected $cartItemClass = \Magento\Checkout\Test\Block\Cart\CartItem::class;
+
/**
* Wait for PayPal page is loaded.
*
@@ -129,7 +136,7 @@ class Cart extends Block
Locator::SELECTOR_XPATH
);
$cartItem = $this->blockFactory->create(
- '\\' . get_class($this) . '\CartItem',
+ $this->cartItemClass,
['element' => $cartItemBlock]
);
}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php
index a3eda5ea1b3c5a3d6b5be217df906ca69b67f742..d29bad980faca881468ae1cf3a58523e13f7ad83 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php
@@ -13,5 +13,13 @@ use Magento\Mtf\Block\Form;
*/
class Shipping extends Form
{
- //
+ /**
+ * Returns form's required elements
+ *
+ * @return \Magento\Mtf\Client\ElementInterface[]
+ */
+ public function getRequiredFields()
+ {
+ return $this->_rootElement->getElements("div .field._required");
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingAddressJsValidationMessagesIsAbsent.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingAddressJsValidationMessagesIsAbsent.php
new file mode 100644
index 0000000000000000000000000000000000000000..f4f46a1c2b7c2577a0f61882f9d707397b1c1a20
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingAddressJsValidationMessagesIsAbsent.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Test\Constraint;
+
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Class AssertShippingAddressJsValidationMessagesIsAbsent
+ * Assert js validation messages are absent for required fields.
+ */
+class AssertShippingAddressJsValidationMessagesIsAbsent extends AbstractConstraint
+{
+ /**
+ * Assert js validation messages are absent for required fields.
+ *
+ * @param CheckoutOnepage $checkoutOnepage
+ * @return void
+ */
+ public function processAssert(CheckoutOnepage $checkoutOnepage)
+ {
+ $requiredFields = $checkoutOnepage->getShippingBlock()->getRequiredFields();
+
+ /** @var \Magento\Mtf\Client\ElementInterface $field */
+ foreach ($requiredFields as $field) {
+ $errorContainer = $field->find("div .field-error");
+ \PHPUnit_Framework_Assert::assertFalse(
+ $errorContainer->isVisible(),
+ 'Js validation error messages must be absent for required fields after checkout start.'
+ );
+ }
+ }
+
+ /**
+ * Returns string representation of successful assertion
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Js validation messages are absent for required fields.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..5361ee6e3c127bafc03e53cd717ac067688f826a
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Steps:
+ * 1. Go to Frontend as guest.
+ * 2. Add simple product to shopping cart
+ * 3. Go to shopping cart page
+ * 4. Proceed to checkout
+ * 5. Perform assertions.
+ *
+ * @group One_Page_Checkout
+ * @ZephyrId MAGETWO-59697
+ */
+class OnePageCheckoutJsValidationTest extends Scenario
+{
+ /**
+ * Runs one page checkout js validation test.
+ *
+ * @return void
+ */
+ public function test()
+ {
+ $this->executeScenario();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e930ff29882ceed4e8f99947a6a6ef4b4acc1c7a
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+ <testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutJsValidationTest" summary="JS validation verification for Checkout flow" ticketId="MAGETWO-59697">
+ <variation name="OnePageCheckoutJsValidationTestVariation1" summary="JS validation is not applied for empty required checkout fields if customer did not fill them">
+ <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
+ <data name="checkoutMethod" xsi:type="string">guest</data>
+ <constraint name="Magento\Checkout\Test\Constraint\AssertShippingAddressJsValidationMessagesIsAbsent" />
+ </variation>
+ </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml
index a26a2cead49b07a094e550db1207e36d53269b15..24eb96c0a9347741384ffd6718bf349eeb452c85 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml
@@ -22,4 +22,10 @@
<step name="placeOrder" module="Magento_Checkout" next="createCustomerAccount" />
<step name="createCustomerAccount" module="Magento_Checkout" />
</scenario>
+ <scenario name="OnePageCheckoutJsValidationTest" firstStep="setupConfiguration">
+ <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
+ <step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart" />
+ <step name="addProductsToTheCart" module="Magento_Checkout" next="ProceedToCheckout" />
+ <step name="ProceedToCheckout" module="Magento_Checkout" />
+ </scenario>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Handler/SalesRule/Curl.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Handler/SalesRule/Curl.php
index 5ab10a0e26f79fcded0b42c77562b077cf0b5412..310f52f75e2cf124e07ab1d7d4bf431e48759e8d 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Handler/SalesRule/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Handler/SalesRule/Curl.php
@@ -70,6 +70,10 @@ class Curl extends Conditions implements SalesRuleInterface
'type' => \Magento\SalesRule\Model\Rule\Condition\Address::class,
'attribute' => 'postcode',
],
+ 'Total Weight' => [
+ 'type' => \Magento\SalesRule\Model\Rule\Condition\Address::class,
+ 'attribute' => 'weight',
+ ],
'Category' => [
'type' => \Magento\SalesRule\Model\Rule\Condition\Product::class,
'attribute' => 'category_ids',
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
index 010b9d3233d163f6ec35ed4291bebbe352bbe9c4..13b68aca6c6eb7867286019b3a9609b3b93db2a8 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
@@ -279,5 +279,24 @@
<field name="stop_rules_processing" xsi:type="string">No</field>
<field name="simple_free_shipping" xsi:type="string">No</field>
</dataset>
+ <dataset name="rule_with_freeshipping_by_weight">
+ <field name="name" xsi:type="string">Cart price rule with free shipping by weight</field>
+ <field name="is_active" xsi:type="string">Yes</field>
+ <field name="website_ids" xsi:type="array">
+ <item name="0" xsi:type="string">Main Website</item>
+ </field>
+ <field name="customer_group_ids" xsi:type="array">
+ <item name="0" xsi:type="string">NOT LOGGED IN</item>
+ </field>
+ <field name="coupon_type" xsi:type="string">No Coupon</field>
+ <field name="sort_order" xsi:type="string">1</field>
+ <field name="is_rss" xsi:type="string">Yes</field>
+ <field name="conditions_serialized" xsi:type="string">[Total Weight|is|1]</field>
+ <field name="simple_action" xsi:type="string">Percent of product price discount</field>
+ <field name="discount_amount" xsi:type="string">0</field>
+ <field name="apply_to_shipping" xsi:type="string">No</field>
+ <field name="stop_rules_processing" xsi:type="string">No</field>
+ <field name="simple_free_shipping" xsi:type="string">For matching items only</field>
+ </dataset>
</repository>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ShoppingCartWithFreeShippingTest.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ShoppingCartWithFreeShippingTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..11e510759fdcc5aa4c9368e61c3f5373d32dd9bb
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ShoppingCartWithFreeShippingTest.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\SalesRule\Test\TestCase;
+
+/**
+ * Precondition:
+ * 1. Cart Price Rule was created.
+ *
+ * Steps:
+ * 1. Go to storefront
+ * 2. Add product to shopping cart
+ * 3. Go to shopping cart page
+ * 4. Perform asserts.
+ *
+ * @group Shopping_Cart_Price_Rules
+ * @ZephyrId MAGETWO-59665
+ */
+class ShoppingCartWithFreeShippingTest extends \Magento\Mtf\TestCase\Injectable
+{
+ /**
+ * @var \Magento\Mtf\TestStep\TestStepFactory
+ */
+ private $testStepFactory;
+
+ /**
+ * Inject data
+ *
+ * @param \Magento\Mtf\TestStep\TestStepFactory $testStepFactory
+ * @return void
+ */
+ public function __inject(
+ \Magento\Mtf\TestStep\TestStepFactory $testStepFactory
+ ) {
+ $this->testStepFactory = $testStepFactory;
+ }
+
+ /**
+ * Test sales rule with free shipping applied by product weight
+ *
+ * @param \Magento\SalesRule\Test\Fixture\SalesRule $salesRule
+ * @param \Magento\Catalog\Test\Fixture\CatalogProductSimple $product
+ * @param \Magento\Checkout\Test\Fixture\Cart $cart
+ * @return void
+ */
+ public function testRuleWithFreeShippingByWeight(
+ \Magento\SalesRule\Test\Fixture\SalesRule $salesRule,
+ \Magento\Catalog\Test\Fixture\CatalogProductSimple $product,
+ \Magento\Checkout\Test\Fixture\Cart $cart
+ ) {
+ $salesRule->persist();
+ $product->persist();
+
+ $this->testStepFactory->create(
+ \Magento\Checkout\Test\TestStep\AddProductsToTheCartStep::class,
+ ['products' => [$product]]
+ )->run();
+
+ $this->testStepFactory->create(
+ \Magento\Checkout\Test\TestStep\EstimateShippingAndTaxStep::class,
+ ['products' => [$product], 'cart' => $cart]
+ )->run();
+ }
+
+ /**
+ * Clear data after test.
+ *
+ * @return void
+ */
+ public function tearDown()
+ {
+ $this->testStepFactory->create(\Magento\SalesRule\Test\TestStep\DeleteAllSalesRuleStep::class)->run();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ShoppingCartWithFreeShippingTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ShoppingCartWithFreeShippingTest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7391d2281f8094b059cfaf9d26115c371d9498b0
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ShoppingCartWithFreeShippingTest.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+ <testCase name="Magento\SalesRule\Test\TestCase\ShoppingCartWithFreeShippingTest" summary="Shopping Cart With Freeshipping" ticketId="MAGETWO-59665">
+ <variation name="ShoppingCartWithFreeShippingTestVariation1">
+ <data name="salesRule/dataset" xsi:type="string">rule_with_freeshipping_by_weight</data>
+ <data name="product/dataset" xsi:type="string">default</data>
+ <data name="cart/data/subtotal" xsi:type="string">560.00</data>
+ <data name="cart/data/shipping_amount" xsi:type="string">0.00</data>
+ <data name="cart/data/grand_total" xsi:type="string">560.00</data>
+ </variation>
+ <variation name="ShoppingCartWithFreeShippingTestVariation2">
+ <data name="salesRule/dataset" xsi:type="string">rule_with_freeshipping_by_weight</data>
+ <data name="product/dataset" xsi:type="string">simple_with_weight_10_for_salesrule</data>
+ <data name="cart/data/subtotal" xsi:type="string">560.00</data>
+ <data name="cart/data/shipping_amount" xsi:type="string">5.00</data>
+ <data name="cart/data/grand_total" xsi:type="string">565.00</data>
+ </variation>
+ </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist.php
index 47f787da38b04264372015a52449f984820490e5..bda0780f553006bddc3f0ce164cb4f6f824ee75d 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist.php
@@ -99,6 +99,7 @@ class Wishlist extends Block
public function clickUpdateWishlist()
{
$this->waitFormToLoad();
+ $this->_rootElement->hover();
$this->_rootElement->find($this->updateButton)->click();
}
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
index da035c8eec78f8a547defd548f5cc93b10d474a6..8f295077afe330076e265c555cae280294cdd9f6 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
@@ -404,4 +404,23 @@ class QuoteTest extends \PHPUnit_Framework_TestCase
\Magento\Customer\Model\Data\Customer::WEBSITE_ID => 1
];
}
+
+ /**
+ * Test to verify that reserved_order_id will be changed if it already in used
+ *
+ * @magentoDataFixture Magento/Sales/_files/order.php
+ * @magentoDataFixture Magento/Quote/_files/empty_quote.php
+ */
+ public function testReserveOrderId()
+ {
+ $objectManager = Bootstrap::getObjectManager();
+ /** @var \Magento\Quote\Model\Quote $quote */
+ $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+ $quote->load('reserved_order_id', 'reserved_order_id');
+ $quote->reserveOrderId();
+ $this->assertEquals('reserved_order_id', $quote->getReservedOrderId());
+ $quote->setReservedOrderId('100000001');
+ $quote->reserveOrderId();
+ $this->assertNotEquals('100000001', $quote->getReservedOrderId());
+ }
}
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/ResourceModel/QuoteTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/ResourceModel/QuoteTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..43ee0893b75f9cc93bdca626d87d5592eefd62aa
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/ResourceModel/QuoteTest.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Quote\Model\ResourceModel;
+
+/**
+ * Class QuoteTest to verify isOrderIncrementIdUsed method behaviour
+ */
+class QuoteTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Quote\Model\ResourceModel\Quote
+ */
+ private $_resourceModel;
+
+ protected function setUp()
+ {
+ $this->_resourceModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ \Magento\Quote\Model\ResourceModel\Quote::class
+ );
+ }
+
+ /**
+ * Test to verify if isOrderIncrementIdUsed method works with numeric increment ids
+ *
+ * @magentoDataFixture Magento/Sales/_files/order.php
+ */
+ public function testIsOrderIncrementIdUsedNumericIncrementId()
+ {
+ $this->assertTrue($this->_resourceModel->isOrderIncrementIdUsed('100000001'));
+ }
+
+ /**
+ * Test to verify if isOrderIncrementIdUsed method works with alphanumeric increment ids
+ *
+ * @magentoDataFixture Magento/Sales/_files/order_alphanumeric_id.php
+ */
+ public function testIsOrderIncrementIdUsedAlphanumericIncrementId()
+ {
+ $this->assertTrue($this->_resourceModel->isOrderIncrementIdUsed('M00000001'));
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Quote/Address/Total/ShippingTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Quote/Address/Total/ShippingTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..543d02e42067483a56ee1b31d084a7e02c18952f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Quote/Address/Total/ShippingTest.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\SalesRule\Model\Quote\Address\Total;
+
+class ShippingTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Quote\Api\GuestCartManagementInterface
+ */
+ private $cartManagement;
+
+ /**
+ * @var \Magento\Quote\Api\GuestCartItemRepositoryInterface
+ */
+ private $itemRepository;
+
+ /**
+ * @var \Magento\Framework\ObjectManagerInterface
+ */
+ private $objectManager;
+
+ protected function setUp()
+ {
+ $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+ $this->cartManagement = $this->objectManager->get(\Magento\Quote\Api\GuestCartManagementInterface::class);
+ $this->itemRepository = $this->objectManager->get(\Magento\Quote\Api\GuestCartItemRepositoryInterface::class);
+ }
+
+ /**
+ * @magentoDataFixture Magento/SalesRule/_files/rule_free_shipping_by_product_weight.php
+ * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ */
+ public function testRuleByProductWeightWithFreeShipping()
+ {
+ $cartId = $this->prepareQuote(1);
+ $methods = $this->estimateShipping($cartId);
+
+ $this->assertTrue(count($methods) > 0);
+ $this->assertEquals('flatrate', $methods[0]->getMethodCode());
+ $this->assertEquals(0, $methods[0]->getAmount());
+
+ }
+
+ /**
+ * @magentoDataFixture Magento/SalesRule/_files/rule_free_shipping_by_product_weight.php
+ * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ */
+ public function testRuleByProductWeightWithoutFreeShipping()
+ {
+ $cartId = $this->prepareQuote(5);
+ $methods = $this->estimateShipping($cartId);
+
+ $this->assertTrue(count($methods) > 0);
+ $this->assertEquals('flatrate', $methods[0]->getMethodCode());
+ $this->assertEquals(25, $methods[0]->getAmount());
+
+ }
+
+ /**
+ * Estimate shipment for guest cart
+ *
+ * @param int $cartId
+ * @return \Magento\Quote\Api\Data\ShippingMethodInterface[]
+ */
+ private function estimateShipping($cartId)
+ {
+ $addressFactory = $this->objectManager->get(\Magento\Quote\Api\Data\AddressInterfaceFactory::class);
+ /** @var \Magento\Quote\Api\Data\AddressInterface $address */
+ $address = $addressFactory->create();
+ $address->setCountryId('US');
+ $address->setRegionId(2);
+
+ /** @var \Magento\Quote\Api\GuestShipmentEstimationInterface $estimation */
+ $estimation = $this->objectManager->get(\Magento\Quote\Api\GuestShipmentEstimationInterface::class);
+ return $estimation->estimateByExtendedAddress($cartId, $address);
+ }
+
+ /**
+ * Create guest quote with products
+ *
+ * @param int $itemQty
+ * @return int
+ */
+ private function prepareQuote($itemQty)
+ {
+ $cartId = $this->cartManagement->createEmptyCart();
+
+ /** @var \Magento\Quote\Api\Data\CartItemInterfaceFactory $cartItemFactory */
+ $cartItemFactory = $this->objectManager->get(\Magento\Quote\Api\Data\CartItemInterfaceFactory::class);
+
+ /** @var \Magento\Quote\Api\Data\CartItemInterface $cartItem */
+ $cartItem = $cartItemFactory->create();
+ $cartItem->setQuoteId($cartId);
+ $cartItem->setQty($itemQty);
+ $cartItem->setSku('simple');
+ $cartItem->setProductType(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE);
+
+ $this->itemRepository->save($cartItem);
+
+ return $cartId;
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/rule_free_shipping_by_product_weight.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/rule_free_shipping_by_product_weight.php
new file mode 100644
index 0000000000000000000000000000000000000000..d59f63d2f313601b06bafdac7287501980e20b37
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/rule_free_shipping_by_product_weight.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require 'cart_rule_free_shipping.php';
+$row =
+ [
+ 'name' => 'Free shipping if item weight <= 1',
+ 'conditions' => [
+ 1 =>
+ [
+ 'type' => \Magento\SalesRule\Model\Rule\Condition\Combine::class,
+ 'attribute' => null,
+ 'operator' => null,
+ 'value' => '1',
+ 'is_value_processed' => null,
+ 'aggregator' => 'all',
+ 'conditions' => [
+ [
+ 'type' => Magento\SalesRule\Model\Rule\Condition\Address::class,
+ 'attribute' => 'weight',
+ 'operator' => '<=',
+ 'value' => '1',
+ 'is_value_processed' => false,
+ ]
+ ]
+ ]
+
+ ],
+ 'actions' => [],
+ ];
+$salesRule->loadPost($row);
+$salesRule->save();
diff --git a/dev/tests/js/jasmine/spec_runner/index.js b/dev/tests/js/jasmine/spec_runner/index.js
index ce57b6c354cb98a4ab48e6043fc8648d8f9f040b..d8329bb35178fefc23ca9d68fc4047a432e98a31 100644
--- a/dev/tests/js/jasmine/spec_runner/index.js
+++ b/dev/tests/js/jasmine/spec_runner/index.js
@@ -13,38 +13,14 @@ function init(grunt, options) {
stripJsonComments = require('strip-json-comments'),
path = require('path'),
config,
- themes;
-
+ themes,
+ file;
+
config = grunt.file.read(__dirname + '/settings.json');
config = stripJsonComments(config);
config = JSON.parse(config);
- //themes = require(path.resolve(process.cwd(), config.themes));
- //TODO: MAGETWO-39843
- themes = {
- blank: {
- area: 'frontend',
- name: 'Magento/blank',
- locale: 'en_US',
- files: [
- 'css/styles-m',
- 'css/styles-l',
- 'css/email',
- 'css/email-inline'
- ],
- dsl: 'less'
- },
- backend: {
- area: 'adminhtml',
- name: 'Magento/backend',
- locale: 'en_US',
- files: [
- 'css/styles-old',
- 'css/styles'
- ],
- dsl: 'less'
- }
- }
+ themes = require(path.resolve(process.cwd(), config.themes));
if (options.theme) {
themes = _.pick(themes, options.theme);
@@ -54,6 +30,12 @@ function init(grunt, options) {
config.themes = themes;
+ file = grunt.option('file');
+
+ if (file) {
+ config.singleTest = file;
+ }
+
enableTasks(grunt, config);
}
diff --git a/dev/tests/js/jasmine/spec_runner/tasks/jasmine.js b/dev/tests/js/jasmine/spec_runner/tasks/jasmine.js
index ccd21fafe33b9220f3203bf4fa0697ad2abc2d2f..99f05198000ec2d3b400c4f8269435e40a7d3fe7 100644
--- a/dev/tests/js/jasmine/spec_runner/tasks/jasmine.js
+++ b/dev/tests/js/jasmine/spec_runner/tasks/jasmine.js
@@ -16,7 +16,6 @@ function init(config) {
root = config.root;
port = config.port;
files = config.files;
- host = _.template(config.host)({ port: port });
themes = config.themes;
_.each(themes, function (themeData, themeName) {
@@ -26,7 +25,13 @@ function init(config) {
_.extend(themeData, { root: root });
+ host = _.template(config.host)({ port: port++ });
render = renderTemplate.bind(null, themeData);
+
+ if (config.singleTest) {
+ files.specs = [config.singleTest];
+ }
+
specs = files.specs.map(render);
specs = expand(specs).map(cutJsExtension);
configs = files.requirejsConfigs.map(render);
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt
index 836a928dc5a72cf6a517dc1ae7f1bbc61e62a763..e4078a959c7a89284e508a884229f69d80e2e25a 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt
@@ -115,3 +115,4 @@ DoubleColon
\Magento\TestModuleMessageQueueConfiguration\AsyncHandler
\Magento\TestModuleMessageQueueConfiguration\SyncHandler
\Magento\TestModuleAsyncAmqp\Model\AsyncTestData
+\Magento\Mtf\Client\ElementInterface
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index bc49ab15a7d54151759f7e183fb36a8a7b6571c6..2ce1bf02bf3896da26a633c158b77697876c4d02 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -2155,7 +2155,6 @@ return [
['addOrderedQty', 'Magento\Reports\Model\ResourceModel\Product\Collection'],
['prepareForProductsInCarts', 'Magento\Reports\Model\ResourceModel\Quote\Collection'],
['getOrdersSubSelect', 'Magento\Reports\Model\ResourceModel\Quote\Collection'],
- ['isOrderIncrementIdUsed', 'Magento\Quote\Model\ResourceModel\Quote'],
['isStateProtected', 'Magento\Sales\Model\Order'],
['_getBundleOptions', 'Magento\Bundle\Block\Checkout\Cart\Item\Renderer'],
['_getSelectionFinalPrice', 'Magento\Bundle\Block\Checkout\Cart\Item\Renderer'],
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
index 167903f62c760ca8ce495efe0dc42c98546d161f..7b5100215200473f0610afaf27c922e4662cce8f 100755
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
@@ -53,6 +53,10 @@ define([
});
}
+ if (jQuery.isReady) {
+ tinyMCE.dom.Event.domLoaded = true;
+ }
+
tinyMCE.init(this.getSettings(mode));
},