diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
index b763774f917308529f724af8b7758887fe0fd5ba..e37fe022342ed5c194914133b9392ef559ff083a 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
@@ -76,6 +76,7 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
ImportAdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => '',
ImportAdvancedPricing::COL_TIER_PRICE_QTY => '',
ImportAdvancedPricing::COL_TIER_PRICE => '',
+ ImportAdvancedPricing::COL_TIER_PRICE_TYPE => ''
];
/**
@@ -279,6 +280,8 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
}
/**
+ * Correct export data.
+ *
* @param array $exportData
* @return array
* @SuppressWarnings(PHPMD.UnusedLocalVariable)
@@ -302,6 +305,12 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
: null
);
unset($exportRow[ImportAdvancedPricing::VALUE_ALL_GROUPS]);
+ } elseif ($keyTemplate === ImportAdvancedPricing::COL_TIER_PRICE) {
+ $exportRow[$keyTemplate] = $row[ImportAdvancedPricing::COL_TIER_PRICE_PERCENTAGE_VALUE]
+ ? $row[ImportAdvancedPricing::COL_TIER_PRICE_PERCENTAGE_VALUE]
+ : $row[ImportAdvancedPricing::COL_TIER_PRICE];
+ $exportRow[ImportAdvancedPricing::COL_TIER_PRICE_TYPE]
+ = $this->tierPriceTypeValue($row[ImportAdvancedPricing::COL_TIER_PRICE_PERCENTAGE_VALUE]);
} else {
$exportRow[$keyTemplate] = $row[$keyTemplate];
}
@@ -311,11 +320,25 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
$customExportData[$key] = $exportRow;
unset($exportRow);
}
+
return $customExportData;
}
/**
- * Get Tier and Group Pricing
+ * Check type for tier price.
+ *
+ * @param string $tierPricePercentage
+ * @return string
+ */
+ private function tierPriceTypeValue($tierPricePercentage)
+ {
+ return $tierPricePercentage
+ ? ImportAdvancedPricing::TIER_PRICE_TYPE_PERCENT
+ : ImportAdvancedPricing::TIER_PRICE_TYPE_FIXED;
+ }
+
+ /**
+ * Get tier prices.
*
* @param array $listSku
* @param string $table
@@ -336,6 +359,7 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
ImportAdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => 'ap.customer_group_id',
ImportAdvancedPricing::COL_TIER_PRICE_QTY => 'ap.qty',
ImportAdvancedPricing::COL_TIER_PRICE => 'ap.value',
+ ImportAdvancedPricing::COL_TIER_PRICE_PERCENTAGE_VALUE => 'ap.percentage_value',
];
if (isset($exportFilter) && !empty($exportFilter)) {
$price = $exportFilter['tier_price'];
@@ -371,6 +395,9 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
if (isset($price[1]) && !empty($price[1])) {
$select->where('ap.value <= ?', $price[1]);
}
+ if (isset($price[0]) && !empty($price[0]) || isset($price[1]) && !empty($price[1])) {
+ $select->orWhere('ap.percentage_value IS NOT NULL');
+ }
if (isset($updatedAtFrom) && !empty($updatedAtFrom)) {
$select->where('cpe.updated_at >= ?', $updatedAtFrom);
}
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
index d751fdc75882d7514e282ad95908ffa74c86e65c..e2275f767ee7ba74ff42528cc6fdb1aa94882c36 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
@@ -33,6 +33,14 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
const COL_TIER_PRICE = 'tier_price';
+ const COL_TIER_PRICE_PERCENTAGE_VALUE = 'percentage_value';
+
+ const COL_TIER_PRICE_TYPE = 'tier_price_value_type';
+
+ const TIER_PRICE_TYPE_FIXED = 'Fixed';
+
+ const TIER_PRICE_TYPE_PERCENT = 'Discount';
+
const TABLE_TIER_PRICE = 'catalog_product_entity_tier_price';
const DEFAULT_ALL_GROUPS_GROUPED_PRICE_VALUE = '0';
@@ -46,7 +54,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
const VALIDATOR_TEAR_PRICE = 'validator_tear_price';
/**
- * Validation failure message template definitions
+ * Validation failure message template definitions.
*
* @var array
*/
@@ -57,6 +65,8 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
ValidatorInterface::ERROR_INVALID_TIER_PRICE_QTY => 'Tier Price data price or quantity value is invalid',
ValidatorInterface::ERROR_INVALID_TIER_PRICE_SITE => 'Tier Price data website is invalid',
ValidatorInterface::ERROR_INVALID_TIER_PRICE_GROUP => 'Tier Price customer group is invalid',
+ ValidatorInterface::ERROR_INVALID_TIER_PRICE_TYPE => 'Value for \'tier_price_value_type\' ' .
+ 'attribute contains incorrect value, acceptable values are Fixed, Discount',
ValidatorInterface::ERROR_TIER_DATA_INCOMPLETE => 'Tier Price data is incomplete',
ValidatorInterface::ERROR_INVALID_ATTRIBUTE_DECIMAL =>
'Value for \'%s\' attribute contains incorrect value, acceptable values are in decimal format',
@@ -70,7 +80,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
protected $needColumnCheck = true;
/**
- * Valid column names
+ * Valid column names.
*
* @array
*/
@@ -80,6 +90,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
self::COL_TIER_PRICE_CUSTOMER_GROUP,
self::COL_TIER_PRICE_QTY,
self::COL_TIER_PRICE,
+ self::COL_TIER_PRICE_TYPE
];
/**
@@ -379,7 +390,10 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
$rowData[self::COL_TIER_PRICE_CUSTOMER_GROUP]
),
'qty' => $rowData[self::COL_TIER_PRICE_QTY],
- 'value' => $rowData[self::COL_TIER_PRICE],
+ 'value' => $rowData[self::COL_TIER_PRICE_TYPE] === self::TIER_PRICE_TYPE_FIXED
+ ? $rowData[self::COL_TIER_PRICE] : 0,
+ 'percentage_value' => $rowData[self::COL_TIER_PRICE_TYPE] === self::TIER_PRICE_TYPE_PERCENT
+ ? $rowData[self::COL_TIER_PRICE] : null,
'website_id' => $this->getWebsiteId($rowData[self::COL_TIER_PRICE_WEBSITE])
];
}
@@ -429,7 +443,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
}
}
if ($priceIn) {
- $this->_connection->insertOnDuplicate($tableName, $priceIn, ['value']);
+ $this->_connection->insertOnDuplicate($tableName, $priceIn, ['value', 'percentage_value']);
}
}
return $this;
@@ -542,19 +556,24 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
*/
protected function processCountExistingPrices($prices, $table)
{
+ $oldSkus = $this->retrieveOldSkus();
+ $existProductIds = array_intersect_key($oldSkus, $prices);
+ if (!count($existProductIds)) {
+ return $this;
+ }
+
$tableName = $this->_resourceFactory->create()->getTable($table);
$productEntityLinkField = $this->getProductEntityLinkField();
$existingPrices = $this->_connection->fetchAssoc(
$this->_connection->select()->from(
$tableName,
['value_id', $productEntityLinkField, 'all_groups', 'customer_group_id']
- )
+ )->where($productEntityLinkField . ' IN (?)', $existProductIds)
);
- $oldSkus = $this->retrieveOldSkus();
foreach ($existingPrices as $existingPrice) {
- foreach ($oldSkus as $sku => $productId) {
- if ($existingPrice[$productEntityLinkField] == $productId && isset($prices[$sku])) {
- $this->incrementCounterUpdated($prices[$sku], $existingPrice);
+ foreach ($prices as $sku => $skuPrices) {
+ if (isset($oldSkus[$sku]) && $existingPrice[$productEntityLinkField] == $oldSkus[$sku]) {
+ $this->incrementCounterUpdated($skuPrices, $existingPrice);
}
}
}
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php
index 5bc9bebf420768184c08ea3f2861e5cfcaaf2e21..53ee3013c625beabb7a6f42229a32a9eb7b02eee 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php
@@ -22,7 +22,8 @@ class TierPrice extends \Magento\CatalogImportExport\Model\Import\Product\Valida
AdvancedPricing::COL_TIER_PRICE_WEBSITE,
AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP,
AdvancedPricing::COL_TIER_PRICE_QTY,
- AdvancedPricing::COL_TIER_PRICE
+ AdvancedPricing::COL_TIER_PRICE,
+ AdvancedPricing::COL_TIER_PRICE_TYPE
];
/**
@@ -101,6 +102,7 @@ class TierPrice extends \Magento\CatalogImportExport\Model\Import\Product\Valida
|| !isset($value[AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP])
|| !isset($value[AdvancedPricing::COL_TIER_PRICE_QTY])
|| !isset($value[AdvancedPricing::COL_TIER_PRICE])
+ || !isset($value[AdvancedPricing::COL_TIER_PRICE_TYPE])
|| $this->hasEmptyColumns($value)
) {
$this->_addMessages([self::ERROR_TIER_DATA_INCOMPLETE]);
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPriceType.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPriceType.php
new file mode 100644
index 0000000000000000000000000000000000000000..29982459e0211991427aafa5eddecf88011b899d
--- /dev/null
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPriceType.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator;
+
+use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing;
+use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
+
+/**
+ * Class TierPriceType validates tier price type.
+ */
+class TierPriceType extends \Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator
+{
+ /**
+ * {@inheritdoc}
+ */
+ public function init($context)
+ {
+ return parent::init($context);
+ }
+
+ /**
+ * Validate tier price type.
+ *
+ * @param array $value
+ * @return bool
+ */
+ public function isValid($value)
+ {
+ $isValid = true;
+
+ if (isset($value[AdvancedPricing::COL_TIER_PRICE_TYPE])
+ && !empty($value[AdvancedPricing::COL_TIER_PRICE_TYPE])
+ && !in_array(
+ $value[AdvancedPricing::COL_TIER_PRICE_TYPE],
+ [AdvancedPricing::TIER_PRICE_TYPE_FIXED, AdvancedPricing::TIER_PRICE_TYPE_PERCENT]
+ )
+ ) {
+ $this->_addMessages([RowValidatorInterface::ERROR_INVALID_TIER_PRICE_TYPE]);
+ $isValid = false;
+ }
+
+ return $isValid;
+ }
+}
diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTypeTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTypeTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..6abdd2232fb44233882e140f61f8020aef145289
--- /dev/null
+++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTypeTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Import\AdvancedPricing\Validator;
+
+use \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing;
+
+/**
+ * Class TierPriceTypeTest.
+ */
+class TierPriceTypeTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var AdvancedPricing\Validator\TierPriceType
+ */
+ private $tierPriceType;
+
+ /**
+ * Set up.
+ *
+ * @return void
+ */
+ protected function setUp()
+ {
+ $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $this->tierPriceType = $objectManager->getObject(
+ AdvancedPricing\Validator\TierPriceType::class,
+ []
+ );
+ }
+
+ /**
+ * Test for isValid() method.
+ *
+ * @dataProvider isValidDataProvider
+ * @param array $value
+ * @param bool $expectedResult
+ */
+ public function testIsValid(array $value, $expectedResult)
+ {
+ $result = $this->tierPriceType->isValid($value);
+ $this->assertEquals($expectedResult, $result);
+ }
+
+ /**
+ * Data Provider for testIsValid().
+ *
+ * @return array
+ */
+ public function isValidDataProvider()
+ {
+ return [
+ [
+ [AdvancedPricing::COL_TIER_PRICE_TYPE => AdvancedPricing::TIER_PRICE_TYPE_FIXED],
+ true
+ ],
+ [
+ [AdvancedPricing::COL_TIER_PRICE_TYPE => AdvancedPricing::TIER_PRICE_TYPE_PERCENT],
+ true
+ ],
+ [
+ [],
+ true
+ ],
+ [
+ [AdvancedPricing::COL_TIER_PRICE_TYPE => null],
+ true
+ ],
+ [
+ [AdvancedPricing::COL_TIER_PRICE_TYPE => 'wrong type'],
+ false
+ ]
+ ];
+ }
+}
diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php
index a289e9970b4999ee82bde14fdb452ef0d78236df..1c80f5789c38108ae9f94030871602f5628086e1 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php
@@ -418,33 +418,123 @@ class AdvancedPricingTest extends \Magento\ImportExport\Test\Unit\Model\Import\A
$groupWebsiteId,
$expectedTierPrices
) {
- $this->advancedPricing
+ $skuProduct = 'product1';
+ $sku = $data[0][AdvancedPricing::COL_SKU];
+ $advancedPricing = $this->getAdvancedPricingMock(
+ [
+ 'retrieveOldSkus',
+ 'validateRow',
+ 'addRowError',
+ 'getCustomerGroupId',
+ 'getWebSiteId',
+ 'deleteProductTierPrices',
+ 'getBehavior',
+ 'saveAndReplaceAdvancedPrices',
+ 'processCountExistingPrices',
+ 'processCountNewPrices'
+ ]
+ );
+ $advancedPricing
->expects($this->any())
->method('getBehavior')
->willReturn(\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND);
$this->dataSourceModel->expects($this->at(0))->method('getNextBunch')->willReturn($data);
- $this->advancedPricing->expects($this->any())->method('validateRow')->willReturn(true);
+ $advancedPricing->expects($this->any())->method('validateRow')->willReturn(true);
- $this->advancedPricing->expects($this->any())->method('getCustomerGroupId')->willReturnMap(
+ $advancedPricing->expects($this->any())->method('getCustomerGroupId')->willReturnMap(
[
[$data[0][AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP], $tierCustomerGroupId],
]
);
- $this->advancedPricing->expects($this->any())->method('getWebSiteId')->willReturnMap(
+ $advancedPricing->expects($this->any())->method('getWebSiteId')->willReturnMap(
[
[$data[0][AdvancedPricing::COL_TIER_PRICE_WEBSITE], $tierWebsiteId],
]
);
- $this->advancedPricing->expects($this->any())->method('saveProductPrices')->will($this->returnSelf());
+ $oldSkus = [$sku => $skuProduct];
+ $expectedTierPrices[$sku][0][self::LINK_FIELD] = $skuProduct;
+ $advancedPricing->expects($this->once())->method('retrieveOldSkus')->willReturn($oldSkus);
+ $this->connection->expects($this->once())
+ ->method('insertOnDuplicate')
+ ->with(self::TABLE_NAME, $expectedTierPrices[$sku], ['value', 'percentage_value']);
- $this->advancedPricing->expects($this->any())->method('processCountExistingPrices')->willReturnSelf();
- $this->advancedPricing->expects($this->any())->method('processCountNewPrices')->willReturnSelf();
+ $advancedPricing->expects($this->any())->method('processCountExistingPrices')->willReturnSelf();
+ $advancedPricing->expects($this->any())->method('processCountNewPrices')->willReturnSelf();
- $result = $this->invokeMethod($this->advancedPricing, 'saveAndReplaceAdvancedPrices');
+ $result = $this->invokeMethod($advancedPricing, 'saveAndReplaceAdvancedPrices');
- $this->assertEquals($this->advancedPricing, $result);
+ $this->assertEquals($advancedPricing, $result);
+ }
+
+ /**
+ * Test method saveAndReplaceAdvancedPrices with append import behaviour.
+ */
+ public function testSaveAndReplaceAdvancedPricesAppendBehaviourDataAndCallsWithoutTierPrice()
+ {
+ $data = [
+ 0 => [
+ AdvancedPricing::COL_SKU => 'sku value',
+ AdvancedPricing::COL_TIER_PRICE_WEBSITE => null,
+ AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => 'tier price customer group value - not all groups',
+ AdvancedPricing::COL_TIER_PRICE_QTY => 'tier price qty value',
+ AdvancedPricing::COL_TIER_PRICE => 'tier price value',
+ AdvancedPricing::COL_TIER_PRICE_TYPE => AdvancedPricing::TIER_PRICE_TYPE_FIXED
+ ],
+ ];
+ $tierCustomerGroupId = 'tier customer group id value';
+ $tierWebsiteId = 'tier website id value';
+ $expectedTierPrices = [];
+
+ $skuProduct = 'product1';
+ $sku = $data[0][AdvancedPricing::COL_SKU];
+ $advancedPricing = $this->getAdvancedPricingMock(
+ [
+ 'retrieveOldSkus',
+ 'validateRow',
+ 'addRowError',
+ 'getCustomerGroupId',
+ 'getWebSiteId',
+ 'deleteProductTierPrices',
+ 'getBehavior',
+ 'saveAndReplaceAdvancedPrices',
+ 'processCountExistingPrices',
+ 'processCountNewPrices'
+ ]
+ );
+ $advancedPricing
+ ->expects($this->any())
+ ->method('getBehavior')
+ ->willReturn(\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND);
+ $this->dataSourceModel->expects($this->at(0))->method('getNextBunch')->willReturn($data);
+ $advancedPricing->expects($this->any())->method('validateRow')->willReturn(true);
+
+ $advancedPricing->expects($this->any())->method('getCustomerGroupId')->willReturnMap(
+ [
+ [$data[0][AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP], $tierCustomerGroupId],
+ ]
+ );
+
+ $advancedPricing->expects($this->any())->method('getWebSiteId')->willReturnMap(
+ [
+ [$data[0][AdvancedPricing::COL_TIER_PRICE_WEBSITE], $tierWebsiteId],
+ ]
+ );
+
+ $oldSkus = [$sku => $skuProduct];
+ $expectedTierPrices[$sku][0][self::LINK_FIELD] = $skuProduct;
+ $advancedPricing->expects($this->never())->method('retrieveOldSkus')->willReturn($oldSkus);
+ $this->connection->expects($this->never())
+ ->method('insertOnDuplicate')
+ ->with(self::TABLE_NAME, $expectedTierPrices[$sku], ['value', 'percentage_value']);
+
+ $advancedPricing->expects($this->any())->method('processCountExistingPrices')->willReturnSelf();
+ $advancedPricing->expects($this->any())->method('processCountNewPrices')->willReturnSelf();
+
+ $result = $this->invokeMethod($advancedPricing, 'saveAndReplaceAdvancedPrices');
+
+ $this->assertEquals($advancedPricing, $result);
}
/**
@@ -575,6 +665,7 @@ class AdvancedPricingTest extends \Magento\ImportExport\Test\Unit\Model\Import\A
AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => 'tier price customer group value - not all groups ',
AdvancedPricing::COL_TIER_PRICE_QTY => 'tier price qty value',
AdvancedPricing::COL_TIER_PRICE => 'tier price value',
+ AdvancedPricing::COL_TIER_PRICE_TYPE => AdvancedPricing::TIER_PRICE_TYPE_FIXED
],
],
'$tierCustomerGroupId' => 'tier customer group id value',
@@ -585,25 +676,25 @@ class AdvancedPricingTest extends \Magento\ImportExport\Test\Unit\Model\Import\A
'sku value' => [
[
'all_groups' => false,
- //$rowData[self::COL_TIER_PRICE_CUSTOMER_GROUP] == self::VALUE_ALL_GROUPS
'customer_group_id' => 'tier customer group id value',
- //$tierCustomerGroupId
'qty' => 'tier price qty value',
'value' => 'tier price value',
'website_id' => 'tier website id value',
+ 'percentage_value' => null
],
],
],
],
- [// tier customer group is equal to all group
+ [
'$data' => [
0 => [
AdvancedPricing::COL_SKU => 'sku value',
//tier
AdvancedPricing::COL_TIER_PRICE_WEBSITE => 'tier price website value',
- AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => AdvancedPricing::VALUE_ALL_GROUPS,
+ AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => 'tier price customer group value - not all groups ',
AdvancedPricing::COL_TIER_PRICE_QTY => 'tier price qty value',
AdvancedPricing::COL_TIER_PRICE => 'tier price value',
+ AdvancedPricing::COL_TIER_PRICE_TYPE => AdvancedPricing::TIER_PRICE_TYPE_PERCENT
],
],
'$tierCustomerGroupId' => 'tier customer group id value',
@@ -613,33 +704,44 @@ class AdvancedPricingTest extends \Magento\ImportExport\Test\Unit\Model\Import\A
'$expectedTierPrices' => [
'sku value' => [
[
- 'all_groups' => true,
- //$rowData[self::COL_TIER_PRICE_CUSTOMER_GROUP] == self::VALUE_ALL_GROUPS
+ 'all_groups' => false,
'customer_group_id' => 'tier customer group id value',
- //$tierCustomerGroupId
'qty' => 'tier price qty value',
- 'value' => 'tier price value',
+ 'value' => 0,
+ 'percentage_value' => 'tier price value',
'website_id' => 'tier website id value',
],
],
],
],
- [
+ [// tier customer group is equal to all group
'$data' => [
0 => [
AdvancedPricing::COL_SKU => 'sku value',
//tier
- AdvancedPricing::COL_TIER_PRICE_WEBSITE => null,
- AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => 'tier price customer group value - not all groups',
+ AdvancedPricing::COL_TIER_PRICE_WEBSITE => 'tier price website value',
+ AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => AdvancedPricing::VALUE_ALL_GROUPS,
AdvancedPricing::COL_TIER_PRICE_QTY => 'tier price qty value',
AdvancedPricing::COL_TIER_PRICE => 'tier price value',
+ AdvancedPricing::COL_TIER_PRICE_TYPE => AdvancedPricing::TIER_PRICE_TYPE_FIXED
],
],
'$tierCustomerGroupId' => 'tier customer group id value',
'$groupCustomerGroupId' => 'group customer group id value',
'$tierWebsiteId' => 'tier website id value',
'$groupWebsiteId' => 'group website id value',
- '$expectedTierPrices' => [],
+ '$expectedTierPrices' => [
+ 'sku value' => [
+ [
+ 'all_groups' => true,
+ 'customer_group_id' => 'tier customer group id value',
+ 'qty' => 'tier price qty value',
+ 'value' => 'tier price value',
+ 'website_id' => 'tier website id value',
+ 'percentage_value' => null
+ ],
+ ],
+ ],
],
[
'$data' => [
@@ -650,6 +752,7 @@ class AdvancedPricingTest extends \Magento\ImportExport\Test\Unit\Model\Import\A
AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => 'tier price customer group value - not all groups',
AdvancedPricing::COL_TIER_PRICE_QTY => 'tier price qty value',
AdvancedPricing::COL_TIER_PRICE => 'tier price value',
+ AdvancedPricing::COL_TIER_PRICE_TYPE => AdvancedPricing::TIER_PRICE_TYPE_FIXED
],
],
'$tierCustomerGroupId' => 'tier customer group id value',
@@ -660,12 +763,11 @@ class AdvancedPricingTest extends \Magento\ImportExport\Test\Unit\Model\Import\A
'sku value' => [
[
'all_groups' => false,
- //$rowData[self::COL_TIER_PRICE_CUSTOMER_GROUP] == self::VALUE_ALL_GROUPS
'customer_group_id' => 'tier customer group id value',
- //$tierCustomerGroupId
'qty' => 'tier price qty value',
'value' => 'tier price value',
'website_id' => 'tier website id value',
+ 'percentage_value' => null
],
]
],
@@ -746,7 +848,7 @@ class AdvancedPricingTest extends \Magento\ImportExport\Test\Unit\Model\Import\A
$this->connection->expects($this->exactly($callNum))
->method('insertOnDuplicate')
- ->with(self::TABLE_NAME, $priceIn, ['value']);
+ ->with(self::TABLE_NAME, $priceIn, ['value', 'percentage_value']);
$this->invokeMethod($this->advancedPricing, 'saveProductPrices', [$priceData, 'table']);
}
diff --git a/app/code/Magento/AdvancedPricingImportExport/etc/di.xml b/app/code/Magento/AdvancedPricingImportExport/etc/di.xml
index c3444069c14c0f3f226bad8cf61ef0d5fc092c17..711d4b8b399f5a8709a1fa0760b16c1aad60106f 100644
--- a/app/code/Magento/AdvancedPricingImportExport/etc/di.xml
+++ b/app/code/Magento/AdvancedPricingImportExport/etc/di.xml
@@ -14,6 +14,7 @@
<argument name="validators" xsi:type="array">
<item name="tierPrice" xsi:type="object">Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator\TierPrice</item>
<item name="website" xsi:type="object">Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator\Website</item>
+ <item name="tierPriceType" xsi:type="object">Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator\TierPriceType</item>
</argument>
</arguments>
</type>
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
index 075a1fdaf1fc118f42832fa438762715420a585a..2d5e0b3a270b71991a48e526aaa8248c9a60c87b 100644
--- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
@@ -296,7 +296,7 @@ define([
getShippingAddress: function () {
var address = quote.shippingAddress();
- if (address.postcode === null) {
+ if (_.isNull(address.postcode) || _.isUndefined(address.postcode)) {
return {};
}
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
index 30b0d6f2ac72cff0062ed5dec33dd8498c696200..9fb752be81a6cc9d755ba5b5036fe6bb46a0b05a 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
@@ -48,6 +48,11 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
*/
private $selectedOptions = [];
+ /**
+ * @var \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor
+ */
+ private $catalogRuleProcessor;
+
/**
* @param \Magento\Catalog\Block\Product\Context $context
* @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
@@ -77,6 +82,20 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
);
}
+ /**
+ * @deprecated
+ * @return \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor
+ */
+ private function getCatalogRuleProcessor()
+ {
+ if ($this->catalogRuleProcessor === null) {
+ $this->catalogRuleProcessor = \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(\Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor::class);
+ }
+
+ return $this->catalogRuleProcessor;
+ }
+
/**
* Returns the bundle product options
* Will return cached options data if the product options are already initialized
@@ -89,6 +108,7 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
{
if (!$this->options) {
$product = $this->getProduct();
+ /** @var \Magento\Bundle\Model\Product\Type $typeInstance */
$typeInstance = $product->getTypeInstance();
$typeInstance->setStoreFilter($product->getStoreId(), $product);
@@ -98,6 +118,8 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
$typeInstance->getOptionsIds($product),
$product
);
+ $this->getCatalogRuleProcessor()->addPriceData($selectionCollection);
+ $selectionCollection->addTierPriceData();
$this->options = $optionCollection->appendSelections(
$selectionCollection,
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index 9b8c6884cd367d56a06587d299055edd9db735e7..4cfdf27fd0e6ab560cf296be35bdb8c5ea8e651e 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -9,6 +9,7 @@
namespace Magento\Bundle\Model\Product;
use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\Pricing\PriceCurrencyInterface;
/**
@@ -42,6 +43,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
* Cache key for Selections Collection
*
* @var string
+ * @deprecated
*/
protected $_keySelectionsCollection = '_cache_instance_selections_collection';
@@ -449,30 +451,24 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
*/
public function getSelectionsCollection($optionIds, $product)
{
- $keyOptionIds = is_array($optionIds) ? implode('_', $optionIds) : '';
- $key = $this->_keySelectionsCollection . $keyOptionIds;
- if (!$product->hasData($key)) {
- $storeId = $product->getStoreId();
- $selectionsCollection = $this->_bundleCollection->create()
- ->addAttributeToSelect($this->_config->getProductAttributes())
- ->addAttributeToSelect('tax_class_id')//used for calculation item taxes in Bundle with Dynamic Price
- ->setFlag('product_children', true)
- ->setPositionOrder()
- ->addStoreFilter($this->getStoreFilter($product))
- ->setStoreId($storeId)
- ->addFilterByRequiredOptions()
- ->setOptionIdsFilter($optionIds);
-
- if (!$this->_catalogData->isPriceGlobal() && $storeId) {
- $websiteId = $this->_storeManager->getStore($storeId)
- ->getWebsiteId();
- $selectionsCollection->joinPrices($websiteId);
- }
-
- $product->setData($key, $selectionsCollection);
+ $storeId = $product->getStoreId();
+ $selectionsCollection = $this->_bundleCollection->create()
+ ->addAttributeToSelect($this->_config->getProductAttributes())
+ ->addAttributeToSelect('tax_class_id') //used for calculation item taxes in Bundle with Dynamic Price
+ ->setFlag('product_children', true)
+ ->setPositionOrder()
+ ->addStoreFilter($this->getStoreFilter($product))
+ ->setStoreId($storeId)
+ ->addFilterByRequiredOptions()
+ ->setOptionIdsFilter($optionIds);
+
+ if (!$this->_catalogData->isPriceGlobal() && $storeId) {
+ $websiteId = $this->_storeManager->getStore($storeId)
+ ->getWebsiteId();
+ $selectionsCollection->joinPrices($websiteId);
}
- return $product->getData($key);
+ return $selectionsCollection;
}
/**
@@ -543,42 +539,33 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
return $product->getData('all_items_salable');
}
- $optionCollection = $this->getOptionsCollection($product);
-
- if (!count($optionCollection->getItems())) {
- return false;
- }
+ $isSalable = false;
+ foreach ($this->getOptionsCollection($product)->getItems() as $option) {
+ $hasSalable = false;
- $requiredOptionIds = [];
+ $selectionsCollection = $this->_bundleCollection->create();
+ $selectionsCollection->addAttributeToSelect('status');
+ $selectionsCollection->addQuantityFilter();
+ $selectionsCollection->addFilterByRequiredOptions();
+ $selectionsCollection->setOptionIdsFilter([$option->getId()]);
- foreach ($optionCollection->getItems() as $option) {
- if ($option->getRequired()) {
- $requiredOptionIds[$option->getId()] = 0;
+ foreach ($selectionsCollection as $selection) {
+ if ($selection->isSalable()) {
+ $hasSalable = true;
+ break;
+ }
}
- }
- $selectionCollection = $this->getSelectionsCollection($optionCollection->getAllIds(), $product);
+ if ($hasSalable) {
+ $isSalable = true;
+ }
- if (!count($selectionCollection->getItems())) {
- return false;
- }
- $salableSelectionCount = 0;
-
- foreach ($selectionCollection as $selection) {
- /* @var $selection \Magento\Catalog\Model\Product */
- if ($selection->isSalable()) {
- $selectionEnoughQty = $this->_stockRegistry->getStockItem($selection->getId())
- ->getManageStock()
- ? $selection->getSelectionQty() <= $this->_stockState->getStockQty($selection->getId())
- : $selection->isInStock();
-
- if (!$selection->hasSelectionQty() || $selection->getSelectionCanChangeQty() || $selectionEnoughQty) {
- $requiredOptionIds[$selection->getOptionId()] = 1;
- $salableSelectionCount++;
- }
+ if (!$hasSalable && $option->getRequired()) {
+ $isSalable = false;
+ break;
}
}
- $isSalable = array_sum($requiredOptionIds) == count($requiredOptionIds) && $salableSelectionCount;
+
$product->setData('all_items_salable', $isSalable);
return $isSalable;
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php b/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
index 988402d8872442a0f29903ea3f74a4521115974c..e5c370fd5b688a6aa02827a596913a85b574c1a3 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
@@ -5,10 +5,12 @@
*/
namespace Magento\Bundle\Model\ResourceModel\Selection;
+use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\DB\Select;
+
/**
* Bundle Selections Resource Collection
- *
- * @author Magento Core Team <core@magentocommerce.com>
*/
class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
{
@@ -19,6 +21,23 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
*/
protected $_selectionTable;
+ /**
+ * @var DataObject
+ */
+ private $itemPrototype = null;
+
+ /**
+ * @var \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor
+ */
+ private $catalogRuleProcessor = null;
+
+ /**
+ * Is website scope prices joined to collection
+ *
+ * @var bool
+ */
+ private $websiteScopePriceJoined = false;
+
/**
* Initialize collection
*
@@ -90,6 +109,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
'price_scope' => 'price.website_id'
]
);
+ $this->websiteScopePriceJoined = true;
+
return $this;
}
@@ -131,4 +152,105 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
$this->getSelect()->order('selection.position asc')->order('selection.selection_id asc');
return $this;
}
+
+ /**
+ * Add filtering of product then havent enoght stock
+ *
+ * @return $this
+ */
+ public function addQuantityFilter()
+ {
+ $this->getSelect()
+ ->joinInner(
+ ['stock' => $this->getTable('cataloginventory_stock_status')],
+ 'selection.product_id = stock.product_id',
+ []
+ )
+ ->where(
+ '(selection.selection_can_change_qty or selection.selection_qty <= stock.qty) and stock.stock_status'
+ );
+ return $this;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getNewEmptyItem()
+ {
+ if (null === $this->itemPrototype) {
+ $this->itemPrototype = parent::getNewEmptyItem();
+ }
+ return clone $this->itemPrototype;
+ }
+
+ /**
+ * Add filter by price
+ *
+ * @param \Magento\Catalog\Model\Product $product
+ * @param bool $searchMin
+ * @param bool $useRegularPrice
+ *
+ * @return $this
+ */
+ public function addPriceFilter($product, $searchMin, $useRegularPrice = false)
+ {
+ if ($product->getPriceType() == \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC) {
+ $this->addPriceData();
+ if ($useRegularPrice) {
+ $minimalPriceExpression = 'price';
+ } else {
+ $this->getCatalogRuleProcessor()->addPriceData($this, 'selection.product_id');
+ $minimalPriceExpression = 'LEAST(minimal_price, IFNULL(catalog_rule_price, minimal_price))';
+ }
+ $orderByValue = new \Zend_Db_Expr(
+ '(' .
+ $minimalPriceExpression .
+ ' * selection.selection_qty' .
+ ')'
+ );
+ } else {
+ $connection = $this->getConnection();
+ $priceType = $connection->getIfNullSql(
+ 'price.selection_price_type',
+ 'selection.selection_price_type'
+ );
+ $priceValue = $connection->getIfNullSql(
+ 'price.selection_price_value',
+ 'selection.selection_price_value'
+ );
+ if (!$this->websiteScopePriceJoined) {
+ $websiteId = $this->_storeManager->getStore()->getWebsiteId();
+ $this->getSelect()->joinLeft(
+ ['price' => $this->getTable('catalog_product_bundle_selection_price')],
+ 'selection.selection_id = price.selection_id AND price.website_id = ' . (int)$websiteId,
+ []
+ );
+ }
+ $price = $connection->getCheckSql(
+ $priceType . ' = 1',
+ (float) $product->getPrice() . ' * '. $priceValue . ' / 100',
+ $priceValue
+ );
+ $orderByValue = new \Zend_Db_Expr('('. $price. ' * '. 'selection.selection_qty)');
+ }
+
+ $this->getSelect()->reset(Select::ORDER);
+ $this->getSelect()->order($orderByValue . ($searchMin ? Select::SQL_ASC : Select::SQL_DESC));
+ $this->getSelect()->limit(1);
+ return $this;
+ }
+
+ /**
+ * @return \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor
+ * @deprecated
+ */
+ private function getCatalogRuleProcessor()
+ {
+ if (null === $this->catalogRuleProcessor) {
+ $this->catalogRuleProcessor = \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(\Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor::class);
+ }
+
+ return $this->catalogRuleProcessor;
+ }
}
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
index ae605a842d06f918015ba98c887df8932c5c11d8..cba123c856d11b0e618465f1ab6d5b0d3bf2d2b8 100644
--- a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
+++ b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
@@ -7,7 +7,6 @@
namespace Magento\Bundle\Pricing\Adjustment;
use Magento\Bundle\Model\Product\Price;
-use Magento\Bundle\Pricing\Price\BundleOptionPrice;
use Magento\Bundle\Pricing\Price\BundleSelectionFactory;
use Magento\Catalog\Model\Product;
use Magento\Framework\Pricing\Adjustment\Calculator as CalculatorBase;
@@ -51,25 +50,38 @@ class Calculator implements BundleCalculatorInterface
*/
protected $priceCurrency;
+ /**
+ * @var \Magento\Framework\Pricing\Amount\AmountInterface[]
+ */
+ private $optionAmount = [];
+
+ /**
+ * @var SelectionPriceListProviderInterface
+ */
+ private $selectionPriceListProvider;
+
/**
* @param CalculatorBase $calculator
* @param AmountFactory $amountFactory
* @param BundleSelectionFactory $bundleSelectionFactory
* @param TaxHelper $taxHelper
* @param PriceCurrencyInterface $priceCurrency
+ * @param SelectionPriceListProviderInterface|null $selectionPriceListProvider
*/
public function __construct(
CalculatorBase $calculator,
AmountFactory $amountFactory,
BundleSelectionFactory $bundleSelectionFactory,
TaxHelper $taxHelper,
- PriceCurrencyInterface $priceCurrency
+ PriceCurrencyInterface $priceCurrency,
+ SelectionPriceListProviderInterface $selectionPriceListProvider = null
) {
$this->calculator = $calculator;
$this->amountFactory = $amountFactory;
$this->selectionFactory = $bundleSelectionFactory;
$this->taxHelper = $taxHelper;
$this->priceCurrency = $priceCurrency;
+ $this->selectionPriceListProvider = $selectionPriceListProvider;
}
/**
@@ -143,12 +155,17 @@ class Calculator implements BundleCalculatorInterface
$baseAmount = 0.,
$useRegularPrice = false
) {
- return $this->calculateBundleAmount(
- $baseAmount,
- $saleableItem,
- $this->getSelectionAmounts($saleableItem, $searchMin, $useRegularPrice),
- $exclude
- );
+ $cacheKey = implode('-', [$saleableItem->getId(), $exclude, $searchMin, $baseAmount, $useRegularPrice]);
+ if (!isset($this->optionAmount[$cacheKey])) {
+ $this->optionAmount[$cacheKey] = $this->calculateBundleAmount(
+ $baseAmount,
+ $saleableItem,
+ $this->getSelectionAmounts($saleableItem, $searchMin, $useRegularPrice),
+ $exclude
+ );
+ }
+
+ return $this->optionAmount[$cacheKey];
}
/**
@@ -174,42 +191,24 @@ class Calculator implements BundleCalculatorInterface
* @param bool $searchMin
* @param bool $useRegularPrice
* @return array
- * @SuppressWarnings(PHPMD.CyclomaticComplexity)
- * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function getSelectionAmounts(Product $bundleProduct, $searchMin, $useRegularPrice = false)
{
- // Flag shows - is it necessary to find minimal option amount in case if all options are not required
- $shouldFindMinOption = false;
- if ($searchMin
- && $bundleProduct->getPriceType() == Price::PRICE_TYPE_DYNAMIC
- && !$this->hasRequiredOption($bundleProduct)
- ) {
- $shouldFindMinOption = true;
- }
- $canSkipRequiredOptions = $searchMin && !$shouldFindMinOption;
+ return $this->getSelectionPriceListProvider()->getPriceList($bundleProduct, $searchMin, $useRegularPrice);
+ }
- $currentPrice = false;
- $priceList = [];
- foreach ($this->getBundleOptions($bundleProduct) as $option) {
- if ($this->canSkipOption($option, $canSkipRequiredOptions)) {
- continue;
- }
- $selectionPriceList = $this->createSelectionPriceList($option, $bundleProduct, $useRegularPrice);
- $selectionPriceList = $this->processOptions($option, $selectionPriceList, $searchMin);
-
- $lastSelectionPrice = end($selectionPriceList);
- $lastValue = $lastSelectionPrice->getAmount()->getValue() * $lastSelectionPrice->getQuantity();
- if ($shouldFindMinOption
- && (!$currentPrice ||
- $lastValue < ($currentPrice->getAmount()->getValue() * $currentPrice->getQuantity()))
- ) {
- $currentPrice = end($selectionPriceList);
- } elseif (!$shouldFindMinOption) {
- $priceList = array_merge($priceList, $selectionPriceList);
- }
+ /**
+ * @return SelectionPriceListProviderInterface
+ * @deprecated
+ */
+ private function getSelectionPriceListProvider()
+ {
+ if (null === $this->selectionPriceListProvider) {
+ $this->selectionPriceListProvider = \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(SelectionPriceListProviderInterface::class);
}
- return $shouldFindMinOption ? [$currentPrice] : $priceList;
+
+ return $this->selectionPriceListProvider;
}
/**
@@ -218,6 +217,7 @@ class Calculator implements BundleCalculatorInterface
* @param \Magento\Bundle\Model\Option $option
* @param bool $canSkipRequiredOption
* @return bool
+ * @deprecated
*/
protected function canSkipOption($option, $canSkipRequiredOption)
{
@@ -229,6 +229,7 @@ class Calculator implements BundleCalculatorInterface
*
* @param Product $bundleProduct
* @return bool
+ * @deprecated
*/
protected function hasRequiredOption($bundleProduct)
{
@@ -246,11 +247,14 @@ class Calculator implements BundleCalculatorInterface
*
* @param Product $saleableItem
* @return \Magento\Bundle\Model\ResourceModel\Option\Collection
+ * @deprecated
*/
protected function getBundleOptions(Product $saleableItem)
{
- /** @var BundleOptionPrice $bundlePrice */
- $bundlePrice = $saleableItem->getPriceInfo()->getPrice(BundleOptionPrice::PRICE_CODE);
+ /** @var \Magento\Bundle\Pricing\Price\BundleOptionPrice $bundlePrice */
+ $bundlePrice = $saleableItem->getPriceInfo()->getPrice(
+ \Magento\Bundle\Pricing\Price\BundleOptionPrice::PRICE_CODE
+ );
return $bundlePrice->getOptions();
}
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php b/app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php
new file mode 100644
index 0000000000000000000000000000000000000000..4c27016f3a107b93a75f7b8af8fe4a2bd37de256
--- /dev/null
+++ b/app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Pricing\Adjustment;
+
+use Magento\Bundle\Model\Option;
+use Magento\Bundle\Pricing\Price\BundleSelectionFactory;
+use Magento\Catalog\Model\Product;
+use Magento\Bundle\Model\Product\Price;
+
+/**
+ * Provide lightweight implementation which uses price index
+ */
+class DefaultSelectionPriceListProvider implements SelectionPriceListProviderInterface
+{
+ /**
+ * @var BundleSelectionFactory
+ */
+ private $selectionFactory;
+
+ /**
+ * @var \Magento\Bundle\Pricing\Price\BundleSelectionPrice[]
+ */
+ private $priceList;
+
+ /**
+ * @param BundleSelectionFactory $bundleSelectionFactory
+ */
+ public function __construct(BundleSelectionFactory $bundleSelectionFactory)
+ {
+ $this->selectionFactory = $bundleSelectionFactory;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getPriceList(Product $bundleProduct, $searchMin, $useRegularPrice)
+ {
+ $shouldFindMinOption = $this->isShouldFindMinOption($bundleProduct, $searchMin);
+ $canSkipRequiredOptions = $searchMin && !$shouldFindMinOption;
+
+ /** @var \Magento\Bundle\Model\Product\Type $typeInstance */
+ $typeInstance = $bundleProduct->getTypeInstance();
+ $this->priceList = [];
+
+ foreach ($this->getBundleOptions($bundleProduct) as $option) {
+ /** @var Option $option */
+ if ($this->canSkipOption($option, $canSkipRequiredOptions)) {
+ continue;
+ }
+
+ $selectionsCollection = $typeInstance->getSelectionsCollection(
+ [(int)$option->getOptionId()],
+ $bundleProduct
+ );
+ $selectionsCollection->removeAttributeToSelect();
+ $selectionsCollection->addQuantityFilter();
+
+ if (!$useRegularPrice) {
+ $selectionsCollection->addAttributeToSelect('special_price');
+ $selectionsCollection->addAttributeToSelect('special_price_from');
+ $selectionsCollection->addAttributeToSelect('special_price_to');
+ $selectionsCollection->addAttributeToSelect('tax_class_id');
+ }
+
+ if (!$searchMin && $option->isMultiSelection()) {
+ $this->addMaximumMultiSelectionPriceList($bundleProduct, $selectionsCollection, $useRegularPrice);
+ } else {
+ $this->addMiniMaxPriceList($bundleProduct, $selectionsCollection, $searchMin, $useRegularPrice);
+ }
+ }
+
+ if ($shouldFindMinOption) {
+ $this->processMinPriceForNonRequiredOptions();
+ }
+
+ return $this->priceList;
+ }
+
+ /**
+ * Flag shows - is it necessary to find minimal option amount in case if all options are not required
+ *
+ * @param Product $bundleProduct
+ * @param bool $searchMin
+ * @return bool
+ */
+ private function isShouldFindMinOption(Product $bundleProduct, $searchMin)
+ {
+ $shouldFindMinOption = false;
+ if ($searchMin
+ && $bundleProduct->getPriceType() == Price::PRICE_TYPE_DYNAMIC
+ && !$this->hasRequiredOption($bundleProduct)
+ ) {
+ $shouldFindMinOption = true;
+ }
+
+ return $shouldFindMinOption;
+ }
+
+ /**
+ * Add minimum or maximum price for option
+ *
+ * @param Product $bundleProduct
+ * @param \Magento\Bundle\Model\ResourceModel\Selection\Collection $selectionsCollection
+ * @param bool $searchMin
+ * @param bool $useRegularPrice
+ * @return void
+ */
+ private function addMiniMaxPriceList(Product $bundleProduct, $selectionsCollection, $searchMin, $useRegularPrice)
+ {
+ $selectionsCollection->addPriceFilter($bundleProduct, $searchMin, $useRegularPrice);
+ $selectionsCollection->setPage(0, 1);
+
+ $selection = $selectionsCollection->getFirstItem();
+
+ if (!$selection->isEmpty()) {
+ $this->priceList[] = $this->selectionFactory->create(
+ $bundleProduct,
+ $selection,
+ $selection->getSelectionQty(),
+ [
+ 'useRegularPrice' => $useRegularPrice,
+ ]
+ );
+ }
+ }
+
+ /**
+ * Add maximum price for multi selection option
+ *
+ * @param Product $bundleProduct
+ * @param \Magento\Bundle\Model\ResourceModel\Selection\Collection $selectionsCollection
+ * @param bool $useRegularPrice
+ * @return void
+ */
+ private function addMaximumMultiSelectionPriceList(Product $bundleProduct, $selectionsCollection, $useRegularPrice)
+ {
+ $selectionsCollection->addPriceData();
+
+ foreach ($selectionsCollection as $selection) {
+ $this->priceList[] = $this->selectionFactory->create(
+ $bundleProduct,
+ $selection,
+ $selection->getSelectionQty(),
+ [
+ 'useRegularPrice' => $useRegularPrice,
+ ]
+ );
+ }
+ }
+
+ /**
+ * @return void
+ */
+ private function processMinPriceForNonRequiredOptions()
+ {
+ $minPrice = null;
+ $priceSelection = null;
+ foreach ($this->priceList as $price) {
+ $minPriceTmp = $price->getAmount()->getValue() * $price->getQuantity();
+ if (!$minPrice || $minPriceTmp < $minPrice) {
+ $minPrice = $minPriceTmp;
+ $priceSelection = $price;
+ }
+ }
+ $this->priceList = $priceSelection ? [$priceSelection] : [];
+ }
+
+ /**
+ * Check this option if it should be skipped
+ *
+ * @param Option $option
+ * @param bool $canSkipRequiredOption
+ * @return bool
+ */
+ private function canSkipOption($option, $canSkipRequiredOption)
+ {
+ return $canSkipRequiredOption && !$option->getRequired();
+ }
+
+ /**
+ * Check the bundle product for availability of required options
+ *
+ * @param Product $bundleProduct
+ * @return bool
+ */
+ private function hasRequiredOption($bundleProduct)
+ {
+ $collection = clone $this->getBundleOptions($bundleProduct);
+ $collection->clear();
+
+ return $collection->addFilter(Option::KEY_REQUIRED, 1)->getSize() > 0;
+ }
+
+ /**
+ * Get bundle options
+ *
+ * @param Product $saleableItem
+ * @return \Magento\Bundle\Model\ResourceModel\Option\Collection
+ */
+ private function getBundleOptions(Product $saleableItem)
+ {
+ return $saleableItem->getTypeInstance()->getOptionsCollection($saleableItem);
+ }
+}
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/SelectionPriceListProviderInterface.php b/app/code/Magento/Bundle/Pricing/Adjustment/SelectionPriceListProviderInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..4c37fc198fb116f69110e0c0477284f82c9ad967
--- /dev/null
+++ b/app/code/Magento/Bundle/Pricing/Adjustment/SelectionPriceListProviderInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Pricing\Adjustment;
+
+use Magento\Catalog\Model\Product;
+
+/**
+ * Provide list of bundle selection prices
+ */
+interface SelectionPriceListProviderInterface
+{
+ /**
+ * @param Product $bundleProduct
+ * @param boolean $searchMin
+ * @param boolean $useRegularPrice
+ * @return \Magento\Bundle\Pricing\Price\BundleSelectionPrice[]
+ */
+ public function getPriceList(Product $bundleProduct, $searchMin, $useRegularPrice);
+}
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php
index 6a7a2329f37991f67d291227c0bab5839e00988b..051a89943c8552513f263b665d5aaf4867691ee6 100644
--- a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php
@@ -42,7 +42,6 @@ class BundleSelectionFactory
* @param Product $selection
* @param float $quantity
* @param array $arguments
- * @throws \InvalidArgumentException
* @return BundleSelectionPrice
*/
public function create(
@@ -54,12 +53,7 @@ class BundleSelectionFactory
$arguments['bundleProduct'] = $bundleProduct;
$arguments['saleableItem'] = $selection;
$arguments['quantity'] = $quantity ? floatval($quantity) : 1.;
- $selectionPrice = $this->objectManager->create(self::SELECTION_CLASS_DEFAULT, $arguments);
- if (!$selectionPrice instanceof BundleSelectionPrice) {
- throw new \InvalidArgumentException(
- get_class($selectionPrice) . ' doesn\'t extend BundleSelectionPrice'
- );
- }
- return $selectionPrice;
+
+ return $this->objectManager->create(self::SELECTION_CLASS_DEFAULT, $arguments);
}
}
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
index 5222e52c1145d6e7f7282d32899937f3fdd1eab4..d213464336af7d3fe2e04339afbafac1a6707a51 100644
--- a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
@@ -100,6 +100,11 @@ class BundleSelectionPrice extends AbstractPrice
if (null !== $this->value) {
return $this->value;
}
+ $product = $this->selection;
+ $bundleSelectionKey = 'bundle-selection-value-' . $product->getSelectionId();
+ if ($product->hasData($bundleSelectionKey)) {
+ return $product->getData($bundleSelectionKey);
+ }
$priceCode = $this->useRegularPrice ? BundleRegularPrice::PRICE_CODE : FinalPrice::PRICE_CODE;
if ($this->bundleProduct->getPriceType() == Price::PRICE_TYPE_DYNAMIC) {
@@ -131,7 +136,7 @@ class BundleSelectionPrice extends AbstractPrice
$value = $this->discountCalculator->calculateDiscount($this->bundleProduct, $value);
}
$this->value = $this->priceCurrency->round($value);
-
+ $product->setData($bundleSelectionKey, $this->value);
return $this->value;
}
@@ -142,18 +147,25 @@ class BundleSelectionPrice extends AbstractPrice
*/
public function getAmount()
{
- if (!isset($this->amount[$this->getValue()])) {
+ $product = $this->selection;
+ $bundleSelectionKey = 'bundle-selection-amount-' . $product->getSelectionId();
+ if ($product->hasData($bundleSelectionKey)) {
+ return $product->getData($bundleSelectionKey);
+ }
+ $value = $this->getValue();
+ if (!isset($this->amount[$value])) {
$exclude = null;
if ($this->getProduct()->getTypeId() == \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
$exclude = $this->excludeAdjustment;
}
- $this->amount[$this->getValue()] = $this->calculator->getAmount(
- $this->getValue(),
+ $this->amount[$value] = $this->calculator->getAmount(
+ $value,
$this->getProduct(),
$exclude
);
+ $product->setData($bundleSelectionKey, $this->amount[$value]);
}
- return $this->amount[$this->getValue()];
+ return $this->amount[$value];
}
/**
diff --git a/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php b/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php
index f11fc30f5b28f90ec7f1a2c13a9b40b714f7cebe..a0cad837e86573838456656d8b8e6e12335bccdd 100644
--- a/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php
@@ -3,26 +3,28 @@
* Copyright © 2016 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-
-// @codingStandardsIgnoreFile
-
namespace Magento\Bundle\Test\Unit\Block\Catalog\Product\View\Type;
use Magento\Bundle\Block\Catalog\Product\View\Type\Bundle as BundleBlock;
-use Magento\Framework\DataObject as MagentoObject;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class BundleTest extends \PHPUnit_Framework_TestCase
{
- /** @var \Magento\Bundle\Model\Product\PriceFactory|\PHPUnit_Framework_MockObject_MockObject */
+ /**
+ * @var \Magento\Bundle\Model\Product\PriceFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
private $bundleProductPriceFactory;
- /** @var \Magento\Framework\Json\Encoder|\PHPUnit_Framework_MockObject_MockObject */
+ /**
+ * @var \Magento\Framework\Json\Encoder|\PHPUnit_Framework_MockObject_MockObject
+ */
private $jsonEncoder;
- /** @var \Magento\Catalog\Helper\Product|\PHPUnit_Framework_MockObject_MockObject */
+ /**
+ * @var \Magento\Catalog\Helper\Product|\PHPUnit_Framework_MockObject_MockObject
+ */
private $catalogProduct;
/**
@@ -30,7 +32,9 @@ class BundleTest extends \PHPUnit_Framework_TestCase
*/
private $eventManager;
- /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject */
+ /**
+ * @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject
+ */
private $product;
/**
@@ -86,6 +90,15 @@ class BundleTest extends \PHPUnit_Framework_TestCase
'catalogProduct' => $this->catalogProduct
]
);
+
+ $ruleProcessor = $this->getMockBuilder(
+ \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor::class
+ )->disableOriginalConstructor()->getMock();
+ $objectHelper->setBackwardCompatibleProperty(
+ $this->bundleBlock,
+ 'catalogRuleProcessor',
+ $ruleProcessor
+ );
}
public function testGetOptionHtmlNoRenderer()
@@ -138,7 +151,7 @@ class BundleTest extends \PHPUnit_Framework_TestCase
$options = [];
$finalPriceMock = $this->getPriceMock(
[
- 'getPriceWithoutOption' => new MagentoObject(
+ 'getPriceWithoutOption' => new \Magento\Framework\DataObject(
[
'value' => 100,
'base_amount' => 100,
@@ -148,7 +161,7 @@ class BundleTest extends \PHPUnit_Framework_TestCase
);
$regularPriceMock = $this->getPriceMock(
[
- 'getAmount' => new MagentoObject(
+ 'getAmount' => new \Magento\Framework\DataObject(
[
'value' => 110,
'base_amount' => 110,
@@ -183,7 +196,9 @@ class BundleTest extends \PHPUnit_Framework_TestCase
'Selection 1',
23,
[
- ['price' => new MagentoObject(['base_amount' => $baseAmount, 'value' => $basePriceValue])]
+ ['price' => new \Magento\Framework\DataObject(
+ ['base_amount' => $baseAmount, 'value' => $basePriceValue]
+ )]
],
true,
true
@@ -211,7 +226,7 @@ class BundleTest extends \PHPUnit_Framework_TestCase
];
$finalPriceMock = $this->getPriceMock(
[
- 'getPriceWithoutOption' => new MagentoObject(
+ 'getPriceWithoutOption' => new \Magento\Framework\DataObject(
[
'value' => 100,
'base_amount' => 100,
@@ -221,7 +236,7 @@ class BundleTest extends \PHPUnit_Framework_TestCase
);
$regularPriceMock = $this->getPriceMock(
[
- 'getAmount' => new MagentoObject(
+ 'getAmount' => new \Magento\Framework\DataObject(
[
'value' => 110,
'base_amount' => 110,
@@ -269,7 +284,7 @@ class BundleTest extends \PHPUnit_Framework_TestCase
* @param array $options
* @param \Magento\Framework\Pricing\PriceInfo\Base|\PHPUnit_Framework_MockObject_MockObject $priceInfo
* @param string $priceType
- * @return BundleBlock
+ * @return void
*/
private function updateBundleBlock($options, $priceInfo, $priceType)
{
@@ -281,6 +296,11 @@ class BundleTest extends \PHPUnit_Framework_TestCase
->method('appendSelections')
->willReturn($options);
+ $selectionCollection = $this->getMockBuilder(\Magento\Bundle\Model\ResourceModel\Selection\Collection::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $selectionCollection->expects($this->once())->method('addTierPriceData');
+
$typeInstance = $this->getMockBuilder(\Magento\Bundle\Model\Product\Type::class)
->disableOriginalConstructor()
->getMock();
@@ -290,6 +310,9 @@ class BundleTest extends \PHPUnit_Framework_TestCase
$typeInstance->expects($this->any())
->method('getStoreFilter')
->willReturn(true);
+ $typeInstance->expects($this->once())
+ ->method('getSelectionsCollection')
+ ->willReturn($selectionCollection);
$this->product->expects($this->any())
->method('getTypeInstance')
@@ -368,7 +391,7 @@ class BundleTest extends \PHPUnit_Framework_TestCase
->with($selectionAmount['item'])
->will(
$this->returnValue(
- new MagentoObject(
+ new \Magento\Framework\DataObject(
[
'value' => $selectionAmount['value'],
'base_amount' => $selectionAmount['base_amount'],
@@ -486,8 +509,8 @@ class BundleTest extends \PHPUnit_Framework_TestCase
->willReturn($optionCollection);
$typeInstance->expects($this->any())->method('getStoreFilter')->willReturn(true);
$typeInstance->expects($this->any())->method('getOptionsCollection')->willReturn($optionCollection);
- $typeInstance->expects($this->any())->method('getOptionsIds')->willReturn([1,2]);
- $typeInstance->expects($this->once())->method('getSelectionsCollection')->with([1,2], $this->product)
+ $typeInstance->expects($this->any())->method('getOptionsIds')->willReturn([1, 2]);
+ $typeInstance->expects($this->once())->method('getSelectionsCollection')->with([1, 2], $this->product)
->willReturn($selectionConnection);
$this->product->expects($this->any())
->method('getTypeInstance')->willReturn($typeInstance);
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
index ed2c8e6c113d8b6d3d9e16a85c68ede526e3e8d8..2be68359909ef547a8f4b03a5d807aebfe509ed4 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
@@ -115,6 +115,12 @@ class TypeTest extends \PHPUnit_Framework_TestCase
->setMethods(['create'])
->disableOriginalConstructor()
->getMock();
+
+ $this->catalogRuleProcessor = $this->getMockBuilder(
+ \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor::class
+ )
+ ->disableOriginalConstructor()
+ ->getMock();
$objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
$this->model = $objectHelper->getObject(
\Magento\Bundle\Model\Product\Type::class,
@@ -128,7 +134,8 @@ class TypeTest extends \PHPUnit_Framework_TestCase
'stockRegistry' => $this->stockRegistry,
'stockState' => $this->stockState,
'catalogProduct' => $this->catalogProduct,
- 'priceCurrency' => $this->priceCurrency
+ 'priceCurrency' => $this->priceCurrency,
+
]
);
}
@@ -201,20 +208,6 @@ class TypeTest extends \PHPUnit_Framework_TestCase
$product->expects($this->any())
->method('getTypeInstance')
->willReturn($productType);
- $product->expects($this->any())
- ->method('getData')
- ->willReturnCallback(
- function ($key) use ($optionCollection, $selectionCollection) {
- $resultValue = null;
- switch ($key) {
- case '_cache_instance_options_collection':
- $resultValue = $optionCollection;
- break;
- }
-
- return $resultValue;
- }
- );
$optionCollection->expects($this->any())
->method('appendSelections')
->willReturn([$option]);
@@ -2087,10 +2080,7 @@ class TypeTest extends \PHPUnit_Framework_TestCase
*/
public function testIsSalableWithoutOptions()
{
- $optionCollectionMock = $this->getMockBuilder(\Magento\Bundle\Model\ResourceModel\Option\Collection::class)
- ->disableOriginalConstructor()
- ->getMock();
-
+ $optionCollectionMock = $this->getOptionCollectionMock([]);
$product = new \Magento\Framework\DataObject(
[
'is_salable' => true,
@@ -2110,19 +2100,6 @@ class TypeTest extends \PHPUnit_Framework_TestCase
$option1 = $this->getRequiredOptionMock(10, 10);
$option2 = $this->getRequiredOptionMock(20, 10);
- $this->stockRegistry->method('getStockItem')
- ->willReturn($this->getStockItem(true));
- $this->stockState
- ->expects($this->at(0))
- ->method('getStockQty')
- ->with(10)
- ->willReturn(10);
- $this->stockState
- ->expects($this->at(1))
- ->method('getStockQty')
- ->with(20)
- ->willReturn(10);
-
$option3 = $this->getMockBuilder(\Magento\Bundle\Model\Option::class)
->setMethods(['getRequired', 'getOptionId', 'getId'])
->disableOriginalConstructor()
@@ -2136,13 +2113,15 @@ class TypeTest extends \PHPUnit_Framework_TestCase
$optionCollectionMock = $this->getOptionCollectionMock([$option1, $option2, $option3]);
$selectionCollectionMock = $this->getSelectionCollectionMock([$option1, $option2]);
+ $this->bundleCollection->expects($this->atLeastOnce())
+ ->method('create')
+ ->will($this->returnValue($selectionCollectionMock));
$product = new \Magento\Framework\DataObject(
[
'is_salable' => true,
'_cache_instance_options_collection' => $optionCollectionMock,
'status' => \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED,
- '_cache_instance_selections_collection10_20_30' => $selectionCollectionMock
]
);
@@ -2174,12 +2153,15 @@ class TypeTest extends \PHPUnit_Framework_TestCase
$optionCollectionMock = $this->getOptionCollectionMock([$option]);
$selectionCollectionMock = $this->getSelectionCollectionMock([]);
+ $this->bundleCollection->expects($this->once())
+ ->method('create')
+ ->will($this->returnValue($selectionCollectionMock));
+
$product = new \Magento\Framework\DataObject(
[
'is_salable' => true,
'_cache_instance_options_collection' => $optionCollectionMock,
'status' => \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED,
- '_cache_instance_selections_collection1' => $selectionCollectionMock
]
);
@@ -2189,7 +2171,7 @@ class TypeTest extends \PHPUnit_Framework_TestCase
/**
* @return void
*/
- public function testIsSalableWithRequiredOptionsOutOfStock()
+ public function nottestIsSalableWithRequiredOptionsOutOfStock()
{
$option1 = $this->getRequiredOptionMock(10, 10);
$option1
@@ -2218,58 +2200,21 @@ class TypeTest extends \PHPUnit_Framework_TestCase
$optionCollectionMock = $this->getOptionCollectionMock([$option1, $option2]);
$selectionCollectionMock = $this->getSelectionCollectionMock([$option1, $option2]);
+ $this->bundleCollection->expects($this->once())
+ ->method('create')
+ ->will($this->returnValue($selectionCollectionMock));
$product = new \Magento\Framework\DataObject(
[
'is_salable' => true,
'_cache_instance_options_collection' => $optionCollectionMock,
'status' => \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED,
- '_cache_instance_selections_collection10_20' => $selectionCollectionMock
]
);
$this->assertFalse($this->model->isSalable($product));
}
- /**
- * @return void
- */
- public function testIsSalableNoManageStock()
- {
- $option1 = $this->getRequiredOptionMock(10, 10);
- $option2 = $this->getRequiredOptionMock(20, 10);
-
- $stockItem = $this->getStockItem(true);
-
- $this->stockRegistry->method('getStockItem')
- ->willReturn($stockItem);
-
- $this->stockState
- ->expects($this->at(0))
- ->method('getStockQty')
- ->with(10)
- ->willReturn(10);
- $this->stockState
- ->expects($this->at(1))
- ->method('getStockQty')
- ->with(20)
- ->willReturn(10);
-
- $optionCollectionMock = $this->getOptionCollectionMock([$option1, $option2]);
- $selectionCollectionMock = $this->getSelectionCollectionMock([$option1, $option2]);
-
- $product = new \Magento\Framework\DataObject(
- [
- 'is_salable' => true,
- '_cache_instance_options_collection' => $optionCollectionMock,
- 'status' => \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED,
- '_cache_instance_selections_collection10_20' => $selectionCollectionMock
- ]
- );
-
- $this->assertTrue($this->model->isSalable($product));
- }
-
/**
* @param int $id
* @param int $selectionQty
@@ -2317,7 +2262,7 @@ class TypeTest extends \PHPUnit_Framework_TestCase
{
$selectionCollectionMock = $this->getMockBuilder(
\Magento\Bundle\Model\ResourceModel\Selection\Collection::class
- )->setMethods(['getItems', 'getIterator'])
+ )
->disableOriginalConstructor()
->getMock();
@@ -2465,36 +2410,29 @@ class TypeTest extends \PHPUnit_Framework_TestCase
]
)
->getMock();
- $selectionCollection = $this->getMockBuilder(\Magento\Bundle\Model\ResourceModel\Selection\Collection::class)
- ->disableOriginalConstructor()
- ->setMethods(
- [
- 'addAttributeToSelect',
- 'setFlag',
- 'setPositionOrder',
- 'addStoreFilter',
- 'setStoreId',
- 'addFilterByRequiredOptions',
- 'setOptionIdsFilter',
- 'joinPrices'
- ]
- )
- ->getMock();
$store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
->disableOriginalConstructor()
->setMethods(['getWebsiteId'])
->getMock();
- $product->expects($this->once())
- ->method('hasData')
- ->with('_cache_instance_selections_collection1_2_3')
- ->willReturn(false);
$product->expects($this->once())->method('getStoreId')->willReturn('store_id');
- $product->expects($this->at(2))
- ->method('getData')
- ->with('_cache_instance_store_filter')
- ->willReturn($selectionCollection);
+ $selectionCollection = $this->getSelectionCollection();
$this->bundleCollection->expects($this->once())->method('create')->willReturn($selectionCollection);
+ $this->storeManager->expects($this->once())->method('getStore')->willReturn($store);
+ $store->expects($this->once())->method('getWebsiteId')->willReturn('website_id');
+ $selectionCollection->expects($this->any())->method('joinPrices')->with('website_id')->willReturnSelf();
+
+ $this->assertEquals($selectionCollection, $this->model->getSelectionsCollection($optionIds, $product));
+ }
+
+ /**
+ * @return \PHPUnit_Framework_MockObject_MockObject
+ */
+ private function getSelectionCollection()
+ {
+ $selectionCollection = $this->getMockBuilder(\Magento\Bundle\Model\ResourceModel\Selection\Collection::class)
+ ->disableOriginalConstructor()
+ ->getMock();
$selectionCollection->expects($this->any())->method('addAttributeToSelect')->willReturnSelf();
$selectionCollection->expects($this->any())->method('setFlag')->willReturnSelf();
$selectionCollection->expects($this->any())->method('setPositionOrder')->willReturnSelf();
@@ -2502,19 +2440,10 @@ class TypeTest extends \PHPUnit_Framework_TestCase
$selectionCollection->expects($this->any())->method('setStoreId')->willReturnSelf();
$selectionCollection->expects($this->any())->method('addFilterByRequiredOptions')->willReturnSelf();
$selectionCollection->expects($this->any())->method('setOptionIdsFilter')->willReturnSelf();
- $this->storeManager->expects($this->once())->method('getStore')->willReturn($store);
- $store->expects($this->once())->method('getWebsiteId')->willReturn('website_id');
- $selectionCollection->expects($this->any())->method('joinPrices')->with('website_id')->willReturnSelf();
- $product->expects($this->once())
- ->method('setData')
- ->with('_cache_instance_selections_collection1_2_3', $selectionCollection)
- ->willReturnSelf();
- $product->expects($this->at(4))
- ->method('getData')
- ->with('_cache_instance_selections_collection1_2_3')
- ->willReturn($selectionCollection);
+ $selectionCollection->expects($this->any())->method('addPriceData')->willReturnSelf();
+ $selectionCollection->expects($this->any())->method('addTierPriceData')->willReturnSelf();
- $this->assertEquals($selectionCollection, $this->model->getSelectionsCollection($optionIds, $product));
+ return $selectionCollection;
}
public function testProcessBuyRequest()
@@ -2548,7 +2477,10 @@ class TypeTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->setMethods(['getId', 'getRequired'])
->getMock();
- $selectionCollection = $this->getMockBuilder(\Magento\Bundle\Model\ResourceModel\Selection\Collection::class)
+ $selectionCollection = $this->getSelectionCollection();
+ $this->bundleCollection->expects($this->once())->method('create')->willReturn($selectionCollection);
+
+ $selectionItem = $this->getMockBuilder(\Magento\Framework\DataObject::class)
->disableOriginalConstructor()
->getMock();
@@ -2559,13 +2491,13 @@ class TypeTest extends \PHPUnit_Framework_TestCase
->willReturn($dbResourceMock);
$dbResourceMock->expects($this->once())->method('getItems')->willReturn([$item]);
$item->expects($this->once())->method('getId')->willReturn('itemId');
- $product->expects($this->at(3))
- ->method('getData')
- ->with('_cache_instance_selections_collectionitemId')
- ->willReturn([$selectionCollection]);
$item->expects($this->once())->method('getRequired')->willReturn(true);
- $this->assertEquals([[$selectionCollection]], $this->model->getProductsToPurchaseByReqGroups($product));
+ $selectionCollection
+ ->expects($this->any())
+ ->method('getIterator')
+ ->willReturn(new \ArrayIterator([$selectionItem]));
+ $this->assertEquals([[$selectionItem]], $this->model->getProductsToPurchaseByReqGroups($product));
}
public function testGetSearchableData()
@@ -2598,14 +2530,17 @@ class TypeTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->setMethods(['getAllIds'])
->getMock();
- $selectionCollection = $this->getMockBuilder(\Magento\Bundle\Model\ResourceModel\Selection\Collection::class)
- ->disableOriginalConstructor()
- ->getMock();
+ $selectionCollection = $this->getSelectionCollection();
+ $selectionCollection
+ ->expects($this->any())
+ ->method('count')
+ ->willReturn(1);
+ $this->bundleCollection->expects($this->once())->method('create')->willReturn($selectionCollection);
- $product->expects($this->once())->method('getStoreId')->willReturn('storeId');
+ $product->expects($this->any())->method('getStoreId')->willReturn(0);
$product->expects($this->once())
->method('setData')
- ->with('_cache_instance_store_filter', 'storeId')
+ ->with('_cache_instance_store_filter', 0)
->willReturnSelf();
$product->expects($this->any())->method('hasData')->willReturn(true);
$product->expects($this->at(3))
@@ -2613,10 +2548,6 @@ class TypeTest extends \PHPUnit_Framework_TestCase
->with('_cache_instance_options_collection')
->willReturn($optionCollection);
$optionCollection->expects($this->once())->method('getAllIds')->willReturn(['ids']);
- $product->expects($this->at(5))
- ->method('getData')
- ->with('_cache_instance_selections_collectionids')
- ->willReturn([$selectionCollection]);
$this->assertTrue($this->model->hasOptions($product));
}
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/CalculatorTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/CalculatorTest.php
index 73bbf1bc5d0d2b6d85a0e08a83492801005780bf..e6604997e7d87bc73de83480cc822eb68d0f0fb1 100644
--- a/app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/CalculatorTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/CalculatorTest.php
@@ -8,8 +8,8 @@
namespace Magento\Bundle\Test\Unit\Pricing\Adjustment;
+use Magento\Bundle\Model\ResourceModel\Selection\Collection;
use \Magento\Bundle\Pricing\Adjustment\Calculator;
-
use Magento\Bundle\Model\Product\Price as ProductPrice;
use Magento\Bundle\Pricing\Price;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -56,6 +56,11 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
*/
protected $taxData;
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $selectionPriceListProvider;
+
/**
* @var Calculator
*/
@@ -64,9 +69,10 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->saleableItem = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
- ->setMethods(['getPriceInfo', 'getPriceType', '__wakeup', 'getStore'])
+ ->setMethods(['getPriceInfo', 'getPriceType', '__wakeup', 'getStore', 'getTypeInstance'])
->disableOriginalConstructor()
->getMock();
+
$priceCurrency = $this->getMockBuilder(\Magento\Framework\Pricing\PriceCurrencyInterface::class)->getMock();
$priceInfo = $this->getMock(\Magento\Framework\Pricing\PriceInfo\Base::class, [], [], '', false);
$priceInfo->expects($this->any())->method('getPrice')->will(
@@ -112,6 +118,10 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
+ $this->selectionPriceListProvider = $this->getMockBuilder(
+ \Magento\Bundle\Pricing\Adjustment\SelectionPriceListProviderInterface::class
+ )->getMock();
+
$this->model = (new ObjectManager($this))->getObject(\Magento\Bundle\Pricing\Adjustment\Calculator::class,
[
'calculator' => $this->baseCalculator,
@@ -119,6 +129,7 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
'bundleSelectionFactory' => $this->selectionFactory,
'taxHelper' => $this->taxData,
'priceCurrency' => $priceCurrency,
+ 'selectionPriceListProvider' => $this->selectionPriceListProvider
]
);
}
@@ -137,6 +148,7 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
*/
public function testGetterAmount($amountForBundle, $optionList, $expectedResult)
{
+ $searchMin = $expectedResult['isMinAmount'];
$this->baseCalculator->expects($this->atLeastOnce())->method('getAmount')
->with($this->baseAmount, $this->saleableItem)
->will($this->returnValue($this->createAmountMock($amountForBundle)));
@@ -145,8 +157,14 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
foreach ($optionList as $optionData) {
$options[] = $this->createOptionMock($optionData);
}
+
+ $optionSelections = [];
+ foreach ($options as $option) {
+ $optionSelections = array_merge($optionSelections, $option->getSelections());
+ }
+ $this->selectionPriceListProvider->expects($this->any())->method('getPriceList')->willReturn($optionSelections);
+
$price = $this->getMock(\Magento\Bundle\Pricing\Price\BundleOptionPrice::class, [], [], '', false);
- $price->expects($this->atLeastOnce())->method('getOptions')->will($this->returnValue($options));
$this->priceMocks[Price\BundleOptionPrice::PRICE_CODE] = $price;
// Price type of saleable items
@@ -158,7 +176,7 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
$this->amountFactory->expects($this->atLeastOnce())->method('create')
->with($expectedResult['fullAmount'], $expectedResult['adjustments']);
- if ($expectedResult['isMinAmount']) {
+ if ($searchMin) {
$this->model->getAmount($this->baseAmount, $this->saleableItem);
} else {
$this->model->getMaxAmount($this->baseAmount, $this->saleableItem);
@@ -287,21 +305,7 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
'required' => '1',
],
'selections' => [
- 'first product selection' => [
- 'data' => ['price' => 70.],
- 'amount' => [
- 'adjustmentsAmounts' => ['tax' => 8, 'weee' => 10],
- 'amount' => 18,
- ],
- ],
- 'second product selection' => [
- 'data' => ['price' => 80.],
- 'amount' => [
- 'adjustmentsAmounts' => ['tax' => 18],
- 'amount' => 28,
- ],
- ],
- 'third product selection with the lowest price' => [
+ 'selection with the lowest price' => [
'data' => ['price' => 50.],
'amount' => [
'adjustmentsAmounts' => ['tax' => 8, 'weee' => 10],
@@ -351,13 +355,6 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
'amount' => 8,
],
],
- 'second product selection' => [
- 'data' => ['price' => 80.],
- 'amount' => [
- 'adjustmentsAmounts' => ['tax' => 18],
- 'amount' => 8,
- ],
- ],
]
],
// second option with multiselection
@@ -471,13 +468,6 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
'amount' => 8,
],
],
- 'second product selection' => [
- 'data' => ['price' => 30.],
- 'amount' => [
- 'adjustmentsAmounts' => ['tax' => 10],
- 'amount' => 12,
- ],
- ],
]
],
// second option
@@ -492,20 +482,6 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
'required' => '0',
],
'selections' => [
- 'first product selection' => [
- 'data' => ['price' => 25.],
- 'amount' => [
- 'adjustmentsAmounts' => ['tax' => 8],
- 'amount' => 9,
- ],
- ],
- 'second product selection' => [
- 'data' => ['price' => 35.],
- 'amount' => [
- 'adjustmentsAmounts' => ['tax' => 10],
- 'amount' => 10,
- ],
- ],
]
],
],
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionFactoryTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionFactoryTest.php
index 3a0b0a22080fa8e248b716751d14f80859481570..1831154043d8be2d39b1890839ee4c8d65b333a7 100644
--- a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionFactoryTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionFactoryTest.php
@@ -66,26 +66,4 @@ class BundleSelectionFactoryTest extends \PHPUnit_Framework_TestCase
->create($this->bundleMock, $this->selectionMock, 2., ['test' => 'some value'])
);
}
-
- /**
- * @expectedException \InvalidArgumentException
- */
- public function testCreateException()
- {
- $this->objectManagerMock->expects($this->once())
- ->method('create')
- ->with(
- $this->equalTo(BundleSelectionFactory::SELECTION_CLASS_DEFAULT),
- $this->equalTo(
- [
- 'test' => 'some value',
- 'bundleProduct' => $this->bundleMock,
- 'saleableItem' => $this->selectionMock,
- 'quantity' => 2.,
- ]
- )
- )
- ->will($this->returnValue(new \stdClass()));
- $this->bundleSelectionFactory->create($this->bundleMock, $this->selectionMock, 2., ['test' => 'some value']);
- }
}
diff --git a/app/code/Magento/Bundle/etc/di.xml b/app/code/Magento/Bundle/etc/di.xml
index b89e290c068148667e3cee1c1477194efc4b0e00..2d3913d72e579302ac9cd1f0e23d6b235f9c6b23 100644
--- a/app/code/Magento/Bundle/etc/di.xml
+++ b/app/code/Magento/Bundle/etc/di.xml
@@ -14,6 +14,7 @@
<preference for="Magento\Bundle\Api\ProductOptionManagementInterface" type="Magento\Bundle\Model\OptionManagement" />
<preference for="Magento\Bundle\Api\Data\OptionInterface" type="Magento\Bundle\Model\Option" />
<preference for="Magento\Bundle\Api\Data\BundleOptionInterface" type="Magento\Bundle\Model\BundleOption" />
+ <preference for="Magento\Bundle\Pricing\Adjustment\SelectionPriceListProviderInterface" type="Magento\Bundle\Pricing\Adjustment\DefaultSelectionPriceListProvider" />
<type name="Magento\Bundle\Model\Source\Option\Type">
<arguments>
<argument name="options" xsi:type="array">
diff --git a/app/code/Magento/Catalog/Block/Product/View.php b/app/code/Magento/Catalog/Block/Product/View.php
index 8157ab4de07f2a10c9bc5e34541944698f0ab71c..964a444a0aef8b924819598634a0eea36f7ba247 100644
--- a/app/code/Magento/Catalog/Block/Product/View.php
+++ b/app/code/Magento/Catalog/Block/Product/View.php
@@ -7,7 +7,6 @@ namespace Magento\Catalog\Block\Product;
use Magento\Catalog\Api\ProductRepositoryInterface;
use Magento\Catalog\Model\Category;
-use Magento\Catalog\Model\Product;
/**
* Product View block
@@ -29,6 +28,7 @@ class View extends AbstractProduct implements \Magento\Framework\DataObject\Iden
/**
* @var \Magento\Framework\Pricing\PriceCurrencyInterface
+ * @deprecated
*/
protected $priceCurrency;
@@ -225,40 +225,34 @@ class View extends AbstractProduct implements \Magento\Framework\DataObject\Iden
$config = [
'productId' => $product->getId(),
'priceFormat' => $this->_localeFormat->getPriceFormat()
- ];
+ ];
return $this->_jsonEncoder->encode($config);
}
$tierPrices = [];
$tierPricesList = $product->getPriceInfo()->getPrice('tier_price')->getTierPriceList();
foreach ($tierPricesList as $tierPrice) {
- $tierPrices[] = $this->priceCurrency->convert($tierPrice['price']->getValue());
+ $tierPrices[] = $tierPrice['price']->getValue();
}
$config = [
- 'productId' => $product->getId(),
+ 'productId' => $product->getId(),
'priceFormat' => $this->_localeFormat->getPriceFormat(),
- 'prices' => [
- 'oldPrice' => [
- 'amount' => $this->priceCurrency->convert(
- $product->getPriceInfo()->getPrice('regular_price')->getAmount()->getValue()
- ),
+ 'prices' => [
+ 'oldPrice' => [
+ 'amount' => $product->getPriceInfo()->getPrice('regular_price')->getAmount()->getValue(),
'adjustments' => []
],
- 'basePrice' => [
- 'amount' => $this->priceCurrency->convert(
- $product->getPriceInfo()->getPrice('final_price')->getAmount()->getBaseAmount()
- ),
+ 'basePrice' => [
+ 'amount' => $product->getPriceInfo()->getPrice('final_price')->getAmount()->getBaseAmount(),
'adjustments' => []
],
'finalPrice' => [
- 'amount' => $this->priceCurrency->convert(
- $product->getPriceInfo()->getPrice('final_price')->getAmount()->getValue()
- ),
+ 'amount' => $product->getPriceInfo()->getPrice('final_price')->getAmount()->getValue(),
'adjustments' => []
]
],
- 'idSuffix' => '_clone',
- 'tierPrices' => $tierPrices
+ 'idSuffix' => '_clone',
+ 'tierPrices' => $tierPrices
];
$responseObject = new \Magento\Framework\DataObject();
diff --git a/app/code/Magento/Catalog/Model/Category/DataProvider.php b/app/code/Magento/Catalog/Model/Category/DataProvider.php
index aefd31e21ad62f8469837a801581170581555c6a..8aa7216a6b63928ba9dcdd415b1745ed404321f1 100644
--- a/app/code/Magento/Catalog/Model/Category/DataProvider.php
+++ b/app/code/Magento/Catalog/Model/Category/DataProvider.php
@@ -5,12 +5,16 @@
*/
namespace Magento\Catalog\Model\Category;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Api\Data\EavAttributeInterface;
+use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
use Magento\Catalog\Model\Category;
use Magento\Catalog\Model\ResourceModel\Eav\Attribute as EavAttribute;
use Magento\Eav\Api\Data\AttributeInterface;
use Magento\Eav\Model\Config;
use Magento\Eav\Model\Entity\Type;
use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
+use Magento\Framework\Stdlib\ArrayManager;
use Magento\Store\Model\Store;
use Magento\Store\Model\StoreManagerInterface;
use Magento\Ui\Component\Form\Field;
@@ -112,6 +116,16 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
*/
private $categoryFactory;
+ /**
+ * @var ScopeOverriddenValue
+ */
+ private $scopeOverriddenValue;
+
+ /**
+ * @var ArrayManager
+ */
+ private $arrayManager;
+
/**
* DataProvider constructor
*
@@ -151,8 +165,91 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
$this->storeManager = $storeManager;
$this->request = $request;
$this->categoryFactory = $categoryFactory;
+
parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
- $this->meta = $this->prepareMeta($this->meta);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getMeta()
+ {
+ $meta = parent::getMeta();
+ $meta = $this->prepareMeta($meta);
+
+ $category = $this->getCurrentCategory();
+
+ if ($category) {
+ $meta = $this->addUseDefaultValueCheckbox($category, $meta);
+ $meta = $this->resolveParentInheritance($category, $meta);
+ }
+
+ return $meta;
+ }
+
+ /**
+ * @param Category $category
+ * @param array $meta
+ * @return array
+ */
+ private function addUseDefaultValueCheckbox(Category $category, array $meta)
+ {
+ /** @var EavAttributeInterface $attribute */
+ foreach ($category->getAttributes() as $attribute) {
+ $attributeCode = $attribute->getAttributeCode();
+ $canDisplayUseDefault = $attribute->getScope() != EavAttributeInterface::SCOPE_GLOBAL_TEXT
+ && $category->getId()
+ && $category->getStoreId();
+ $attributePath = $this->getArrayManager()->findPath($attributeCode, $meta);
+
+ if (
+ !$attributePath
+ || !$canDisplayUseDefault
+ || in_array($attributeCode, $this->elementsWithUseConfigSetting)
+ ) {
+ continue;
+ }
+
+ $meta = $this->getArrayManager()->merge(
+ [$attributePath, 'arguments/data/config'],
+ $meta,
+ [
+ 'service' => [
+ 'template' => 'ui/form/element/helper/service',
+ ],
+ 'disabled' => !$this->getScopeOverriddenValue()->containsValue(
+ CategoryInterface::class,
+ $category,
+ $attributeCode,
+ $this->request->getParam($this->requestScopeFieldName, Store::DEFAULT_STORE_ID)
+ )
+ ]
+ );
+ }
+
+ return $meta;
+ }
+
+ /**
+ * Removes not necessary inheritance fields
+ *
+ * @param Category $category
+ * @param array $meta
+ * @return array
+ */
+ private function resolveParentInheritance(Category $category, array $meta)
+ {
+ if (!$category->getParentId() || !$this->getArrayManager()->findPath('custom_use_parent_settings', $meta)) {
+ return $meta;
+ }
+
+ $meta = $this->getArrayManager()->merge(
+ [$this->getArrayManager()->findPath('custom_use_parent_settings', $meta), 'arguments/data/config'],
+ $meta,
+ ['visible' => false]
+ );
+
+ return $meta;
}
/**
@@ -204,7 +301,6 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
$category = $this->getCurrentCategory();
if ($category) {
$categoryData = $category->getData();
- $categoryData = $this->addUseDefaultSettings($category, $categoryData);
$categoryData = $this->addUseConfigSettings($categoryData);
$categoryData = $this->filterFields($categoryData);
$categoryData = $this->convertValues($category, $categoryData);
@@ -292,6 +388,7 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
* @param \Magento\Catalog\Model\Category $category
* @param array $categoryData
* @return array
+ * @deprecated
*/
protected function addUseDefaultSettings($category, $categoryData)
{
@@ -406,15 +503,6 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
$result['use_config.available_sort_by']['default'] = true;
$result['use_config.default_sort_by']['default'] = true;
$result['use_config.filter_price_range']['default'] = true;
- if ($this->request->getParam('store') && $this->request->getParam('id')) {
- $result['use_default.url_key']['checked'] = true;
- $result['use_default.url_key']['default'] = true;
- $result['use_default.url_key']['visible'] = true;
- } else {
- $result['use_default.url_key']['checked'] = false;
- $result['use_default.url_key']['default'] = false;
- $result['use_default.url_key']['visible'] = false;
- }
return $result;
}
@@ -454,7 +542,6 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
[
'url_key',
'url_key_create_redirect',
- 'use_default.url_key',
'url_key_group',
'meta_title',
'meta_keywords',
@@ -484,4 +571,38 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
],
];
}
+
+ /**
+ * Retrieve scope overridden value
+ *
+ * @return ScopeOverriddenValue
+ * @deprecated
+ */
+ private function getScopeOverriddenValue()
+ {
+ if (null === $this->scopeOverriddenValue) {
+ $this->scopeOverriddenValue = \Magento\Framework\App\ObjectManager::getInstance()->get(
+ ScopeOverriddenValue::class
+ );
+ }
+
+ return $this->scopeOverriddenValue;
+ }
+
+ /**
+ * Retrieve array manager
+ *
+ * @return ArrayManager
+ * @deprecated
+ */
+ private function getArrayManager()
+ {
+ if (null === $this->arrayManager) {
+ $this->arrayManager = \Magento\Framework\App\ObjectManager::getInstance()->get(
+ ArrayManager::class
+ );
+ }
+
+ return $this->arrayManager;
+ }
}
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index c913c82de1acdecbf3328c37fe7529dfbab193ba..0e8aa2833fb44e4b6c62f109829789c9db1f965c 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -1616,6 +1616,9 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
*/
public function isSalable()
{
+ if ($this->hasData('salable') && !$this->_catalogProduct->getSkipSaleableCheck()) {
+ return $this->getData('salable');
+ }
$this->_eventManager->dispatch('catalog_product_is_salable_before', ['product' => $this]);
$salable = $this->isAvailable();
@@ -1625,6 +1628,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
'catalog_product_is_salable_after',
['product' => $this, 'salable' => $object]
);
+ $this->setData('salable', $object->getIsSalable());
return $object->getIsSalable();
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/TierPriceTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/TierPriceTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..9dccb8eef452ad50e58e04aef1f7273a3fb524a4
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/TierPriceTest.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Model\Config\Source\ProductPriceOptionsInterface;
+use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\TierPrice;
+
+/**
+ * Class TierPriceTest.
+ */
+class TierPriceTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var ProductPriceOptionsInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $productPriceOptions;
+
+ /**
+ * @var ArrayManager|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $arrayManager;
+
+ /**
+ * @var TierPrice
+ */
+ private $tierPrice;
+
+ /**
+ * Set Up.
+ * @return void
+ */
+ protected function setUp()
+ {
+ $this->productPriceOptions = $this->getMock(ProductPriceOptionsInterface::class);
+ $this->arrayManager = $this->getMock(ArrayManager::class, [], [], '', false);
+
+ $this->tierPrice = (new ObjectManager($this))->getObject(TierPrice::class, [
+ 'productPriceOptions' => $this->productPriceOptions,
+ 'arrayManager' => $this->arrayManager,
+ ]);
+ }
+
+ /**
+ * Test modifyData.
+ */
+ public function testModifyData()
+ {
+ $data = [1, 2];
+ $this->assertEquals($data, $this->tierPrice->modifyData($data));
+ }
+
+ /**
+ * Test modifyMeta.
+ */
+ public function testModifyMeta()
+ {
+ $meta = [1, 2];
+ $tierPricePath = 'tier_price';
+ $priceWrapperPath = 'tier_price/some-wrapper';
+ $pricePath = $priceWrapperPath . '/price';
+ $priceMeta = [
+ 'arguments' => [
+ 'data' => [
+ 'config' => [
+ 'visible' => true,
+ 'validation' => ['validate-number' => true],
+ ],
+ ],
+ ],
+ ];
+
+ $this->productPriceOptions->expects($this->once())->method('toOptionArray')->willReturn([
+ [
+ 'value' => ProductPriceOptionsInterface::VALUE_FIXED,
+ 'label' => 'label1',
+ ],
+ ]);
+
+ $this->productPriceOptions->expects($this->once())->method('toOptionArray')->willReturn([
+ [
+ 'value' => ProductPriceOptionsInterface::VALUE_FIXED,
+ 'label' => 'label1',
+ ],
+ ]);
+
+ $this->arrayManager
+ ->expects($this->exactly(2))
+ ->method('findPath')
+ ->willReturnMap([
+ [
+ ProductAttributeInterface::CODE_TIER_PRICE,
+ $meta,
+ null,
+ 'children',
+ ArrayManager::DEFAULT_PATH_DELIMITER,
+ $tierPricePath
+ ],
+ [
+ ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE,
+ $meta,
+ $tierPricePath,
+ null,
+ ArrayManager::DEFAULT_PATH_DELIMITER,
+ $pricePath
+ ],
+ ]);
+ $this->arrayManager
+ ->expects($this->once())
+ ->method('get')
+ ->with($pricePath, $meta)
+ ->willReturn($priceMeta);
+ $this->arrayManager
+ ->expects($this->once())
+ ->method('remove')
+ ->with($pricePath, $meta)
+ ->willReturn($meta);
+ $this->arrayManager
+ ->expects($this->once())
+ ->method('slicePath')
+ ->with($pricePath, 0, -1)
+ ->willReturn($priceWrapperPath);
+ $this->arrayManager
+ ->expects($this->once())
+ ->method('merge')
+ ->with($priceWrapperPath, $meta, $this->isType('array'))
+ ->willReturnArgument(2);
+
+ $modifiedMeta = $this->tierPrice->modifyMeta($meta);
+ $children = $modifiedMeta['price_value']['children'];
+
+ $this->assertNotEmpty($children[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_VALUE_TYPE]);
+ $this->assertNotEmpty($children[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PERCENTAGE_VALUE]);
+ $this->assertEquals($priceMeta, $children[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE]);
+ }
+}
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php
new file mode 100644
index 0000000000000000000000000000000000000000..ac511edcf2e5338eba6b83c60cf38a749406cf89
--- /dev/null
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier;
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Model\Config\Source\ProductPriceOptionsInterface;
+use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Ui\Component\Container;
+use Magento\Ui\Component\Form\Element\DataType\Price;
+use Magento\Ui\Component\Form\Element\Input;
+use Magento\Ui\Component\Form\Element\Select;
+use Magento\Ui\Component\Form\Field;
+
+/**
+ * Tier prices modifier adds price type option to tier prices.
+ */
+class TierPrice extends AbstractModifier
+{
+ /**
+ * @var ProductPriceOptionsInterface
+ */
+ private $productPriceOptions;
+
+ /**
+ * @var ArrayManager
+ */
+ private $arrayManager;
+
+ /**
+ * @param ProductPriceOptionsInterface $productPriceOptions
+ * @param ArrayManager $arrayManager
+ */
+ public function __construct(
+ ProductPriceOptionsInterface $productPriceOptions,
+ ArrayManager $arrayManager
+ ) {
+ $this->productPriceOptions = $productPriceOptions;
+ $this->arrayManager = $arrayManager;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function modifyData(array $data)
+ {
+ return $data;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function modifyMeta(array $meta)
+ {
+ $tierPricePath = $this->arrayManager->findPath(
+ ProductAttributeInterface::CODE_TIER_PRICE,
+ $meta,
+ null,
+ 'children'
+ );
+ if ($tierPricePath) {
+ $pricePath = $this->arrayManager->findPath(
+ ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE,
+ $meta,
+ $tierPricePath
+ );
+
+ if ($pricePath) {
+ $priceMeta = $this->arrayManager->get($pricePath, $meta);
+ $updatedStructure = $this->getUpdatedTierPriceStructure($priceMeta);
+ $meta = $this->arrayManager->remove($pricePath, $meta);
+ $meta = $this->arrayManager->merge(
+ $this->arrayManager->slicePath($pricePath, 0, -1),
+ $meta,
+ $updatedStructure
+ );
+ }
+ }
+ return $meta;
+ }
+
+ /**
+ * Get updated tier price structure.
+ *
+ * @param array $priceMeta
+ * @return array
+ */
+ private function getUpdatedTierPriceStructure(array $priceMeta)
+ {
+ $priceTypeOptions = $this->productPriceOptions->toOptionArray();
+ $firstOption = $priceTypeOptions ? current($priceTypeOptions) : null;
+
+ $priceMeta['arguments']['data']['config']['visible'] = $firstOption
+ && $firstOption['value'] == ProductPriceOptionsInterface::VALUE_FIXED;
+ $priceMeta['arguments']['data']['config']['validation'] = [
+ 'validate-number' => true,
+ ];
+ return [
+ 'price_value' => [
+ 'arguments' => [
+ 'data' => [
+ 'config' => [
+ 'componentType' => Container::NAME,
+ 'formElement' => Container::NAME,
+ 'dataType' => Price::NAME,
+ 'component' => 'Magento_Ui/js/form/components/group',
+ 'label' => __('Price'),
+ 'enableLabel' => true,
+ 'dataScope' => '',
+ 'sortOrder' => isset($priceMeta['arguments']['data']['config']['sortOrder'])
+ ? $priceMeta['arguments']['data']['config']['sortOrder'] : 40,
+ ],
+ ],
+ ],
+ 'children' => [
+ ProductAttributeInterface::CODE_TIER_PRICE_FIELD_VALUE_TYPE => [
+ 'arguments' => [
+ 'data' => [
+ 'options' => $priceTypeOptions,
+ 'config' => [
+ 'componentType' => Field::NAME,
+ 'formElement' => Select::NAME,
+ 'dataType' => 'text',
+ 'component' => 'Magento_Catalog/js/tier-price/value-type-select',
+ 'prices' => [
+ ProductPriceOptionsInterface::VALUE_FIXED => '${ $.parentName }.'
+ . ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE,
+ ProductPriceOptionsInterface::VALUE_PERCENT => '${ $.parentName }.'
+ . ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PERCENTAGE_VALUE,
+ ],
+ ],
+ ],
+ ],
+ ],
+ ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE => $priceMeta,
+ ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PERCENTAGE_VALUE => [
+ 'arguments' => [
+ 'data' => [
+ 'config' => [
+ 'componentType' => Field::NAME,
+ 'formElement' => Input::NAME,
+ 'dataType' => Price::NAME,
+ 'addbefore' => '%',
+ 'validation' => [
+ 'validate-number' => true,
+ 'less-than-equals-to' => 100
+ ],
+ 'visible' => $firstOption
+ && $firstOption['value'] == ProductPriceOptionsInterface::VALUE_PERCENT,
+ ],
+ ],
+ ],
+ ],
+ 'price_calc' => [
+ 'arguments' => [
+ 'data' => [
+ 'config' => [
+ 'componentType' => Container::NAME,
+ 'component' => 'Magento_Catalog/js/tier-price/percentage-processor',
+ 'visible' => false
+ ],
+ ],
+ ]
+ ]
+ ],
+ ],
+ ];
+ }
+}
diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml
index 584a2e51514db53a0250615a55d67455ca1a0f57..5fc5ec8d44fd0a88f8a5d542d5518fa60ad77629 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/di.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/di.xml
@@ -142,6 +142,10 @@
<item name="class" xsi:type="string">Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Attributes</item>
<item name="sortOrder" xsi:type="number">120</item>
</item>
+ <item name="advanced-pricing-tier-price-type" xsi:type="array">
+ <item name="class" xsi:type="string">Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\TierPrice</item>
+ <item name="sortOrder" xsi:type="number">150</item>
+ </item>
</argument>
</arguments>
</virtualType>
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
index 85793a2073d76224a467e97621766b079ffe63b3..4b99707b85f5cbdadc3e3b506aceab73a7940362 100644
--- a/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
@@ -375,19 +375,6 @@
<item name="source" xsi:type="string">category</item>
<item name="label" xsi:type="string" translate="true">URL Key</item>
<item name="sortOrder" xsi:type="number">10</item>
- <item name="imports" xsi:type="array">
- <item name="disabled" xsi:type="string">${ $.provider }:data.use_default.url_key</item>
- </item>
- </item>
- </argument>
- </field>
- <field name="use_default.url_key">
- <argument name="data" xsi:type="array">
- <item name="config" xsi:type="array">
- <item name="description" xsi:type="string" translate="true">Use Default</item>
- <item name="dataType" xsi:type="string">boolean</item>
- <item name="formElement" xsi:type="string">checkbox</item>
- <item name="sortOrder" xsi:type="number">20</item>
</item>
</argument>
</field>
@@ -453,10 +440,9 @@
<field name="custom_use_parent_settings">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
- <item name="additionalClasses" xsi:type="string">admin__field-no-label</item>
+ <item name="additionalClasses" xsi:type="string">admin__field-x-small</item>
<item name="sortOrder" xsi:type="number">170</item>
- <item name="label" xsi:type="string"/>
- <item name="description" xsi:type="string" translate="true">Use Parent Category Settings</item>
+ <item name="label" xsi:type="string">Use Parent Category Settings</item>
<item name="dataType" xsi:type="string">boolean</item>
<item name="formElement" xsi:type="string">checkbox</item>
<item name="valueMap" xsi:type="array">
@@ -464,6 +450,8 @@
<item name="false" xsi:type="string">0</item>
</item>
<item name="default" xsi:type="string">0</item>
+ <item name="component" xsi:type="string">Magento_Ui/js/form/element/single-checkbox</item>
+ <item name="prefer" xsi:type="string">toggle</item>
</item>
</argument>
</field>
@@ -509,20 +497,21 @@
<field name="custom_apply_to_products">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
- <item name="additionalClasses" xsi:type="string">admin__field-no-label</item>
+ <item name="additionalClasses" xsi:type="string">admin__field-x-small</item>
<item name="sortOrder" xsi:type="number">210</item>
- <item name="label" xsi:type="string"/>
- <item name="description" xsi:type="string" translate="true">Apply Design to Products</item>
+ <item name="label" xsi:type="string" translate="true">Apply Design to Products</item>
<item name="dataType" xsi:type="string">boolean</item>
<item name="formElement" xsi:type="string">checkbox</item>
- <item name="imports" xsi:type="array">
- <item name="disabled" xsi:type="string">ns = ${ $.ns }, index = custom_use_parent_settings :checked</item>
- </item>
<item name="valueMap" xsi:type="array">
<item name="true" xsi:type="string">1</item>
<item name="false" xsi:type="string">0</item>
</item>
<item name="default" xsi:type="string">0</item>
+ <item name="component" xsi:type="string">Magento_Ui/js/form/element/single-checkbox</item>
+ <item name="prefer" xsi:type="string">toggle</item>
+ <item name="imports" xsi:type="array">
+ <item name="disabled" xsi:type="string">ns = ${ $.ns }, index = custom_use_parent_settings:checked</item>
+ </item>
</item>
</argument>
</field>
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/tier-price/percentage-processor.js b/app/code/Magento/Catalog/view/adminhtml/web/js/tier-price/percentage-processor.js
new file mode 100644
index 0000000000000000000000000000000000000000..afc0bab3f7fa4baa4dfbb76dc261b0e97672d80e
--- /dev/null
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/tier-price/percentage-processor.js
@@ -0,0 +1,73 @@
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'uiElement',
+ 'underscore',
+ 'Magento_Ui/js/lib/view/utils/async',
+ 'Magento_Catalog/js/utils/percentage-price-calculator'
+], function (Element, _, $, percentagePriceCalculator) {
+ 'use strict';
+
+ return Element.extend({
+ defaults: {
+ priceElem: '${ $.parentName }.price',
+ selector: 'input',
+ imports: {
+ priceValue: '${ $.priceElem }:priceValue'
+ },
+ exports: {
+ calculatedVal: '${ $.priceElem }:value'
+ }
+ },
+
+ /**
+ * {@inheritdoc}
+ */
+ initialize: function () {
+ this._super();
+
+ _.bindAll(this, 'initPriceListener', 'onInput');
+
+ $.async({
+ component: this.priceElem,
+ selector: this.selector
+ }, this.initPriceListener);
+
+ return this;
+ },
+
+ /**
+ * {@inheritdoc}
+ */
+ initObservable: function () {
+ return this._super()
+ .observe(['visible']);
+ },
+
+ /**
+ * Handles keyup event on price input.
+ *
+ * {@param} HTMLElement elem
+ */
+ initPriceListener: function (elem) {
+ $(elem).on('keyup.priceCalc', this.onInput);
+ },
+
+ /**
+ * Delegates calculation of the price input value to percentagePriceCalculator.
+ *
+ * {@param} object event
+ */
+ onInput: function (event) {
+ var value = event.currentTarget.value;
+
+ if (value.slice(-1) === '%') {
+ value = percentagePriceCalculator(this.priceValue, value);
+ this.set('calculatedVal', value);
+ }
+ }
+ });
+});
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/tier-price/value-type-select.js b/app/code/Magento/Catalog/view/adminhtml/web/js/tier-price/value-type-select.js
new file mode 100644
index 0000000000000000000000000000000000000000..216a767d393d57e6596c4d9d75cb7aef0e4a86f7
--- /dev/null
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/tier-price/value-type-select.js
@@ -0,0 +1,118 @@
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'Magento_Ui/js/form/element/select',
+ 'uiRegistry',
+ 'underscore'
+], function (Select, uiRegistry, _) {
+ 'use strict';
+
+ return Select.extend({
+ defaults: {
+ prices: {}
+ },
+
+ /**
+ * {@inheritdoc}
+ */
+ initialize: function () {
+ this._super()
+ .prepareForm();
+ },
+
+ /**
+ * {@inheritdoc}
+ */
+ setInitialValue: function () {
+ this.initialValue = this.getInitialValue();
+
+ if (this.value.peek() !== this.initialValue) {
+ this.value(this.initialValue);
+ }
+
+ this.isUseDefault(this.disabled());
+
+ return this;
+ },
+
+ /**
+ * {@inheritdoc}
+ */
+ prepareForm: function () {
+ var elements = this.getElementsByPrices(),
+ prices = this.prices,
+ currencyType = _.keys(prices)[0],
+ select = this;
+
+ uiRegistry.get(elements, function () {
+ _.each(arguments, function (currentValue) {
+ if (parseFloat(currentValue.value()) > 0) {
+ _.each(prices, function (priceValue, priceKey) {
+ if (priceValue === currentValue.name) {
+ currencyType = priceKey;
+ }
+ });
+ }
+ });
+ select.value(currencyType);
+ select.on('value', select.onUpdate.bind(select));
+ select.onUpdate();
+ });
+ },
+
+ /**
+ * @returns {Array}
+ */
+ getElementsByPrices: function () {
+ var elements = [];
+
+ _.each(this.prices, function (currentValue) {
+ elements.push(currentValue);
+ });
+
+ return elements;
+ },
+
+ /**
+ * Callback that fires when 'value' property is updated
+ */
+ onUpdate: function () {
+ var value = this.value(),
+ prices = this.prices,
+ select = this,
+ parentDataScopeArr = this.dataScope.split('.'),
+ parentDataScope,
+ elements = this.getElementsByPrices();
+
+ parentDataScopeArr.pop();
+ parentDataScope = parentDataScopeArr.join('.');
+
+ uiRegistry.get(elements, function () {
+ var sourceData = select.source.get(parentDataScope);
+
+ _.each(arguments, function (currentElement) {
+ var index;
+
+ _.each(prices, function (priceValue, priceKey) {
+ if (priceValue === currentElement.name) {
+ index = priceKey;
+ }
+ });
+
+ if (value === index) {
+ currentElement.visible(true);
+ sourceData[currentElement.index] = currentElement.value();
+ } else {
+ currentElement.value('');
+ currentElement.visible(false);
+ delete sourceData[currentElement.index];
+ }
+ });
+ select.source.set(parentDataScope, sourceData);
+ });
+ }
+ });
+});
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/utils/percentage-price-calculator.js b/app/code/Magento/Catalog/view/adminhtml/web/js/utils/percentage-price-calculator.js
new file mode 100644
index 0000000000000000000000000000000000000000..b7c18d5332f56347d269dc623ff05c2bff936959
--- /dev/null
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/utils/percentage-price-calculator.js
@@ -0,0 +1,45 @@
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define(['Magento_Ui/js/lib/validation/utils'], function (utils) {
+ 'use strict';
+
+ /**
+ * Calculates the price input value when entered percentage value.
+ *
+ * @param {String} price
+ * @param {String} input
+ *
+ * @returns {String}
+ */
+ return function (price, input) {
+ var result,
+ lastInputSymbol = input.slice(-1),
+ inputPercent = input.slice(0, -1),
+ parsedPercent = utils.parseNumber(inputPercent),
+ parsedPrice = utils.parseNumber(price);
+
+ if (lastInputSymbol !== '%') {
+ result = input;
+ } else if (
+ input === '%' ||
+ isNaN(parsedPrice) ||
+ parsedPercent != inputPercent || /* eslint eqeqeq:0 */
+ isNaN(parsedPercent) ||
+ input === ''
+ ) {
+ result = '';
+ } else if (parsedPercent > 100) {
+ result = '0.00';
+ } else if (lastInputSymbol === '%') {
+ result = parsedPrice - parsedPrice * (inputPercent / 100);
+ result = result.toFixed(2);
+ } else {
+ result = input;
+ }
+
+ return result;
+ };
+});
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
index eacc039255caf98525625e3a18f6dd7e43376e70..ea3e8077d0dc195f42e4cddb78135b6a0d0f9470 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
@@ -20,9 +20,9 @@
<input type="number"
name="qty"
id="qty"
- maxlength="12"
value="<?php /* @escapeNotVerified */ echo $block->getProductDefaultQty() * 1 ?>"
- title="<?php /* @escapeNotVerified */ echo __('Qty') ?>" class="input-text qty"
+ title="<?php /* @escapeNotVerified */ echo __('Qty') ?>"
+ class="input-text qty"
data-validate="<?php echo $block->escapeHtml(json_encode($block->getQuantityValidators())) ?>"
/>
</div>
@@ -58,4 +58,4 @@
}
}
</script>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 54208dcdba534139c96e8fd975e0757f9ecb11e1..ceb5580307c22e07486effd290c61e88f768c84a 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -1416,7 +1416,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
}
/**
- * Get existing images for current bucnh
+ * Get existing images for current bunch
*
* @param array $bunch
* @return array
@@ -1436,7 +1436,21 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
)->joinInner(
['mgvte' => $this->mediaGalleryEntityToValueTableName],
'(mg.value_id = mgvte.value_id)',
- [$this->getProductEntityLinkField() => 'mgvte.' . $this->getProductEntityLinkField()]
+ [
+ $this->getProductEntityLinkField() => 'mgvte.' . $this->getProductEntityLinkField(),
+ 'value_id' => 'mgvte.value_id'
+ ]
+ )->joinLeft(
+ ['mgv' => $this->mediaGalleryValueTableName],
+ sprintf(
+ '(mg.value_id = mgv.value_id AND mgv.%s = mgvte.%s AND mgv.store_id = %d)',
+ $this->getProductEntityLinkField(),
+ $this->getProductEntityLinkField(),
+ \Magento\Store\Model\Store::DEFAULT_STORE_ID
+ ),
+ [
+ 'label' => 'mgv.label'
+ ]
)->joinInner(
['pe' => $this->productEntityTableName],
"(mgvte.{$this->getProductEntityLinkField()} = pe.{$this->getProductEntityLinkField()})",
@@ -1447,7 +1461,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
);
foreach ($this->_connection->fetchAll($select) as $image) {
- $result[$image['sku']][$image['value']] = true;
+ $result[$image['sku']][$image['value']] = $image;
}
return $result;
@@ -1462,22 +1476,21 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
$images = [];
$labels = [];
foreach ($this->_imagesArrayKeys as $column) {
- $images[$column] = [];
- $labels[$column] = [];
if (!empty($rowData[$column])) {
$images[$column] = array_unique(
- explode($this->getMultipleValueSeparator(), $rowData[$column])
+ array_map(
+ 'trim',
+ explode($this->getMultipleValueSeparator(), $rowData[$column])
+ )
);
- }
- if (!empty($rowData[$column . '_label'])) {
- $labels[$column] = explode($this->getMultipleValueSeparator(), $rowData[$column . '_label']);
- }
+ if (!empty($rowData[$column . '_label'])) {
+ $labels[$column] = $this->parseMultipleValues($rowData[$column . '_label']);
- if (count($labels[$column]) > count($images[$column])) {
- $labels[$column] = array_slice($labels[$column], 0, count($images[$column]));
- } elseif (count($labels[$column]) < count($images[$column])) {
- $labels[$column] = array_pad($labels[$column], count($images[$column]), '');
+ if (count($labels[$column]) > count($images[$column])) {
+ $labels[$column] = array_slice($labels[$column], 0, count($images[$column]));
+ }
+ }
}
}
@@ -1507,6 +1520,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
$this->categoriesCache = [];
$tierPrices = [];
$mediaGallery = [];
+ $labelsForUpdate = [];
$uploadedImages = [];
$previousType = null;
$prevAttributeSet = null;
@@ -1616,7 +1630,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
foreach ($rowImages as $column => $columnImages) {
foreach ($columnImages as $position => $columnImage) {
if (!isset($uploadedImages[$columnImage])) {
- $uploadedFile = $this->uploadMediaFiles(trim($columnImage), true);
+ $uploadedFile = $this->uploadMediaFiles($columnImage, true);
if ($uploadedFile) {
$uploadedImages[$columnImage] = $uploadedFile;
} else {
@@ -1636,20 +1650,28 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
$rowData[$column] = $uploadedFile;
}
- $imageNotAssigned = !isset($existingImages[$rowSku][$uploadedFile]);
-
- if ($uploadedFile && $imageNotAssigned) {
- if ($column == self::COL_MEDIA_IMAGE) {
- $rowData[$column][] = $uploadedFile;
+ if ($uploadedFile && !isset($mediaGallery[$rowSku][$uploadedFile])) {
+ if (isset($existingImages[$rowSku][$uploadedFile])) {
+ if (isset($rowLabels[$column][$position])
+ && $rowLabels[$column][$position] != $existingImages[$rowSku][$uploadedFile]['label']
+ ) {
+ $labelsForUpdate[] = [
+ 'label' => $rowLabels[$column][$position],
+ 'imageData' => $existingImages[$rowSku][$uploadedFile]
+ ];
+ }
+ } else {
+ if ($column == self::COL_MEDIA_IMAGE) {
+ $rowData[$column][] = $uploadedFile;
+ }
+ $mediaGallery[$rowSku][$uploadedFile] = [
+ 'attribute_id' => $this->getMediaGalleryAttributeId(),
+ 'label' => isset($rowLabels[$column][$position]) ? $rowLabels[$column][$position] : '',
+ 'position' => $position + 1,
+ 'disabled' => isset($disabledImages[$columnImage]) ? '1' : '0',
+ 'value' => $uploadedFile,
+ ];
}
- $mediaGallery[$rowSku][] = [
- 'attribute_id' => $this->getMediaGalleryAttributeId(),
- 'label' => isset($rowLabels[$column][$position]) ? $rowLabels[$column][$position] : '',
- 'position' => $position + 1,
- 'disabled' => isset($disabledImages[$columnImage]) ? '1' : '0',
- 'value' => $uploadedFile,
- ];
- $existingImages[$rowSku][$uploadedFile] = true;
}
}
}
@@ -1767,6 +1789,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
$mediaGallery
)->_saveProductAttributes(
$attributes
+ )->updateMediaGalleryLabels(
+ $labelsForUpdate
);
$this->_eventManager->dispatch(
@@ -2535,12 +2559,13 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
* Parse values of multiselect attributes depends on "Fields Enclosure" parameter
*
* @param string $values
+ * @param string $delimiter
* @return array
*/
- public function parseMultiselectValues($values)
+ public function parseMultiselectValues($values, $delimiter = self::PSEUDO_MULTI_LINE_SEPARATOR)
{
if (empty($this->_parameters[Import::FIELDS_ENCLOSURE])) {
- return explode(self::PSEUDO_MULTI_LINE_SEPARATOR, $values);
+ return explode($delimiter, $values);
}
if (preg_match_all('~"((?:[^"]|"")*)"~', $values, $matches)) {
return $values = array_map(function ($value) {
@@ -2752,4 +2777,64 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
}
return $this->productEntityIdentifierField;
}
+
+ /**
+ * Update media gallery labels
+ *
+ * @param array $labels
+ * @return void
+ */
+ private function updateMediaGalleryLabels(array $labels)
+ {
+ if (empty($labels)) {
+ return;
+ }
+
+ $insertData = [];
+ foreach ($labels as $label) {
+ $imageData = $label['imageData'];
+
+ if ($imageData['label'] === null) {
+ $insertData[] = [
+ 'label' => $label['label'],
+ $this->getProductEntityLinkField() => $imageData[$this->getProductEntityLinkField()],
+ 'value_id' => $imageData['value_id'],
+ 'store_id' => \Magento\Store\Model\Store::DEFAULT_STORE_ID
+ ];
+ } else {
+ $this->_connection->update(
+ $this->mediaGalleryValueTableName,
+ [
+ 'label' => $label['label']
+ ],
+ [
+ $this->getProductEntityLinkField() . ' = ?' => $imageData[$this->getProductEntityLinkField()],
+ 'value_id = ?' => $imageData['value_id'],
+ 'store_id = ?' => \Magento\Store\Model\Store::DEFAULT_STORE_ID
+ ]
+ );
+ }
+ }
+
+ if (!empty($insertData)) {
+ $this->_connection->insertMultiple(
+ $this->mediaGalleryValueTableName,
+ $insertData
+ );
+ }
+ }
+
+ /**
+ * Parse values from multiple attributes fields
+ *
+ * @param string $labelRow
+ * @return array
+ */
+ private function parseMultipleValues($labelRow)
+ {
+ return $this->parseMultiselectValues(
+ $labelRow,
+ $this->getMultipleValueSeparator()
+ );
+ }
}
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php
index 45cd01bc8252d71711389ae3a837cffb2a846ac0..3f9e157c5710a63c1bb3a47d0462953e96ac48c1 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php
@@ -45,6 +45,8 @@ interface RowValidatorInterface extends \Magento\Framework\Validator\ValidatorIn
const ERROR_INVALID_TIER_PRICE_GROUP = 'tierPriceGroupInvalid';
+ const ERROR_INVALID_TIER_PRICE_TYPE = 'tierPriceTypeInvalid';
+
const ERROR_TIER_DATA_INCOMPLETE = 'tierPriceDataIsIncomplete';
const ERROR_SKU_NOT_FOUND_FOR_DELETE = 'skuNotFoundToDelete';
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Media.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Media.php
index 0b728ee5038873ddbb7a56eab967fcdf53c6c419..3067aa3c2b2eb29eb032201b0c6d062ab54baa08 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Media.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Media.php
@@ -5,7 +5,6 @@
*/
namespace Magento\CatalogImportExport\Model\Import\Product\Validator;
-use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator;
use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
class Media extends AbstractImportValidator implements RowValidatorInterface
@@ -16,19 +15,15 @@ class Media extends AbstractImportValidator implements RowValidatorInterface
const ADDITIONAL_IMAGES = 'additional_images';
+ /**
+ * @deprecated
+ * @see \Magento\CatalogImportExport\Model\Import\Product::getMultipleValueSeparator()
+ */
const ADDITIONAL_IMAGES_DELIMITER = ',';
/** @var array */
protected $mediaAttributes = ['image', 'small_image', 'thumbnail'];
- /**
- * {@inheritdoc}
- */
- public function init($context)
- {
- return parent::init($context);
- }
-
/**
* @param string $string
* @return bool
@@ -83,7 +78,7 @@ class Media extends AbstractImportValidator implements RowValidatorInterface
}
}
if (isset($value[self::ADDITIONAL_IMAGES]) && strlen($value[self::ADDITIONAL_IMAGES])) {
- foreach (explode(self::ADDITIONAL_IMAGES_DELIMITER, $value[self::ADDITIONAL_IMAGES]) as $image) {
+ foreach (explode($this->context->getMultipleValueSeparator(), $value[self::ADDITIONAL_IMAGES]) as $image) {
if (!$this->checkPath($image) && !$this->checkValidUrl($image)) {
$this->_addMessages(
[
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/MediaTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/MediaTest.php
index a4a937f25cf81334e19ef1aa079c1d274f79bacd..df7b33c72995b1a7a78faa6f0d5d74daf7ce8a5e 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/MediaTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/MediaTest.php
@@ -6,11 +6,14 @@
namespace Magento\CatalogImportExport\Test\Unit\Model\Import\Product\Validator;
+use Magento\CatalogImportExport\Model\Import\Product;
+use Magento\CatalogImportExport\Model\Import\Product\Validator\Media;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\ImportExport\Model\Import;
class MediaTest extends \PHPUnit_Framework_TestCase
{
- /** @var \Magento\CatalogImportExport\Model\Import\Product\Validator\Media */
+ /** @var Media */
protected $media;
/** @var ObjectManagerHelper */
@@ -21,7 +24,7 @@ class MediaTest extends \PHPUnit_Framework_TestCase
$this->objectManagerHelper = new ObjectManagerHelper($this);
$this->media = $this->objectManagerHelper->getObject(
- \Magento\CatalogImportExport\Model\Import\Product\Validator\Media::class,
+ Media::class,
[
]
@@ -41,6 +44,18 @@ class MediaTest extends \PHPUnit_Framework_TestCase
*/
public function testIsValid($data, $expected)
{
+ $contextMock = $this->getMockBuilder(Product::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $contextMock->expects($this->any())
+ ->method('getMultipleValueSeparator')
+ ->willReturn(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR);
+ $contextMock->expects($this->any())
+ ->method('retrieveMessageTemplate')
+ ->with(Media::ERROR_INVALID_MEDIA_URL_OR_PATH)
+ ->willReturn('%s');
+ $this->media->init($contextMock);
+
$result = $this->media->isValid($data);
$this->assertEquals($expected['result'], $result);
$messages = $this->media->getMessages();
@@ -50,7 +65,7 @@ class MediaTest extends \PHPUnit_Framework_TestCase
public function testIsValidClearMessagesCall()
{
$media = $this->getMock(
- \Magento\CatalogImportExport\Model\Import\Product\Validator\Media::class,
+ Media::class,
['_clearMessages'],
[],
'',
@@ -78,6 +93,14 @@ class MediaTest extends \PHPUnit_Framework_TestCase
'invalid' => [
['_media_image' => 1],
['result' => true,'messages' => []],
+ ],
+ 'additional_images' => [
+ ['additional_images' => 'image1.png,image2.jpg'],
+ ['result' => true, 'messages' => []]
+ ],
+ 'additional_images_fail' => [
+ ['additional_images' => 'image1.png|image2.jpg|image3.gif'],
+ ['result' => false, 'messages' => [0 => 'additional_images']]
]
];
}
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
index bf9c694d949d44709be47b73f08dd4eeb2c50c18..cd1fedf82fe85a4b0ea0b55ff056c38cd5ee8e4c 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
@@ -1280,6 +1280,43 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
$importProduct->validateRow($rowData, $rowNum);
}
+ /**
+ * @dataProvider getImagesFromRowDataProvider
+ */
+ public function testGetImagesFromRow($rowData, $expectedResult)
+ {
+ $this->assertEquals(
+ $this->importProduct->getImagesFromRow($rowData),
+ $expectedResult
+ );
+ }
+
+ public function getImagesFromRowDataProvider()
+ {
+ return [
+ [
+ [],
+ [[], []]
+ ],
+ [
+ [
+ 'image' => 'image3.jpg',
+ '_media_image' => 'image1.jpg,image2.png',
+ '_media_image_label' => 'label1,label2'
+ ],
+ [
+ [
+ 'image' => ['image3.jpg'],
+ '_media_image' => ['image1.jpg', 'image2.png']
+ ],
+ [
+ '_media_image' => ['label1', 'label2']
+ ],
+ ]
+ ]
+ ];
+ }
+
public function validateRowValidateNewProductTypeAddRowErrorCallDataProvider()
{
return [
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/Product/CollectionProcessor.php b/app/code/Magento/CatalogRule/Model/ResourceModel/Product/CollectionProcessor.php
new file mode 100644
index 0000000000000000000000000000000000000000..686fc3de623680d6e31cb318f94e20c71665638e
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Model/ResourceModel/Product/CollectionProcessor.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ *
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogRule\Model\ResourceModel\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Magento\CatalogRule\Pricing\Price\CatalogRulePrice;
+
+/**
+ * Add catalog rule prices to collection
+ */
+class CollectionProcessor
+{
+ /**
+ * @var \Magento\Store\Model\StoreManagerInterface
+ */
+ private $storeManager;
+
+ /**
+ * @var \Magento\Framework\App\ResourceConnection
+ */
+ private $resource;
+
+ /**
+ * @var \Magento\Customer\Model\Session
+ */
+ private $customerSession;
+
+ /**
+ * @var \Magento\Framework\Stdlib\DateTime
+ */
+ private $dateTime;
+
+ /**
+ * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
+ */
+ private $localeDate;
+
+ /**
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\App\ResourceConnection $resourceConnection
+ * @param \Magento\Customer\Model\Session $customerSession
+ * @param \Magento\Framework\Stdlib\DateTime $dateTime
+ * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
+ */
+ public function __construct(
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\App\ResourceConnection $resourceConnection,
+ \Magento\Customer\Model\Session $customerSession,
+ \Magento\Framework\Stdlib\DateTime $dateTime,
+ \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
+ ) {
+ $this->storeManager = $storeManager;
+ $this->resource = $resourceConnection;
+ $this->customerSession = $customerSession;
+ $this->dateTime = $dateTime;
+ $this->localeDate = $localeDate;
+ }
+
+ /**
+ * @param ProductCollection $productCollection
+ * @param string $joinColumn
+ * @return ProductCollection
+ */
+ public function addPriceData(ProductCollection $productCollection, $joinColumn = 'e.entity_id')
+ {
+ if (!$productCollection->hasFlag('catalog_rule_loaded')) {
+ $connection = $this->resource->getConnection();
+ $store = $this->storeManager->getStore();
+ $productCollection->getSelect()
+ ->joinLeft(
+ ['catalog_rule' => $this->resource->getTableName('catalogrule_product_price')],
+ implode(' AND ', [
+ 'catalog_rule.product_id = ' . $connection->quoteIdentifier($joinColumn),
+ $connection->quoteInto('catalog_rule.website_id = ?', $store->getWebsiteId()),
+ $connection->quoteInto(
+ 'catalog_rule.customer_group_id = ?',
+ $this->customerSession->getCustomerGroupId()
+ ),
+ $connection->quoteInto(
+ 'catalog_rule.rule_date = ?',
+ $this->dateTime->formatDate($this->localeDate->scopeDate($store->getId()), false)
+ ),
+ ]),
+ [CatalogRulePrice::PRICE_CODE => 'rule_price']
+ );
+ $productCollection->setFlag('catalog_rule_loaded', true);
+ }
+
+ return $productCollection;
+ }
+}
diff --git a/app/code/Magento/CatalogRuleConfigurable/Plugin/ConfigurableProduct/Model/ResourceModel/AddCatalogRulePrice.php b/app/code/Magento/CatalogRuleConfigurable/Plugin/ConfigurableProduct/Model/ResourceModel/AddCatalogRulePrice.php
index 5335043966f352d57632411f5b8d7eb38fc7c60f..c7f97f770c3fb28a073a1f80dcd8a734e368c23a 100644
--- a/app/code/Magento/CatalogRuleConfigurable/Plugin/ConfigurableProduct/Model/ResourceModel/AddCatalogRulePrice.php
+++ b/app/code/Magento/CatalogRuleConfigurable/Plugin/ConfigurableProduct/Model/ResourceModel/AddCatalogRulePrice.php
@@ -8,54 +8,21 @@
namespace Magento\CatalogRuleConfigurable\Plugin\ConfigurableProduct\Model\ResourceModel;
use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection;
-use Magento\CatalogRule\Pricing\Price\CatalogRulePrice;
class AddCatalogRulePrice
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessorFactory
*/
- private $storeManager;
+ private $catalogRuleCollectionFactory;
/**
- * @var \Magento\Framework\App\ResourceConnection
- */
- private $resource;
-
- /**
- * @var \Magento\Customer\Model\Session
- */
- private $customerSession;
-
- /**
- * @var \Magento\Framework\Stdlib\DateTime
- */
- private $dateTime;
-
- /**
- * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
- */
- private $localeDate;
-
- /**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
- * @param \Magento\Framework\App\ResourceConnection $resourceConnection
- * @param \Magento\Customer\Model\Session $customerSession
- * @param \Magento\Framework\Stdlib\DateTime $dateTime
- * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
+ * @param \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessorFactory $catalogRuleCollectionFactory
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
- \Magento\Framework\App\ResourceConnection $resourceConnection,
- \Magento\Customer\Model\Session $customerSession,
- \Magento\Framework\Stdlib\DateTime $dateTime,
- \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
+ \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessorFactory $catalogRuleCollectionFactory
) {
- $this->storeManager = $storeManager;
- $this->resource = $resourceConnection;
- $this->customerSession = $customerSession;
- $this->dateTime = $dateTime;
- $this->localeDate = $localeDate;
+ $this->catalogRuleCollectionFactory = $catalogRuleCollectionFactory;
}
/**
@@ -66,28 +33,9 @@ class AddCatalogRulePrice
*/
public function beforeLoad(Collection $productCollection, $printQuery = false, $logQuery = false)
{
- if (!$productCollection->hasFlag('catalog_rule_loaded')) {
- $connection = $this->resource->getConnection();
- $store = $this->storeManager->getStore();
- $productCollection->getSelect()
- ->joinLeft(
- ['catalog_rule' => $this->resource->getTableName('catalogrule_product_price')],
- implode(' AND ', [
- 'catalog_rule.product_id = e.entity_id',
- $connection->quoteInto('catalog_rule.website_id = ?', $store->getWebsiteId()),
- $connection->quoteInto(
- 'catalog_rule.customer_group_id = ?',
- $this->customerSession->getCustomerGroupId()
- ),
- $connection->quoteInto(
- 'catalog_rule.rule_date = ?',
- $this->dateTime->formatDate($this->localeDate->scopeDate($store->getId()), false)
- ),
- ]),
- [CatalogRulePrice::PRICE_CODE => 'rule_price']
- );
- $productCollection->setFlag('catalog_rule_loaded', true);
- }
+ $this->catalogRuleCollectionFactory
+ ->create()
+ ->addPriceData($productCollection);
return [$printQuery, $logQuery];
}
diff --git a/app/code/Magento/CatalogRuleConfigurable/composer.json b/app/code/Magento/CatalogRuleConfigurable/composer.json
index b930380f7bb025ea409be398c013c12773cb2f20..921873146e0a5cd7295aae4543d9ded16f8368f8 100644
--- a/app/code/Magento/CatalogRuleConfigurable/composer.json
+++ b/app/code/Magento/CatalogRuleConfigurable/composer.json
@@ -7,8 +7,6 @@
"magento/framework": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/module-catalog-rule": "100.2.*",
- "magento/module-store": "100.2.*",
- "magento/module-customer": "100.2.*",
"magento/magento-composer-installer": "*"
},
"suggest": {
diff --git a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Combine.php b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Combine.php
index 283309247cd9d0fbdc9edc8b0cb2bf2d06b2f33c..e40aae5d189b04b9e63911fddbe4813e378fcfa8 100644
--- a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Combine.php
+++ b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Combine.php
@@ -82,7 +82,7 @@ class Combine extends \Magento\Rule\Model\Condition\Combine
public function collectValidatedAttributes($productCollection)
{
foreach ($this->getConditions() as $condition) {
- $condition->addToCollection($productCollection);
+ $condition->collectValidatedAttributes($productCollection);
}
return $this;
}
diff --git a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
index 262ba8f6a6d8dd198da0cb85c87e37a4c1d73795..7d41741135b80498f9b77cc77e4014369efaefc1 100644
--- a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
@@ -223,4 +223,12 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
return $result;
}
+
+ /**
+ * {@inheritdoc}
+ */
+ public function collectValidatedAttributes($productCollection)
+ {
+ return $this->addToCollection($productCollection);
+ }
}
diff --git a/app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/CombineTest.php b/app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/CombineTest.php
index fa6474e31e7ccb715c09d1b8d2df5523f2ec9f13..dd42ee1c7c9216fc3749a92c643c4afc972bc233 100644
--- a/app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/CombineTest.php
+++ b/app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/CombineTest.php
@@ -80,9 +80,9 @@ class CombineTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
$condition = $this->getMockBuilder(\Magento\CatalogWidget\Model\Rule\Condition\Combine::class)
- ->disableOriginalConstructor()->setMethods(['addToCollection'])
+ ->disableOriginalConstructor()->setMethods(['collectValidatedAttributes'])
->getMock();
- $condition->expects($this->any())->method('addToCollection')->with($collection)
+ $condition->expects($this->any())->method('collectValidatedAttributes')->with($collection)
->will($this->returnSelf());
$this->condition->setConditions([$condition]);
diff --git a/app/code/Magento/Checkout/Block/Cart/LayoutProcessor.php b/app/code/Magento/Checkout/Block/Cart/LayoutProcessor.php
index a492002b0a5a5f55219efe09c3422c39f46e9fee..a042c41634bcb615921b93e01c4c42b23bfb8cd4 100644
--- a/app/code/Magento/Checkout/Block/Cart/LayoutProcessor.php
+++ b/app/code/Magento/Checkout/Block/Cart/LayoutProcessor.php
@@ -85,14 +85,14 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
'visible' => true,
'formElement' => 'select',
'label' => __('Country'),
- 'options' => $this->countryCollection->loadByStore()->toOptionArray(),
+ 'options' => [],
'value' => null
],
'region_id' => [
'visible' => true,
'formElement' => 'select',
'label' => __('State/Province'),
- 'options' => $this->regionCollection->load()->toOptionArray(),
+ 'options' => [],
'value' => null
],
'postcode' => [
@@ -103,6 +103,13 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
]
];
+ if (!isset($jsLayout['components']['checkoutProvider']['dictionaries'])) {
+ $jsLayout['components']['checkoutProvider']['dictionaries'] = [
+ 'country_id' => $this->countryCollection->loadByStore()->toOptionArray(),
+ 'region_id' => $this->regionCollection->addAllowedCountriesFilter()->toOptionArray(),
+ ];
+ }
+
if (isset($jsLayout['components']['block-summary']['children']['block-shipping']['children']
['address-fieldsets']['children'])
) {
diff --git a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
index 1882d88e04a8b25f51ccf0afbd92a1635f443735..e7686e4bea58b3a5f4db81e1b11f2e17770744c8 100644
--- a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
+++ b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
@@ -192,6 +192,15 @@ class AttributeMerger
'visible' => isset($additionalConfig['visible']) ? $additionalConfig['visible'] : true,
];
+ if ($attributeCode === 'region_id' || $attributeCode === 'country_id') {
+ unset($element['options']);
+ $element['deps'] = [$providerName];
+ $element['imports'] = [
+ 'initialOptions' => 'index = ' . $providerName . ':dictionaries.' . $attributeCode,
+ 'setOptions' => 'index = ' . $providerName . ':dictionaries.' . $attributeCode
+ ];
+ }
+
if (isset($attributeConfig['value']) && $attributeConfig['value'] != null) {
$element['value'] = $attributeConfig['value'];
} elseif (isset($attributeConfig['default']) && $attributeConfig['default'] != null) {
@@ -341,11 +350,11 @@ class AttributeMerger
* @param string $attributeCode
* @param array $attributeConfig
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function getFieldOptions($attributeCode, array $attributeConfig)
{
- $options = isset($attributeConfig['options']) ? $attributeConfig['options'] : [];
- return ($attributeCode == 'country_id') ? $this->orderCountryOptions($options) : $options;
+ return isset($attributeConfig['options']) ? $attributeConfig['options'] : [];
}
/**
@@ -353,6 +362,7 @@ class AttributeMerger
*
* @param array $countryOptions
* @return array
+ * @deprecated
*/
protected function orderCountryOptions(array $countryOptions)
{
diff --git a/app/code/Magento/Checkout/Block/Checkout/DirectoryDataProcessor.php b/app/code/Magento/Checkout/Block/Checkout/DirectoryDataProcessor.php
new file mode 100644
index 0000000000000000000000000000000000000000..4a02ebbd079a407e531f17168531a5f9439915fb
--- /dev/null
+++ b/app/code/Magento/Checkout/Block/Checkout/DirectoryDataProcessor.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Checkout\Block\Checkout;
+
+use Magento\Directory\Helper\Data as DirectoryHelper;
+use Magento\Store\Api\StoreResolverInterface;
+
+/**
+ * Directory data processor.
+ *
+ * This class adds various country and region dictionaries to checkout page.
+ * This data can be used by other UI components during checkout flow.
+ */
+class DirectoryDataProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcessorInterface
+{
+ /**
+ * @var array
+ */
+ private $countryOptions;
+
+ /**
+ * @var array
+ */
+ private $regionOptions;
+
+ /**
+ * @var \Magento\Directory\Model\ResourceModel\Region\CollectionFactory
+ */
+ private $regionCollectionFactory;
+
+ /**
+ * @var \Magento\Directory\Model\ResourceModel\Region\CollectionFactory
+ */
+ private $countryCollectionFactory;
+
+ /**
+ * @var StoreResolverInterface
+ */
+ private $storeResolver;
+
+ /**
+ * @var DirectoryHelper
+ */
+ private $directoryHelper;
+
+ /**
+ * @param \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countryCollection
+ * @param \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollection
+ * @param StoreResolverInterface $storeResolver
+ * @param DirectoryHelper $directoryHelper
+ */
+ public function __construct(
+ \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countryCollection,
+ \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollection,
+ StoreResolverInterface $storeResolver,
+ DirectoryHelper $directoryHelper
+ ) {
+ $this->countryCollectionFactory = $countryCollection;
+ $this->regionCollectionFactory = $regionCollection;
+ $this->storeResolver = $storeResolver;
+ $this->directoryHelper = $directoryHelper;
+ }
+
+ /**
+ * Process js Layout of block
+ *
+ * @param array $jsLayout
+ * @return array
+ */
+ public function process($jsLayout)
+ {
+ if (!isset($jsLayout['components']['checkoutProvider']['dictionaries'])) {
+ $jsLayout['components']['checkoutProvider']['dictionaries'] = [
+ 'country_id' => $this->getCountryOptions(),
+ 'region_id' => $this->getRegionOptions(),
+ ];
+ }
+
+ return $jsLayout;
+ }
+
+ /**
+ * Get country options list.
+ *
+ * @return array
+ */
+ private function getCountryOptions()
+ {
+ if (!isset($this->countryOptions)) {
+ $this->countryOptions = $this->countryCollectionFactory->create()->loadByStore(
+ $this->storeResolver->getCurrentStoreId()
+ )->toOptionArray();
+ $this->countryOptions = $this->orderCountryOptions($this->countryOptions);
+ }
+
+ return $this->countryOptions;
+ }
+
+ /**
+ * Get region options list.
+ *
+ * @return array
+ */
+ private function getRegionOptions()
+ {
+ if (!isset($this->regionOptions)) {
+ $this->regionOptions = $this->regionCollectionFactory->create()->addAllowedCountriesFilter(
+ $this->storeResolver->getCurrentStoreId()
+ )->toOptionArray();
+ }
+
+ return $this->regionOptions;
+ }
+
+ /**
+ * Sort country options by top country codes.
+ *
+ * @param array $countryOptions
+ * @return array
+ */
+ private function orderCountryOptions(array $countryOptions)
+ {
+ $topCountryCodes = $this->directoryHelper->getTopCountryCodes();
+ if (empty($topCountryCodes)) {
+ return $countryOptions;
+ }
+
+ $headOptions = [];
+ $tailOptions = [[
+ 'value' => 'delimiter',
+ 'label' => '──────────',
+ 'disabled' => true,
+ ]];
+ foreach ($countryOptions as $countryOption) {
+ if (empty($countryOption['value']) || in_array($countryOption['value'], $topCountryCodes)) {
+ array_push($headOptions, $countryOption);
+ } else {
+ array_push($tailOptions, $countryOption);
+ }
+ }
+ return array_merge($headOptions, $tailOptions);
+ }
+}
diff --git a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
index 1b2c7444198915c866a55ca2cc9b8e6b29544e39..fd8434703ab756a2664e235332d09e13e7890e19 100644
--- a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
+++ b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
@@ -7,7 +7,11 @@ namespace Magento\Checkout\Block\Checkout;
use Magento\Checkout\Helper\Data;
use Magento\Framework\App\ObjectManager;
+use Magento\Store\Api\StoreResolverInterface;
+/**
+ * Class LayoutProcessor
+ */
class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcessorInterface
{
/**
@@ -35,6 +39,16 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
*/
private $checkoutDataHelper;
+ /**
+ * @var StoreResolverInterface
+ */
+ private $storeResolver;
+
+ /**
+ * @var \Magento\Shipping\Model\Config
+ */
+ private $shippingConfig;
+
/**
* @param \Magento\Customer\Model\AttributeMetadataDataProvider $attributeMetadataDataProvider
* @param \Magento\Ui\Component\Form\AttributeMapper $attributeMapper
@@ -146,6 +160,16 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
$elements
);
}
+ if (isset($jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children']
+ ['step-config']['children']['shipping-rates-validation']['children']
+ )) {
+ $jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children']
+ ['step-config']['children']['shipping-rates-validation']['children'] =
+ $this->processShippingChildrenComponents(
+ $jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children']
+ ['step-config']['children']['shipping-rates-validation']['children']
+ );
+ }
if (isset($jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']
['children']['shippingAddress']['children']['shipping-address-fieldset']['children']
@@ -163,6 +187,26 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
return $jsLayout;
}
+ /**
+ * Process shipping configuration to exclude inactive carriers.
+ *
+ * @param array $shippingRatesLayout
+ * @return array
+ */
+ private function processShippingChildrenComponents($shippingRatesLayout)
+ {
+ $activeCarriers = $this->getShippingConfig()->getActiveCarriers(
+ $this->getStoreResolver()->getCurrentStoreId()
+ );
+ foreach (array_keys($shippingRatesLayout) as $carrierName) {
+ $carrierKey = str_replace('-rates-validation', '', $carrierName);
+ if (!array_key_exists($carrierKey, $activeCarriers)) {
+ unset($shippingRatesLayout[$carrierName]);
+ }
+ }
+ return $shippingRatesLayout;
+ }
+
/**
* Appends billing address form component to payment layout
* @param array $paymentLayout
@@ -314,4 +358,34 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
return $this->checkoutDataHelper;
}
+
+ /**
+ * Retrieve Shipping Configuration.
+ *
+ * @return \Magento\Shipping\Model\Config
+ * @deprecated
+ */
+ private function getShippingConfig()
+ {
+ if (!$this->shippingConfig) {
+ $this->shippingConfig = ObjectManager::getInstance()->get(\Magento\Shipping\Model\Config::class);
+ }
+
+ return $this->shippingConfig;
+ }
+
+ /**
+ * Get store resolver.
+ *
+ * @return StoreResolverInterface
+ * @deprecated
+ */
+ private function getStoreResolver()
+ {
+ if (!$this->storeResolver) {
+ $this->storeResolver = ObjectManager::getInstance()->get(StoreResolverInterface::class);
+ }
+
+ return $this->storeResolver;
+ }
}
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/LayoutProcessorTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/LayoutProcessorTest.php
index 95ffed86cbb35177051303726222813942336c72..5eabb6c9c86a47def05a69762c21f0b47f5a608f 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/LayoutProcessorTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/LayoutProcessorTest.php
@@ -69,7 +69,7 @@ class LayoutProcessorTest extends \PHPUnit_Framework_TestCase
$this->countryCollection->expects($this->once())->method('loadByStore')->willReturnSelf();
$this->countryCollection->expects($this->once())->method('toOptionArray')->willReturn($countries);
- $this->regionCollection->expects($this->once())->method('load')->willReturnSelf();
+ $this->regionCollection->expects($this->once())->method('addAllowedCountriesFilter')->willReturnSelf();
$this->regionCollection->expects($this->once())->method('toOptionArray')->willReturn($regions);
$layoutMerged = $layout;
@@ -77,7 +77,12 @@ class LayoutProcessorTest extends \PHPUnit_Framework_TestCase
['address-fieldsets']['children']['fieldThree'] = ['param' => 'value'];
$layoutMergedPointer = &$layoutMerged['components']['block-summary']['children']['block-shipping']
['children']['address-fieldsets']['children'];
-
+ $layoutMerged['components']['checkoutProvider'] = [
+ 'dictionaries' => [
+ 'country_id' => [],
+ 'region_id' => [],
+ ]
+ ];
$elements = [
'city' => [
'visible' => false,
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Checkout/DirectoryDataProcessorTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/DirectoryDataProcessorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..c84fac464c047ad611268d26ac988adb2b419596
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/DirectoryDataProcessorTest.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Checkout\Test\Unit\Block\Checkout;
+
+class DirectoryDataProcessorTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Checkout\Block\Checkout\DirectoryDataProcessor
+ */
+ protected $model;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $countryCollectionFactoryMock;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $countryCollectionMock;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $regionCollectionFactoryMock;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $regionCollectionMock;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $storeResolverMock;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $directoryDataHelperMock;
+
+ protected function setUp()
+ {
+ $this->countryCollectionFactoryMock = $this->getMock(
+ \Magento\Directory\Model\ResourceModel\Country\CollectionFactory::class,
+ ['create'],
+ [],
+ '',
+ false
+ );
+ $this->countryCollectionMock = $this->getMock(
+ \Magento\Directory\Model\ResourceModel\Country\Collection::class,
+ [],
+ [],
+ '',
+ false
+ );
+ $this->regionCollectionFactoryMock = $this->getMock(
+ \Magento\Directory\Model\ResourceModel\Region\CollectionFactory::class,
+ ['create'],
+ [],
+ '',
+ false
+ );
+ $this->regionCollectionMock = $this->getMock(
+ \Magento\Directory\Model\ResourceModel\Region\Collection::class,
+ [],
+ [],
+ '',
+ false
+ );
+ $this->storeResolverMock = $this->getMock(
+ \Magento\Store\Api\StoreResolverInterface::class
+ );
+ $this->directoryDataHelperMock = $this->getMock(
+ \Magento\Directory\Helper\Data::class,
+ [],
+ [],
+ '',
+ false
+ );
+
+ $this->model = new \Magento\Checkout\Block\Checkout\DirectoryDataProcessor(
+ $this->countryCollectionFactoryMock,
+ $this->regionCollectionFactoryMock,
+ $this->storeResolverMock,
+ $this->directoryDataHelperMock
+ );
+ }
+
+ public function testProcess()
+ {
+ $expectedResult['components']['checkoutProvider']['dictionaries'] = [
+ 'country_id' => [],
+ 'region_id' => [],
+ ];
+
+ $this->countryCollectionFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($this->countryCollectionMock);
+ $this->countryCollectionMock->expects($this->once())->method('loadByStore')->willReturnSelf();
+ $this->countryCollectionMock->expects($this->once())->method('toOptionArray')->willReturn([]);
+ $this->regionCollectionFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($this->regionCollectionMock);
+ $this->regionCollectionMock->expects($this->once())->method('addAllowedCountriesFilter')->willReturnSelf();
+ $this->regionCollectionMock->expects($this->once())->method('toOptionArray')->willReturn([]);
+
+ $this->assertEquals($expectedResult, $this->model->process([]));
+ }
+}
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Checkout/LayoutProcessorTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/LayoutProcessorTest.php
index 1351213f990b54a573a5d5d3a015e7b940a5f7ee..95aed9b56afc33d2f08f778a2e4b1e2162d35fe6 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Checkout/LayoutProcessorTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/LayoutProcessorTest.php
@@ -17,6 +17,8 @@ use PHPUnit_Framework_MockObject_MockObject as MockObject;
/**
* LayoutProcessorTest covers a list of variations for
* checkout layout processor
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class LayoutProcessorTest extends \PHPUnit_Framework_TestCase
{
@@ -45,6 +47,11 @@ class LayoutProcessorTest extends \PHPUnit_Framework_TestCase
*/
private $layoutProcessor;
+ /**
+ * @var MockObject
+ */
+ private $storeResolver;
+
protected function setUp()
{
$objectManager = new ObjectManager($this);
@@ -79,8 +86,11 @@ class LayoutProcessorTest extends \PHPUnit_Framework_TestCase
$this->attributeMerger
);
+ $this->storeResolver = $this->getMock(\Magento\Store\Api\StoreResolverInterface::class);
+
$objectManager->setBackwardCompatibleProperty($this->layoutProcessor, 'checkoutDataHelper', $this->dataHelper);
$objectManager->setBackwardCompatibleProperty($this->layoutProcessor, 'options', $options);
+ $objectManager->setBackwardCompatibleProperty($this->layoutProcessor, 'storeResolver', $this->storeResolver);
}
/**
diff --git a/app/code/Magento/Checkout/etc/frontend/di.xml b/app/code/Magento/Checkout/etc/frontend/di.xml
index 6fb9058c3b7681c8905a40a5eace5d88d8566b6f..69ed33721740d680ec6662e43858e9c42a1c6629 100644
--- a/app/code/Magento/Checkout/etc/frontend/di.xml
+++ b/app/code/Magento/Checkout/etc/frontend/di.xml
@@ -55,6 +55,7 @@
<argument name="layoutProcessors" xsi:type="array">
<item name="addressFormAttributes" xsi:type="object">Magento\Checkout\Block\Checkout\LayoutProcessor</item>
<item name="totalsSortOrder" xsi:type="object">Magento\Checkout\Block\Checkout\TotalsProcessor</item>
+ <item name="directoryData" xsi:type="object">Magento\Checkout\Block\Checkout\DirectoryDataProcessor</item>
</argument>
</arguments>
</type>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
index 0f221a393f5eb181f31a778ce4d01da1b0cc109b..ebe8f4570b02f39ca9acb39986d72b5c402b496d 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
@@ -17,7 +17,13 @@
<div class="field qty">
<label class="label" for="qty"><span><?php /* @escapeNotVerified */ echo __('Qty') ?></span></label>
<div class="control">
- <input type="number" name="qty" id="qty" maxlength="12" value="" title="<?php /* @escapeNotVerified */ echo __('Qty') ?>" class="input-text qty" data-validate="{'required-number':true,digits:true}"/>
+ <input type="number"
+ name="qty"
+ id="qty"
+ value=""
+ title="<?php /* @escapeNotVerified */ echo __('Qty') ?>"
+ class="input-text qty"
+ data-validate="{'required-number':true,digits:true}"/>
</div>
</div>
<?php endif; ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
index d83b552b05cd4be4e55262bfb4c56a86039113c6..21fafe4d37f1b2496f421026c410e974972bc59d 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
@@ -96,7 +96,6 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
size="4"
title="<?php echo $block->escapeHtml(__('Qty')); ?>"
class="input-text qty"
- maxlength="12"
data-validate="{required:true,'validate-greater-than-zero':true}"
data-role="cart-item-qty"/>
</div>
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 9a3685b212b435e8c03adb7be2cd7a182e591b87..c215b1989edbeafe273819b09f2588f06169b4e5 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
@@ -10,13 +10,13 @@ define([], function () {
* Returns new address object
*/
return function (addressData) {
- var identifier = Date.now();
- var regionId = null;
+ var identifier = Date.now(),
+ regionId;
if (addressData.region && addressData.region.region_id) {
regionId = addressData.region.region_id;
} else if (addressData.country_id && addressData.country_id == window.checkoutConfig.defaultCountryId) {
- regionId = window.checkoutConfig.defaultRegionId;
+ regionId = window.checkoutConfig.defaultRegionId || undefined;
}
return {
@@ -25,7 +25,7 @@ define([], function () {
regionId: regionId || addressData.regionId,
regionCode: (addressData.region) ? addressData.region.region_code : null,
region: (addressData.region) ? addressData.region.region : null,
- customerId: addressData.customer_id,
+ customerId: addressData.customer_id || addressData.customerId,
street: addressData.street,
company: addressData.company,
telephone: addressData.telephone,
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/cart/shipping-estimation.js b/app/code/Magento/Checkout/view/frontend/web/js/view/cart/shipping-estimation.js
index 08641f015f609a9b8c75e80e0cfd39a82a6f5b1e..cd43dc646584d52708f3923c042889fdb20e0d82 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/cart/shipping-estimation.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/cart/shipping-estimation.js
@@ -50,9 +50,13 @@ define(
if (address) {
estimatedAddress = address.isEditable() ?
addressConverter.quoteAddressToFormAddressData(address) :
- addressConverter.quoteAddressToFormAddressData(
- addressConverter.addressToEstimationAddress(address)
- );
+ {
+ // only the following fields must be used by estimation form data provider
+ 'country_id': address.countryId,
+ region: address.region,
+ 'region_id': address.regionId,
+ postcode: address.postcode
+ };
checkoutProvider.set(
'shippingAddress',
$.extend({}, checkoutProvider.get('shippingAddress'), estimatedAddress)
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
index 8910e41731d11a9be99bf1777dc13e3550781976..fb15e47eaf7d487da1c8671c545f0b99ce2a7445 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
@@ -79,7 +79,6 @@ define(
fieldsetName = 'checkout.steps.shipping-step.shippingAddress.shipping-address-fieldset';
this._super();
- shippingRatesValidator.initFields(fieldsetName);
if (!quote.isVirtual()) {
stepNavigator.registerStep(
@@ -120,6 +119,7 @@ define(
checkoutProvider.on('shippingAddress', function (shippingAddressData) {
checkoutData.setShippingAddressFromData(shippingAddressData);
});
+ shippingRatesValidator.initFields(fieldsetName);
});
return this;
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
index 89789996e5248bb8ffec2ac9db18b52eec315d56..8796152eb60315266d870682924f44789c2f5dc7 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
@@ -79,8 +79,7 @@
}, value: qty"
type="number"
size="4"
- class="item-qty cart-item-qty"
- maxlength="12"/>
+ class="item-qty cart-item-qty">
<button data-bind="attr: {
id: 'update-cart-item-'+item_id,
'data-cart-item': item_id,
diff --git a/app/code/Magento/Cms/Setup/UpgradeData.php b/app/code/Magento/Cms/Setup/UpgradeData.php
index 41a28989439af2e9ae14fe270b603e7e8c254abb..6d22f782b25b130b0cca1174e5386e7fb92cd5a7 100644
--- a/app/code/Magento/Cms/Setup/UpgradeData.php
+++ b/app/code/Magento/Cms/Setup/UpgradeData.php
@@ -13,6 +13,9 @@ use Magento\Framework\Setup\UpgradeDataInterface;
class UpgradeData implements UpgradeDataInterface
{
+ /**
+ * @deprecated
+ */
const PRIVACY_COOKIE_PAGE_ID = 4;
/**
@@ -234,7 +237,10 @@ class UpgradeData implements UpgradeDataInterface
</table>
</div>
EOD;
- $privacyAndCookiePolicyPage = $this->createPage()->load(self::PRIVACY_COOKIE_PAGE_ID);
+ $privacyAndCookiePolicyPage = $this->createPage()->load(
+ 'privacy-policy-cookie-restriction-mode',
+ 'identifier'
+ );
$privacyAndCookiePolicyPageId = $privacyAndCookiePolicyPage->getId();
if ($privacyAndCookiePolicyPageId) {
$privacyAndCookiePolicyPage->setContent($newPageContent);
diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
index 1cc1cceefb39972cfc09d2c7f70463d2f3f76da7..51c68145b24cf5e72061a51647d4b311f39e60bf 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
@@ -92,6 +92,18 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
);
}
+ /**
+ * Get cache key informative items.
+ *
+ * @return array
+ */
+ public function getCacheKeyInfo()
+ {
+ $parentData = parent::getCacheKeyInfo();
+ $parentData[] = $this->priceCurrency->getCurrencySymbol();
+ return $parentData;
+ }
+
/**
* Get allowed attributes
*
diff --git a/app/code/Magento/Customer/view/frontend/web/js/model/customer-addresses.js b/app/code/Magento/Customer/view/frontend/web/js/model/customer-addresses.js
index f6740550efca6556490481a9c6c0516d21b9b4e2..a96dca0002d69d30fd0aab7372020e787383512e 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/model/customer-addresses.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/model/customer-addresses.js
@@ -11,11 +11,13 @@ define(
],
function($, ko, address) {
"use strict";
+
var isLoggedIn = ko.observable(window.isCustomerLoggedIn);
+
return {
getAddressItems: function() {
var items = [];
- if (isLoggedIn) {
+ if (isLoggedIn()) {
var customerData = window.customerData;
if (Object.keys(customerData).length) {
$.each(customerData.addresses, function (key, item) {
@@ -23,8 +25,9 @@ define(
});
}
}
+
return items;
}
}
}
-);
\ No newline at end of file
+);
diff --git a/app/code/Magento/Customer/view/frontend/web/js/model/customer/address.js b/app/code/Magento/Customer/view/frontend/web/js/model/customer/address.js
index 30fbef98fd39ab15db1c7971e3e86ad82e367253..e013a96e4890aee11d30641a2f2ee31c4e6088c2 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/model/customer/address.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/model/customer/address.js
@@ -10,11 +10,17 @@ define([], function() {
* Returns new address object
*/
return function (addressData) {
+ var regionId;
+
+ if (addressData.region['region_id'] && addressData.region['region_id'] !== '0') {
+ regionId = addressData.region['region_id'] + '';
+ }
+
return {
customerAddressId: addressData.id,
email: addressData.email,
countryId: addressData.country_id,
- regionId: addressData.region_id,
+ regionId: regionId,
regionCode: addressData.region.region_code,
region: addressData.region.region,
customerId: addressData.customer_id,
diff --git a/app/code/Magento/Developer/Model/Logger/Handler/Debug.php b/app/code/Magento/Developer/Model/Logger/Handler/Debug.php
index e05f008f70aa80a47f2eb8a6094d0f2ca3292671..cdf2403fa40a861a68b09b1112cd8885011ea92f 100644
--- a/app/code/Magento/Developer/Model/Logger/Handler/Debug.php
+++ b/app/code/Magento/Developer/Model/Logger/Handler/Debug.php
@@ -9,6 +9,7 @@ use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\App\State;
use Magento\Framework\Filesystem\DriverInterface;
use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\DeploymentConfig;
/**
* Class Debug
@@ -25,22 +26,30 @@ class Debug extends \Magento\Framework\Logger\Handler\Debug
*/
private $scopeConfig;
+ /**
+ * @var DeploymentConfig
+ */
+ private $deploymentConfig;
+
/**
* @param DriverInterface $filesystem
* @param State $state
* @param ScopeConfigInterface $scopeConfig
+ * @param DeploymentConfig $deploymentConfig
* @param string $filePath
*/
public function __construct(
DriverInterface $filesystem,
State $state,
ScopeConfigInterface $scopeConfig,
+ DeploymentConfig $deploymentConfig,
$filePath = null
) {
parent::__construct($filesystem, $filePath);
$this->state = $state;
$this->scopeConfig = $scopeConfig;
+ $this->deploymentConfig = $deploymentConfig;
}
/**
@@ -48,9 +57,13 @@ class Debug extends \Magento\Framework\Logger\Handler\Debug
*/
public function isHandling(array $record)
{
- return
- parent::isHandling($record)
- && $this->state->getMode() !== State::MODE_PRODUCTION
- && $this->scopeConfig->getValue('dev/debug/debug_logging', ScopeInterface::SCOPE_STORE);
+ if ($this->deploymentConfig->isAvailable()) {
+ return
+ parent::isHandling($record)
+ && $this->state->getMode() !== State::MODE_PRODUCTION
+ && $this->scopeConfig->getValue('dev/debug/debug_logging', ScopeInterface::SCOPE_STORE);
+ }
+
+ return parent::isHandling($record);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/DebugTest.php b/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/DebugTest.php
index 7eae4020e676884a4710549c959b8f774efe9e14..e539e6b1772b87182ee4c5bb763d262ca60386b8 100644
--- a/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/DebugTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/DebugTest.php
@@ -13,9 +13,11 @@ use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
use Magento\Store\Model\ScopeInterface;
use Monolog\Formatter\FormatterInterface;
use Monolog\Logger;
+use Magento\Framework\App\DeploymentConfig;
/**
* Class DebugTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class DebugTest extends \PHPUnit_Framework_TestCase
{
@@ -44,6 +46,11 @@ class DebugTest extends \PHPUnit_Framework_TestCase
*/
private $formatterMock;
+ /**
+ * @var DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $deploymentConfigMock;
+
protected function setUp()
{
$this->filesystemMock = $this->getMockBuilder(DriverInterface::class)
@@ -55,6 +62,10 @@ class DebugTest extends \PHPUnit_Framework_TestCase
->getMockForAbstractClass();
$this->formatterMock = $this->getMockBuilder(FormatterInterface::class)
->getMockForAbstractClass();
+ $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
+ ->disableOriginalConstructor()
+ ->disableOriginalClone()
+ ->getMock();
$this->formatterMock->expects($this->any())
->method('format')
@@ -64,12 +75,16 @@ class DebugTest extends \PHPUnit_Framework_TestCase
'filesystem' => $this->filesystemMock,
'state' => $this->stateMock,
'scopeConfig' => $this->scopeConfigMock,
+ 'deploymentConfig' => $this->deploymentConfigMock
]);
$this->model->setFormatter($this->formatterMock);
}
public function testHandle()
{
+ $this->deploymentConfigMock->expects($this->once())
+ ->method('isAvailable')
+ ->willReturn(true);
$this->stateMock->expects($this->once())
->method('getMode')
->willReturn(State::MODE_DEVELOPER);
@@ -78,22 +93,28 @@ class DebugTest extends \PHPUnit_Framework_TestCase
->with('dev/debug/debug_logging', ScopeInterface::SCOPE_STORE, null)
->willReturn(true);
- $this->model->handle(['formatted' => false, 'level' => Logger::DEBUG]);
+ $this->assertTrue($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
}
public function testHandleDisabledByProduction()
{
+ $this->deploymentConfigMock->expects($this->once())
+ ->method('isAvailable')
+ ->willReturn(true);
$this->stateMock->expects($this->once())
->method('getMode')
->willReturn(State::MODE_PRODUCTION);
$this->scopeConfigMock->expects($this->never())
->method('getValue');
- $this->model->handle(['formatted' => false, 'level' => Logger::DEBUG]);
+ $this->assertFalse($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
}
public function testHandleDisabledByConfig()
{
+ $this->deploymentConfigMock->expects($this->once())
+ ->method('isAvailable')
+ ->willReturn(true);
$this->stateMock->expects($this->once())
->method('getMode')
->willReturn(State::MODE_DEVELOPER);
@@ -102,16 +123,32 @@ class DebugTest extends \PHPUnit_Framework_TestCase
->with('dev/debug/debug_logging', ScopeInterface::SCOPE_STORE, null)
->willReturn(false);
- $this->model->handle(['formatted' => false, 'level' => Logger::DEBUG]);
+ $this->assertFalse($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
}
public function testHandleDisabledByLevel()
{
+ $this->deploymentConfigMock->expects($this->once())
+ ->method('isAvailable')
+ ->willReturn(true);
+ $this->stateMock->expects($this->never())
+ ->method('getMode');
+ $this->scopeConfigMock->expects($this->never())
+ ->method('getValue');
+
+ $this->assertFalse($this->model->isHandling(['formatted' => false, 'level' => Logger::API]));
+ }
+
+ public function testDeploymentConfigIsNotAvailable()
+ {
+ $this->deploymentConfigMock->expects($this->once())
+ ->method('isAvailable')
+ ->willReturn(false);
$this->stateMock->expects($this->never())
->method('getMode');
$this->scopeConfigMock->expects($this->never())
->method('getValue');
- $this->model->handle(['formatted' => false, 'level' => Logger::API]);
+ $this->assertTrue($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
}
}
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Region/Collection.php b/app/code/Magento/Directory/Model/ResourceModel/Region/Collection.php
index 718e0c0223d767dd3857f5c796d9b7f9d918900a..3fdb20165d4bea912e42c94e14c5c0b3e01cdf8e 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Region/Collection.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Region/Collection.php
@@ -9,6 +9,14 @@
*/
namespace Magento\Directory\Model\ResourceModel\Region;
+use Magento\Directory\Model\AllowedCountries;
+use Magento\Framework\App\ObjectManager;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Class Collection
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
{
/**
@@ -30,6 +38,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
*/
protected $_localeResolver;
+ /**
+ * @var AllowedCountries
+ */
+ private $allowedCountriesReader;
+
/**
* @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
@@ -89,6 +102,40 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
return $this;
}
+ /**
+ * Return Allowed Countries reader
+ *
+ * @return \Magento\Directory\Model\AllowedCountries
+ * @deprecated
+ */
+ private function getAllowedCountriesReader()
+ {
+ if (!$this->allowedCountriesReader) {
+ $this->allowedCountriesReader = ObjectManager::getInstance()->get(AllowedCountries::class);
+ }
+
+ return $this->allowedCountriesReader;
+ }
+
+ /**
+ * Set allowed countries filter based on the given store.
+ * This is a convenience method for collection filtering based on store configuration settings.
+ *
+ * @param null|int|string|\Magento\Store\Model\Store $store
+ * @return \Magento\Directory\Model\ResourceModel\Region\Collection
+ */
+ public function addAllowedCountriesFilter($store = null)
+ {
+ $allowedCountries = $this->getAllowedCountriesReader()
+ ->getAllowedCountries(ScopeInterface::SCOPE_STORE, $store);
+
+ if (!empty($allowedCountries)) {
+ $this->addFieldToFilter('main_table.country_id', ['in' => $allowedCountries]);
+ }
+
+ return $this;
+ }
+
/**
* Filter by country_id
*
diff --git a/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Region/CollectionTest.php b/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Region/CollectionTest.php
index 59c054b00a5f9c11607ca2126c0e0174918785e6..5c09ab119295a4e511f99f80f8320950a2a8ff57 100644
--- a/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Region/CollectionTest.php
+++ b/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Region/CollectionTest.php
@@ -6,6 +6,7 @@
namespace Magento\Directory\Test\Unit\Model\ResourceModel\Region;
use Magento\Directory\Model\ResourceModel\Region\Collection;
+use Magento\Directory\Model\AllowedCountries;
use Magento\Framework\DB\Adapter\Pdo\Mysql;
use Magento\Framework\DB\Select;
use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
@@ -15,7 +16,14 @@ use Magento\Framework\Data\Collection\EntityFactory;
use Magento\Framework\Locale\ResolverInterface;
use Magento\Framework\DataObject;
use Psr\Log\LoggerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+/**
+ * Class CollectionTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class CollectionTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -23,15 +31,22 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
*/
private $collection;
+ /**
+ * @var MockObject
+ */
+ private $allowedCountries;
+
protected function setUp()
{
+ $objectManager = new ObjectManager($this);
$entityFactoryMock = $this->getMock(EntityFactory::class, [], [], '', false);
$loggerMock = $this->getMock(LoggerInterface::class);
$fetchStrategyMock = $this->getMock(FetchStrategyInterface::class);
$eventManagerMock = $this->getMock(ManagerInterface::class);
$localeResolverMock = $this->getMock(ResolverInterface::class);
$connectionMock = $this->getMock(Mysql::class, [], [], '', false);
- $resourceMock = $this->getMockForAbstractClass(AbstractDb::class,
+ $resourceMock = $this->getMockForAbstractClass(
+ AbstractDb::class,
[],
'',
false,
@@ -39,6 +54,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
true,
['getConnection', 'getMainTable', 'getTable', '__wakeup']
);
+ $this->allowedCountries = $this->getMock(AllowedCountries::class, [], [], '', false);
$selectMock = $this->getMock(Select::class, [], [], '', false);
$connectionMock->expects($this->any())->method('select')->will($this->returnValue($selectMock));
@@ -54,6 +70,12 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
$connectionMock,
$resourceMock
);
+
+ $objectManager->setBackwardCompatibleProperty(
+ $this->collection,
+ 'allowedCountriesReader',
+ $this->allowedCountries
+ );
}
public function testToOptionArray()
@@ -98,4 +120,14 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expectedResult, $this->collection->toOptionArray());
}
+
+ public function testAddAllowedCountriesFilter()
+ {
+ $allowedCountries = [1, 2, 3];
+ $this->allowedCountries->expects($this->once())->method('getAllowedCountries')->with(
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ null
+ )->willReturn($allowedCountries);
+ $this->assertEquals($this->collection->addAllowedCountriesFilter(), $this->collection);
+ }
}
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
index 0d8d18df223767b2812f58356de3b7904090d8f7..1841a9efb6cf8424ebc7ef0b289495388da31db2 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
@@ -8,6 +8,7 @@ namespace Magento\Eav\Model\Entity\Attribute;
use Magento\Framework\Api\AttributeValueFactory;
use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Serialize\SerializerInterface;
/**
* Entity/Attribute/Model - attribute abstract
@@ -22,6 +23,11 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
{
const TYPE_STATIC = 'static';
+ /**
+ * Const for empty string value.
+ */
+ const EMPTY_STRING = '';
+
/**
* Attribute name
*
@@ -111,6 +117,27 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
*/
protected $dataObjectHelper;
+ /**
+ * Serializer Instance.
+ *
+ * @var SerializerInterface
+ */
+ private $serializer;
+
+ /**
+ * Array of attribute types that have empty string as a possible value.
+ *
+ * @var array
+ */
+ private $emptyStringTypes = [
+ 'int',
+ 'decimal',
+ 'datetime',
+ 'varchar',
+ 'text',
+ 'static',
+ ];
+
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
@@ -166,6 +193,21 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
$this->dataObjectHelper = $dataObjectHelper;
}
+ /**
+ * Get Serializer instance.
+ * @deprecated
+ *
+ * @return SerializerInterface
+ */
+ private function getSerializer()
+ {
+ if ($this->serializer === null) {
+ $this->serializer = \Magento\Framework\App\ObjectManager::getInstance()->create(SerializerInterface::class);
+ }
+
+ return $this->serializer;
+ }
+
/**
* Initialize resource model
*
@@ -202,6 +244,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
$this->_getResource()->loadByCode($this, $entityTypeId, $code);
$this->_afterLoad();
\Magento\Framework\Profiler::stop('load_by_code');
+
return $this;
}
@@ -226,6 +269,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
public function setAttributeId($data)
{
$this->_data['attribute_id'] = $data;
+
return $this;
}
@@ -372,6 +416,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
public function setAttributeSetId($id)
{
$this->_data['attribute_set_id'] = $id;
+
return $this;
}
@@ -392,6 +437,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
public function setEntityTypeId($id)
{
$this->_data['entity_type_id'] = $id;
+
return $this;
}
@@ -403,6 +449,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
public function setEntityType($type)
{
$this->setData('entity_type', $type);
+
return $this;
}
@@ -456,6 +503,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
public function setEntity($entity)
{
$this->_entity = $entity;
+
return $this;
}
@@ -469,6 +517,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
if (!$this->_entity) {
$this->_entity = $this->getEntityType();
}
+
return $this->_entity;
}
@@ -546,6 +595,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
}
$this->_source = $source->setAttribute($this);
}
+
return $this->_source;
}
@@ -557,6 +607,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
public function usesSource()
{
$input = $this->getFrontendInput();
+
return $input === 'select' || $input === 'multiselect' || $this->_getData('source_model') != '';
}
@@ -588,17 +639,38 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
}
/**
+ * Check if Value is empty.
+ *
* @param array|null|bool|int|float|string $value
* @return bool
*/
public function isValueEmpty($value)
{
- /** @var array $emptyStringTypes list of attribute types that treat empty string as a possible value */
- $emptyStringTypes = ['int', 'decimal', 'datetime', 'varchar', 'text', 'static'];
return (is_array($value) && count($value) == 0)
|| $value === null
|| ($value === false && $this->getBackend()->getType() != 'int')
- || ($value === '' && in_array($this->getBackend()->getType(), $emptyStringTypes));
+ || ($value === self::EMPTY_STRING && $this->isInEmptyStringTypes());
+ }
+
+ /**
+ * Check if attribute empty value is valid.
+ *
+ * @param array|null|bool|int|float|string $value
+ * @return bool
+ */
+ public function isAllowedEmptyTextValue($value)
+ {
+ return $this->isInEmptyStringTypes() && $value === self::EMPTY_STRING;
+ }
+
+ /**
+ * Check is attribute type in allowed empty string types.
+ *
+ * @return bool
+ */
+ private function isInEmptyStringTypes()
+ {
+ return in_array($this->getBackend()->getType(), $this->emptyStringTypes);
}
/**
@@ -654,6 +726,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
if (!isset($this->_attributeIdCache[$cacheKey])) {
$this->_attributeIdCache[$cacheKey] = $this->getResource()->getIdByCode($entityType, $code);
}
+
return $this->_attributeIdCache[$cacheKey];
}
@@ -686,6 +759,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
$this->_dataTable = $backendTable;
}
}
+
return $this->_dataTable;
}
@@ -700,6 +774,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
if ($this->usesSource() && $this->getBackendType() != self::TYPE_STATIC) {
return $this->getSource()->getFlatColumns();
}
+
return $this->_getFlatColumnsDdlDefinition();
}
@@ -723,60 +798,60 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
$size = $prop['LENGTH'] ? $prop['LENGTH'] : null;
$columns[$this->getAttributeCode()] = [
- 'type' => $this->_resourceHelper->getDdlTypeByColumnType($type),
- 'length' => $size,
+ 'type' => $this->_resourceHelper->getDdlTypeByColumnType($type),
+ 'length' => $size,
'unsigned' => $prop['UNSIGNED'] ? true : false,
'nullable' => $prop['NULLABLE'],
- 'default' => $prop['DEFAULT'],
- 'extra' => null,
+ 'default' => $prop['DEFAULT'],
+ 'extra' => null,
];
break;
case 'datetime':
$columns[$this->getAttributeCode()] = [
- 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_DATETIME,
+ 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_DATETIME,
'unsigned' => false,
'nullable' => true,
- 'default' => null,
- 'extra' => null,
+ 'default' => null,
+ 'extra' => null,
];
break;
case 'decimal':
$columns[$this->getAttributeCode()] = [
- 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
- 'length' => '12,4',
+ 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
+ 'length' => '12,4',
'unsigned' => false,
'nullable' => true,
- 'default' => null,
- 'extra' => null,
+ 'default' => null,
+ 'extra' => null,
];
break;
case 'int':
$columns[$this->getAttributeCode()] = [
- 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+ 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
'unsigned' => false,
'nullable' => true,
- 'default' => null,
- 'extra' => null,
+ 'default' => null,
+ 'extra' => null,
];
break;
case 'text':
$columns[$this->getAttributeCode()] = [
- 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+ 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
'unsigned' => false,
'nullable' => true,
- 'default' => null,
- 'extra' => null,
- 'length' => \Magento\Framework\DB\Ddl\Table::MAX_TEXT_SIZE,
+ 'default' => null,
+ 'extra' => null,
+ 'length' => \Magento\Framework\DB\Ddl\Table::MAX_TEXT_SIZE,
];
break;
case 'varchar':
$columns[$this->getAttributeCode()] = [
- 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
- 'length' => '255',
+ 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+ 'length' => '255',
'unsigned' => false,
'nullable' => true,
- 'default' => null,
- 'extra' => null,
+ 'default' => null,
+ 'extra' => null,
];
break;
default:
@@ -804,61 +879,62 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
}
$prop = $describe[$this->getAttributeCode()];
$columns[$this->getAttributeCode()] = [
- 'type' => $prop['DATA_TYPE'] . ($prop['LENGTH'] ? "({$prop['LENGTH']})" : ""),
+ 'type' => $prop['DATA_TYPE'] . ($prop['LENGTH'] ? "({$prop['LENGTH']})" : ""),
'unsigned' => $prop['UNSIGNED'] ? true : false,
- 'is_null' => $prop['NULLABLE'],
- 'default' => $prop['DEFAULT'],
- 'extra' => null,
+ 'is_null' => $prop['NULLABLE'],
+ 'default' => $prop['DEFAULT'],
+ 'extra' => null,
];
break;
case 'datetime':
$columns[$this->getAttributeCode()] = [
- 'type' => 'datetime',
+ 'type' => 'datetime',
'unsigned' => false,
- 'is_null' => true,
- 'default' => null,
- 'extra' => null,
+ 'is_null' => true,
+ 'default' => null,
+ 'extra' => null,
];
break;
case 'decimal':
$columns[$this->getAttributeCode()] = [
- 'type' => 'decimal(12,4)',
+ 'type' => 'decimal(12,4)',
'unsigned' => false,
- 'is_null' => true,
- 'default' => null,
- 'extra' => null,
+ 'is_null' => true,
+ 'default' => null,
+ 'extra' => null,
];
break;
case 'int':
$columns[$this->getAttributeCode()] = [
- 'type' => 'int',
+ 'type' => 'int',
'unsigned' => false,
- 'is_null' => true,
- 'default' => null,
- 'extra' => null,
+ 'is_null' => true,
+ 'default' => null,
+ 'extra' => null,
];
break;
case 'text':
$columns[$this->getAttributeCode()] = [
- 'type' => 'text',
+ 'type' => 'text',
'unsigned' => false,
- 'is_null' => true,
- 'default' => null,
- 'extra' => null,
+ 'is_null' => true,
+ 'default' => null,
+ 'extra' => null,
];
break;
case 'varchar':
$columns[$this->getAttributeCode()] = [
- 'type' => 'varchar(255)',
+ 'type' => 'varchar(255)',
'unsigned' => false,
- 'is_null' => true,
- 'default' => null,
- 'extra' => null,
+ 'is_null' => true,
+ 'default' => null,
+ 'extra' => null,
];
break;
default:
break;
}
+
return $columns;
}
@@ -945,6 +1021,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
foreach ($this->_storeManager->getStores() as $store) {
$this->getFlatUpdateSelect($store->getId());
}
+
return $this;
}
@@ -955,6 +1032,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
if ($this->usesSource()) {
return $this->getSource()->getFlatUpdateSelect($store);
}
+
return $this->_getResource()->getFlatUpdateSelect($this, $store);
}
@@ -1064,6 +1142,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
} else {
$this->setData(self::OPTIONS, $options);
}
+
return $this;
}
@@ -1086,6 +1165,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
);
$dataObjects[] = $optionDataObject;
}
+
return $dataObjects;
}
@@ -1195,8 +1275,9 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
if (is_array($rules)) {
return $rules;
} elseif (!empty($rules)) {
- return unserialize($rules);
+ return $this->getSerializer()->unserialize($rules);
}
+
return [];
}
diff --git a/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php b/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
index c775a24a03c465dad45640a7f634823cb8b43ef8..bcaf11aaf5532be296fe19ac6d0bb451b6a20b13 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
@@ -125,55 +125,65 @@ class UpdateHandler implements AttributeInterface
: null; // @todo verify is it normal to not have attributer_set_id
$snapshot = $this->readSnapshot->execute($entityType, $entityDataForSnapshot);
foreach ($this->getAttributes($entityType, $attributeSetId) as $attribute) {
- if ($attribute->isStatic()) {
- continue;
- }
- /**
- * Only scalar values can be stored in generic tables
- */
- if (isset($entityData[$attribute->getAttributeCode()])
- && !is_scalar($entityData[$attribute->getAttributeCode()])) {
+ $code = $attribute->getAttributeCode();
+ $isAllowedValueType = array_key_exists($code, $entityData)
+ && (is_scalar($entityData[$code]) || $entityData[$code] === null);
+
+ if ($attribute->isStatic() || !$isAllowedValueType) {
continue;
}
- if (isset($snapshot[$attribute->getAttributeCode()])
- && $snapshot[$attribute->getAttributeCode()] !== false
- && (array_key_exists($attribute->getAttributeCode(), $entityData)
- && $attribute->isValueEmpty($entityData[$attribute->getAttributeCode()]))
- ) {
- $this->attributePersistor->registerDelete(
- $entityType,
- $entityData[$metadata->getLinkField()],
- $attribute->getAttributeCode()
- );
- }
- if ((!array_key_exists($attribute->getAttributeCode(), $snapshot)
- || $snapshot[$attribute->getAttributeCode()] === false)
- && array_key_exists($attribute->getAttributeCode(), $entityData)
- && !$attribute->isValueEmpty($entityData[$attribute->getAttributeCode()])
- ) {
- $this->attributePersistor->registerInsert(
- $entityType,
- $entityData[$metadata->getLinkField()],
- $attribute->getAttributeCode(),
- $entityData[$attribute->getAttributeCode()]
- );
- }
- if (array_key_exists($attribute->getAttributeCode(), $snapshot)
- && $snapshot[$attribute->getAttributeCode()] !== false
- && array_key_exists($attribute->getAttributeCode(), $entityData)
- && $snapshot[$attribute->getAttributeCode()] != $entityData[$attribute->getAttributeCode()]
- && !$attribute->isValueEmpty($entityData[$attribute->getAttributeCode()])
- ) {
- $this->attributePersistor->registerUpdate(
- $entityType,
- $entityData[$metadata->getLinkField()],
- $attribute->getAttributeCode(),
- $entityData[$attribute->getAttributeCode()]
- );
+
+ $newValue = $entityData[$code];
+ $isValueEmpty = $attribute->isValueEmpty($newValue);
+ $isAllowedEmptyStringValue = $attribute->isAllowedEmptyTextValue($newValue);
+
+ if (array_key_exists($code, $snapshot)) {
+ $snapshotValue = $snapshot[$code];
+ /**
+ * 'FALSE' value for attributes can't be update or delete
+ */
+ if ($snapshotValue === false) {
+ continue;
+ }
+
+ if (!$isValueEmpty || $isAllowedEmptyStringValue) {
+ /**
+ * NOT Updated value for attributes not need to update
+ */
+ if ($snapshotValue === $newValue) {
+ continue;
+ }
+
+ $this->attributePersistor->registerUpdate(
+ $entityType,
+ $entityData[$metadata->getLinkField()],
+ $code,
+ $newValue
+ );
+ } else {
+ $this->attributePersistor->registerDelete(
+ $entityType,
+ $entityData[$metadata->getLinkField()],
+ $code
+ );
+ }
+ } else {
+ /**
+ * Only not empty value of attribute is insertable
+ */
+ if (!$isValueEmpty || $isAllowedEmptyStringValue) {
+ $this->attributePersistor->registerInsert(
+ $entityType,
+ $entityData[$metadata->getLinkField()],
+ $code,
+ $newValue
+ );
+ }
}
}
$this->attributePersistor->flush($entityType, $context);
}
+
return $this->getReadHandler()->execute($entityType, $entityData, $arguments);
}
@@ -189,6 +199,7 @@ class UpdateHandler implements AttributeInterface
if (!$this->readHandler) {
$this->readHandler = ObjectManager::getInstance()->get(ReadHandler::class);
}
+
return $this->readHandler;
}
}
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/AbstractAttributeTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/AbstractAttributeTest.php
index a10bafacda42dc2b72fcc285307a0250cae3074b..3c0e77408ba2dfbbe68651107cfa1a1d7a885588 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/AbstractAttributeTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/AbstractAttributeTest.php
@@ -144,19 +144,33 @@ class AbstractAttributeTest extends \PHPUnit_Framework_TestCase
public function testGetValidationRulesWhenRuleIsSerialized()
{
- $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
- $rule = 'some value';
- $model = $objectManagerHelper->getObject(
- \Magento\Catalog\Model\Entity\Attribute::class,
- [
- 'data' => [
- \Magento\Eav\Api\Data\AttributeInterface::VALIDATE_RULES => serialize($rule)
- ]
+ $rule = serialize('some value');
+ $expected = 'some test result';
- ]
- );
+ $modelClassName = \Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class;
+ $model = $this->getMockForAbstractClass($modelClassName, [], '', false);
- $this->assertEquals($rule, $model->getValidationRules());
+ $serializerMock = $this->getMock(\Magento\Framework\Serialize\SerializerInterface::class);
+
+ $reflection = new \ReflectionClass($modelClassName);
+ $reflectionProperty = $reflection->getProperty('serializer');
+ $reflectionProperty->setAccessible(true);
+ $reflectionProperty->setValue($model, $serializerMock);
+
+ $model->setData(\Magento\Eav\Api\Data\AttributeInterface::VALIDATE_RULES, $rule);
+
+ $serializerMock->method('unserialize')
+ ->with($rule)
+ ->willReturn($expected);
+
+ $this->assertEquals($expected, $model->getValidationRules());
+
+ $data = ['test array'];
+ $model->setData(\Magento\Eav\Api\Data\AttributeInterface::VALIDATE_RULES, $data);
+ $this->assertEquals($data, $model->getValidationRules());
+
+ $model->setData(\Magento\Eav\Api\Data\AttributeInterface::VALIDATE_RULES, null);
+ $this->assertEquals([], $model->getValidationRules());
}
public function testGetValidationRulesWhenRuleIsEmpty()
diff --git a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
index 58fbb4511e54ca06afdf0d3f8c864bb9e1a8bee4..05428e248b69c996af9c0863e9d48ca261777538 100644
--- a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
+++ b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
@@ -46,9 +46,9 @@
<td data-th="<?php echo $block->escapeHtml(__('Qty')); ?>" class="col qty">
<?php if ($_item->isSaleable()) : ?>
<div class="control qty">
- <input type="number" name="super_group[<?php /* @escapeNotVerified */ echo $_item->getId() ?>]"
+ <input type="number"
+ name="super_group[<?php /* @escapeNotVerified */ echo $_item->getId() ?>]"
data-selector="super_group[<?php /* @escapeNotVerified */ echo $_item->getId() ?>]"
- maxlength="12"
value="<?php /* @escapeNotVerified */ echo $_item->getQty() * 1 ?>"
title="<?php /* @escapeNotVerified */ echo __('Qty') ?>"
class="input-text qty"
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
index 2f054b5a9c4d10c93dd83193493ae35cd4f00a48..6d3f8b763026cd0514b6c87b4dc898717bc75ee0 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
@@ -6,6 +6,7 @@
namespace Magento\ImportExport\Block\Adminhtml\Export;
use Magento\Eav\Model\Entity\Attribute;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
/**
* Export filter block
@@ -185,25 +186,39 @@ class Filter extends \Magento\Backend\Block\Widget\Grid\Extended
$toValue = $this->escapeHtml(next($value));
}
- return '<strong class="admin__control-support-text">' . __(
- 'From'
- ) .
- ':</strong> ' .
- '<input type="text" name="' .
- $name .
- '[]" class="admin__control-text input-text input-text-range"' .
- ' value="' .
- $fromValue .
- '"/> ' .
- '<strong class="admin__control-support-text">' .
- __(
- 'To'
- ) .
- ':</strong> <input type="text" name="' .
- $name .
- '[]" class="admin__control-text input-text input-text-range" value="' .
- $toValue .
- '" />';
+ return '<strong class="admin__control-support-text">' .
+ $this->getFromAttributePrefix($attribute) .
+ ':</strong> ' .
+ '<input type="text" name="' .
+ $name .
+ '[]" class="admin__control-text input-text input-text-range"' .
+ ' value="' .
+ $fromValue .
+ '"/> ' .
+ '<strong class="admin__control-support-text">' .
+ __(
+ 'To'
+ ) .
+ ':</strong> <input type="text" name="' .
+ $name .
+ '[]" class="admin__control-text input-text input-text-range" value="' .
+ $toValue .
+ '" />';
+ }
+
+ /**
+ * Get 'From' prefix to attribute.
+ *
+ * @param Attribute $attribute
+ * @return \Magento\Framework\Phrase
+ */
+ protected function getFromAttributePrefix(Attribute $attribute)
+ {
+ $attributePrefix = $attribute->getAttributeCode() === ProductAttributeInterface::CODE_TIER_PRICE
+ ? __('Fixed Price: From')
+ : __('From');
+
+ return $attributePrefix;
}
/**
diff --git a/app/code/Magento/ImportExport/Files/Sample/advanced_pricing.csv b/app/code/Magento/ImportExport/Files/Sample/advanced_pricing.csv
index 82db6382bd8d5fda511e50a6da9fa4876fa35f1a..e4c203bed3be9ae6f935e7cb1f6cfbeb086d8816 100644
--- a/app/code/Magento/ImportExport/Files/Sample/advanced_pricing.csv
+++ b/app/code/Magento/ImportExport/Files/Sample/advanced_pricing.csv
@@ -1,5 +1,5 @@
-sku,tier_price_website,tier_price_customer_group,tier_price_qty,tier_price
-sku123,base,General,2,10
-sku124,All Websites [USD],ALL GROUPS,3,15
-sku123,,,,
-sku124,,,,
+sku,tier_price_website,tier_price_customer_group,tier_price_qty,tier_price,tier_price_value_type
+sku123,base,General,2,10,Fixed
+sku124,All Websites [USD],ALL GROUPS,3,15,Discount
+sku123,,,,,
+sku124,,,,,
diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json
index 5e403d2180652a6f3565bf03b573abf75310f19f..d5e3b41f47fd93387b0ce70e1764105fa7341027 100644
--- a/app/code/Magento/ImportExport/composer.json
+++ b/app/code/Magento/ImportExport/composer.json
@@ -3,6 +3,7 @@
"description": "N/A",
"require": {
"php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
+ "magento/module-catalog": "101.1.*",
"magento/module-store": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-eav": "100.2.*",
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Billing/Items.php b/app/code/Magento/Multishipping/Block/Checkout/Billing/Items.php
index 5a3e581d5375bb983baac8516b63788331388da9..3d2ca91d3ba6c0b687a6361858ce13269967861e 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Billing/Items.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Billing/Items.php
@@ -68,7 +68,7 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
*/
public function getVirtualProductEditUrl()
{
- return $this->getUrl('*/cart');
+ return $this->getUrl('checkout/cart');
}
/**
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
index 0031b6416d333eb32eb032ead7267ca4d8f9da9c..299e85d6f13c31a4633d9886f4565866def62802 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Overview.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
@@ -297,7 +297,7 @@ class Overview extends \Magento\Sales\Block\Items\AbstractItems
*/
public function getVirtualProductEditUrl()
{
- return $this->getUrl('*/cart');
+ return $this->getUrl('checkout/cart');
}
/**
diff --git a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Billing/ItemsTest.php b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Billing/ItemsTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..056ac173621743ac162ba744d83a60d097cf12fc
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Billing/ItemsTest.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Multishipping\Test\Unit\Block\Checkout\Billing;
+
+
+class ItemsTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Multishipping\Block\Checkout\Billing\Items
+ */
+ private $model;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $urlBuilderMock;
+
+ protected function setUp()
+ {
+ $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $this->urlBuilderMock = $this->getMock(\Magento\Framework\UrlInterface::class);
+ $this->model = $objectManager->getObject(
+ \Magento\Multishipping\Block\Checkout\Billing\Items::class,
+ [
+ 'urlBuilder' => $this->urlBuilderMock
+ ]
+ );
+ }
+
+ public function testGetVirtualProductEditUrl()
+ {
+ $url = 'http://example.com';
+ $this->urlBuilderMock->expects($this->once())->method('getUrl')->with('checkout/cart', [])->willReturn($url);
+ $this->assertEquals($url, $this->model->getVirtualProductEditUrl());
+ }
+}
diff --git a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/OverviewTest.php b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/OverviewTest.php
index fc2169f38e4af88559b112931ac0952ecd82f5d0..b583ad258595b7101fb8683df6c9932a20ee1b3f 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/OverviewTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/OverviewTest.php
@@ -52,6 +52,11 @@ class OverviewTest extends \PHPUnit_Framework_TestCase
*/
protected $quoteMock;
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $urlBuilderMock;
+
protected function setUp()
{
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -83,13 +88,15 @@ class OverviewTest extends \PHPUnit_Framework_TestCase
$this->checkoutMock =
$this->getMock(\Magento\Multishipping\Model\Checkout\Type\Multishipping::class, [], [], '', false);
$this->quoteMock = $this->getMock(\Magento\Quote\Model\Quote::class, [], [], '', false);
+ $this->urlBuilderMock = $this->getMock(\Magento\Framework\UrlInterface::class);
$this->model = $objectManager->getObject(
\Magento\Multishipping\Block\Checkout\Overview::class,
[
'priceCurrency' => $this->priceCurrencyMock,
'totalsCollector' => $this->totalsCollectorMock,
'totalsReader' => $this->totalsReaderMock,
- 'multishipping' => $this->checkoutMock
+ 'multishipping' => $this->checkoutMock,
+ 'urlBuilder' => $this->urlBuilderMock
]
);
}
@@ -189,4 +196,11 @@ class OverviewTest extends \PHPUnit_Framework_TestCase
->willReturn([$totalMock]);
return $totalMock;
}
+
+ public function testGetVirtualProductEditUrl()
+ {
+ $url = 'http://example.com';
+ $this->urlBuilderMock->expects($this->once())->method('getUrl')->with('checkout/cart', [])->willReturn($url);
+ $this->assertEquals($url, $this->model->getVirtualProductEditUrl());
+ }
}
diff --git a/app/code/Magento/Payment/Plugin/PaymentConfigurationProcess.php b/app/code/Magento/Payment/Plugin/PaymentConfigurationProcess.php
new file mode 100644
index 0000000000000000000000000000000000000000..5b107b74295b3a842c00429543b00e0466b1d530
--- /dev/null
+++ b/app/code/Magento/Payment/Plugin/PaymentConfigurationProcess.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Payment\Plugin;
+
+/**
+ * Class PaymentConfigurationProcess
+ *
+ * Removes inactive payment methods and group from checkout configuration.
+ */
+class PaymentConfigurationProcess
+{
+ /**
+ * @var \Magento\Payment\Api\PaymentMethodListInterface
+ */
+ private $paymentMethodList;
+
+ /**
+ * @var \Magento\Store\Model\StoreManagerInterface
+ */
+ private $storeManager;
+
+ /**
+ * @param \Magento\Payment\Api\PaymentMethodListInterface $paymentMethodList
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ */
+ public function __construct(
+ \Magento\Payment\Api\PaymentMethodListInterface $paymentMethodList,
+ \Magento\Store\Model\StoreManagerInterface $storeManager
+ ) {
+ $this->paymentMethodList = $paymentMethodList;
+ $this->storeManager = $storeManager;
+ }
+
+ /**
+ * Checkout LayoutProcessor before process plugin.
+ *
+ * @param \Magento\Checkout\Block\Checkout\LayoutProcessor $processor
+ * @param array $jsLayout
+ * @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function beforeProcess(\Magento\Checkout\Block\Checkout\LayoutProcessor $processor, $jsLayout)
+ {
+ $configuration = &$jsLayout['components']['checkout']['children']['steps']['children']['billing-step']
+ ['children']['payment']['children']['renders']['children'];
+
+ if (!isset($configuration)) {
+ return [$jsLayout];
+ }
+
+ $storeId = $this->storeManager->getStore()->getId();
+ $activePaymentMethodList = $this->paymentMethodList->getActiveList($storeId);
+ $getCodeFunc = function ($method) {
+ return $method->getCode();
+ };
+ $activePaymentMethodCodes = array_map($getCodeFunc, $activePaymentMethodList);
+
+ foreach ($configuration as $paymentGroup => $groupConfig) {
+ $notActivePaymentMethodCodes = array_diff(array_keys($groupConfig['methods']), $activePaymentMethodCodes);
+ foreach ($notActivePaymentMethodCodes as $notActivePaymentMethodCode) {
+ unset($configuration[$paymentGroup]['methods'][$notActivePaymentMethodCode]);
+ }
+ if (empty($configuration[$paymentGroup]['methods'])) {
+ unset($configuration[$paymentGroup]);
+ }
+ }
+
+ return [$jsLayout];
+ }
+}
diff --git a/app/code/Magento/Payment/Test/Unit/Plugin/PaymentConfigurationProcessTest.php b/app/code/Magento/Payment/Test/Unit/Plugin/PaymentConfigurationProcessTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..3e49c8718e6044de36cc6a1018d052dc48ed7485
--- /dev/null
+++ b/app/code/Magento/Payment/Test/Unit/Plugin/PaymentConfigurationProcessTest.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Payment\Test\Unit\Plugin;
+
+/**
+ * Class PaymentConfigurationProcessTest.
+ */
+class PaymentConfigurationProcessTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $storeManager;
+
+ /**
+ * @var \Magento\Store\Api\Data\StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $store;
+
+ /**
+ * @var \Magento\Payment\Api\PaymentMethodListInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $paymentMethodList;
+
+ /**
+ * @var \Magento\Checkout\Block\Checkout\LayoutProcessor|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $layoutProcessor;
+
+ /**
+ * @var \Magento\Payment\Plugin\PaymentConfigurationProcess
+ */
+ private $plugin;
+
+ /**
+ * Set up
+ */
+ protected function setUp()
+ {
+ $this->storeManager = $this
+ ->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getStore'])
+ ->getMockForAbstractClass();
+ $this->store = $this
+ ->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getId'])
+ ->getMockForAbstractClass();
+ $this->paymentMethodList = $this
+ ->getMockBuilder(\Magento\Payment\Api\PaymentMethodListInterface::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getActiveList'])
+ ->getMockForAbstractClass();
+ $this->layoutProcessor = $this
+ ->getMockBuilder(\Magento\Checkout\Block\Checkout\LayoutProcessor::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['process'])
+ ->getMockForAbstractClass();
+
+ $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $this->plugin = $objectManagerHelper->getObject(
+ \Magento\Payment\Plugin\PaymentConfigurationProcess::class,
+ [
+ 'paymentMethodList' => $this->paymentMethodList,
+ 'storeManager' => $this->storeManager
+ ]
+ );
+ }
+
+ /**
+ * @param array $jsLayout
+ * @param array $activePaymentList
+ * @param array $expectedResult
+ * @dataProvider beforeProcessDataProvider
+ */
+ public function testBeforeProcess($jsLayout, $activePaymentList, $expectedResult)
+ {
+ $this->store->expects($this->once())->method('getId')->willReturn(1);
+ $this->storeManager->expects($this->once())->method('getStore')->willReturn($this->store);
+ $this->paymentMethodList->expects($this->once())
+ ->method('getActiveList')
+ ->with(1)
+ ->willReturn($activePaymentList);
+
+ $result = $this->plugin->beforeProcess($this->layoutProcessor, $jsLayout);
+ $this->assertEquals($result[0], $expectedResult);
+ }
+
+ /**
+ * Data provider for BeforeProcess.
+ *
+ * @return array
+ */
+ public function beforeProcessDataProvider()
+ {
+ $jsLayout['components']['checkout']['children']['steps']['children']['billing-step']
+ ['children']['payment']['children']['renders']['children'] = [
+ 'braintree' => [
+ 'methods' => [
+ 'braintree_paypal' => [],
+ 'braintree' => []
+ ]
+ ],
+ 'paypal-payments' => [
+ 'methods' => [
+ 'payflowpro' => [],
+ 'payflow_link' => []
+ ]
+ ]
+ ];
+ $result1['components']['checkout']['children']['steps']['children']['billing-step']
+ ['children']['payment']['children']['renders']['children'] = [];
+ $result2['components']['checkout']['children']['steps']['children']['billing-step']
+ ['children']['payment']['children']['renders']['children'] = [
+ 'braintree' => [
+ 'methods' => [
+ 'braintree' => [],
+ 'braintree_paypal' => []
+ ]
+ ]
+ ];
+
+ $braintreePaymentMethod = $this
+ ->getMockBuilder(\Magento\Payment\Api\Data\PaymentMethodInterface::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getCode'])
+ ->getMockForAbstractClass();
+ $braintreePaypalPaymentMethod = $this
+ ->getMockBuilder(\Magento\Payment\Api\Data\PaymentMethodInterface::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getCode'])
+ ->getMockForAbstractClass();
+
+ $braintreePaymentMethod->expects($this->any())->method('getCode')->willReturn('braintree');
+ $braintreePaypalPaymentMethod->expects($this->any())->method('getCode')->willReturn('braintree_paypal');
+
+ return [
+ [$jsLayout, [], $result1],
+ [$jsLayout, [$braintreePaymentMethod, $braintreePaypalPaymentMethod], $result2]
+ ];
+ }
+}
diff --git a/app/code/Magento/Payment/etc/frontend/di.xml b/app/code/Magento/Payment/etc/frontend/di.xml
index 4ff3c013b676523fe20a3deb49f32758c01e604e..471a7ce9e2de585609eb490ada35248c4ee59be3 100644
--- a/app/code/Magento/Payment/etc/frontend/di.xml
+++ b/app/code/Magento/Payment/etc/frontend/di.xml
@@ -19,4 +19,7 @@
</argument>
</arguments>
</type>
+ <type name="Magento\Checkout\Block\Checkout\LayoutProcessor">
+ <plugin name="ProcessPaymentConfiguration" type="Magento\Payment\Plugin\PaymentConfigurationProcess"/>
+ </type>
</config>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php
index 70eb41e8fcbdf6f8b55c00a8bd291a2ceef68df1..e97a1a2f9d64c9d60c82869ed2ff882dcecd5979 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php
@@ -131,7 +131,7 @@ class Detail extends \Magento\Backend\Block\Widget\Container
$this->setOrderIncrementIdHtml($this->escapeHtml($this->_txn->getOrder()->getIncrementId()));
- $this->setTxnTypeHtml($this->escapeHtml($this->_txn->getTxnType()));
+ $this->setTxnTypeHtml($this->escapeHtml(__($this->_txn->getTxnType())));
$this->setOrderIdUrlHtml(
$this->escapeHtml($this->getUrl('sales/order/view', ['order_id' => $this->_txn->getOrderId()]))
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
index 6d09c4d7601890d4948c5d40fb801b51371bd57f..4a9af33449b61c80b709998cf663b5601df26447 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
@@ -40,9 +40,7 @@
</div>
<script>
require(["Magento_Sales/order/create/form"], function(){
- <?php if($_methodsCount == 1):?>
- order.switchPaymentMethod('<?php /* @escapeNotVerified */ echo $block->getSelectedMethodCode(); ?>');
- <?php else: ?>
+ <?php if($_methodsCount != 1):?>
order.setPaymentMethod('<?php /* @escapeNotVerified */ echo $block->getSelectedMethodCode(); ?>');
<?php endif; ?>
});
diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml
index e0a5471b1e45ee1f6ba9bd8c05d0145656a642ea..0dc555c93d94d3db64e102f24b2fa4e6f45e278f 100644
--- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml
+++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml
@@ -322,7 +322,7 @@
</item>
</argument>
</column>
- <column name="total_refunded" class="Magento\Sales\Ui\Component\Listing\Column\Price">
+ <column name="total_refunded" class="Magento\Sales\Ui\Component\Listing\Column\PurchasedPrice">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="filter" xsi:type="string">textRange</item>
diff --git a/app/code/Magento/SalesInventory/composer.json b/app/code/Magento/SalesInventory/composer.json
index d7f9075cdd310141bab6b25869f33d6229f513dc..fa06db402a286f5f37b2b1991d2c8c49665bd1d8 100644
--- a/app/code/Magento/SalesInventory/composer.json
+++ b/app/code/Magento/SalesInventory/composer.json
@@ -6,7 +6,7 @@
"magento/module-catalog-inventory": "100.2.*",
"magento/module-sales": "100.2.*",
"magento/module-store": "100.2.*",
- "magento/module-catalog": "101.2.*",
+ "magento/module-catalog": "101.1.*",
"magento/framework": "100.2.*"
},
"type": "magento2-module",
diff --git a/app/code/Magento/SampleData/Model/Dependency.php b/app/code/Magento/SampleData/Model/Dependency.php
index 09f0c16aac848cafa797441137c9bc62f90a37ce..2a1849364bd77e0c43d19876579b3e2e7129b7ac 100644
--- a/app/code/Magento/SampleData/Model/Dependency.php
+++ b/app/code/Magento/SampleData/Model/Dependency.php
@@ -88,6 +88,10 @@ class Dependency
foreach ($this->componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $moduleDir) {
$file = $moduleDir . '/composer.json';
+ if (!file_exists($file) || !is_readable($file)) {
+ continue;
+ }
+
/** @var Package $package */
$package = $this->getModuleComposerPackage($file);
$suggest = json_decode(json_encode($package->get('suggest')), true);
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
index 07b9c558043b0ddee1c3b99f63fa0b2f8aa27490..c2c53a3d7754ab080bb9fa818d3cb8d65eac2531 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
@@ -535,6 +535,7 @@ class CommonTaxCollector extends AbstractTotal
$total->setSubtotalInclTax($subtotalInclTax);
$total->setBaseSubtotalTotalInclTax($baseSubtotalInclTax);
$total->setBaseSubtotalInclTax($baseSubtotalInclTax);
+ $shippingAssignment->getShipping()->getAddress()->setBaseSubtotalTotalInclTax($baseSubtotalInclTax);;
return $this;
}
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
index 917dc62f9f49b148d58ad62c671eb6fbeeff8beb..32ebd40f75346afb4d2d06cd6f9c4db16950fd4a 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
@@ -72,6 +72,7 @@ define([
this.value(value);
this.on('value', this.onUpdate.bind(this));
+ this.isUseDefault(this.disabled());
return this;
},
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/select.js b/app/code/Magento/Ui/view/base/web/js/form/element/select.js
index 1887639c8d0313fe466aadb89b3cdaf7adc6bd81..4567bba1d017aec81e53dc668b35b4bf696c49d3 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/select.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/select.js
@@ -105,7 +105,9 @@ define([
return Abstract.extend({
defaults: {
customName: '${ $.parentName }.${ $.index }_input',
- elementTmpl: 'ui/form/element/select'
+ elementTmpl: 'ui/form/element/select',
+ caption: '',
+ options: []
},
/**
@@ -127,28 +129,6 @@ define([
return this;
},
- /**
- * Parses options and merges the result with instance
- *
- * @param {Object} config
- * @returns {Object} Chainable.
- */
- initConfig: function (config) {
- var options = config.options,
- captionValue = config.captionValue || '',
- result = parseOptions(options, captionValue);
-
- if (config.caption) {
- delete result.caption;
- }
-
- _.extend(config, result);
-
- this._super();
-
- return this;
- },
-
/**
* Calls 'initObservable' of parent, initializes 'options' and 'initialOptions'
* properties, calls 'setOptions' passing options to it
@@ -160,7 +140,7 @@ define([
this.initialOptions = this.options;
- this.observe('options')
+ this.observe('options caption')
.setOptions(this.options());
return this;
@@ -209,7 +189,7 @@ define([
return option && option.value;
}
- if (!this.caption) {
+ if (!this.caption()) {
return findFirst(this.options);
}
},
@@ -254,14 +234,20 @@ define([
* @returns {Object} Chainable
*/
setOptions: function (data) {
- var isVisible;
+ var captionValue = this.captionValue || '',
+ result = parseOptions(data, captionValue),
+ isVisible;
+
+ this.indexedOptions = indexOptions(result.options);
- this.indexedOptions = indexOptions(data);
+ this.options(result.options);
- this.options(data);
+ if (!this.caption()) {
+ this.caption(result.caption);
+ }
if (this.customEntry) {
- isVisible = !!data.length;
+ isVisible = !!result.options.length;
this.setVisible(isVisible);
this.toggleInput(!isVisible);
@@ -301,7 +287,7 @@ define([
* @returns {Object} Chainable.
*/
clear: function () {
- var value = this.caption ? '' : findFirst(this.options);
+ var value = this.caption() ? '' : findFirst(this.options);
this.value(value);
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js b/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
index 01c8ef29029a9ef34f82885e3efbada75774a88b..209b05773a497b8e02d36cdd4adba10eab107779 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
@@ -93,7 +93,7 @@ define([
/* eslint-disable no-undef */
if (tinyMCE) {
_.each(tinyMCE.activeEditor.controlManager.controls, function (property, index, controls) {
- controls[property].setDisabled(status);
+ controls[property.id].setDisabled(status);
});
tinyMCE.activeEditor.getBody().setAttribute('contenteditable', !status);
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html b/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html
index 63c34c1a433129ddf427ecd8104743083a81e98b..ab309026c9ffeb3a8e56816c19994b33d34d4116 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html
@@ -29,5 +29,6 @@
<each args="data: value, as: '$file'" render="$parent.getPreviewTmpl($file)"/>
</div>
+ <render args="$data.service.template" if="$data.hasService()"/>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/code/Magento/Vault/Plugin/PaymentVaultConfigurationProcess.php b/app/code/Magento/Vault/Plugin/PaymentVaultConfigurationProcess.php
new file mode 100644
index 0000000000000000000000000000000000000000..db38ccbed417a95870a9da916a64e36b4281353d
--- /dev/null
+++ b/app/code/Magento/Vault/Plugin/PaymentVaultConfigurationProcess.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Plugin;
+
+/**
+ * Class PaymentVaultConfigurationProcess
+ *
+ * Checks if vault group have active vaults.
+ */
+class PaymentVaultConfigurationProcess
+{
+ /**
+ * @var \Magento\Vault\Api\PaymentMethodListInterface
+ */
+ private $vaultPaymentList;
+
+ /**
+ * @var \Magento\Vault\Api\PaymentMethodListInterface
+ */
+ private $paymentMethodList;
+
+ /**
+ * @var \Magento\Store\Model\StoreManagerInterface
+ */
+ private $storeManager;
+
+ /**
+ * @param \Magento\Vault\Api\PaymentMethodListInterface $vaultPaymentList
+ * @param \Magento\Payment\Api\PaymentMethodListInterface $paymentMethodList
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ */
+ public function __construct(
+ \Magento\Vault\Api\PaymentMethodListInterface $vaultPaymentList,
+ \Magento\Payment\Api\PaymentMethodListInterface $paymentMethodList,
+ \Magento\Store\Model\StoreManagerInterface $storeManager
+ ) {
+ $this->vaultPaymentList = $vaultPaymentList;
+ $this->paymentMethodList = $paymentMethodList;
+ $this->storeManager = $storeManager;
+ }
+
+ /**
+ * Checkout LayoutProcessor before process plugin.
+ *
+ * @param \Magento\Checkout\Block\Checkout\LayoutProcessor $processor
+ * @param array $jsLayout
+ * @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function beforeProcess(\Magento\Checkout\Block\Checkout\LayoutProcessor $processor, $jsLayout)
+ {
+ $configuration = &$jsLayout['components']['checkout']['children']['steps']['children']['billing-step']
+ ['children']['payment']['children']['renders']['children'];
+
+ if (!isset($configuration)) {
+ return [$jsLayout];
+ }
+
+ $storeId = $this->storeManager->getStore()->getId();
+ $activePaymentMethodList = $this->paymentMethodList->getActiveList($storeId);
+ $activeVaultList = $this->vaultPaymentList->getActiveList($storeId);
+ $getCodeFunc = function ($method) {
+ return $method->getCode();
+ };
+ $getProviderCodeFunc = function ($method) {
+ return $method->getProviderCode();
+ };
+ $activePaymentMethodCodes = array_map($getCodeFunc, $activePaymentMethodList);
+ $activeVaultProviderCodes = array_map($getProviderCodeFunc, $activeVaultList);
+ $activePaymentMethodCodes = array_merge(
+ $activePaymentMethodCodes,
+ $activeVaultProviderCodes
+ );
+
+ foreach ($configuration as $paymentGroup => $groupConfig) {
+ $notActivePaymentMethodCodes = array_diff(array_keys($groupConfig['methods']), $activePaymentMethodCodes);
+ foreach ($notActivePaymentMethodCodes as $notActivePaymentMethodCode) {
+ unset($configuration[$paymentGroup]['methods'][$notActivePaymentMethodCode]);
+ }
+ if ($paymentGroup === 'vault' && !empty($activeVaultProviderCodes)) {
+ continue;
+ }
+ if (empty($configuration[$paymentGroup]['methods'])) {
+ unset($configuration[$paymentGroup]);
+ }
+ }
+
+ return [$jsLayout];
+ }
+}
diff --git a/app/code/Magento/Vault/Test/Unit/Plugin/PaymentVaultConfigurationProcessTest.php b/app/code/Magento/Vault/Test/Unit/Plugin/PaymentVaultConfigurationProcessTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..7e7a3fd0aebdfcd8054a7276dcce04ec5f49dcb8
--- /dev/null
+++ b/app/code/Magento/Vault/Test/Unit/Plugin/PaymentVaultConfigurationProcessTest.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Test\Unit\Plugin;
+
+/**
+ * Class PaymentVaultConfigurationProcessTest.
+ */
+class PaymentVaultConfigurationProcessTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $storeManager;
+
+ /**
+ * @var \Magento\Store\Api\Data\StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $store;
+
+ /**
+ * @var \Magento\Vault\Api\PaymentMethodListInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $vaultList;
+
+ /**
+ * @var \Magento\Payment\Api\PaymentMethodListInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $paymentMethodList;
+
+ /**
+ * @var \Magento\Checkout\Block\Checkout\LayoutProcessor|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $layoutProcessor;
+
+ /**
+ * @var \Magento\Vault\Plugin\PaymentVaultConfigurationProcess
+ */
+ private $plugin;
+
+ /**
+ * Set up
+ */
+ protected function setUp()
+ {
+ $this->storeManager = $this
+ ->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getStore'])
+ ->getMockForAbstractClass();
+ $this->store = $this
+ ->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getId'])
+ ->getMockForAbstractClass();
+ $this->vaultList = $this
+ ->getMockBuilder(\Magento\Vault\Api\PaymentMethodListInterface::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getActiveList'])
+ ->getMockForAbstractClass();
+ $this->paymentMethodList = $this
+ ->getMockBuilder(\Magento\Payment\Api\PaymentMethodListInterface::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getActiveList'])
+ ->getMockForAbstractClass();
+ $this->layoutProcessor = $this
+ ->getMockBuilder(\Magento\Checkout\Block\Checkout\LayoutProcessor::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['process'])
+ ->getMockForAbstractClass();
+
+ $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $this->plugin = $objectManagerHelper->getObject(
+ \Magento\Vault\Plugin\PaymentVaultConfigurationProcess::class,
+ [
+ 'vaultPaymentList' => $this->vaultList,
+ 'paymentMethodList' => $this->paymentMethodList,
+ 'storeManager' => $this->storeManager
+ ]
+ );
+ }
+
+ /**
+ * @param array $jsLayout
+ * @param array $activeVaultList
+ * @param array $activePaymentList
+ * @param array $expectedResult
+ * @dataProvider beforeProcessDataProvider
+ */
+ public function testBeforeProcess($jsLayout, $activeVaultList, $activePaymentList, $expectedResult)
+ {
+ $this->store->expects($this->once())->method('getId')->willReturn(1);
+ $this->storeManager->expects($this->once())->method('getStore')->willReturn($this->store);
+ $this->vaultList->expects($this->once())->method('getActiveList')->with(1)->willReturn($activeVaultList);
+ $this->paymentMethodList->expects($this->once())
+ ->method('getActiveList')
+ ->with(1)
+ ->willReturn($activePaymentList);
+ $result = $this->plugin->beforeProcess($this->layoutProcessor, $jsLayout);
+ $this->assertEquals($result[0], $expectedResult);
+ }
+
+ /**
+ * Data provider for BeforeProcess.
+ *
+ * @return array
+ */
+ public function beforeProcessDataProvider()
+ {
+ $jsLayout['components']['checkout']['children']['steps']['children']['billing-step']
+ ['children']['payment']['children']['renders']['children'] = [
+ 'vault' => [
+ 'methods' => []
+ ],
+ 'braintree' => [
+ 'methods' => [
+ 'braintree_paypal' => [],
+ 'braintree' => []
+ ]
+ ],
+ 'paypal-payments' => [
+ 'methods' => [
+ 'payflowpro' => [],
+ 'payflow_link' => []
+ ]
+ ]
+ ];
+ $result1['components']['checkout']['children']['steps']['children']['billing-step']
+ ['children']['payment']['children']['renders']['children'] = [];
+ $result2['components']['checkout']['children']['steps']['children']['billing-step']
+ ['children']['payment']['children']['renders']['children'] = [
+ 'vault' => [
+ 'methods' => []
+ ],
+ 'braintree' => [
+ 'methods' => [
+ 'braintree_paypal' => []
+ ]
+ ]
+ ];
+
+ $vaultPaymentMethod = $this
+ ->getMockBuilder(\Magento\Vault\Api\PaymentMethodListInterface::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getCode', 'getProviderCode'])
+ ->getMockForAbstractClass();
+
+ $vaultPaymentMethod->expects($this->any())->method('getCode')->willReturn('braintree_paypal_vault');
+ $vaultPaymentMethod->expects($this->any())->method('getProviderCode')->willReturn('braintree_paypal');
+
+ return [
+ [$jsLayout, [], [], $result1],
+ [$jsLayout, [$vaultPaymentMethod], [$vaultPaymentMethod], $result2]
+ ];
+ }
+}
diff --git a/app/code/Magento/Vault/etc/frontend/di.xml b/app/code/Magento/Vault/etc/frontend/di.xml
index d7f699faff53c6e48c6d3d854b265ded269e4dcc..0af0e4cd32217f952d3c49fc7424e99bc8a1ffe0 100644
--- a/app/code/Magento/Vault/etc/frontend/di.xml
+++ b/app/code/Magento/Vault/etc/frontend/di.xml
@@ -19,4 +19,8 @@
<argument name="session" xsi:type="object">Magento\Customer\Model\Session</argument>
</arguments>
</type>
+ <type name="Magento\Checkout\Block\Checkout\LayoutProcessor">
+ <plugin name="ProcessPaymentVaultConfiguration" type="Magento\Vault\Plugin\PaymentVaultConfigurationProcess"/>
+ <plugin name="ProcessPaymentConfiguration" disabled="true"/>
+ </type>
</config>
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index cef145167860c8ebad9695d870b6cc73580e47f3..e4a9bd10fa65832e7fdc4ae01f10578056b55a47 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,6 +1,6 @@
{
"require": {
- "magento/mtf": "1.0.0-rc48",
+ "magento/mtf": "1.0.0-rc49",
"php": "~5.6.5|7.0.2|~7.0.6",
"phpunit/phpunit": "~4.8.0|~5.5.0",
"phpunit/phpunit-selenium": ">=1.2"
diff --git a/dev/tests/functional/credentials.xml.dist b/dev/tests/functional/credentials.xml.dist
index 88794d183e8781d5cea1c9199370c67daae1585c..78186091a568ddba7368126c4b9217714e35d127 100644
--- a/dev/tests/functional/credentials.xml.dist
+++ b/dev/tests/functional/credentials.xml.dist
@@ -32,10 +32,15 @@
<field path="payment/authorizenet_directpost/trans_key" value="" />
<field path="payment/authorizenet_directpost/trans_md5" value="" />
- <field path="payment/braintree_section/braintree/braintree_advanced/merchant_account_id" value="" />
- <field path="payment/braintree_section/braintree/braintree_required/merchant_id" value="" />
- <field path="payment/braintree_section/braintree/braintree_required/public_key" value="" />
- <field path="payment/braintree_section/braintree/braintree_required/private_key" value="" />
+ <field replace="braintree_enabled_fraud_merchant_account_id" value="" />
+ <field replace="braintree_enabled_fraud_merchant_id" value="" />
+ <field replace="braintree_enabled_fraud_public_key" value="" />
+ <field replace="braintree_enabled_fraud_private_key" value="" />
+
+ <field replace="braintree_disabled_fraud_merchant_account_id" value="" />
+ <field replace="braintree_disabled_fraud_merchant_id" value="" />
+ <field replace="braintree_disabled_fraud_public_key" value="" />
+ <field replace="braintree_disabled_fraud_private_key" value="" />
<field path="payment/paypal_group_all_in_one/wpp_usuk/wpp_required_settings/wpp_and_express_checkout/business_account" value="" />
<field path="payment/paypal_group_all_in_one/wpp_usuk/wpp_required_settings/wpp_and_express_checkout/api_username" value="" />
diff --git a/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php b/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php
index 8005f4bff16f7e2315de3b9fcd4fe4ac28b7044a..fbcf0c7c12b9210c5c926679c06562afa439b3da 100644
--- a/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php
+++ b/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php
@@ -25,7 +25,7 @@ class State1 extends AbstractState
*
* @var string
*/
- protected $config ='admin_session_lifetime_1_hour, wysiwyg_disabled, admin_account_sharing_enable';
+ protected $config ='admin_session_lifetime_1_hour, wysiwyg_disabled, admin_account_sharing_enable, log_to_file';
/**
* @construct
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml
index d4cf5dab742aa37684e8b5ee884bd6164c88426f..d629bcba9e174251a1bc1e4c8fff6cc664911598 100644
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml
@@ -22,10 +22,6 @@
<data name="creditCard/dataset" xsi:type="string">visa_authorizenet</data>
<data name="configData" xsi:type="string">authorizenet</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="transactionDetails" xsi:type="array">
- <item name="isClosed" xsi:type="string">No</item>
- <item name="transactionType" xsi:type="string">Authorization</item>
- </data>
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml
index fcf6e2ac0c4d0ece60aa742dfcb438456a0d9bd5..9274985a74edfa1ccfb7709ee979486733e8fe1b 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml
@@ -150,6 +150,15 @@
</field>
</dataset>
+ <dataset name="log_to_file">
+ <field name="dev/debug/debug_logging" xsi:type="array">
+ <item name="scope" xsi:type="string">default</item>
+ <item name="scope_id" xsi:type="number">0</item>
+ <item name="label" xsi:type="string">Yes</item>
+ <item name="value" xsi:type="number">1</item>
+ </field>
+ </dataset>
+
<dataset name="enable_https_frontend_admin">
<field name="web/secure/use_in_frontend" xsi:type="array">
<item name="scope" xsi:type="string">default</item>
@@ -164,6 +173,22 @@
<item name="value" xsi:type="number">1</item>
</field>
</dataset>
+
+ <dataset name="enable_https_frontend_admin_rollback">
+ <field name="web/secure/use_in_frontend" xsi:type="array">
+ <item name="scope" xsi:type="string">default</item>
+ <item name="scope_id" xsi:type="number">0</item>
+ <item name="label" xsi:type="string">No</item>
+ <item name="value" xsi:type="number">0</item>
+ </field>
+ <field name="web/secure/use_in_adminhtml" xsi:type="array">
+ <item name="scope" xsi:type="string">default</item>
+ <item name="scope_id" xsi:type="number">0</item>
+ <item name="label" xsi:type="string">No</item>
+ <item name="value" xsi:type="number">0</item>
+ </field>
+ </dataset>
+
<dataset name="enable_hsts">
<field name="web/secure/enable_hsts" xsi:type="array">
<item name="scope" xsi:type="string">default</item>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml
index 7f01e4f46106c020c10457a8f3e0fb0a7f1de8d7..268ce5795221dbbe3f545891c4d2e420bc87440e 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml
@@ -11,26 +11,26 @@
<field name="payment/braintree_section/braintree/braintree_required/merchant_id" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
<item name="scope_id" xsi:type="number">1</item>
- <item name="label" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ID</item>
- <item name="value" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ID</item>
+ <item name="label" xsi:type="string">Merchant ID</item>
+ <item name="value" xsi:type="string">%braintree_disabled_fraud_merchant_id%</item>
</field>
<field name="payment/braintree_section/braintree/braintree_required/public_key" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
<item name="scope_id" xsi:type="number">1</item>
- <item name="label" xsi:type="string">PAYMENT_PAYMENT_BRAINTREE_PUBLIC_KEY</item>
- <item name="value" xsi:type="string">PAYMENT_PAYMENT_BRAINTREE_PUBLIC_KEY</item>
+ <item name="label" xsi:type="string">Public Key</item>
+ <item name="value" xsi:type="string">%braintree_disabled_fraud_public_key%</item>
</field>
<field name="payment/braintree_section/braintree/braintree_required/private_key" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
<item name="scope_id" xsi:type="number">1</item>
- <item name="label" xsi:type="string">PAYMENT_BRAINTREE_PRIVATE_KEY</item>
- <item name="value" xsi:type="string">PAYMENT_BRAINTREE_PRIVATE_KEY</item>
+ <item name="label" xsi:type="string">Private Key</item>
+ <item name="value" xsi:type="string">%braintree_disabled_fraud_private_key%</item>
</field>
<field name="payment/braintree_section/braintree/braintree_advanced/merchant_account_id" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
<item name="scope_id" xsi:type="number">1</item>
- <item name="label" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ACCOUNT_ID</item>
- <item name="value" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ACCOUNT_ID</item>
+ <item name="label" xsi:type="string">Merchant Account ID</item>
+ <item name="value" xsi:type="string">%braintree_disabled_fraud_merchant_account_id%</item>
</field>
<field name="payment/braintree_section/braintree/braintree_required/payment_action" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -51,6 +51,7 @@
<item name="value" xsi:type="number">1</item>
</field>
</dataset>
+
<dataset name="braintree_rollback">
<field name="payment/braintree/active" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -59,6 +60,16 @@
<item name="value" xsi:type="number">0</item>
</field>
</dataset>
+
+ <dataset name="braintree_incorrect_merchant_account_id">
+ <field name="payment/braintree_section/braintree/braintree_advanced/merchant_account_id" xsi:type="array">
+ <item name="scope" xsi:type="string">payment</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">Merchant Account ID</item>
+ <item name="value" xsi:type="string">incorrect</item>
+ </field>
+ </dataset>
+
<dataset name="braintree_sale">
<field name="payment/braintree/payment_action" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -67,6 +78,7 @@
<item name="value" xsi:type="string">authorize_capture</item>
</field>
</dataset>
+
<dataset name="braintree_3d_secure">
<field name="payment/braintree_section/braintree/braintree_3dsecure/verify_3dsecure" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -75,6 +87,7 @@
<item name="value" xsi:type="number">1</item>
</field>
</dataset>
+
<dataset name="braintree_3d_secure_rollback">
<field name="payment/braintree_section/braintree/braintree_3dsecure/verify_3dsecure" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -83,6 +96,7 @@
<item name="value" xsi:type="number">0</item>
</field>
</dataset>
+
<dataset name="braintree_3d_secure_uk">
<field name="payment/braintree/verify_3dsecure" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -107,6 +121,7 @@
</item>
</field>
</dataset>
+
<dataset name="braintree_3d_secure_uk_rollback">
<field name="payment/braintree_section/braintree/braintree_3dsecure/verify_3dsecure" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -121,6 +136,7 @@
<item name="value" xsi:type="number">0</item>
</field>
</dataset>
+
<dataset name="braintree_3d_secure_not_triggered_due_threshold">
<field name="payment/braintree/verify_3dsecure" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -135,6 +151,7 @@
<item name="value" xsi:type="number">300</item>
</field>
</dataset>
+
<dataset name="braintree_3d_secure_not_triggered_due_threshold_rollback">
<field name="payment/braintree/verify_3dsecure" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -143,6 +160,7 @@
<item name="value" xsi:type="number">0</item>
</field>
</dataset>
+
<dataset name="braintree_use_vault">
<field name="payment/braintree_section/braintree/braintree_cc_vault_active" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -151,6 +169,7 @@
<item name="value" xsi:type="number">1</item>
</field>
</dataset>
+
<dataset name="braintree_use_vault_rollback">
<field name="payment/braintree_section/braintree/braintree_cc_vault_active" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -159,6 +178,7 @@
<item name="value" xsi:type="number">0</item>
</field>
</dataset>
+
<dataset name="braintree_paypal">
<field name="payment/braintree_section/braintree/active_braintree_paypal" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -173,6 +193,7 @@
<item name="value" xsi:type="string">authorize</item>
</field>
</dataset>
+
<dataset name="braintree_paypal_rollback">
<field name="payment/braintree_section/braintree/active_braintree_paypal" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -181,7 +202,14 @@
<item name="value" xsi:type="number">0</item>
</field>
</dataset>
+
<dataset name="braintree_paypal_sale">
+ <field name="payment/braintree_section/braintree/active_braintree_paypal" xsi:type="array">
+ <item name="scope" xsi:type="string">payment</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">Yes</item>
+ <item name="value" xsi:type="number">1</item>
+ </field>
<field name="payment/braintree_section/braintree/braintree_paypal/payment_action" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
<item name="scope_id" xsi:type="number">1</item>
@@ -189,6 +217,16 @@
<item name="value" xsi:type="string">authorize_capture</item>
</field>
</dataset>
+
+ <dataset name="braintree_paypal_sale_rollback">
+ <field name="payment/braintree_section/braintree/active_braintree_paypal" xsi:type="array">
+ <item name="scope" xsi:type="string">payment</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">No</item>
+ <item name="value" xsi:type="number">0</item>
+ </field>
+ </dataset>
+
<dataset name="braintree_paypal_skip_order_review">
<field name="payment/braintree_section/braintree/braintree_paypal/skip_order_review" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -197,6 +235,7 @@
<item name="value" xsi:type="number">1</item>
</field>
</dataset>
+
<dataset name="braintree_paypal_skip_order_review_rollback">
<field name="payment/braintree_section/braintree/braintree_paypal/skip_order_review" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -205,6 +244,7 @@
<item name="value" xsi:type="number">0</item>
</field>
</dataset>
+
<dataset name="braintree_paypal_use_vault">
<field name="payment/braintree_section/braintree/braintree_paypal/braintree_paypal_vault_active" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -213,6 +253,7 @@
<item name="value" xsi:type="number">1</item>
</field>
</dataset>
+
<dataset name="braintree_paypal_use_vault_rollback">
<field name="payment/braintree_section/braintree/braintree_paypal/braintree_paypal_vault_active" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -221,6 +262,7 @@
<item name="value" xsi:type="number">0</item>
</field>
</dataset>
+
<dataset name="braintree_fraudprotection">
<field name="payment/braintree/fraudprotection" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -229,6 +271,7 @@
<item name="value" xsi:type="number">1</item>
</field>
</dataset>
+
<dataset name="braintree_fraudprotection_rollback">
<field name="payment/braintree/fraudprotection" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -237,5 +280,59 @@
<item name="value" xsi:type="number">0</item>
</field>
</dataset>
+
+ <dataset name="braintree_fraud_tool_enabled_account">
+ <field name="payment/braintree_section/braintree/braintree_required/merchant_id" xsi:type="array">
+ <item name="scope" xsi:type="string">payment</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">Merchant ID</item>
+ <item name="value" xsi:type="string">%braintree_enabled_fraud_merchant_id%</item>
+ </field>
+ <field name="payment/braintree_section/braintree/braintree_required/public_key" xsi:type="array">
+ <item name="scope" xsi:type="string">payment</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">Public Key</item>
+ <item name="value" xsi:type="string">%braintree_enabled_fraud_public_key%</item>
+ </field>
+ <field name="payment/braintree_section/braintree/braintree_required/private_key" xsi:type="array">
+ <item name="scope" xsi:type="string">payment</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">Private Key</item>
+ <item name="value" xsi:type="string">%braintree_enabled_fraud_private_key%</item>
+ </field>
+ <field name="payment/braintree_section/braintree/braintree_advanced/merchant_account_id" xsi:type="array">
+ <item name="scope" xsi:type="string">payment</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">Merchant Account ID</item>
+ <item name="value" xsi:type="string">%braintree_enabled_fraud_merchant_account_id%</item>
+ </field>
+ <field name="payment/braintree_section/braintree/braintree_required/payment_action" xsi:type="array">
+ <item name="scope" xsi:type="string">payment</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">Authorize</item>
+ <item name="value" xsi:type="string">authorize</item>
+ </field>
+ <field name="payment/braintree_section/braintree/braintree_advanced/debug" xsi:type="array">
+ <item name="scope" xsi:type="string">payment</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">Yes</item>
+ <item name="value" xsi:type="number">1</item>
+ </field>
+ <field name="payment/braintree_section/braintree/active" xsi:type="array">
+ <item name="scope" xsi:type="string">payment</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">Yes</item>
+ <item name="value" xsi:type="number">1</item>
+ </field>
+ </dataset>
+
+ <dataset name="braintree_fraud_tool_enabled_account_rollback">
+ <field name="payment/braintree/active" xsi:type="array">
+ <item name="scope" xsi:type="string">payment</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">No</item>
+ <item name="value" xsi:type="number">0</item>
+ </field>
+ </dataset>
</repository>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/CreditCard.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/CreditCard.xml
index e750aa9cb423444e2cc17b8e269a7a62b9289f20..6aa9383ff2bd1051364b1498d799ebb681714aca 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/CreditCard.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/CreditCard.xml
@@ -13,17 +13,26 @@
<field name="credit_card_exp_year" xsi:type="string">2020</field>
<field name="cvv" xsi:type="string">123</field>
</dataset>
+
<dataset name="visa_braintree_3dsecure">
<field name="credit_card_number" xsi:type="string">4000000000000002</field>
<field name="credit_card_exp_month" xsi:type="string">01</field>
<field name="credit_card_exp_year" xsi:type="string">20</field>
<field name="cvv" xsi:type="string">123</field>
</dataset>
+
<dataset name="visa_braintree_3dsecure_failed">
<field name="credit_card_number" xsi:type="string">4000000000000028</field>
<field name="credit_card_exp_month" xsi:type="string">01</field>
<field name="credit_card_exp_year" xsi:type="string">2020</field>
<field name="cvv" xsi:type="string">123</field>
</dataset>
+
+ <dataset name="visa_braintree_fraud_rejected">
+ <field name="credit_card_number" xsi:type="string">4000111111111511</field>
+ <field name="credit_card_exp_month" xsi:type="string">01</field>
+ <field name="credit_card_exp_year" xsi:type="string">2020</field>
+ <field name="cvv" xsi:type="string">123</field>
+ </dataset>
</repository>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml
index 9614923691c6c097702c3a222bfc52edfcd2489a..083bd33feca7b133903b9f83eb12c4d5b3f1fcfa 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml
@@ -64,5 +64,28 @@
<constraint name="Magento\Sales\Test\Constraint\AssertCaptureInCommentsHistory" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
</variation>
+ <variation name="CreateOrderBackendTestBraintreeVariation3" summary="Checkout with Braintree Credit Card from Admin (Basic Fraud Protection)" ticketId="MAGETWO-46470">
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
+ <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+ <data name="products/1" xsi:type="string">configurableProduct::with_one_option</data>
+ <data name="products/2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
+ <data name="customer/dataset" xsi:type="string">default</data>
+ <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
+ <data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
+ <data name="saveAddress" xsi:type="string">No</data>
+ <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+ <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+ <data name="prices" xsi:type="array">
+ <item name="grandTotal" xsi:type="string">145.98</item>
+ </data>
+ <data name="payment/method" xsi:type="string">braintree</data>
+ <data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
+ <data name="creditCard/dataset" xsi:type="string">visa_braintree_fraud_rejected</data>
+ <data name="configData" xsi:type="string">braintree</data>
+ <data name="status" xsi:type="string">Processing</data>
+ <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
+ <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
+ <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
+ </variation>
</testCase>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDeclinedTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDeclinedTest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4a2aa551a18170002045f821de2d492ddb7a2082
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDeclinedTest.xml
@@ -0,0 +1,43 @@
+<?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\OnePageCheckoutDeclinedTest" summary="Error message during OnePageCheckout">
+ <variation name="OnePageCheckoutBraintreeDeclinedTestVariation1" summary="Registered Checkout with Braintree Credit Card from Storefront with Advanced Fraud Protection failed" ticketId="MAGETWO-46469">
+ <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+ <data name="customer/dataset" xsi:type="string">default</data>
+ <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
+ <data name="checkoutMethod" xsi:type="string">login</data>
+ <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+ <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+ <data name="payment/method" xsi:type="string">braintree</data>
+ <data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
+ <data name="creditCard/dataset" xsi:type="string">visa_braintree_fraud_rejected</data>
+ <data name="expectedErrorMessage" xsi:type="string">Transaction has been declined. Please try again later.</data>
+ <data name="configData" xsi:type="string">braintree_fraud_tool_enabled_account, braintree_fraudprotection</data>
+ <data name="status" xsi:type="string">Processing</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
+ <constraint name="Magento\Checkout\Test\Constraint\AssertCheckoutErrorMessage" />
+ </variation>
+ <variation name="OnePageCheckoutBraintreeDeclinedTestVariation2" summary="Checkout with Braintree Credit Card configured with incorrect credentials" ticketId="MAGETWO-46244">
+ <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+ <data name="customer/dataset" xsi:type="string">default</data>
+ <data name="shippingAddress/dataset" xsi:type="string">US_address_1</data>
+ <data name="checkoutMethod" xsi:type="string">guest</data>
+ <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+ <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+ <data name="payment/method" xsi:type="string">braintree</data>
+ <data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
+ <data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
+ <data name="expectedErrorMessage" xsi:type="string">Sorry, but something went wrong</data>
+ <data name="configData" xsi:type="string">braintree, braintree_incorrect_merchant_account_id</data>
+ <data name="status" xsi:type="string">Processing</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
+ <constraint name="Magento\Checkout\Test\Constraint\AssertCheckoutErrorMessage" />
+ </variation>
+ </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutTest.xml
index 1e9c539c8c0d379d6e5b69929e9270b21a8cc593..54fdfc96dc947db330c37b701132bfc0e3fcbeb0 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutTest.xml
@@ -23,6 +23,7 @@
<data name="payment/method" xsi:type="string">braintree</data>
<data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
<data name="creditCard/dataset" xsi:type="string">visa_braintree_3dsecure</data>
+ <data name="isVaultPresent" xsi:type="boolean">false</data>
<data name="configData" xsi:type="string">braintree, braintree_3d_secure_not_triggered_due_threshold</data>
<data name="status" xsi:type="string">Processing</data>
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
@@ -46,6 +47,7 @@
<data name="payment/method" xsi:type="string">braintree</data>
<data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
<data name="creditCard/dataset" xsi:type="string">visa_braintree_3dsecure</data>
+ <data name="isVaultPresent" xsi:type="boolean">false</data>
<data name="configData" xsi:type="string">braintree, braintree_3d_secure_uk</data>
<data name="status" xsi:type="string">Processing</data>
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
@@ -69,6 +71,7 @@
<data name="payment/method" xsi:type="string">braintree</data>
<data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
<data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
+ <data name="isVaultPresent" xsi:type="boolean">false</data>
<data name="configData" xsi:type="string">braintree</data>
<data name="status" xsi:type="string">Processing</data>
<data name="tag" xsi:type="string">test_type:extended_acceptance_test, test_type:3rd_party_test, severity:S0</data>
@@ -96,6 +99,7 @@
<data name="payment/method" xsi:type="string">braintree</data>
<data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
<data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
+ <data name="isVaultPresent" xsi:type="boolean">false</data>
<data name="configData" xsi:type="string">braintree, braintree_sale</data>
<data name="status" xsi:type="string">Processing</data>
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureFailedTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureFailedTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..0f21b8f219cb13dd426c1aad3cdb0f6ba24b06a6
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureFailedTest.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Braintree\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ * 1. Configure payment method.
+ * 2. Create products.
+ *
+ * Steps:
+ * 1. Log in Storefront.
+ * 2. Add products to the Shopping Cart.
+ * 5. Click the 'Proceed to Checkout' button.
+ * 6. Fill shipping information.
+ * 7. Select shipping method.
+ * 8. Select payment method.
+ * 9. Verify order total on review step.
+ * 10. Click 'Place Order' button.
+ * 11. Specify password in 3D Secure popup.
+ * 12. Click 'Submit'.
+ * 13. Perform assertions.
+ *
+ * @group Braintree
+ * @ZephyrId MAGETWO-46477
+ */
+class OnePageCheckoutWith3dSecureFailedTest extends Scenario
+{
+ /* tags */
+ const MVP = 'yes';
+ const TEST_TYPE = '3rd_party_test';
+ const SEVERITY = 'S1';
+ /* end tags */
+
+ /**
+ * Verifies error message on Onepage Checkout if 3d secure validation is failed.
+ *
+ * @return void
+ */
+ public function test()
+ {
+ $this->executeScenario();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureFailedTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureFailedTest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2a17d1496a72dfb1bb63073ccd982abf3522ca9f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureFailedTest.xml
@@ -0,0 +1,28 @@
+<?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\Braintree\Test\TestCase\OnePageCheckoutWith3dSecureFailedTest" summary="Onepage checkout with Braintree payment method with 3D Secure enabled.">
+ <variation name="OnePageCheckoutBraintree3dSecureFailedTestVariation1" summary="Guest Checkout with Braintree Credit Card from Storefront with 3D Secure verification failed" ticketId="MAGETWO-46477">
+ <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+ <data name="customer/dataset" xsi:type="string">default</data>
+ <data name="shippingAddress/dataset" xsi:type="string">US_address_1</data>
+ <data name="checkoutMethod" xsi:type="string">guest</data>
+ <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+ <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+ <data name="payment/method" xsi:type="string">braintree</data>
+ <data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
+ <data name="creditCard/dataset" xsi:type="string">visa_braintree_3dsecure_failed</data>
+ <data name="secure3d/dataset" xsi:type="string">secure3d_braintree</data>
+ <data name="configData" xsi:type="string">braintree, braintree_3d_secure</data>
+ <data name="expectedErrorMessage" xsi:type="string">Please try again with another form of payment.</data>
+ <data name="status" xsi:type="string">Processing</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
+ <constraint name="Magento\Checkout\Test\Constraint\AssertCheckoutErrorMessage" />
+ </variation>
+ </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.xml
index 7e38e6f0303b64e55ce6e126a2653f0ce7420df7..7bc8fe883dc2df1945871e039d9d67d52ab40516 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.xml
@@ -50,5 +50,21 @@
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
<constraint name="Magento\Sales\Test\Constraint\AssertCaptureInCommentsHistory" />
</variation>
+ <variation name="OnePageCheckoutWithBraintreePaypalTestVariation3" summary="Guest Checkout virtual quote with Braintree PayPal from Cart" ticketId="MAGETWO-41559">
+ <data name="products/0" xsi:type="string">catalogProductVirtual::product_50_dollar</data>
+ <data name="customer/dataset" xsi:type="string">default</data>
+ <data name="checkoutMethod" xsi:type="string">guest</data>
+ <data name="prices" xsi:type="array">
+ <item name="grandTotal" xsi:type="string">50.00</item>
+ </data>
+ <data name="payment/method" xsi:type="string">braintree_paypal</data>
+ <data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_skip_order_review</data>
+ <data name="status" xsi:type="string">Processing</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S2</data>
+ <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+ <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
+ <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
+ <constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
+ </variation>
</testCase>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/ReorderUsingVaultTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/ReorderUsingVaultTest.xml
index ad4d5cc06e92e260aed4c90e6f534f2540d25034..66d912d77bba7836ab2f747757f32f2a82cf02ec 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/ReorderUsingVaultTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/ReorderUsingVaultTest.xml
@@ -20,6 +20,7 @@
</data>
<data name="payment/method" xsi:type="string">braintree</data>
<data name="vault/method" xsi:type="string">braintree_cc_vault</data>
+ <data name="isVaultPresent" xsi:type="boolean">false</data>
<data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
<data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
<data name="configData" xsi:type="string">braintree, braintree_use_vault</data>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWith3dSecureFailedStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWith3dSecureFailedStep.php
new file mode 100644
index 0000000000000000000000000000000000000000..00a8fce571617e5cd643d9b05bd914dc24e3eb43
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWith3dSecureFailedStep.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Braintree\Test\TestStep;
+
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Braintree\Test\Fixture\Secure3dBraintree;
+
+/**
+ * Click 'Place order' button and submit 3D secure verification step.
+ */
+class PlaceOrderWith3dSecureFailedStep implements TestStepInterface
+{
+ /**
+ * Onepage checkout page.
+ *
+ * @var CheckoutOnepage
+ */
+ private $checkoutOnepage;
+
+ /**
+ * 3D Secure fixture.
+ *
+ * @var Secure3dBraintree
+ */
+ private $secure3d;
+
+ /**
+ * @param CheckoutOnepage $checkoutOnepage
+ * @param Secure3dBraintree $secure3d
+ */
+ public function __construct(
+ CheckoutOnepage $checkoutOnepage,
+ Secure3dBraintree $secure3d
+ ) {
+ $this->checkoutOnepage = $checkoutOnepage;
+ $this->secure3d = $secure3d;
+ }
+
+ /**
+ * Click 'Place order' button and submit 3D secure verification.
+ *
+ * @return array
+ */
+ public function run()
+ {
+ $this->checkoutOnepage->getPaymentBlock()->getSelectedPaymentMethodBlock()->clickPlaceOrder();
+
+ $this->checkoutOnepage->getBraintree3dSecureBlock()->fill($this->secure3d);
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php
index 0ff7f164b0996108ab332343b8b6528e0af54630..d61e2fff6337a4ddc3c616bd9dbc1ad2c8e0540e 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php
@@ -6,6 +6,7 @@
namespace Magento\Braintree\Test\TestStep;
use Magento\Checkout\Test\Constraint\AssertGrandTotalOrderReview;
+use Magento\Checkout\Test\Constraint\AssertBillingAddressAbsentInPayment;
use Magento\Checkout\Test\Page\CheckoutOnepage;
use Magento\Checkout\Test\Page\CheckoutOnepageSuccess;
use Magento\Mtf\Fixture\FixtureFactory;
@@ -26,6 +27,11 @@ class PlaceOrderWithPaypalStep implements TestStepInterface
*/
private $assertGrandTotalOrderReview;
+ /**
+ * @var AssertBillingAddressAbsentInPayment
+ */
+ private $assertBillingAddressAbsentInPayment;
+
/**
* @var CheckoutOnepageSuccess
*/
@@ -49,6 +55,7 @@ class PlaceOrderWithPaypalStep implements TestStepInterface
/**
* @param CheckoutOnepage $checkoutOnepage
* @param AssertGrandTotalOrderReview $assertGrandTotalOrderReview
+ * @param AssertBillingAddressAbsentInPayment $assertBillingAddressAbsentInPayment
* @param CheckoutOnepageSuccess $checkoutOnepageSuccess
* @param FixtureFactory $fixtureFactory
* @param array $products
@@ -57,6 +64,7 @@ class PlaceOrderWithPaypalStep implements TestStepInterface
public function __construct(
CheckoutOnepage $checkoutOnepage,
AssertGrandTotalOrderReview $assertGrandTotalOrderReview,
+ AssertBillingAddressAbsentInPayment $assertBillingAddressAbsentInPayment,
CheckoutOnepageSuccess $checkoutOnepageSuccess,
FixtureFactory $fixtureFactory,
array $products,
@@ -64,6 +72,7 @@ class PlaceOrderWithPaypalStep implements TestStepInterface
) {
$this->checkoutOnepage = $checkoutOnepage;
$this->assertGrandTotalOrderReview = $assertGrandTotalOrderReview;
+ $this->assertBillingAddressAbsentInPayment = $assertBillingAddressAbsentInPayment;
$this->checkoutOnepageSuccess = $checkoutOnepageSuccess;
$this->fixtureFactory = $fixtureFactory;
$this->products = $products;
@@ -78,6 +87,9 @@ class PlaceOrderWithPaypalStep implements TestStepInterface
if (isset($this->prices['grandTotal'])) {
$this->assertGrandTotalOrderReview->processAssert($this->checkoutOnepage, $this->prices['grandTotal']);
}
+
+ $this->assertBillingAddressAbsentInPayment->processAssert($this->checkoutOnepage);
+
$parentWindow = $this->checkoutOnepage->getPaymentBlock()
->getSelectedPaymentMethodBlock()
->clickPayWithPaypal();
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml
index 495f455c43a72f4d61029a07a8633fc09744c2f0..6ad46774f0f765b01761f6227465c63b695535d6 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml
@@ -21,6 +21,19 @@
<step name="fillBillingInformation" module="Magento_Checkout" next="placeOrderWith3dSecure" />
<step name="placeOrderWith3dSecure" module="Magento_Braintree" />
</scenario>
+ <scenario name="OnePageCheckoutWith3dSecureFailedTest" 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" next="createCustomer" />
+ <step name="createCustomer" module="Magento_Customer" next="selectCheckoutMethod" />
+ <step name="selectCheckoutMethod" module="Magento_Checkout" next="fillShippingAddress" />
+ <step name="fillShippingAddress" module="Magento_Checkout" next="fillShippingMethod" />
+ <step name="fillShippingMethod" module="Magento_Checkout" next="selectPaymentMethod" />
+ <step name="selectPaymentMethod" module="Magento_Checkout" next="fillBillingInformation" />
+ <step name="fillBillingInformation" module="Magento_Checkout" next="placeOrderWith3dSecureFailed" />
+ <step name="placeOrderWith3dSecureFailed" module="Magento_Braintree" />
+ </scenario>
<scenario name="UseVaultWith3dSecureOnCheckoutTest" firstStep="setupConfiguration">
<step name="setupConfiguration" module="Magento_Config" next="createProducts" />
<step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart" />
@@ -106,8 +119,8 @@
<step name="selectPaymentMethod" module="Magento_Checkout" next="fillBillingInformation" />
<step name="fillBillingInformation" module="Magento_Checkout" next="placeOrderWithPaypal" />
<step name="placeOrderWithPaypal" module="Magento_Braintree" next="createInvoice" />
- <step name="createInvoice" module="Magento_Sales" next="createBraintreeCreditMemo" />
- <step name="createBraintreeCreditMemo" module="Magento_Braintree" />
+ <step name="createInvoice" module="Magento_Sales" next="createOnlineCreditMemo" />
+ <step name="createOnlineCreditMemo" module="Magento_Sales" />
</scenario>
<scenario name="SaveUseDeleteVaultForPaypalBraintreeTest" firstStep="setupConfiguration">
<step name="setupConfiguration" module="Magento_Config" next="createProducts" />
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php
index ec96c5b27f50a39ffcfc6f88bfc5d1299a17af83..a688ffac5ac019627c137fcb678c56f374599c8b 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php
@@ -133,4 +133,19 @@ class View extends \Magento\Catalog\Test\Block\Product\View
}
$this->getBundleBlock()->fillBundleOptions($bundleCheckoutData);
}
+
+ /**
+ * Fill in the custom option data.
+ *
+ * @param array $optionsData
+ * @return void
+ */
+ public function fillOptionsWithCustomData(array $optionsData = [])
+ {
+ if (!$this->getBundleBlock()->isVisible()) {
+ $this->clickCustomize();
+ }
+
+ $this->getBundleBlock()->fillBundleOptions($optionsData);
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Summary.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Summary.php
index 76a46bfe3088a47f79dafa7f8c71d649e324b130..03c0aeadd85bbb9bc69572eeb2cba026cb7c0bac 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Summary.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Summary.php
@@ -20,6 +20,13 @@ class Summary extends \Magento\Catalog\Test\Block\Product\View
*/
private $configuredPriceBlockSelector = '.price-configured_price';
+ /**
+ * Summary items selector.
+ *
+ * @var string
+ */
+ private $summaryItemsSelector = '.bundle li div div';
+
/**
* Get configured price block.
*
@@ -32,4 +39,14 @@ class Summary extends \Magento\Catalog\Test\Block\Product\View
['element' => $this->_rootElement->find($this->configuredPriceBlockSelector)]
);
}
+
+ /**
+ * Get Bundle Summary row items.
+ *
+ * @return \Magento\Mtf\Client\ElementInterface[]
+ */
+ public function getSummaryItems()
+ {
+ return $this->_rootElement->getElements($this->summaryItemsSelector);
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsSummaryOnProductPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsSummaryOnProductPage.php
new file mode 100644
index 0000000000000000000000000000000000000000..e60e08e3c9b9aa755734b21e3ef05a040b8d87d2
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsSummaryOnProductPage.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Bundle\Test\Constraint;
+
+use Magento\Bundle\Test\Fixture\BundleProduct;
+use Magento\Catalog\Test\Page\Product\CatalogProductView;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+
+/**
+ * Assert that displayed summary for bundle options equals to passed from fixture.
+ */
+class AssertBundleItemsSummaryOnProductPage extends AbstractAssertForm
+{
+ /**
+ * Assert that selecting bundle option affects Summary section accordingly.
+ *
+ * @param CatalogProductView $catalogProductView
+ * @param BundleProduct $product
+ * @param BrowserInterface $browser
+ * @return void
+ */
+ public function processAssert(
+ CatalogProductView $catalogProductView,
+ BundleProduct $product,
+ BrowserInterface $browser
+ ) {
+ $expectedResult = [];
+ $actualResult = [];
+
+ $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
+ $bundleOptions = $product->getData()['bundle_selections']['bundle_options'];
+ $bundleViewBlock = $catalogProductView->getBundleViewBlock();
+ $configuredPriceBlock = $bundleViewBlock->getBundleSummaryBlock()->getConfiguredPriceBlock();
+ foreach ($bundleOptions as $bundleOption) {
+ foreach ($bundleOption['assigned_products'] as $assignedProduct) {
+ $bundleViewBlock->fillOptionsWithCustomData([
+ [
+ 'title' => $bundleOption['title'],
+ 'type' => $bundleOption['type'],
+ 'frontend_type' => $bundleOption['type'],
+ 'value' => [
+ 'name' => $assignedProduct['search_data']['name']
+ ]
+ ]
+ ]);
+ $assignedProductPrice = (double)$assignedProduct['data']['selection_price_value'];
+ $assignedProductQty = (double)$assignedProduct['data']['selection_qty'];
+
+ foreach ($bundleViewBlock->getBundleSummaryBlock()->getSummaryItems() as $bundleSummaryItem) {
+ $bundleSummaryItemText = $bundleSummaryItem->getText();
+ if (strpos($bundleSummaryItemText, $assignedProduct['search_data']['name']) !== false) {
+ $optionData = $this->getBundleOptionData($bundleSummaryItemText);
+ $optionData['price'] = (double)$configuredPriceBlock->getPrice();
+ $actualResult[] = $optionData;
+ }
+ }
+
+ $expectedResult[] = [
+ 'qty' => $assignedProduct['data']['selection_qty'],
+ 'name' => $assignedProduct['search_data']['name'],
+ 'price' => $assignedProductQty * $assignedProductPrice + (double)$product->getPrice()
+ ];
+ }
+ }
+
+ \PHPUnit_Framework_Assert::assertEquals(
+ $expectedResult,
+ $actualResult,
+ 'Bundle Summary Section does not contain correct bundle options data.'
+ );
+ }
+
+ /**
+ * Extract Bundle summary item Qty and Name from row text.
+ *
+ * @param string $rowItem
+ * @return array
+ */
+ private function getBundleOptionData($rowItem)
+ {
+ // Row item must be displayed like "1 x Simple Product".
+ $rowItem = explode(' x ', $rowItem);
+ return [
+ 'qty' => $rowItem[0],
+ 'name' => $rowItem[1]
+ ];
+ }
+
+ /**
+ * Return Text if displayed on frontend equals with fixture.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Bundle options are displayed correctly in the summary section.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml
index 6a507a7a99b437a793b4096f8f10d9e33ccb825a..25c9e2693258800c04303db31e703247e6507d3f 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml
@@ -184,6 +184,34 @@
<item name="dataset" xsi:type="string">bundle_required_two_fixed_options</item>
</field>
</dataset>
+
+ <dataset name="fixed_with_required_options_and_qty">
+ <field name="name" xsi:type="string">Bundle fixed product %isolation%</field>
+ <field name="url_key" xsi:type="string">bundle-fixed-product-%isolation%</field>
+ <field name="sku" xsi:type="string">sku_bundle_fixed_product_%isolation%</field>
+ <field name="sku_type" xsi:type="string">No</field>
+ <field name="price_type" xsi:type="string">No</field>
+ <field name="price" xsi:type="array">
+ <item name="value" xsi:type="string">100</item>
+ </field>
+ <field name="tax_class_id" xsi:type="array">
+ <item name="dataset" xsi:type="string">taxable_goods</item>
+ </field>
+ <field name="weight" xsi:type="string">1</field>
+ <field name="weight_type" xsi:type="string">No</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="shipment_type" xsi:type="string">Separately</field>
+ <field name="bundle_selections" xsi:type="array">
+ <item name="dataset" xsi:type="string">required_three_fixed_options_with_qty</item>
+ </field>
+ <field name="checkout_data" xsi:type="array">
+ <item name="dataset" xsi:type="string">bundle_required_three_fixed_options_with_qty</item>
+ </field>
+ </dataset>
<dataset name="bundle_fixed_100_dollar_product">
<field name="name" xsi:type="string">Bundle fixed product %isolation%</field>
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/BundleSelections.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/BundleSelections.xml
index c19a78f64894e17b256a1ec13828b0612bdada08..a297891ba085ce99ea3391176efa38a8d325e775 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/BundleSelections.xml
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/BundleSelections.xml
@@ -623,6 +623,56 @@
</field>
</dataset>
+ <dataset name="required_three_fixed_options_with_qty">
+ <field name="bundle_options" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="title" xsi:type="string">Drop-down Option</item>
+ <item name="type" xsi:type="string">Drop-down</item>
+ <item name="frontend_type" xsi:type="string">Drop-down</item>
+ <item name="required" xsi:type="string">Yes</item>
+ <item name="assigned_products" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="search_data" xsi:type="array">
+ <item name="name" xsi:type="string">%product_name%</item>
+ </item>
+ <item name="data" xsi:type="array">
+ <item name="selection_price_value" xsi:type="string">10.00</item>
+ <item name="selection_price_type" xsi:type="string">Fixed</item>
+ <item name="selection_qty" xsi:type="string">1</item>
+ </item>
+ </item>
+ <item name="1" xsi:type="array">
+ <item name="search_data" xsi:type="array">
+ <item name="name" xsi:type="string">%product_name%</item>
+ </item>
+ <item name="data" xsi:type="array">
+ <item name="selection_price_value" xsi:type="string">20.00</item>
+ <item name="selection_price_type" xsi:type="string">Fixed</item>
+ <item name="selection_qty" xsi:type="string">2</item>
+ </item>
+ </item>
+ <item name="2" xsi:type="array">
+ <item name="search_data" xsi:type="array">
+ <item name="name" xsi:type="string">%product_name%</item>
+ </item>
+ <item name="data" xsi:type="array">
+ <item name="selection_price_value" xsi:type="string">30.00</item>
+ <item name="selection_price_type" xsi:type="string">Fixed</item>
+ <item name="selection_qty" xsi:type="string">3</item>
+ </item>
+ </item>
+ </item>
+ </item>
+ </field>
+ <field name="products" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="0" xsi:type="string">catalogProductSimple::simple</item>
+ <item name="1" xsi:type="string">catalogProductSimple::product_15_dollar</item>
+ <item name="2" xsi:type="string">catalogProductSimple::product_40_dollar</item>
+ </item>
+ </field>
+ </dataset>
+
<dataset name="dynamic_with_two_required_options_assigned_products_with_special_price">
<field name="bundle_options" xsi:type="array">
<item name="0" xsi:type="array">
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/CheckoutData.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/CheckoutData.xml
index d68fb0d0b83f8ff3520508a1c72bc51dcf8ff1c1..3bf2e7b7f2ad1387c89752282148fc582d65a0e1 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/CheckoutData.xml
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/CheckoutData.xml
@@ -393,5 +393,20 @@
<item name="configuredPrice" xsi:type="string">1680</item>
</field>
</dataset>
+
+ <dataset name="bundle_required_three_fixed_options_with_qty">
+ <field name="options" xsi:type="array">
+ <item name="bundle_options" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="title" xsi:type="string">Drop-down Option</item>
+ <item name="type" xsi:type="string">Drop-down</item>
+ <item name="frontend_type" xsi:type="string">Drop-down</item>
+ <item name="value" xsi:type="array">
+ <item name="name" xsi:type="string">Test simple product</item>
+ </item>
+ </item>
+ </item>
+ </field>
+ </dataset>
</repository>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleOptionsSummaryTest.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleOptionsSummaryTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..1069a09a354a57619241f55008aec7df1d0a5cc7
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleOptionsSummaryTest.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Bundle\Test\TestCase;
+
+use Magento\Bundle\Test\Fixture\BundleProduct;
+use Magento\Mtf\TestCase\Injectable;
+
+/**
+ * Preconditions:
+ * 1. Bundle Product with options is created.
+ *
+ * Steps:
+ * 1. Navigate to the Storefront Catalog Product Page.
+ * 2. Select each bundle option and verify that Bundle Summary section updates with the option data.
+ *
+ * @group Bundle_Product
+ * @ZephyrId MAGETWO-60637
+ */
+class BundleOptionsSummaryTest extends Injectable
+{
+ /**
+ * Test bundle options summary block.
+ *
+ * @param BundleProduct $product
+ * @return void
+ */
+ public function test(BundleProduct $product)
+ {
+ $product->persist();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleOptionsSummaryTest.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleOptionsSummaryTest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..76ad9fd7ca11631994f4fbd153e5c136fc54b327
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleOptionsSummaryTest.xml
@@ -0,0 +1,17 @@
+<?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\Bundle\Test\TestCase\BundleOptionsSummaryTest" summary="Bundle Product Options Summary block contains information about option's price, qty and name" ticketId="MAGETWO-60637">
+ <variation name="Bundle_Option_Fixed_DropDown_With_Price_and_Qty_1">
+ <data name="tag" xsi:type="string">severity:S2</data>
+ <data name="description" xsi:type="string">Bundle Option with Three Drop-Down selections with qty</data>
+ <data name="product/dataset" xsi:type="string">fixed_with_required_options_and_qty</data>
+ <constraint name="\Magento\Bundle\Test\Constraint\AssertBundleItemsSummaryOnProductPage" />
+ </variation>
+ </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/etc/di.xml
new file mode 100644
index 0000000000000000000000000000000000000000..402dcca44c9485a46d9c40b5103f1cac50b86122
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/etc/di.xml
@@ -0,0 +1,14 @@
+<?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="urn:magento:framework:ObjectManager/etc/config.xsd">
+ <type name="Magento\Bundle\Test\Constraint\AssertBundleItemsSummaryOnProductPage">
+ <arguments>
+ <argument name="severity" xsi:type="string">S2</argument>
+ </arguments>
+ </type>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.xml
index dff1a9fd71d865dd52fd6cdd0e05d3e3d000db94..411833f03335645e4395cd8bb5695121cc4c2dad 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.xml
@@ -90,6 +90,10 @@
<input>input</input>
<selector>input[name='url_key']</selector>
</url_key>
+ <use_default_url_key>
+ <input>checkbox</input>
+ <selector>input[name='use_default[url_key]']</selector>
+ </use_default_url_key>
<meta_title>
<input>input</input>
<selector>input[name='meta_title']</selector>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/PageActions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/PageActions.php
index 27e15044df11d91765251d1de783243cf6b55adf..808da58c7dd4995a20f88ef2059df2ecc9eb574f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/PageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/PageActions.php
@@ -7,12 +7,18 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Category\Edit;
use Magento\Backend\Test\Block\FormPageActions;
+use Magento\Mtf\Client\Locator;
/**
* Category page actions.
*/
class PageActions extends FormPageActions
{
+ /**
+ * Top page element to implement a scrolling in case of floating blocks overlay.
+ */
+ const TOP_ELEMENT_TO_SCROLL = '.page-title';
+
/**
* Locator for "OK" button in warning block
*
@@ -20,6 +26,20 @@ class PageActions extends FormPageActions
*/
protected $warningBlock = '.ui-widget-content .ui-dialog-buttonset button:first-child';
+ /**
+ * Change Store View selector.
+ *
+ * @var string
+ */
+ protected $storeChangeButton = '#store-change-button';
+
+ /**
+ * Selector for confirm.
+ *
+ * @var string
+ */
+ protected $confirmModal = '.confirm._show[data-role=modal]';
+
/**
* Click on "Save" button
*
@@ -33,4 +53,23 @@ class PageActions extends FormPageActions
$warningBlock->click();
}
}
+
+ /**
+ * Select Store View.
+ *
+ * @param string $name
+ * @return void
+ */
+ public function selectStoreView($name)
+ {
+ $this->browser->find(self::TOP_ELEMENT_TO_SCROLL)->click();
+ $this->_rootElement->find($this->storeChangeButton)->click();
+ $this->waitForElementVisible($name, Locator::SELECTOR_LINK_TEXT);
+ $this->_rootElement->find($name, Locator::SELECTOR_LINK_TEXT)->click();
+ $element = $this->browser->find($this->confirmModal);
+ /** @var \Magento\Ui\Test\Block\Adminhtml\Modal $modal */
+ $modal = $this->blockFactory->create(\Magento\Ui\Test\Block\Adminhtml\Modal::class, ['element' => $element]);
+ $modal->acceptAlert();
+ $this->waitForElementVisible($this->storeChangeButton);
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
index 15a624c4b734f828264ebfee75801d80d08c5f05..447e1319898084dfecbcb50e3f801ae04ae9f156 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
@@ -60,6 +60,13 @@ class Tree extends Block
*/
protected $header = 'header';
+ /**
+ * Xpath locator for category in tree.
+ *
+ * @var string
+ */
+ protected $categoryInTree = '//*[@class="x-tree-node-ct"]/li/div/a/span[contains(text(), "%s")]/..';
+
/**
* Get backend abstract block.
*
@@ -153,6 +160,26 @@ class Tree extends Block
->isElementVisible($categoryPath);
}
+ /**
+ * Assign child category to the parent.
+ *
+ * @param string $parentCategoryName
+ * @param string $childCategoryName
+ *
+ * @return void
+ */
+ public function assignCategory($parentCategoryName, $childCategoryName)
+ {
+ $this->_rootElement->find(sprintf($this->categoryInTree, $childCategoryName), Locator::SELECTOR_XPATH)->click();
+ $this->getTemplateBlock()->waitLoader();
+ $targetElement = $this->_rootElement->find(
+ sprintf($this->categoryInTree, $parentCategoryName),
+ Locator::SELECTOR_XPATH
+ );
+ $this->_rootElement->find(sprintf($this->categoryInTree, $childCategoryName), Locator::SELECTOR_XPATH)
+ ->dragAndDrop($targetElement);
+ }
+
/**
* Expand all categories tree.
*
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/AdvancedPricing/OptionTier.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/AdvancedPricing/OptionTier.xml
index ca10de4ebf8c127fdb310073437261cab7d7a435..9df266994f4fad767a0c13478bdc2e8cbb002c99 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/AdvancedPricing/OptionTier.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/AdvancedPricing/OptionTier.xml
@@ -10,6 +10,13 @@
<price>
<selector>[name$="[price]"]</selector>
</price>
+ <value_type>
+ <selector>[name$="[value_type]"]</selector>
+ <input>select</input>
+ </value_type>
+ <percentage_value>
+ <selector>[name$="[percentage_value]"]</selector>
+ </percentage_value>
<website>
<selector>[name$="[website_id]"]</selector>
<input>select</input>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
index b6e95f5393e1455796b190642414d0e53345b59c..08d38f45c4ff99a4eae99a1be3c3972bdba7f790 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
@@ -14,9 +14,12 @@ use Magento\Mtf\Client\Element\SimpleElement;
use Magento\Mtf\Client\Locator;
use Magento\Mtf\Fixture\FixtureInterface;
use Magento\Ui\Test\Block\Adminhtml\DataGrid;
+use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Section\ProductDetails\NewCategoryIds;
/**
* Product form on backend product page.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class ProductForm extends FormSections
{
@@ -48,6 +51,13 @@ class ProductForm extends FormSections
*/
protected $attributeBlock = '[data-index="%s"]';
+ /**
+ * NewCategoryIds block selector.
+ *
+ * @var string
+ */
+ protected $newCategoryModalForm = '.product_form_product_form_create_category_modal';
+
/**
* Magento form loader.
*
@@ -70,8 +80,6 @@ class ProductForm extends FormSections
* @param FixtureInterface|null $category
* @return $this
* @throws \Exception
- *
- * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function fill(FixtureInterface $product, SimpleElement $element = null, FixtureInterface $category = null)
{
@@ -88,9 +96,14 @@ class ProductForm extends FormSections
$this->callRender($typeId, 'fill', $renderArguments);
} else {
$sections = $this->getFixtureFieldsByContainers($product);
-
+ $category = $product->hasData('category_ids')
+ ? $product->getDataFieldConfig('category_ids')['source']->getCategories()[0] : $category;
if ($category) {
- $sections['product-details']['category_ids']['value'] = $category->getName();
+ if ((int)$category->getId()) {
+ $sections['product-details']['category_ids']['value'] = $category->getName();
+ } else {
+ $this->getNewCategoryModalForm()->addNewCategory($category);
+ }
}
$this->fillContainers($sections, $element);
}
@@ -193,6 +206,19 @@ class ProductForm extends FormSections
);
}
+ /**
+ * Get New Category Modal Form.
+ *
+ * @return NewCategoryIds
+ */
+ public function getNewCategoryModalForm()
+ {
+ return $this->blockFactory->create(
+ \Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Section\ProductDetails\NewCategoryIds::class,
+ ['element' => $this->browser->find($this->newCategoryModalForm)]
+ );
+ }
+
/**
* Get attribute element.
*
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Links/CompareLink.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Links/CompareLink.php
index c81d85a724dcf22ef37e2aa497bf2c6be22f51bd..86c30f4caf8a4ccb10bd7cdebc5f5b8137bfa6b2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Links/CompareLink.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Links/CompareLink.php
@@ -20,6 +20,13 @@ class CompareLink extends Block
*/
protected $qtyCompareProducts = '.compare .counter.qty';
+ /**
+ * Locator value for Compare Products link.
+ *
+ * @var string
+ */
+ protected $linkCompareProducts = '[data-role="compare-products-link"] a.compare';
+
/**
* Get qty of Products in Compare list.
*
@@ -32,4 +39,14 @@ class CompareLink extends Block
preg_match_all('/^\d+/', $compareProductLink->getText(), $matches);
return $matches[0][0];
}
+
+ /**
+ * Wait for compare products link to appear
+ *
+ * @return void
+ */
+ public function waitForCompareProductsLinks()
+ {
+ $this->waitForElementVisible($this->linkCompareProducts);
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php
index 3d5e550560e857b8530037637b4f97f7763874e2..f7529f1fcb61e262856bdf8856c0cbaf14ce57d2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php
@@ -36,12 +36,11 @@ class TopToolbar extends Block
/**
* Get all available method of sorting product
*
- * @return array|string
+ * @return array
*/
public function getSortType()
{
$content = $this->_rootElement->find($this->sorter)->getText();
- preg_match_all('/\w+\s?\w+/', $content, $matches);
- return $matches[0];
+ return explode("\n", $content);
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceInCart.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceInCart.php
new file mode 100644
index 0000000000000000000000000000000000000000..1bc689d8e1b1e3009bbf2f3fc563b3aa51ccc3c7
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceInCart.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Magento\Catalog\Test\Page\Product\CatalogProductView;
+use Magento\Checkout\Test\Page\CheckoutCart;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
+
+/**
+ * This assert adds product to cart and checks price.
+ */
+class AssertProductTierPriceInCart extends AbstractConstraint
+{
+ /**
+ * Price on form.
+ *
+ * @var string
+ */
+ private $formPrice;
+
+ /**
+ * Fixture actual price.
+ *
+ * @var string
+ */
+ private $fixtureActualPrice;
+
+ /**
+ * Fixture price.
+ *
+ * @var string
+ */
+ private $fixturePrice;
+
+ /**
+ * Assertion that the product is correctly displayed in cart.
+ *
+ * @param CatalogProductView $catalogProductView
+ * @param FixtureInterface $product
+ * @param BrowserInterface $browser
+ * @param CheckoutCart $checkoutCart
+ * @return void
+ */
+ public function processAssert(
+ CatalogProductView $catalogProductView,
+ FixtureInterface $product,
+ BrowserInterface $browser,
+ CheckoutCart $checkoutCart
+ ) {
+ $checkoutCart->open();
+ $checkoutCart->getCartBlock()->clearShoppingCart();
+ // Add product to cart
+ $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
+ $requiredQty = $product->getDataFieldConfig('tier_price')['source']->getData()[0]['price_qty'];
+ $catalogProductView->getViewBlock()->setQtyAndClickAddToCart($requiredQty);
+ $catalogProductView->getMessagesBlock()->waitSuccessMessage();
+
+ // Check price
+ $this->countPrices($product, $checkoutCart);
+ \PHPUnit_Framework_Assert::assertEquals(
+ $this->fixtureActualPrice,
+ $this->formPrice,
+ 'Product price in shopping cart is not correct.'
+ );
+ }
+
+ /**
+ * Count prices.
+ *
+ * @param FixtureInterface $product
+ * @param CheckoutCart $checkoutCart
+ * @return void
+ */
+ private function countPrices(FixtureInterface $product, CheckoutCart $checkoutCart)
+ {
+ /** @var CatalogProductSimple $product */
+ $this->fixturePrice = $product->getPrice();
+ $this->prepareFormPrice($product, $checkoutCart);
+ $this->countCheckoutCartItemPrice($product);
+ }
+
+ /**
+ * Prepare form price.
+ *
+ * @param FixtureInterface $product
+ * @param CheckoutCart $checkoutCart
+ * @return void
+ */
+ private function prepareFormPrice(FixtureInterface $product, CheckoutCart $checkoutCart)
+ {
+ $checkoutCart->open();
+ $cartItem = $checkoutCart->getCartBlock()->getCartItem($product);
+ $this->formPrice = $cartItem->getPrice();
+ }
+
+ /**
+ * Count cart item price.
+ *
+ * @param FixtureInterface $product
+ * @return void
+ */
+ private function countCheckoutCartItemPrice(FixtureInterface $product)
+ {
+ $tierPrice = $product->getDataFieldConfig('tier_price')['source']->getData()[0];
+
+ if ($tierPrice['value_type'] === "Percent") {
+ $this->fixtureActualPrice = $this->fixturePrice * (1 - $tierPrice['percentage_value'] / 100);
+ } else {
+ $this->fixtureActualPrice = $tierPrice['price'];
+ }
+ }
+
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Product is correctly displayed in cart.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml
index b9ba495535e82eb970f8ff02ebaa7097aab999b0..ed6f9568c2441aa1bba72eb3992cb6b6f89066f7 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml
@@ -41,6 +41,7 @@
<field name="use_config_price_range" is_required="0" group="display_setting" />
<field name="layered_navigation_price_step" is_required="0" group="display_setting" />
<field name="url_key" group="seo" />
+ <field name="use_default_url_key" group="seo" />
<field name="meta_title" is_required="" group="seo" />
<field name="meta_keywords" is_required="" group="seo" />
<field name="meta_description" is_required="" group="seo" />
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 e1cbc1a1d8ba2dba7f3be971b3f1b456f6e7d02a..997d0ab1d7f11c64ce33ea386870055ea2e77798 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
@@ -98,6 +98,87 @@
<field name="url_key" xsi:type="string">simple-product-%isolation%</field>
</dataset>
+ <dataset name="product_1_dollar">
+ <field name="attribute_set_id" xsi:type="array">
+ <item name="dataset" xsi:type="string">default</item>
+ </field>
+ <field name="name" xsi:type="string">product_1_dollar %isolation%</field>
+ <field name="sku" xsi:type="string">sku_product_1_dollar_%isolation%</field>
+ <field name="product_has_weight" xsi:type="string">This item has weight</field>
+ <field name="weight" xsi:type="string">1</field>
+ <field name="quantity_and_stock_status" xsi:type="array">
+ <item name="qty" xsi:type="string">1000</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">1</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">product-1-dollar-%isolation%</field>
+ </dataset>
+
+ <dataset name="product_5_dollar">
+ <field name="attribute_set_id" xsi:type="array">
+ <item name="dataset" xsi:type="string">default</item>
+ </field>
+ <field name="name" xsi:type="string">product_5_dollar %isolation%</field>
+ <field name="sku" xsi:type="string">sku_product_5_dollar_%isolation%</field>
+ <field name="product_has_weight" xsi:type="string">This item has weight</field>
+ <field name="weight" xsi:type="string">1</field>
+ <field name="quantity_and_stock_status" xsi:type="array">
+ <item name="qty" xsi:type="string">1000</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">5</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">product-5-dollar-%isolation%</field>
+ </dataset>
+
+ <dataset name="product_9_99_dollar">
+ <field name="attribute_set_id" xsi:type="array">
+ <item name="dataset" xsi:type="string">default</item>
+ </field>
+ <field name="name" xsi:type="string">product_9_99_dollar %isolation%</field>
+ <field name="sku" xsi:type="string">sku_product_9_99_dollar_%isolation%</field>
+ <field name="product_has_weight" xsi:type="string">This item has weight</field>
+ <field name="weight" xsi:type="string">1</field>
+ <field name="quantity_and_stock_status" xsi:type="array">
+ <item name="qty" xsi:type="string">1000</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">9.99</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">product-9-99-dollar-%isolation%</field>
+ </dataset>
+
<dataset name="product_10_dollar">
<field name="attribute_set_id" xsi:type="array">
<item name="dataset" xsi:type="string">default</item>
@@ -128,6 +209,33 @@
</field>
</dataset>
+ <dataset name="product_15_dollar">
+ <field name="attribute_set_id" xsi:type="array">
+ <item name="dataset" xsi:type="string">default</item>
+ </field>
+ <field name="name" xsi:type="string">product_15_dollar %isolation%</field>
+ <field name="sku" xsi:type="string">sku_product_15_dollar_%isolation%</field>
+ <field name="product_has_weight" xsi:type="string">This item has weight</field>
+ <field name="weight" xsi:type="string">1</field>
+ <field name="quantity_and_stock_status" xsi:type="array">
+ <item name="qty" xsi:type="string">1000</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">15</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">product-15-dollar-%isolation%</field>
+ </dataset>
+
<dataset name="product_20_dollar">
<field name="attribute_set_id" xsi:type="array">
<item name="dataset" xsi:type="string">default</item>
@@ -155,6 +263,33 @@
<field name="url_key" xsi:type="string">product-20-dollar-%isolation%</field>
</dataset>
+ <dataset name="product_21_dollar">
+ <field name="attribute_set_id" xsi:type="array">
+ <item name="dataset" xsi:type="string">default</item>
+ </field>
+ <field name="name" xsi:type="string">product_21_dollar %isolation%</field>
+ <field name="sku" xsi:type="string">sku_product_21_dollar_%isolation%</field>
+ <field name="product_has_weight" xsi:type="string">This item has weight</field>
+ <field name="weight" xsi:type="string">1</field>
+ <field name="quantity_and_stock_status" xsi:type="array">
+ <item name="qty" xsi:type="string">1000</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">21</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">product-21-dollar-%isolation%</field>
+ </dataset>
+
<dataset name="product_with_url_key">
<field name="name" xsi:type="string">Simple Product %isolation%</field>
<field name="sku" xsi:type="string">sku_simple_product_%isolation%</field>
@@ -1263,5 +1398,101 @@
</field>
</dataset>
+ <dataset name="with_default_custom_option">
+ <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="price" xsi:type="array">
+ <item name="value" xsi:type="string">56.78</item>
+ </field>
+ <field name="product_has_weight" xsi:type="string">This item has weight</field>
+ <field name="weight" xsi:type="string">1</field>
+ <field name="quantity_and_stock_status" xsi:type="array">
+ <item name="qty" xsi:type="string">1</item>
+ <item name="is_in_stock" xsi:type="string">In Stock</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="url_key" xsi:type="string">simple-product-%isolation%</field>
+ <field name="category_ids" xsi:type="array">
+ <item name="dataset" xsi:type="string">default_subcategory</item>
+ </field>
+ <field name="custom_options" xsi:type="array">
+ <item name="dataset" xsi:type="string">percent_and_fixed_radio_options</item>
+ </field>
+ <field name="checkout_data" xsi:type="array">
+ <item name="dataset" xsi:type="string">simple_order_qty_1_price_56</item>
+ </field>
+ </dataset>
+
+ <dataset name="with_fixed_custom_option">
+ <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="price" xsi:type="array">
+ <item name="value" xsi:type="string">56.78</item>
+ </field>
+ <field name="product_has_weight" xsi:type="string">This item has weight</field>
+ <field name="weight" xsi:type="string">1</field>
+ <field name="quantity_and_stock_status" xsi:type="array">
+ <item name="qty" xsi:type="string">1</item>
+ <item name="is_in_stock" xsi:type="string">In Stock</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="url_key" xsi:type="string">simple-product-%isolation%</field>
+ <field name="category_ids" xsi:type="array">
+ <item name="dataset" xsi:type="string">default_subcategory</item>
+ </field>
+ <field name="custom_options" xsi:type="array">
+ <item name="dataset" xsi:type="string">percent_and_fixed_radio_options</item>
+ </field>
+ <field name="checkout_data" xsi:type="array">
+ <item name="dataset" xsi:type="string">with_fixed_custom_option</item>
+ </field>
+ </dataset>
+
+ <dataset name="with_percent_custom_option">
+ <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="price" xsi:type="array">
+ <item name="value" xsi:type="string">56.78</item>
+ </field>
+ <field name="product_has_weight" xsi:type="string">This item has weight</field>
+ <field name="weight" xsi:type="string">1</field>
+ <field name="quantity_and_stock_status" xsi:type="array">
+ <item name="qty" xsi:type="string">1</item>
+ <item name="is_in_stock" xsi:type="string">In Stock</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="url_key" xsi:type="string">simple-product-%isolation%</field>
+ <field name="category_ids" xsi:type="array">
+ <item name="dataset" xsi:type="string">default_subcategory</item>
+ </field>
+ <field name="custom_options" xsi:type="array">
+ <item name="dataset" xsi:type="string">percent_and_fixed_radio_options</item>
+ </field>
+ <field name="checkout_data" xsi:type="array">
+ <item name="dataset" xsi:type="string">with_percent_custom_option</item>
+ </field>
+ </dataset>
+
</repository>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple/CheckoutData.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple/CheckoutData.xml
index 53ec00f56b1e87662966c8298fa4104a6f804b0e..180da27ca2a099ab36c00473ac35572c45a31ffd 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple/CheckoutData.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple/CheckoutData.xml
@@ -101,6 +101,14 @@
</field>
</dataset>
+ <dataset name="simple_order_qty_2">
+ <field name="qty" xsi:type="string">2</field>
+ <field name="cartItem" xsi:type="array">
+ <item name="price" xsi:type="string">560</item>
+ <item name="subtotal" xsi:type="string">560</item>
+ </field>
+ </dataset>
+
<dataset name="simple_two_products">
<field name="qty" xsi:type="string">2</field>
<field name="cartItem" xsi:type="array">
@@ -148,5 +156,47 @@
<dataset name="simple_order_qty_3">
<field name="qty" xsi:type="string">3</field>
</dataset>
+
+ <dataset name="simple_order_qty_1_price_56">
+ <field name="qty" xsi:type="string">1</field>
+ <field name="cartItem" xsi:type="array">
+ <item name="price" xsi:type="string">49.40</item>
+ <item name="subtotal" xsi:type="string">49.40</item>
+ </field>
+ </dataset>
+
+ <dataset name="with_fixed_custom_option">
+ <field name="options" xsi:type="array">
+ <item name="custom_options" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="title" xsi:type="string">attribute_key_0</item>
+ <item name="value" xsi:type="string">option_key_0</item>
+ </item>
+ </item>
+ </field>
+ <field name="qty" xsi:type="string">1</field>
+ <field name="cartItem" xsi:type="array">
+ <item name="price" xsi:type="string">61.74</item>
+ <item name="qty" xsi:type="string">1</item>
+ <item name="subtotal" xsi:type="string">61.74</item>
+ </field>
+ </dataset>
+
+ <dataset name="with_percent_custom_option">
+ <field name="options" xsi:type="array">
+ <item name="custom_options" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="title" xsi:type="string">attribute_key_0</item>
+ <item name="value" xsi:type="string">option_key_1</item>
+ </item>
+ </item>
+ </field>
+ <field name="qty" xsi:type="string">1</field>
+ <field name="cartItem" xsi:type="array">
+ <item name="price" xsi:type="string">53.85</item>
+ <item name="qty" xsi:type="string">1</item>
+ <item name="subtotal" xsi:type="string">53.85</item>
+ </field>
+ </dataset>
</repository>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml
index 3252f0178e24195e724b45a17021d0528990070a..b977e23166f45ec9c471ea08c5e7dc7516a728c0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml
@@ -358,5 +358,46 @@
</item>
</field>
</dataset>
+
+ <dataset name="percent_and_fixed_radio_options">
+ <field name="0" xsi:type="array">
+ <item name="title" xsi:type="string">custom menu</item>
+ <item name="is_require" xsi:type="string">No</item>
+ <item name="type" xsi:type="string">Select/Radio Buttons</item>
+ <item name="options" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="title" xsi:type="string">12.34 bucks</item>
+ <item name="price" xsi:type="string">12.34</item>
+ <item name="price_type" xsi:type="string">Fixed</item>
+ <item name="sku" xsi:type="string">sku_radio_buttons_row_1</item>
+ <item name="sort_order" xsi:type="string">0</item>
+ </item>
+ <item name="1" xsi:type="array">
+ <item name="title" xsi:type="string">9 Percent</item>
+ <item name="price" xsi:type="string">9</item>
+ <item name="price_type" xsi:type="string">Percent</item>
+ <item name="sku" xsi:type="string">sku_radio_buttons_row_2</item>
+ <item name="sort_order" xsi:type="string">0</item>
+ </item>
+ </item>
+ </field>
+ </dataset>
+
+ <dataset name="not_required_text_option">
+ <field name="0" xsi:type="array">
+ <item name="title" xsi:type="string">Test1 option %isolation%</item>
+ <item name="is_require" xsi:type="string">No</item>
+ <item name="type" xsi:type="string">Text/Field</item>
+ <item name="options" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="price" xsi:type="string">10</item>
+ <item name="price_type" xsi:type="string">Fixed</item>
+ <item name="sku" xsi:type="string">sku1_%isolation%</item>
+ <item name="max_characters" xsi:type="string">45</item>
+ </item>
+ </item>
+ </field>
+ </dataset>
+
</repository>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/TierPrice.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/TierPrice.xml
index 412818cbe40e71634eb1e635d8dc8e1630913b49..2f517f4d6cf3cc03020abc575d4e91cd7f7188da 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/TierPrice.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/TierPrice.xml
@@ -77,5 +77,29 @@
</item>
</field>
</dataset>
+
+ <dataset name="custom_with_fixed_discount">
+ <field name="0" xsi:type="array">
+ <item name="value_type" xsi:type="string">Fixed</item>
+ <item name="price" xsi:type="string">95</item>
+ <item name="website" xsi:type="string">All Websites [USD]</item>
+ <item name="price_qty" xsi:type="string">5</item>
+ <item name="customer_group" xsi:type="array">
+ <item name="dataset" xsi:type="string">ALL_GROUPS</item>
+ </item>
+ </field>
+ </dataset>
+
+ <dataset name="custom_with_percentage_discount">
+ <field name="0" xsi:type="array">
+ <item name="value_type" xsi:type="string">Percent</item>
+ <item name="percentage_value" xsi:type="string">3</item>
+ <item name="website" xsi:type="string">All Websites [USD]</item>
+ <item name="price_qty" xsi:type="string">10</item>
+ <item name="customer_group" xsi:type="array">
+ <item name="dataset" xsi:type="string">ALL_GROUPS</item>
+ </item>
+ </field>
+ </dataset>
</repository>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
index fa81264dd2d4b061ef769f882408b104ba92793f..238fddba3de426f683e981c0a1b7b1b60c12fbeb 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
@@ -16,7 +16,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryForm" />
</variation>
<variation name="CreateCategoryEntityTestVariation2_RootCategory_AllFields">
- <data name="tag" xsi:type="string">to_maintain:yes</data>
+ <data name="issue" xsi:type="string">MAGETWO-60635: [CE][Categories] Design update dates are incorrect after save</data>
<data name="description" xsi:type="string">Create root category with all fields</data>
<data name="addCategory" xsi:type="string">addRootCategory</data>
<data name="category/data/is_active" xsi:type="string">Yes</data>
@@ -57,7 +57,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryPage" />
</variation>
<variation name="CreateCategoryEntityTestVariation4_Subcategory_AllFields">
- <data name="tag" xsi:type="string">to_maintain:yes</data>
+ <data name="issue" xsi:type="string">MAGETWO-60635: [CE][Categories] Design update dates are incorrect after save</data>
<data name="description" xsi:type="string">Create not anchor subcategory specifying all fields</data>
<data name="addCategory" xsi:type="string">addSubcategory</data>
<data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>
@@ -86,13 +86,14 @@
<data name="category/data/apply_design_to_products" xsi:type="string">Yes</data>
<data name="category/data/schedule_update_from" xsi:type="string">01/10/2014</data>
<data name="category/data/schedule_update_to" xsi:type="string">12/31/2024</data>
+ <data name="filterByPath" xsi:type="string">request_path</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertCategorySaveMessage" />
+ <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCategoryInGrid" />
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryForm" />
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryPage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryForAssignedProducts" />
</variation>
<variation name="CreateCategoryEntityTestVariation5_Anchor_MostOfFields">
- <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="description" xsi:type="string">Create anchor subcategory with all fields</data>
<data name="addCategory" xsi:type="string">addSubcategory</data>
<data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>
@@ -153,7 +154,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryForAssignedProducts" />
</variation>
<variation name="CreateCategoryEntityTestVariation9_ThreeNesting">
- <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes</data>
+ <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
<data name="description" xsi:type="string">Create category with three nesting</data>
<data name="addCategory" xsi:type="string">addSubcategory</data>
<data name="category/data/parent_id/dataset" xsi:type="string">two_nested_categories</data>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
index 9f4a5e4bb71fea9293612125157757f7e3d965da..7979faa5e1f761844fa5d1bb8bebd00430e87623 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
@@ -317,6 +317,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage" />
</variation>
<variation name="CreateSimpleProductEntityTestVariation18">
+ <data name="issue" xsi:type="string">MAGETWO-60470: [Import Custom options] An error occurs on attempt to save the product with imported options</data>
<data name="description" xsi:type="string">Create product wit suite of custom options</data>
<data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
<data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
@@ -509,6 +510,24 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInCart" />
</variation>
+ <variation name="CreateSimpleProductEntityWithTierPriceTestVariation1" summary="Create Simple Product with fixed tier price.">
+ <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
+ <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
+ <data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
+ <data name="product/data/price/value" xsi:type="string">100.00</data>
+ <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">555</data>
+ <data name="product/data/tier_price/dataset" xsi:type="string">custom_with_fixed_discount</data>
+ <constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceInCart" />
+ </variation>
+ <variation name="CreateSimpleProductEntityWithTierPriceTestVariation2" summary="Create Simple Product with percentage tier price.">
+ <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
+ <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
+ <data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
+ <data name="product/data/price/value" xsi:type="string">200.00</data>
+ <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">555</data>
+ <data name="product/data/tier_price/dataset" xsi:type="string">custom_with_percentage_discount</data>
+ <constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceInCart" />
+ </variation>
<variation name="CreateSimpleProductEntityWithImageTestVariation1" summary="Create product with image and try to save it again">
<data name="product/data/image/0/file" xsi:type="string">Magento/Catalog/Test/_files/test1.png</data>
<data name="product/data/image/1/file" xsi:type="string">Magento/Catalog/Test/_files/test2.png</data>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.php
index 4a4c6a25321c8363133aa0d6696cb29a35c946b5..68972e5bb766d458425ad6bf0796760325b931e8 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.php
@@ -11,6 +11,8 @@ use Magento\CatalogRule\Test\Fixture\CatalogRule;
use Magento\Customer\Test\Fixture\Customer;
use Magento\Mtf\Util\Command\Cli\Cron;
use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleEdit;
+use Magento\Mtf\TestStep\TestStepFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Preconditions:
@@ -37,57 +39,66 @@ class ApplyCatalogPriceRulesTest extends AbstractCatalogRuleEntityTest
* Apply catalog price rules.
*
* @param array $catalogRules
- * @param CatalogProductSimple $product
* @param CatalogRuleEdit $catalogRuleEdit
+ * @param TestStepFactory $stepFactory
* @param Cron $cron
* @param bool $isCronEnabled
* @param Customer $customer
- * @return array
+ * @param array $products
+ * @return FixtureInterface[]
*/
public function test(
array $catalogRules,
- CatalogProductSimple $product,
CatalogRuleEdit $catalogRuleEdit,
+ TestStepFactory $stepFactory,
Cron $cron,
$isCronEnabled = false,
- Customer $customer = null
+ Customer $customer = null,
+ array $products = null
) {
- $product->persist();
-
- foreach ($catalogRules as $catalogPriceRule) {
- $catalogPriceRule = $this->createCatalogPriceRule($catalogPriceRule, $product, $customer);
+ if ($customer !== null) {
+ $customer->persist();
+ }
- if ($isCronEnabled) {
- $cron->run();
- $cron->run();
- } else {
- $catalogRuleEdit->open(['id' => $catalogPriceRule->getId()]);
- $this->catalogRuleNew->getFormPageActions()->saveAndApply();
+ $products = $stepFactory->create(
+ \Magento\Catalog\Test\TestStep\CreateProductsStep::class,
+ ['products' => $products]
+ )->run()['products'];
+
+ foreach ($catalogRules as $catalogRule) {
+ foreach ($products as $product) {
+ $catalogPriceRule = $this->createCatalogPriceRule($catalogRule, $product, $customer);
+ if ($isCronEnabled) {
+ $cron->run();
+ $cron->run();
+ } else {
+ $catalogRuleEdit->open(['id' => $catalogPriceRule->getId()]);
+ $this->catalogRuleNew->getFormPageActions()->saveAndApply();
+ }
}
}
-
- return ['products' => [$product]];
+ return ['products' => $products];
}
/**
* Prepare condition for catalog price rule.
*
- * @param CatalogProductSimple $productSimple
+ * @param FixtureInterface $product
* @param array $catalogPriceRule
* @return array
*/
- private function prepareCondition(CatalogProductSimple $productSimple, array $catalogPriceRule)
+ private function prepareCondition(FixtureInterface $product, array $catalogPriceRule)
{
$result = [];
$conditionEntity = explode('|', trim($catalogPriceRule['data']['rule'], '[]'))[0];
switch ($conditionEntity) {
case 'Category':
- $result['%category_id%'] = $productSimple->getDataFieldConfig('category_ids')['source']->getIds()[0];
+ $result['%category_id%'] = $product->getDataFieldConfig('category_ids')['source']->getIds()[0];
break;
case 'Attribute':
/** @var \Magento\Catalog\Test\Fixture\CatalogProductAttribute[] $attrs */
- $attributes = $productSimple->getDataFieldConfig('attribute_set_id')['source']
+ $attributes = $product->getDataFieldConfig('attribute_set_id')['source']
->getAttributeSet()->getDataFieldConfig('assigned_attributes')['source']->getAttributes();
$result['%attribute_id%'] = $attributes[0]->getAttributeCode();
@@ -110,7 +121,6 @@ class ApplyCatalogPriceRulesTest extends AbstractCatalogRuleEntityTest
*/
private function applyCustomerGroup(array $catalogPriceRule, Customer $customer)
{
- $customer->persist();
/** @var \Magento\Customer\Test\Fixture\CustomerGroup $customerGroup */
$customerGroup = $customer->getDataFieldConfig('group_id')['source']->getCustomerGroup();
$catalogPriceRule['data']['customer_group_ids']['option_0'] = $customerGroup->getCustomerGroupId();
@@ -121,20 +131,19 @@ class ApplyCatalogPriceRulesTest extends AbstractCatalogRuleEntityTest
/**
* Create catalog price rule.
*
- * @param CatalogProductSimple $product
* @param array $catalogPriceRule
+ * @param FixtureInterface $product
* @param Customer $customer
* @return CatalogRule
*/
private function createCatalogPriceRule(
array $catalogPriceRule,
- CatalogProductSimple $product,
+ FixtureInterface $product,
Customer $customer = null
) {
if (isset($catalogPriceRule['data']['rule'])) {
$catalogPriceRule = $this->prepareCondition($product, $catalogPriceRule);
}
-
if ($customer !== null) {
$catalogPriceRule = $this->applyCustomerGroup($catalogPriceRule, $customer);
}
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml
index c732ae1f2b877b1ad95a53083a5ea82c5f27460f..00b02c61bd61cb07587fd2df00ef035d85c09b95 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml
@@ -11,7 +11,7 @@
<data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
<data name="catalogRules/0/dataset" xsi:type="string">catalog_price_rule_priority_0</data>
<data name="catalogRules/1/dataset" xsi:type="string">catalog_price_rule_priority_2</data>
- <data name="product/dataset" xsi:type="string">simple_for_salesrule_2</data>
+ <data name="products/0" xsi:type="string">catalogProductSimple::simple_for_salesrule_2</data>
<data name="cartPrice/sub_total" xsi:type="string">15</data>
<data name="cartPrice/grand_total" xsi:type="string">20</data>
<data name="productPrice/0/discount_amount" xsi:type="string">35</data>
@@ -26,7 +26,7 @@
<data name="catalogRules/0/dataset" xsi:type="string">catalog_price_rule_priority_0</data>
<data name="catalogRules/1/dataset" xsi:type="string">catalog_price_rule_priority_1_stop_further_rules</data>
<data name="catalogRules/2/dataset" xsi:type="string">catalog_price_rule_priority_2</data>
- <data name="product/dataset" xsi:type="string">simple_for_salesrule_2</data>
+ <data name="products/0" xsi:type="string">catalogProductSimple::simple_for_salesrule_2</data>
<data name="cartPrice/sub_total" xsi:type="string">20</data>
<data name="cartPrice/grand_total" xsi:type="string">25</data>
<data name="productPrice/0/discount_amount" xsi:type="string">30</data>
@@ -40,7 +40,7 @@
<variation name="ApplyCatalogRules_WithExpireDate" summary="Apply Catalog Price rule with Expire Date and Catalog Price Rule with Start Date">
<data name="catalogRules/0/dataset" xsi:type="string">active_catalog_price_rule_with_conditions</data>
<data name="catalogRules/1/dataset" xsi:type="string">active_catalog_rule</data>
- <data name="product/dataset" xsi:type="string">simple_for_salesrule_2</data>
+ <data name="products/0" xsi:type="string">catalogProductSimple::simple_for_salesrule_2</data>
<data name="cartPrice/sub_total" xsi:type="string">45</data>
<data name="cartPrice/grand_total" xsi:type="string">50</data>
<data name="productPrice/0/discount_amount" xsi:type="string">5</data>
@@ -53,7 +53,7 @@
</variation>
<variation name="ApplyCatalogRule_ForGuestUsers_ByProductAttribute_AdjustPriceToValue" summary="Apply Catalog Price Rule with Product Attribute in Condition" ticketId="MAGETWO-30095">
<data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
- <data name="product/dataset" xsi:type="string">product_with_custom_color_attribute</data>
+ <data name="products/0" xsi:type="string">catalogProductSimple::product_with_custom_color_attribute</data>
<data name="catalogRules/0/data/name" xsi:type="string">Catalog Price Rule %isolation%</data>
<data name="catalogRules/0/data/is_active" xsi:type="string">Active</data>
<data name="catalogRules/0/data/website_ids/option_0" xsi:type="string">Main Website</data>
@@ -72,7 +72,7 @@
<constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleAppliedShoppingCart" />
</variation>
<variation name="ApplyCatalogRule_ForGuestUsers_AdjustPriceToPercentage" summary="Apply Catalog Price Rule for Guest Users with Adjust Price to Percentage" ticketId="MAGETWO-23036">
- <data name="product/dataset" xsi:type="string">MAGETWO-23036</data>
+ <data name="products/0" xsi:type="string">catalogProductSimple::MAGETWO-23036</data>
<data name="catalogRules/0/data/name" xsi:type="string">rule_name%isolation%</data>
<data name="catalogRules/0/data/is_active" xsi:type="string">Active</data>
<data name="catalogRules/0/data/website_ids/option_0" xsi:type="string">Main Website</data>
@@ -93,7 +93,7 @@
<variation name="ApplyCatalogRule_ForNewCustomerGroup" summary="Apply Catalog Price Rules to Specific Customer Group" ticketId="MAGETWO-12908">
<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
<data name="customer/dataset" xsi:type="string">customer_with_new_customer_group</data>
- <data name="product/dataset" xsi:type="string">simple_10_dollar</data>
+ <data name="products/0" xsi:type="string">catalogProductSimple::simple_10_dollar</data>
<data name="catalogRules/0/data/name" xsi:type="string">rule_name%isolation%</data>
<data name="catalogRules/0/data/is_active" xsi:type="string">Active</data>
<data name="catalogRules/0/data/website_ids/option_0" xsi:type="string">Main Website</data>
@@ -113,5 +113,38 @@
<constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleAppliedProductPage" />
<constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleAppliedShoppingCart" />
</variation>
+ <variation name="ApplyCatalogRuleForSimpleProductWithCustomOptions" summary="Apply Catalog Rule for Simple Product With Custom Options" ticketId="MAGETWO-23038">
+ <data name="products/0" xsi:type="string">catalogProductSimple::with_default_custom_option</data>
+ <data name="products/1" xsi:type="string">catalogProductSimple::with_fixed_custom_option</data>
+ <data name="products/2" xsi:type="string">catalogProductSimple::with_percent_custom_option</data>
+ <data name="customer/dataset" xsi:type="string">customer_US</data>
+ <data name="catalogRules/0/data/name" xsi:type="string">CatalogPriceRule %isolation%</data>
+ <data name="catalogRules/0/data/is_active" xsi:type="string">Active</data>
+ <data name="catalogRules/0/data/website_ids/option_0" xsi:type="string">Main Website</data>
+ <data name="customer/data/group_id/dataset" xsi:type="string">default</data>
+ <data name="catalogRules/0/data/simple_action" xsi:type="string">Apply as percentage of original</data>
+ <data name="catalogRules/0/data/discount_amount" xsi:type="string">13</data>
+ <data name="catalogRules/0/data/stop_rules_processing" xsi:type="string">Yes</data>
+ <data name="cartPrice/sub_total" xsi:type="string">164.99</data>
+ <data name="cartPrice/grand_total" xsi:type="string">179.99</data>
+ <data name="productPrice/0/discount_amount" xsi:type="string">7.38</data>
+ <data name="productPrice/1/discount_amount" xsi:type="string">8.04</data>
+ <data name="productPrice/2/discount_amount" xsi:type="string">7.38</data>
+ <data name="productPrice/0/special" xsi:type="string">49.40</data>
+ <data name="productPrice/1/special" xsi:type="string">53.85</data>
+ <data name="productPrice/2/special" xsi:type="string">61.74</data>
+ <data name="productPrice/0/sub_total" xsi:type="string">49.40</data>
+ <data name="productPrice/1/sub_total" xsi:type="string">61.74</data>
+ <data name="productPrice/2/sub_total" xsi:type="string">53.85</data>
+ <data name="productPrice/0/regular" xsi:type="string">56.78</data>
+ <data name="productPrice/1/regular" xsi:type="string">61.98</data>
+ <data name="productPrice/2/regular" xsi:type="string">69.12</data>
+ <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+ <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+ <data name="shippingAddress/dataset" xsi:type="string">UK_address</data>
+ <data name="payment/method" xsi:type="string">free</data>
+ <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleAppliedShoppingCart" />
+ <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleAppliedOnepageCheckout" />
+ </variation>
</testCase>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
index 483d6fa28636ac9f875495d277691b8f2acc3778..a10d28f5e70e35a6e64abf63bf5f69df99823eb8 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
@@ -86,16 +86,17 @@ class Shipping extends Form
*/
public function selectShippingMethod(array $shipping)
{
- $selector = sprintf($this->shippingMethod, $shipping['shipping_service'], $shipping['shipping_method']);
- if (!$this->_rootElement->find($selector, Locator::SELECTOR_XPATH)->isVisible()) {
- $this->openEstimateShippingAndTax();
- }
-
- $element = $this->_rootElement->find($selector, Locator::SELECTOR_XPATH);
- if (!$element->isDisabled()) {
- $element->click();
- } else {
- throw new \Exception("Unable to set value to field '$selector' as it's disabled.");
+ if (isset($shipping['shipping_service']) && isset($shipping['shipping_method'])) {
+ $selector = sprintf($this->shippingMethod, $shipping['shipping_service'], $shipping['shipping_method']);
+ if (!$this->_rootElement->find($selector, Locator::SELECTOR_XPATH)->isVisible()) {
+ $this->openEstimateShippingAndTax();
+ }
+ $element = $this->_rootElement->find($selector, Locator::SELECTOR_XPATH);
+ if (!$element->isDisabled()) {
+ $element->click();
+ } else {
+ throw new \Exception("Unable to set value to field '$selector' as it's disabled.");
+ }
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php
index cbda80aa712f00271370c55b1555a32472e95234..231589bfdab774a2c04ed2f5ebdc07a3bf91e786 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php
@@ -36,6 +36,13 @@ class Sidebar extends Block
*/
protected $braintreePaypalCheckoutButton = './/button[contains(@id, "braintree-paypal-mini-cart")]';
+ /**
+ * Locator value for "Proceed to Checkout" button.
+ *
+ * @var string
+ */
+ private $proceedToCheckoutButton = '#top-cart-btn-checkout';
+
/**
* Minicart items quantity
*
@@ -116,6 +123,16 @@ class Sidebar extends Block
->click();
}
+ /**
+ * Click "Proceed to Checkout" button.
+ *
+ * @return void
+ */
+ public function clickProceedToCheckoutButton()
+ {
+ $this->_rootElement->find($this->proceedToCheckoutButton)->click();
+ }
+
/**
* Wait counter qty visibility.
*
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/CustomAddress.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/CustomAddress.php
new file mode 100644
index 0000000000000000000000000000000000000000..6905aacd4018968eb0765735eb53c9b55feac2a4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/CustomAddress.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Test\Block\Onepage;
+
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Form for custom billing address filling.
+ */
+class CustomAddress extends Form
+{
+ /**
+ * Update billing address button.
+ *
+ * @var string
+ */
+ private $updateButtonSelector = '.action.action-update';
+
+ /**
+ * Select address dropdown.
+ *
+ * @var string
+ */
+ private $select = "[name='billing_address_id']";
+
+ /**
+ * Click update on billing information block.
+ *
+ * @return void
+ */
+ public function clickUpdate()
+ {
+ $this->_rootElement->find($this->updateButtonSelector)->click();
+ }
+
+ /**
+ * Set address value from dropdown.
+ *
+ * @param string $value
+ * @return void
+ */
+ public function selectAddress($value)
+ {
+ $this->_rootElement->find($this->select, Locator::SELECTOR_CSS, 'select')->setValue($value);
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php
index 789069299d22c62342e65d46c8492d37d7600692..507bb5673effc80e7525b238d0b14b2ee6d40c11 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php
@@ -6,6 +6,7 @@
namespace Magento\Checkout\Test\Block\Onepage;
use Magento\Checkout\Test\Fixture\Checkout;
+use Magento\Customer\Test\Fixture\Customer;
use Magento\Mtf\Block\Form;
use Magento\Mtf\Fixture\FixtureInterface;
@@ -90,6 +91,20 @@ class Login extends Form
$this->waitForElementNotVisible($this->loadingMask);
}
+ /**
+ * Fill required fields for guest checkout.
+ *
+ * @param Customer $customer
+ * @return void
+ */
+ public function fillGuestFields(Customer $customer)
+ {
+ $mapping = $this->dataMapping();
+ $this->_rootElement->find($mapping['email']['selector'], $mapping['email']['strategy'])
+ ->setValue($customer->getEmail());
+ $this->waitForElementNotVisible($this->loadingMask);
+ }
+
/**
* Click continue on checkout method block.
*
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Method.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Method.php
index 55351dbe5fd5eb5105843dfba1311d4d1cb2c029..64afdf5486068736758ac1311fe96fb748e19d46 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Method.php
@@ -35,13 +35,6 @@ class Method extends Block
*/
protected $billingAddressSelector = '.payment-method-billing-address';
- /**
- * Save credit card check box.
- *
- * @var string
- */
- protected $vaultCheckbox = '#%s_enable_vault';
-
/**
* PayPal load spinner.
*
@@ -137,17 +130,4 @@ class Method extends Block
['element' => $element]
);
}
-
- /**
- * Save credit card.
- *
- * @param string $paymentMethod
- * @param string $creditCardSave
- * @return void
- */
- public function saveCreditCard($paymentMethod, $creditCardSave)
- {
- $saveCard = sprintf($this->vaultCheckbox, $paymentMethod);
- $this->_rootElement->find($saveCard, Locator::SELECTOR_CSS, 'checkbox')->setValue($creditCardSave);
- }
}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Method/Billing.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Method/Billing.php
index 167767e518a48bb4879c076d9de6c0fd95ece128..d93c24f2641b0f2f326b60e5478537b242a51b47 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Method/Billing.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Method/Billing.php
@@ -36,6 +36,20 @@ class Billing extends Form
*/
protected $sameAsShippingCheckbox = '[name="billing-address-same-as-shipping"]';
+ /**
+ * New address select selector.
+ *
+ * @var string
+ */
+ private $newAddressSelect = '[name="billing_address_id"]';
+
+ /**
+ * New address option value.
+ *
+ * @var string
+ */
+ private $newAddressOption = 'New Address';
+
/**
* Fill billing address.
*
@@ -44,6 +58,10 @@ class Billing extends Form
*/
public function fillBilling(Address $billingAddress)
{
+ $select = $this->_rootElement->find($this->newAddressSelect, Locator::SELECTOR_CSS, 'select');
+ if ($select && $select->isVisible()) {
+ $select->setValue($this->newAddressOption);
+ }
$this->fill($billingAddress);
$this->clickUpdate();
$this->waitForElementNotVisible($this->waitElement);
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 f2530c016b714bf5af16c2b6d0f0f6d690cc4af0..fe844bc08b0017b2aa1cabfe4a7882b3733c118a 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
@@ -36,6 +36,39 @@ class Shipping extends Form
*/
private $addressModalBlock = '//*[@id="opc-new-shipping-address"]/../..';
+ /**
+ * @var string
+ */
+ private $selectedAddress = '.shipping-address-item.selected-item';
+
+ /**
+ * New address button selector.
+ *
+ * @var string
+ */
+ private $popupSelector = '.action-show-popup';
+
+ /**
+ * Locator for address select button.
+ *
+ * @var string
+ */
+ private $addressSelectButton = '.action-select-shipping-item';
+
+ /**
+ * Locator for shipping address select block.
+ *
+ * @var string
+ */
+ private $shippingAddressBlock = '.shipping-address-item';
+
+ /**
+ * Locator for shipping address select block.
+ *
+ * @var string
+ */
+ private $selectedShippingAddressBlock = '.selected-item';
+
/**
* Click on "New Address" button.
*
@@ -69,4 +102,63 @@ class Shipping extends Form
{
return $this->_rootElement->getElements("div .field._required");
}
+
+ /**
+ * @return array
+ */
+ public function getSelectedAddress()
+ {
+ return $this->_rootElement->find($this->selectedAddress, Locator::SELECTOR_CSS)->getText();
+ }
+
+ /**
+ * Select address.
+ *
+ * @param string $address
+ * @return void
+ */
+ public function selectAddress($address)
+ {
+ $addresses = $this->_rootElement->getElements($this->shippingAddressBlock);
+ foreach ($addresses as $addressBlock) {
+ if (strpos($addressBlock->getText(), $address) === 0 && !$this->isAddressSelected($address)) {
+ $addressBlock->find($this->addressSelectButton)->click();
+ break;
+ }
+ }
+ }
+
+ /**
+ * Check if address selected.
+ *
+ * @param string $address
+ * @return bool
+ */
+ public function isAddressSelected($address)
+ {
+ $text = $this->_rootElement->find($this->shippingAddressBlock . $this->selectedShippingAddressBlock)->getText();
+
+ return $text == $address;
+ }
+
+ /**
+ * Checks if new address button is visible.
+ *
+ * @return bool
+ */
+ public function isPopupNewAddressButtonVisible()
+ {
+ $button = $this->_rootElement->find($this->popupSelector);
+ return $button->isVisible();
+ }
+
+ /**
+ * Clicks new address button.
+ *
+ * @return void
+ */
+ public function clickPopupNewAddressButton()
+ {
+ $this->_rootElement->find($this->popupSelector)->click();
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php
index d038ca0599d75a779a352622ac85213a183f8053..24bddf79c1a07c9205e0b22426946e11b92d0489 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php
@@ -10,38 +10,61 @@ use Magento\Mtf\Block\Block;
use Magento\Mtf\Client\Locator;
/**
- * One page checkout status shipping method block
+ * One page checkout status shipping method block.
*/
class Method extends Block
{
/**
- * Shipping method selector
+ * Shipping method selector.
*
* @var string
*/
protected $shippingMethod = './/tbody//tr[td[contains(., "%s")] and td[contains(., "%s")]]//input';
/**
- * Continue checkout button
+ * Continue checkout button.
*
* @var string
*/
protected $continue = '#shipping-method-buttons-container button';
/**
- * Wait element
+ * Wait element.
*
* @var string
*/
protected $waitElement = '.loading-mask';
/**
- * Block wait element
+ * Block wait element.
*
* @var string
*/
protected $blockWaitElement = '._block-content-loading';
+ /**
+ * Wait until shipping rates will appear.
+ *
+ * @return void
+ */
+ private function waitForShippingRates()
+ {
+ // Code under test uses JavaScript setTimeout at this point as well.
+ sleep(3);
+ $this->waitForElementNotVisible($this->blockWaitElement);
+ }
+
+ /**
+ * Retrieve if the shipping methods loader appears.
+ *
+ * @return bool|null
+ */
+ public function isLoaderAppeared()
+ {
+ $this->_rootElement->click();
+ return $this->waitForElementVisible($this->waitElement);
+ }
+
/**
* Select shipping method.
*
@@ -50,15 +73,26 @@ class Method extends Block
*/
public function selectShippingMethod(array $method)
{
- // Code under test uses JavaScript setTimeout at this point as well.
- sleep(3);
+ $this->waitForShippingRates();
$selector = sprintf($this->shippingMethod, $method['shipping_method'], $method['shipping_service']);
- $this->waitForElementNotVisible($this->blockWaitElement);
$this->_rootElement->find($selector, Locator::SELECTOR_XPATH)->click();
}
/**
- * Click continue button
+ * Check whether shipping method is available in the shipping rates.
+ *
+ * @param array $method
+ * @return bool
+ */
+ public function isShippingMethodAvaiable(array $method)
+ {
+ $this->waitForShippingRates();
+ $selector = sprintf($this->shippingMethod, $method['shipping_method'], $method['shipping_service']);
+ return $this->_rootElement->find($selector, Locator::SELECTOR_XPATH)->isVisible();
+ }
+
+ /**
+ * Click continue button.
*
* @return void
*/
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/ShippingPopup.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/ShippingPopup.php
new file mode 100644
index 0000000000000000000000000000000000000000..fa6a8fa2a28613094139eb6cb91126ab5e85763b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/ShippingPopup.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Test\Block\Onepage;
+
+use Magento\Mtf\Block\Form;
+
+/**
+ * Checkout new shipping address popup block.
+ */
+class ShippingPopup extends Form
+{
+ /**
+ * Save address button selector.
+ *
+ * @var string
+ */
+ private $saveAddressButton = '.action-save-address';
+
+ /**
+ * Click on save address button.
+ *
+ * @return void
+ */
+ public function clickSaveAddressButton()
+ {
+ $this->browser->find($this->saveAddressButton)->click();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/ShippingPopup.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/ShippingPopup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..13403b792684512c9741bca74a78f7c84036eb48
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/ShippingPopup.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<mapping strict="0">
+ <fields>
+ <firstname />
+ <lastname />
+ <company />
+ <street>
+ <selector>input[name="street[0]"]</selector>
+ </street>
+ <city />
+ <region_id>
+ <input>select</input>
+ </region_id>
+ <country_id>
+ <input>select</input>
+ </country_id>
+ <telephone />
+ <postcode />
+ </fields>
+</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertBillingAddressAbsentInPayment.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertBillingAddressAbsentInPayment.php
new file mode 100644
index 0000000000000000000000000000000000000000..62fd88e98eed4b4ee9d19393525d55be898ca248
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertBillingAddressAbsentInPayment.php
@@ -0,0 +1,43 @@
+<?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;
+
+/**
+ * Assert billing address is not present in selected payment method.
+ */
+class AssertBillingAddressAbsentInPayment extends AbstractConstraint
+{
+ /**
+ * Assert billing address is not present in selected payment method.
+ *
+ * @param CheckoutOnepage $checkoutOnepage
+ * @return void
+ */
+ public function processAssert(CheckoutOnepage $checkoutOnepage)
+ {
+ \PHPUnit_Framework_Assert::assertFalse(
+ $checkoutOnepage->getPaymentBlock()
+ ->getSelectedPaymentMethodBlock()
+ ->getBillingBlock()
+ ->isVisible(),
+ 'Billing address is present in payment method'
+ );
+ }
+
+ /**
+ * Returns string representation of successful assertion
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Billing address is absent in payment method';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCheckoutErrorMessage.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCheckoutErrorMessage.php
new file mode 100644
index 0000000000000000000000000000000000000000..24fc2419721b51e3b16c4bcc25e88d13497591c2
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCheckoutErrorMessage.php
@@ -0,0 +1,42 @@
+<?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;
+
+/**
+ * Assert that error message is correct.
+ */
+class AssertCheckoutErrorMessage extends AbstractConstraint
+{
+ /**
+ * Assert that error message is correct.
+ *
+ * @param CheckoutOnepage $checkoutOnepage
+ * @param string $expectedErrorMessage
+ * @return void
+ */
+ public function processAssert(CheckoutOnepage $checkoutOnepage, $expectedErrorMessage)
+ {
+ \PHPUnit_Framework_Assert::assertEquals(
+ $expectedErrorMessage,
+ $checkoutOnepage->getMessagesBlock()->getErrorMessage(),
+ 'Wrong error message is displayed.'
+ );
+ }
+
+ /**
+ * Returns string representation of successful assertion.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Error message on Checkout onepage page is correct.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCustomerIsRedirectedToCheckoutFromCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCustomerIsRedirectedToCheckoutFromCart.php
new file mode 100644
index 0000000000000000000000000000000000000000..61fcf0f5adf8a3958050101ba053f104dc208fa3
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCustomerIsRedirectedToCheckoutFromCart.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Test\Constraint;
+
+use Magento\Sales\Test\Constraint\AssertOrderGrandTotal;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Cms\Test\Page\CmsIndex;
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\TestStep\TestStepFactory;
+
+/**
+ * Assert first step on Checkout page is available.
+ * Assert that Order Grand Total is correct on order page in backend.
+ */
+class AssertCustomerIsRedirectedToCheckoutFromCart extends AbstractConstraint
+{
+ /**
+ * Factory for Test Steps.
+ *
+ * @var TestStepFactory
+ */
+ private $stepFactory;
+
+ /**
+ * Order Id.
+ *
+ * @var string
+ */
+ private $orderId;
+
+ /**
+ * Assert first step on Checkout page is available.
+ * Assert that Order Grand Total is correct on order page in backend.
+ *
+ * @param CmsIndex $cmsIndex
+ * @param CheckoutOnepage $checkoutOnepage
+ * @param TestStepFactory $stepFactory
+ * @param AssertOrderGrandTotal $assertOrderGrandTotal
+ * @param SalesOrderView $salesOrderView
+ * @param OrderIndex $orderIndex
+ * @param array $prices
+ * @param array $checkoutData
+ * @return void
+ */
+ public function processAssert(
+ CmsIndex $cmsIndex,
+ CheckoutOnepage $checkoutOnepage,
+ TestStepFactory $stepFactory,
+ AssertOrderGrandTotal $assertOrderGrandTotal,
+ SalesOrderView $salesOrderView,
+ OrderIndex $orderIndex,
+ array $prices,
+ array $checkoutData = []
+ ) {
+ $this->stepFactory = $stepFactory;
+
+ $miniShoppingCart = $cmsIndex->getCartSidebarBlock();
+ $miniShoppingCart->openMiniCart();
+ $miniShoppingCart->clickProceedToCheckoutButton();
+
+ \PHPUnit_Framework_Assert::assertTrue(
+ !$checkoutOnepage->getMessagesBlock()->isVisible()
+ && $checkoutOnepage->getShippingMethodBlock()->isVisible(),
+ 'Checkout first step is not available.'
+ );
+
+ if (isset($checkoutData['shippingAddress'])) {
+ $this->getOrder($checkoutData);
+ }
+
+ //Assert that Order Grand Total is correct on order page in backend.
+ $assertOrderGrandTotal->processAssert($salesOrderView, $orderIndex, $this->orderId, $prices);
+ }
+
+ /**
+ * Get Order.
+ *
+ * @param array $checkoutData
+ * @return void
+ */
+ protected function getOrder(array $checkoutData)
+ {
+ $this->stepFactory->create(
+ \Magento\Checkout\Test\TestStep\FillShippingAddressStep::class,
+ ['shippingAddress' => $checkoutData['shippingAddress']]
+ )->run();
+ $this->objectManager->create(
+ \Magento\Checkout\Test\TestStep\FillShippingMethodStep::class,
+ ['shipping' => $checkoutData['shipping']]
+ )->run();
+ $this->objectManager->create(
+ \Magento\Checkout\Test\TestStep\SelectPaymentMethodStep::class,
+ ['payment' => $checkoutData['payment']]
+ )->run();
+ $this->orderId = $this->objectManager->create(
+ \Magento\Checkout\Test\TestStep\PlaceOrderStep::class
+ )->run()['orderId'];
+ }
+
+ /**
+ * Returns string representation of successful assertion.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Checkout first step is available.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductDataInMiniShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductDataInMiniShoppingCart.php
index 2b10754d9b47b945bd5a87709e78b378a2a754df..3e78cfb076acb1c8d033bb3dfa0a6e44f3cfd02c 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductDataInMiniShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductDataInMiniShoppingCart.php
@@ -14,12 +14,12 @@ use Magento\Mtf\Constraint\AbstractAssertForm;
use Magento\Mtf\Fixture\FixtureInterface;
/**
- * Assert that product price and qty in mini shopping cart equal to expected price from data set.
+ * Assert that product price and qty in mini shopping cart are equal to expected price from data set.
*/
class AssertProductDataInMiniShoppingCart extends AbstractAssertForm
{
/**
- * Assert that product price and qty in mini shopping cart are equal to expected price from data set.
+ * Assert that product price and qty in mini shopping cart equal to expected price from data set.
*
* @param CmsIndex $cmsIndex
* @param Cart $cart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepage.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepage.xml
index f8dcf95b0c16d87d6f7a241d1f0980b86c5c08d5..00ac573da2e7e658b2dc3a9de50a7185bb2512fb 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepage.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepage.xml
@@ -8,12 +8,16 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
<page name="CheckoutOnepage" mca="checkout" module="Magento_Checkout">
<block name="authenticationPopupBlock" class="Magento\Customer\Test\Block\Account\AuthenticationPopup" locator=".block-authentication" strategy="css selector" />
+ <block name="authenticationWrapperBlock" class="Magento\Customer\Test\Block\Account\AuthenticationWrapper" locator="[data-block='authentication']" strategy="css selector" />
<block name="loginBlock" class="Magento\Checkout\Test\Block\Onepage\Login" locator="[data-role='email-with-possible-login']" strategy="css selector" />
+ <block name="linksBlock" class="Magento\Theme\Test\Block\Links" locator=".header .links" strategy="css selector" />
<block name="shippingBlock" class="Magento\Checkout\Test\Block\Onepage\Shipping" locator="#checkout-step-shipping" strategy="css selector" />
+ <block name="shippingAddressPopupBlock" class="Magento\Checkout\Test\Block\Onepage\ShippingPopup" locator="#opc-new-shipping-address" strategy="css selector" />
<block name="shippingMethodBlock" class="Magento\Checkout\Test\Block\Onepage\Shipping\Method" locator="#checkout-step-shipping_method" strategy="css selector" />
<block name="paymentBlock" class="Magento\Checkout\Test\Block\Onepage\Payment" locator="#checkout-step-payment" strategy="css selector" />
<block name="discountCodesBlock" class="Magento\Checkout\Test\Block\Onepage\Payment\DiscountCodes" locator=".discount-code" strategy="css selector" />
<block name="reviewBlock" class="Magento\Checkout\Test\Block\Onepage\Review" locator=".opc-block-summary" strategy="css selector" />
- <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator=".page.messages" strategy="css selector" />
+ <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="//*[@id='checkout']//div[@data-role='checkout-messages' and .//div]" strategy="xpath" />
+ <block name="customAddressBlock" class="Magento\Checkout\Test\Block\Onepage\CustomAddress" locator=".checkout-billing-address" strategy="css selector" />
</page>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Repository/ConfigData.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f1d9108ec3fc4e960e462fe06d2b9e8866612f97
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Repository/ConfigData.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * 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/Magento/Mtf/Repository/etc/repository.xsd">
+ <repository class="Magento\Config\Test\Repository\ConfigData">
+ <dataset name="disable_guest_checkout">
+ <field name="checkout/options/guest_checkout" xsi:type="array">
+ <item name="scope" xsi:type="string">checkout</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">No</item>
+ <item name="value" xsi:type="string">0</item>
+ </field>
+ </dataset>
+ <dataset name="disable_guest_checkout_rollback">
+ <field name="checkout/options/guest_checkout" xsi:type="array">
+ <item name="scope" xsi:type="string">checkout</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">Yes</item>
+ <item name="value" xsi:type="string">1</item>
+ </field>
+ </dataset>
+ <dataset name="disable_customer_redirect_after_logging">
+ <field name="customer/startup/redirect_dashboard" xsi:type="array">
+ <item name="scope" xsi:type="string">customer</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">No</item>
+ <item name="value" xsi:type="string">0</item>
+ </field>
+ </dataset>
+ <dataset name="disable_customer_redirect_after_logging_rollback">
+ <field name="customer/startup/redirect_dashboard" xsi:type="array">
+ <item name="scope" xsi:type="string">customer</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">Yes</item>
+ <item name="value" xsi:type="string">1</item>
+ </field>
+ </dataset>
+ </repository>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutDeclinedTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutDeclinedTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..990c3df13e9b1f00e6a2171dfb8f2216b38f0ec3
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutDeclinedTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ * 1. Configure payment method.
+ * 2. Create products.
+ *
+ * Steps:
+ * 1. Log in Storefront.
+ * 2. Add products to the Shopping Cart.
+ * 3. Click the 'Proceed to Checkout' button.
+ * 4. Fill shipping information.
+ * 5. Select shipping method.
+ * 6. Select payment method.
+ * 7. Click 'Place Order' button.
+ * 8. Perform assertions.
+ *
+ * @group Checkout
+ * @ZephyrId MAGETWO-46469
+ */
+class OnePageCheckoutDeclinedTest extends Scenario
+{
+ /* tags */
+ const MVP = 'yes';
+ const TEST_TYPE = '3rd_party_test';
+ const SEVERITY = 'S1';
+ /* end tags */
+
+ /**
+ * Verifies error message on Onepage Checkout.
+ *
+ * @return void
+ */
+ public function test()
+ {
+ $this->executeScenario();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.php
index 58d0c23f2274fcdde30703aa8ca4920ec0aa208a..25922102e1269c95280697db6c3175c36d6253fc 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.php
@@ -33,7 +33,7 @@ use Magento\Mtf\TestCase\Scenario;
* 14. Perform assertions.
*
* @group One_Page_Checkout
- * @ZephyrId MAGETWO-27485, MAGETWO-12412, MAGETWO-12429
+ * @ZephyrId MAGETWO-27485, MAGETWO-12412, MAGETWO-12429, MAGETWO-49917, MAGETWO-27485
* @ZephyrId MAGETWO-12444, MAGETWO-12848, MAGETWO-12849, MAGETWO-12850
*/
class OnePageCheckoutTest extends Scenario
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
index 797255d4e374acf001132647eee1121168ec0b50..24f63035645f22ebbf051f2ab0cb8cbf48c59c93 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
@@ -7,6 +7,34 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest" summary="OnePageCheckout within Offline Payment Methods" ticketId="MAGETWO-27485">
+ <variation name="OnePageCheckoutUsingLoginPopup" summary="Customer is redirected to checkout on login if guest is disabled, flow for existed Customer" ticketId="MAGETWO-49916">
+ <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
+ <data name="customer/dataset" xsi:type="string">johndoe_with_addresses</data>
+ <data name="checkoutMethod" xsi:type="string">login</data>
+ <data name="prices" xsi:type="array">
+ <item name="grandTotal" xsi:type="string">565.00</item>
+ </data>
+ <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+ <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+ <data name="payment/method" xsi:type="string">checkmo</data>
+ <data name="configData" xsi:type="string">checkmo, disable_guest_checkout, disable_customer_redirect_after_logging</data>
+ <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+ </variation>
+ <variation name="OnePageCheckoutUsingRegisterLink" summary="Customer is redirected to checkout on login if guest is disabled, flow with registration new Customer" ticketId="MAGETWO-49917">
+ <data name="issue" xsi:type="string">MAGETWO-59816: Redirect works improperly in a browser incognito mode</data>
+ <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
+ <data name="customer/dataset" xsi:type="string">register_customer</data>
+ <data name="checkoutMethod" xsi:type="string">register_before_checkout</data>
+ <data name="prices" xsi:type="array">
+ <item name="grandTotal" xsi:type="string">565.00</item>
+ </data>
+ <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+ <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+ <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
+ <data name="payment/method" xsi:type="string">checkmo</data>
+ <data name="configData" xsi:type="string">checkmo, disable_guest_checkout, disable_customer_redirect_after_logging, enable_https_frontend_only</data>
+ <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+ </variation>
<variation name="OnePageCheckoutTestVariation1" summary="Checkout as UK guest with virtual product and downloadable product using coupon for not logged in customers">
<data name="products/0" xsi:type="string">catalogProductVirtual::default</data>
<data name="products/1" xsi:type="string">downloadableProduct::with_two_separately_links</data>
@@ -168,12 +196,13 @@
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
</variation>
- <variation name="OnePageCheckoutTestVariation9" summary="One Page Checkout Products with Tier Prices">
+ <variation name="OnePageCheckoutTestVariation9" summary="One Page Checkout Products with different shipping/billing address and Tier Prices" ticketId="MAGETWO-42604">
<data name="tag" xsi:type="string">stable:no</data>
<data name="products/0" xsi:type="string">catalogProductSimple::simple_with_tier_price_and_order_qty_3</data>
<data name="customer/dataset" xsi:type="string">default</data>
- <data name="checkoutMethod" xsi:type="string">guest</data>
- <data name="shippingAddress/dataset" xsi:type="string">UK_address</data>
+ <data name="checkoutMethod" xsi:type="string">login</data>
+ <data name="shippingAddress/dataset" xsi:type="string">UK_address_without_email</data>
+ <data name="billingAddress/dataset" xsi:type="string">UK_address_2_without_email</data>
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
<data name="prices" xsi:type="array">
@@ -183,6 +212,7 @@
<data name="configData" xsi:type="string">banktransfer_specificcountry_gb</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
+ <constraint name="Magento\Customer\Test\Constraint\AssertCustomerDefaultAddressFrontendAddressBook" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
</variation>
<variation name="OnePageCheckoutTestVariation10" summary="One Page Checkout with all product types">
@@ -203,7 +233,88 @@
</data>
<data name="payment/method" xsi:type="string">checkmo</data>
<data name="configData" xsi:type="string">checkmo</data>
+ <constraint name="Magento\Customer\Test\Constraint\AssertCustomerDefaultAddressFrontendAddressBook" />
+ <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
+ </variation>
+ <variation name="OnePageCheckoutUsingSingInLink" summary="Login during checkout using 'Sign In' link" ticketId="MAGETWO-42547">
+ <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
+ <data name="customer/dataset" xsi:type="string">customer_UK_US_addresses</data>
+ <data name="checkoutMethod" xsi:type="string">sign_in</data>
+ <data name="shippingAddressCustomer" xsi:type="array">
+ <item name="added" xsi:type="number">1</item>
+ </data>
+ <data name="billingAddressCustomer" xsi:type="array">
+ <item name="added" xsi:type="number">1</item>
+ </data>
+ <data name="prices" xsi:type="array">
+ <item name="grandTotal" xsi:type="string">565.00</item>
+ </data>
+ <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+ <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+ <data name="payment/method" xsi:type="string">checkmo</data>
+ <data name="configData" xsi:type="string">checkmo</data>
+ <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+ <constraint name="Magento\Sales\Test\Constraint\AssertOrderAddresses" />
+ </variation>
+ <variation name="OnePageCheckoutUsingNonDefaultAddress" summary="Checkout as Customer using non default address" ticketId="MAGETWO-42602">
+ <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
+ <data name="customer/dataset" xsi:type="string">customer_US_DE_UK</data>
+ <data name="checkoutMethod" xsi:type="string">login</data>
+ <data name="shippingAddressCustomer" xsi:type="array">
+ <item name="added" xsi:type="number">1</item>
+ </data>
+ <data name="billingAddressCustomer" xsi:type="array">
+ <item name="added" xsi:type="number">2</item>
+ </data>
+ <data name="prices" xsi:type="array">
+ <item name="grandTotal" xsi:type="string">565.00</item>
+ </data>
+ <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+ <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+ <data name="payment/method" xsi:type="string">checkmo</data>
+ <data name="configData" xsi:type="string">checkmo</data>
+ <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+ <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
+ <constraint name="Magento\Sales\Test\Constraint\AssertOrderAddresses" />
+ </variation>
+ <variation name="OnePageCheckoutUsingNewAddress" summary="Checkout as Customer using New address" ticketId="MAGETWO-42601">
+ <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
+ <data name="customer/dataset" xsi:type="string">johndoe_with_addresses</data>
+ <data name="checkoutMethod" xsi:type="string">sign_in</data>
+ <data name="prices" xsi:type="array">
+ <item name="grandTotal" xsi:type="string">565.00</item>
+ </data>
+ <data name="shippingAddress/dataset" xsi:type="string">UK_address_without_email</data>
+ <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+ <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+ <data name="billingCheckboxState" xsi:type="string">Yes</data>
+ <data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
+ <data name="payment/method" xsi:type="string">checkmo</data>
+ <data name="configData" xsi:type="string">checkmo</data>
+ <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+ <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
+ <constraint name="Magento\Sales\Test\Constraint\AssertOrderAddresses" />
+ </variation>
+ <variation name="OnePageCheckoutTestVariation11" summary="Checkout as Customer using default address" ticketId="MAGETWO-42600, MAGETWO-42546">
+ <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
+ <data name="customer/dataset" xsi:type="string">customer_UK_US_addresses</data>
+ <data name="checkoutMethod" xsi:type="string">login</data>
+ <data name="shippingAddressCustomer" xsi:type="array">
+ <item name="added" xsi:type="number">0</item>
+ </data>
+ <data name="billingAddressCustomer" xsi:type="array">
+ <item name="added" xsi:type="number">0</item>
+ </data>
+ <data name="prices" xsi:type="array">
+ <item name="grandTotal" xsi:type="string">565.00</item>
+ </data>
+ <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+ <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+ <data name="payment/method" xsi:type="string">checkmo</data>
+ <data name="configData" xsi:type="string">checkmo_specificcountry_gb</data>
+ <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
+ <constraint name="Magento\Sales\Test\Constraint\AssertOrderAddresses" />
</variation>
</testCase>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
index 62d773a6637bf8fdacedf62932d798dcd6d9e431..0bfe42f7fe78ced0ffb2282d69790ca42c4a1dec 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
@@ -11,6 +11,7 @@ use Magento\Cms\Test\Page\CmsIndex;
use Magento\Mtf\Fixture\FixtureFactory;
use Magento\Mtf\Fixture\FixtureInterface;
use Magento\Mtf\TestCase\Injectable;
+use Magento\Customer\Test\Fixture\Customer;
/**
* Preconditions:
@@ -76,14 +77,28 @@ class UpdateProductFromMiniShoppingCartEntityTest extends Injectable
/**
* Update product from mini shopping cart.
- *
* @param array $originalProduct
* @param array $checkoutData
+ * @param boolean $useMiniCartToEditQty
+ * @param array $shippingAddress
+ * @param array $shipping
+ * @param array $payment
+ * @param Customer $customer
* @return array
*/
- public function test(array $originalProduct, array $checkoutData)
- {
+ public function test(
+ array $originalProduct,
+ array $checkoutData,
+ $useMiniCartToEditQty = false,
+ $shippingAddress = null,
+ $shipping = null,
+ $payment = null,
+ Customer $customer = null
+ ) {
// Preconditions:
+ if ($customer !== null) {
+ $customer->persist();
+ }
$product = $this->createProduct($originalProduct);
$this->addToCart($product);
@@ -93,16 +108,25 @@ class UpdateProductFromMiniShoppingCartEntityTest extends Injectable
$newProduct = $this->createProduct([explode('::', $originalProduct[0])[0]], [$productData]);
$miniShoppingCart = $this->cmsIndex->getCartSidebarBlock();
$miniShoppingCart->openMiniCart();
- $miniShoppingCart->getCartItem($newProduct)->clickEditItem();
- $this->catalogProductView->getViewBlock()->addToCart($newProduct);
+ if ($useMiniCartToEditQty) {
+ $miniShoppingCart->getCartItem($newProduct)->editQty($newProduct->getCheckoutData());
+ } else {
+ $miniShoppingCart->getCartItem($newProduct)->clickEditItem();
+ $this->catalogProductView->getViewBlock()->addToCart($newProduct);
+ }
// Prepare data for asserts:
$cart['data']['items'] = ['products' => [$newProduct]];
$deletedCart['data']['items'] = ['products' => [$product]];
return [
'deletedCart' => $this->fixtureFactory->createByCode('cart', $deletedCart),
- 'cart' => $this->fixtureFactory->createByCode('cart', $cart)
+ 'cart' => $this->fixtureFactory->createByCode('cart', $cart),
+ 'checkoutData' => [
+ 'shippingAddress' => $shippingAddress,
+ 'shipping' => $shipping,
+ 'payment' => $payment
+ ]
];
}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml
index 5f9b069ab85ca92d37ac8773ac3d1694e5d6ee81..cd500a935485cd0e08981d32a53b9280a7d2ad57 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml
@@ -7,12 +7,22 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Checkout\Test\TestCase\UpdateProductFromMiniShoppingCartEntityTest" summary="Update Product from Mini Shopping Cart" ticketId="MAGETWO-29812">
- <variation name="UpdateProductFromMiniShoppingCartEntityTestVariation1" summary="Update Simple">
- <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes</data>
- <data name="originalProduct/0" xsi:type="string">catalogProductSimple::with_two_custom_option</data>
- <data name="checkoutData/dataset" xsi:type="string">simple_update_mini_shopping_cart</data>
+ <variation name="UpdateProductFromMiniShoppingCartEntityTestVariation1" summary="Update Product Qty on Mini Shopping Cart" ticketId=" MAGETWO-35536">
+ <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
+ <data name="originalProduct/0" xsi:type="string">catalogProductSimple::default</data>
+ <data name="checkoutData/dataset" xsi:type="string">simple_order_qty_2</data>
+ <data name="use_minicart_to_edit_qty" xsi:type="boolean">true</data>
+ <data name="prices" xsi:type="array">
+ <item name="grandTotal" xsi:type="string">1130</item>
+ </data>
+ <data name="customer/dataset" xsi:type="string">customer_US</data>
+ <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+ <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+ <data name="shippingAddress/dataset" xsi:type="string">UK_address</data>
+ <data name="payment/method" xsi:type="string">free</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertProductDataInMiniShoppingCart" />
<constraint name="Magento\Checkout\Test\Constraint\AssertProductQtyInShoppingCart" />
+ <constraint name="Magento\Checkout\Test\Constraint\AssertCustomerIsRedirectedToCheckoutFromCart" />
</variation>
<variation name="UpdateProductFromMiniShoppingCartEntityTestVariation2" summary="Update Configurable and verify previous product was updated to new one in shopping cart and mini shopping cart">
<data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes</data>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/ClickPlaceOrderButtonStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/ClickPlaceOrderButtonStep.php
new file mode 100644
index 0000000000000000000000000000000000000000..cf086e55d5a305f716f4b64513190b32c7708cba
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/ClickPlaceOrderButtonStep.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Test\TestStep;
+
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Mtf\TestStep\TestStepInterface;
+
+/**
+ * Click 'Place order' button.
+ */
+class ClickPlaceOrderButtonStep implements TestStepInterface
+{
+ /**
+ * Onepage checkout page.
+ *
+ * @var CheckoutOnepage
+ */
+ private $checkoutOnepage;
+
+ /**
+ * @param CheckoutOnepage $checkoutOnepage
+ */
+ public function __construct(CheckoutOnepage $checkoutOnepage)
+ {
+ $this->checkoutOnepage = $checkoutOnepage;
+ }
+
+ /**
+ * Click 'Place order' button.
+ *
+ * @return array
+ */
+ public function run()
+ {
+ $this->checkoutOnepage->getPaymentBlock()->getSelectedPaymentMethodBlock()->clickPlaceOrder();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
index a7d432fa38b2a6a3ef05f8b883887d093baae554..720965212ad38d6d249d7ef4f1634e2c43f5deb2 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
@@ -10,6 +10,8 @@ use Magento\Checkout\Test\Page\CheckoutOnepage;
use Magento\Customer\Test\Fixture\Address;
use Magento\Mtf\TestStep\TestStepInterface;
use Magento\Checkout\Test\Constraint\AssertBillingAddressSameAsShippingCheckbox;
+use Magento\Customer\Test\Fixture\Customer;
+use Magento\Mtf\ObjectManager;
/**
* Fill billing information.
@@ -37,6 +39,13 @@ class FillBillingInformationStep implements TestStepInterface
*/
protected $shippingAddress;
+ /**
+ * Customer fixture.
+ *
+ * @var Customer
+ */
+ protected $customer;
+
/**
* "Same as Shipping" checkbox value assertion.
*
@@ -51,45 +60,85 @@ class FillBillingInformationStep implements TestStepInterface
*/
protected $billingCheckboxState;
+ /**
+ * Customer shipping address data for select.
+ *
+ * @var array
+ */
+ private $billingAddressCustomer;
+
+ /**
+ * Object manager instance.
+ *
+ * @var ObjectManager $objectManager
+ */
+ protected $objectManager;
+
/**
* @constructor
* @param CheckoutOnepage $checkoutOnepage
* @param AssertBillingAddressSameAsShippingCheckbox $assertBillingAddressCheckbox
+ * @param Customer $customer
+ * @param ObjectManager $objectManager
* @param Address $billingAddress
* @param Address $shippingAddress
* @param string $billingCheckboxState
+ * @param array|null $billingAddressCustomer
*/
public function __construct(
CheckoutOnepage $checkoutOnepage,
AssertBillingAddressSameAsShippingCheckbox $assertBillingAddressCheckbox,
+ Customer $customer,
+ ObjectManager $objectManager,
Address $billingAddress = null,
Address $shippingAddress = null,
- $billingCheckboxState = null
+ $billingCheckboxState = null,
+ $billingAddressCustomer = null
) {
$this->checkoutOnepage = $checkoutOnepage;
$this->billingAddress = $billingAddress;
$this->shippingAddress = $shippingAddress;
$this->assertBillingAddressCheckbox = $assertBillingAddressCheckbox;
+ $this->customer = $customer;
+ $this->objectManager = $objectManager;
$this->billingCheckboxState = $billingCheckboxState;
+ $this->billingAddressCustomer = $billingAddressCustomer;
}
/**
* Fill billing address.
*
- * @return void
+ * @return array
*/
public function run()
{
+ $billingAddress = null;
if ($this->billingCheckboxState) {
$this->assertBillingAddressCheckbox->processAssert($this->checkoutOnepage, $this->billingCheckboxState);
}
-
if ($this->billingAddress) {
$selectedPaymentMethod = $this->checkoutOnepage->getPaymentBlock()->getSelectedPaymentMethodBlock();
if ($this->shippingAddress) {
$selectedPaymentMethod->getBillingBlock()->unsetSameAsShippingCheckboxValue();
}
$selectedPaymentMethod->getBillingBlock()->fillBilling($this->billingAddress);
+ $billingAddress = $this->billingAddress;
+ }
+ if (isset($this->billingAddressCustomer['added'])) {
+ $addressIndex = $this->billingAddressCustomer['added'];
+ $billingAddress = $this->customer->getDataFieldConfig('address')['source']->getAddresses()[$addressIndex];
+ $address = $this->objectManager->create(
+ \Magento\Customer\Test\Block\Address\Renderer::class,
+ ['address' => $billingAddress, 'type' => 'html_for_select_element']
+ )->render();
+ $selectedPaymentMethod = $this->checkoutOnepage->getPaymentBlock()->getSelectedPaymentMethodBlock();
+ $selectedPaymentMethod->getBillingBlock()->unsetSameAsShippingCheckboxValue();
+ $this->checkoutOnepage->getCustomAddressBlock()->selectAddress($address);
+ $selectedPaymentMethod->getBillingBlock()->clickUpdate();
}
+
+ return [
+ 'billingAddress' => $billingAddress
+ ];
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillShippingAddressStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillShippingAddressStep.php
index 5150eb9964ba3e960e88694fcc781e7bc6d829e0..1c4e407fb8c24391da8ecf4498e1702adb0d254b 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillShippingAddressStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillShippingAddressStep.php
@@ -8,7 +8,10 @@ namespace Magento\Checkout\Test\TestStep;
use Magento\Checkout\Test\Page\CheckoutOnepage;
use Magento\Customer\Test\Fixture\Address;
+use Magento\Mtf\Fixture\FixtureFactory;
use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Customer\Test\Fixture\Customer;
+use Magento\Mtf\ObjectManager;
/**
* Fill shipping address step.
@@ -20,37 +23,109 @@ class FillShippingAddressStep implements TestStepInterface
*
* @var CheckoutOnepage
*/
- protected $checkoutOnepage;
+ private $checkoutOnepage;
/**
* Address fixture.
*
* @var Address
*/
- protected $shippingAddress;
+ private $shippingAddress;
+
+ /**
+ * Customer fixture.
+ *
+ * @var Customer
+ */
+ private $customer;
+
+ /**
+ * Customer shipping address data for select.
+ *
+ * @var array
+ */
+ private $shippingAddressCustomer;
+
+ /**
+ * Object manager instance.
+ *
+ * @var ObjectManager
+ */
+ private $objectManager;
+
+ /**
+ * Fixture factory.
+ *
+ * @var FixtureFactory
+ */
+ private $fixtureFactory;
/**
* @constructor
* @param CheckoutOnepage $checkoutOnepage
- * @param Address $shippingAddress
+ * @param Customer $customer
+ * @param ObjectManager $objectManager
+ * @param FixtureFactory $fixtureFactory
+ * @param Address|null $shippingAddress
+ * @param array|null $shippingAddressCustomer
*/
public function __construct(
CheckoutOnepage $checkoutOnepage,
- Address $shippingAddress = null
+ Customer $customer,
+ ObjectManager $objectManager,
+ FixtureFactory $fixtureFactory,
+ Address $shippingAddress = null,
+ $shippingAddressCustomer = null
) {
$this->checkoutOnepage = $checkoutOnepage;
+ $this->customer = $customer;
+ $this->objectManager = $objectManager;
+ $this->fixtureFactory = $fixtureFactory;
$this->shippingAddress = $shippingAddress;
+ $this->shippingAddressCustomer = $shippingAddressCustomer;
}
/**
* Fill shipping address.
*
- * @return void
+ * @return array
*/
public function run()
{
+ $shippingAddress = null;
if ($this->shippingAddress) {
- $this->checkoutOnepage->getShippingBlock()->fill($this->shippingAddress);
+ $shippingBlock = $this->checkoutOnepage->getShippingBlock();
+ if ($shippingBlock->isPopupNewAddressButtonVisible()) {
+ $shippingBlock->clickPopupNewAddressButton();
+ $this->checkoutOnepage->getShippingAddressPopupBlock()
+ ->fill($this->shippingAddress)
+ ->clickSaveAddressButton();
+ } else {
+ $shippingBlock->fill($this->shippingAddress);
+ }
+ $shippingAddress = $this->shippingAddress;
+ }
+ if (isset($this->shippingAddressCustomer['new'])) {
+ $shippingAddress = $this->fixtureFactory->create(
+ 'address',
+ ['dataset' => $this->shippingAddressCustomer['new']]
+ );
+ $this->checkoutOnepage->getShippingBlock()->clickPopupNewAddressButton();
+ $this->checkoutOnepage->getShippingAddressPopupBlock()->fill($shippingAddress)->clickSaveAddressButton();
}
+ if (isset($this->shippingAddressCustomer['added'])) {
+ $addressIndex = $this->shippingAddressCustomer['added'];
+ $shippingAddress = $this->customer->getDataFieldConfig('address')['source']->getAddresses()[$addressIndex];
+ $address = $this->objectManager->create(
+ \Magento\Customer\Test\Block\Address\Renderer::class,
+ ['address' => $shippingAddress, 'type' => 'html_without_company']
+ )->render();
+ $shippingBlock = $this->checkoutOnepage->getShippingBlock();
+ $shippingBlock->selectAddress($address);
+ }
+
+ return [
+ 'shippingAddress' => $shippingAddress,
+ ];
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
index 444b98adb7f836b140a52d6c3644b6ee9e7c3c72..3af915e22bfcb1c85ebb53b84872ef4ed255fac2 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
@@ -8,6 +8,7 @@ namespace Magento\Checkout\Test\TestStep;
use Magento\Mtf\TestStep\TestStepInterface;
use Magento\Customer\Test\Fixture\Customer;
+use Magento\Customer\Test\Page\CustomerAccountCreate;
use Magento\Checkout\Test\Page\CheckoutOnepage;
use Magento\Customer\Test\TestStep\LogoutCustomerOnFrontendStep;
@@ -51,9 +52,17 @@ class SelectCheckoutMethodStep implements TestStepInterface
*/
private $clickProceedToCheckoutStep;
+ /**
+ * Customer account create page instance.
+ *
+ * @var CustomerAccountCreate
+ */
+ private $customerAccountCreatePage;
+
/**
* @constructor
* @param CheckoutOnepage $checkoutOnepage
+ * @param CustomerAccountCreate $customerAccountCreatePage
* @param Customer $customer
* @param LogoutCustomerOnFrontendStep $logoutCustomerOnFrontend
* @param ClickProceedToCheckoutStep $clickProceedToCheckoutStep
@@ -61,12 +70,14 @@ class SelectCheckoutMethodStep implements TestStepInterface
*/
public function __construct(
CheckoutOnepage $checkoutOnepage,
+ CustomerAccountCreate $customerAccountCreatePage,
Customer $customer,
LogoutCustomerOnFrontendStep $logoutCustomerOnFrontend,
ClickProceedToCheckoutStep $clickProceedToCheckoutStep,
$checkoutMethod
) {
$this->checkoutOnepage = $checkoutOnepage;
+ $this->customerAccountCreatePage = $customerAccountCreatePage;
$this->customer = $customer;
$this->logoutCustomerOnFrontend = $logoutCustomerOnFrontend;
$this->clickProceedToCheckoutStep = $clickProceedToCheckoutStep;
@@ -79,6 +90,17 @@ class SelectCheckoutMethodStep implements TestStepInterface
* @return void
*/
public function run()
+ {
+ $this->processLogin();
+ $this->processRegister();
+ }
+
+ /**
+ * Process login action.
+ *
+ * @return void
+ */
+ private function processLogin()
{
if ($this->checkoutMethod === 'login') {
if ($this->checkoutOnepage->getAuthenticationPopupBlock()->isVisible()) {
@@ -87,17 +109,37 @@ class SelectCheckoutMethodStep implements TestStepInterface
} else {
$this->checkoutOnepage->getLoginBlock()->loginCustomer($this->customer);
}
+ } elseif ($this->checkoutMethod === 'guest') {
+ $this->checkoutOnepage->getLoginBlock()->fillGuestFields($this->customer);
+ } elseif ($this->checkoutMethod === 'sign_in') {
+ $this->checkoutOnepage->getAuthenticationWrapperBlock()->signInLinkClick();
+ $this->checkoutOnepage->getAuthenticationWrapperBlock()->loginCustomer($this->customer);
+ }
+ }
+
+ /**
+ * Process customer register action.
+ *
+ * @return void
+ */
+ private function processRegister()
+ {
+ if ($this->checkoutMethod === 'register_before_checkout') {
+ $this->checkoutOnepage->getAuthenticationPopupBlock()->createAccount();
+ $this->customerAccountCreatePage->getRegisterForm()->registerCustomer($this->customer);
}
}
/**
- * Logout customer on fronted.
+ * Logout customer on frontend.
*
* @return void
*/
public function cleanup()
{
- if ($this->checkoutMethod === 'login') {
+ if ($this->checkoutMethod === 'login' ||
+ $this->checkoutMethod === 'sign_in' ||
+ $this->checkoutMethod === 'register_before_checkout') {
$this->logoutCustomerOnFrontend->run();
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/di.xml
index 6dc1b3b0c67edc232caa1932116908af3745ad94..d7a61b0eaaa2fece41b7d1f464f0e56bdb80d159 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/di.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/di.xml
@@ -5,10 +5,26 @@
* See COPYING.txt for license details.
*/
-->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
- <type name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty">
- <arguments>
- <argument name="severity" xsi:type="string">middle</argument>
- </arguments>
- </type>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+ <type name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty">
+ <arguments>
+ <argument name="severity" xsi:type="string">middle</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Checkout\Test\Constraint\AssertBillingAddressAbsentInPayment">
+ <arguments>
+ <argument name="severity" xsi:type="string">S2</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage">
+ <arguments>
+ <argument name="severity" xsi:type="string">S0</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Checkout\Test\Constraint\AssertCheckoutErrorMessage">
+ <arguments>
+ <argument name="severity" xsi:type="string">S1</argument>
+ </arguments>
+ </type>
</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 24eb96c0a9347741384ffd6718bf349eeb452c85..e9b49babbba1936aae49b20339a56732b5b2531b 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
@@ -28,4 +28,17 @@
<step name="addProductsToTheCart" module="Magento_Checkout" next="ProceedToCheckout" />
<step name="ProceedToCheckout" module="Magento_Checkout" />
</scenario>
+ <scenario name="OnePageCheckoutDeclinedTest" 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" next="createCustomer" />
+ <step name="createCustomer" module="Magento_Customer" next="selectCheckoutMethod" />
+ <step name="selectCheckoutMethod" module="Magento_Checkout" next="fillShippingAddress" />
+ <step name="fillShippingAddress" module="Magento_Checkout" next="fillShippingMethod" />
+ <step name="fillShippingMethod" module="Magento_Checkout" next="selectPaymentMethod" />
+ <step name="selectPaymentMethod" module="Magento_Checkout" next="fillBillingInformation" />
+ <step name="fillBillingInformation" module="Magento_Checkout" next="clickPlaceOrderButton" />
+ <step name="clickPlaceOrderButton" module="Magento_Checkout" />
+ </scenario>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/GridFilteringTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/GridFilteringTest.xml
index 715190039162b4fdbab91af72ca564e0c0732858..0b237e506636cf1beb8ff22122c515079cda176e 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/GridFilteringTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/GridFilteringTest.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Ui\Test\TestCase\GridFilteringTest" summary="Grid UI Component Filtering" ticketId="MAGETWO-41329">
<variation name="CmsPageGridFiltering">
- <data name="tag" xsi:type="string">severity:S2</data>
+ <data name="tag" xsi:type="string">severity:S3</data>
<data name="description" xsi:type="string">Verify cms page grid filtering</data>
<data name="itemsCount" xsi:type="string">2</data>
<data name="fixtureName" xsi:type="string">cmsPage</data>
@@ -29,7 +29,7 @@
<constraint name="\Magento\Ui\Test\Constraint\AssertGridFiltering"/>
</variation>
<variation name="CmsBlockGridFiltering">
- <data name="tag" xsi:type="string">severity:S2</data>
+ <data name="tag" xsi:type="string">severity:S3</data>
<data name="description" xsi:type="string">Verify cms block grid filtering</data>
<data name="itemsCount" xsi:type="string">2</data>
<data name="fixtureName" xsi:type="string">cmsBlock</data>
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/GridFullTextSearchTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/GridFullTextSearchTest.xml
index fc279aad59d3d7e21590be2c256f83831e7295cf..b17f32db04b23727a6583db5227dbf79d0f0d19d 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/GridFullTextSearchTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/GridFullTextSearchTest.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Ui\Test\TestCase\GridFullTextSearchTest" summary="Grid UI Component Full Text Search" ticketId="MAGETWO-41023">
<variation name="CmsPageGridFullTextSearch">
- <data name="tag" xsi:type="string">severity:S2, stable:no</data>
+ <data name="tag" xsi:type="string">severity:S3, stable:no</data>
<data name="description" xsi:type="string">Verify cms page grid full text search</data>
<data name="itemsCount" xsi:type="string">2</data>
<data name="fixtureName" xsi:type="string">cmsPage</data>
@@ -20,7 +20,7 @@
<constraint name="Magento\Ui\Test\Constraint\AssertGridFullTextSearch"/>
</variation>
<variation name="CmsBlockGridFullTextSearch">
- <data name="tag" xsi:type="string">severity:S2</data>
+ <data name="tag" xsi:type="string">severity:S3</data>
<data name="description" xsi:type="string">Verify cms blocks grid full text search</data>
<data name="itemsCount" xsi:type="string">2</data>
<data name="fixtureName" xsi:type="string">cmsBlock</data>
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/GridSortingTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/GridSortingTest.xml
index 1be7e61f6bd0ea27a99733a63828f438ab481215..053d32a0598ef1677cf67c83c307aa2352ac7803 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/GridSortingTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/GridSortingTest.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Ui\Test\TestCase\GridSortingTest" summary="Grid UI Component Sorting" ticketId="MAGETWO-41328">
<variation name="CmsPagesGridSorting">
- <data name="tag" xsi:type="string">severity:S2, stable:no</data>
+ <data name="tag" xsi:type="string">severity:S3, stable:no</data>
<data name="description" xsi:type="string">Verify cms page grid sorting</data>
<data name="columnsForSorting" xsi:type="array">
<item name="id" xsi:type="string">ID</item>
@@ -19,7 +19,7 @@
<constraint name="Magento\Ui\Test\Constraint\AssertGridSorting"/>
</variation>
<variation name="CmsBlocksGridSorting">
- <data name="tag" xsi:type="string">severity:S2, stable:no</data>
+ <data name="tag" xsi:type="string">severity:S3, stable:no</data>
<data name="description" xsi:type="string">Verify cms blocks grid sorting</data>
<data name="steps" xsi:type="array">
<item name="0" xsi:type="string">-</item>
diff --git a/dev/tests/functional/tests/app/Magento/Config/Test/TestStep/SetupConfigurationStep.php b/dev/tests/functional/tests/app/Magento/Config/Test/TestStep/SetupConfigurationStep.php
index a69117609450912fa1af6e2acdb9a9234c7f01b5..2441f175feef040ef83e6a35a84048957f6675aa 100644
--- a/dev/tests/functional/tests/app/Magento/Config/Test/TestStep/SetupConfigurationStep.php
+++ b/dev/tests/functional/tests/app/Magento/Config/Test/TestStep/SetupConfigurationStep.php
@@ -8,6 +8,7 @@ namespace Magento\Config\Test\TestStep;
use Magento\Mtf\Fixture\FixtureFactory;
use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Util\Command\Cli\Cache;
use Magento\PageCache\Test\Page\Adminhtml\AdminCache;
/**
@@ -50,12 +51,20 @@ class SetupConfigurationStep implements TestStepInterface
*/
protected $flushCache;
+ /**
+ * Cli command to do operations with cache.
+ *
+ * @var Cache
+ */
+ private $cache;
+
/**
* Preparing step properties.
*
* @constructor
* @param FixtureFactory $fixtureFactory
* @param AdminCache $adminCache
+ * @param Cache $cache
* @param string $configData
* @param bool $rollback
* @param bool $flushCache
@@ -63,6 +72,7 @@ class SetupConfigurationStep implements TestStepInterface
public function __construct(
FixtureFactory $fixtureFactory,
AdminCache $adminCache,
+ Cache $cache,
$configData = null,
$rollback = false,
$flushCache = false
@@ -72,6 +82,7 @@ class SetupConfigurationStep implements TestStepInterface
$this->configData = $configData;
$this->rollback = $rollback;
$this->flushCache = $flushCache;
+ $this->cache = $cache;
}
/**
@@ -95,13 +106,11 @@ class SetupConfigurationStep implements TestStepInterface
$config->persist();
$result[] = $config;
}
+ if ($this->flushCache) {
+ $this->cache->flush();
+ }
}
-
- if ($this->flushCache) {
- $this->adminCache->open();
- $this->adminCache->getActionsBlock()->flushMagentoCache();
- $this->adminCache->getMessagesBlock()->waitSuccessMessage();
- }
+
return ['config' => $result];
}
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertCurrencyRateAppliedOnProductPage.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertCurrencyRateAppliedOnProductPage.php
new file mode 100644
index 0000000000000000000000000000000000000000..6f3cfc48cdd553fea81ef9681f24e5799273af5e
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertCurrencyRateAppliedOnProductPage.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\ConfigurableProduct\Test\Constraint;
+
+use Magento\Catalog\Test\Page\Product\CatalogProductView;
+use Magento\Cms\Test\Page\CmsIndex;
+use Magento\CurrencySymbol\Test\Fixture\CurrencySymbolEntity;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
+
+/**
+ * Assert currency rate applied on configurable product page.
+ */
+class AssertCurrencyRateAppliedOnProductPage extends AbstractConstraint
+{
+ /**
+ * Assert currency rate applied on configurable product page.
+ *
+ * @param BrowserInterface $browser
+ * @param InjectableFixture $product
+ * @param CatalogProductView $view
+ * @param CmsIndex $cmsIndex
+ * @param CurrencySymbolEntity $baseCurrency
+ * @param array $configuredPrices
+ * @param string $basePrice
+ */
+ public function processAssert(
+ BrowserInterface $browser,
+ InjectableFixture $product,
+ CatalogProductView $view,
+ CmsIndex $cmsIndex,
+ CurrencySymbolEntity $baseCurrency,
+ array $configuredPrices,
+ $basePrice
+ ) {
+ $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
+ $this->assertPrice($view, $basePrice);
+
+ $view->getViewBlock()->configure($product);
+ $this->assertPrice($view, $configuredPrices['custom_currency']);
+
+ $cmsIndex->getCurrencyBlock()->switchCurrency($baseCurrency);
+ $view->getViewBlock()->configure($product);
+ $this->assertPrice($view, $configuredPrices['base_currency']);
+ }
+
+ /**
+ * Assert price.
+ *
+ * @param CatalogProductView $view
+ * @param string $price
+ * @param string $currency [optional]
+ */
+ public function assertPrice(CatalogProductView $view, $price, $currency = '')
+ {
+ \PHPUnit_Framework_Assert::assertEquals(
+ $price,
+ $view->getViewBlock()->getPriceBlock()->getPrice($currency),
+ 'Wrong price is displayed on Product page.'
+ );
+ }
+
+ /**
+ * Returns a string representation of successful assertion.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return "Currency rate has been applied correctly on Configurable Product page.";
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct/ConfigurableAttributesData.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct/ConfigurableAttributesData.php
index 65f80eb7144638b59e61a984c27582a316e9b129..65715d116ab45780dcacae89ef987a16e9127ceb 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct/ConfigurableAttributesData.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct/ConfigurableAttributesData.php
@@ -277,10 +277,12 @@ class ConfigurableAttributesData extends DataSource
$variationsMatrix = $this->addVariationMatrix($variationsMatrix, $attribute, $attributeKey);
}
- foreach ($data['matrix'] as $key => $value) {
- if (isset($value['sku']) && $value['sku'] === '') {
- unset($variationsMatrix[$key]['sku']);
- unset($data['matrix'][$key]['sku']);
+ if (isset($data['matrix'])) {
+ foreach ($data['matrix'] as $key => $value) {
+ if (isset($value['sku']) && $value['sku'] === '') {
+ unset($variationsMatrix[$key]['sku']);
+ unset($data['matrix'][$key]['sku']);
+ }
}
}
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateCurrencyRateTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateCurrencyRateTest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6ba7729120ae909591f0703c36b83b51f2ea8aa0
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateCurrencyRateTest.xml
@@ -0,0 +1,28 @@
+<?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\Directory\Test\TestCase\CreateCurrencyRateTest" summary="Create Currency Rate" ticketId="MAGETWO-36824">
+ <variation name="CreateCurrencyRateTestVariation3">
+ <data name="currencyRate/data/currency_from" xsi:type="string">USD</data>
+ <data name="currencyRate/data/currency_to" xsi:type="string">UAH</data>
+ <data name="currencyRate/data/rate" xsi:type="number">2.000</data>
+ <data name="currencySymbol/dataSet" xsi:type="string">currency_symbols_uah</data>
+ <data name="product" xsi:type="string">configurableProduct::default</data>
+ <data name="config/dataset" xsi:type="string">config_base_currency_us_display_currency_uah</data>
+ <data name="baseCurrency/data/code" xsi:type="string">USD</data>
+ <data name="basePrice" xsi:type="string">â‚´80.00</data>
+ <data name="configuredPrices" xsi:type="array">
+ <item name="custom_currency" xsi:type="string">â‚´80.00</item>
+ <item name="base_currency" xsi:type="string">$40.00</item>
+ </data>
+ <data name="tag" xsi:type="string">test_type:acceptance_test</data>
+ <constraint name="Magento\Directory\Test\Constraint\AssertCurrencyRateSuccessSaveMessage" />
+ <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertCurrencyRateAppliedOnProductPage" />
+ </variation>
+ </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Repository/ConfigData.xml
index 9df42574840d692ced41a85979d63de6bf7c467f..3a099d79d370a97b9d75afb419bd36860e559a1a 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Repository/ConfigData.xml
@@ -48,6 +48,18 @@
<item name="US Dollar" xsi:type="string">USD</item>
</item>
</field>
+ <field name="currency/options/base" xsi:type="array">
+ <item name="scope" xsi:type="string">currency</item>
+ <item name="label" xsi:type="string">US Dollar</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="value" xsi:type="string">USD</item>
+ </field>
+ <field name="currency/options/default" xsi:type="array">
+ <item name="scope" xsi:type="string">currency</item>
+ <item name="label" xsi:type="string">US Dollar</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="value" xsi:type="string">USD</item>
+ </field>
</dataset>
<dataset name="config_base_currency_ch">
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationPopup.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationPopup.php
index c4fcfd569490a6ac1f2ae68c2068d4f110f594bb..cc23998f60ac2ced653c294313cfa54eb98ef5a9 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationPopup.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationPopup.php
@@ -18,7 +18,7 @@ class AuthenticationPopup extends Form
*
* @var string
*/
- private $login = '[name="send"]';
+ private $login = '.action.action-login.secondary';
/**
* Selector for loading mask element.
@@ -27,6 +27,23 @@ class AuthenticationPopup extends Form
*/
private $loadingMask = '.loading-mask';
+ /**
+ * 'Create an Account' button.
+ *
+ * @var string
+ */
+ protected $createAccountButton = '.action.action-register.primary';
+
+ /**
+ * Click 'Create an Account' button.
+ *
+ * @return void
+ */
+ public function createAccount()
+ {
+ $this->_rootElement->find($this->createAccountButton)->click();
+ }
+
/**
* Login customer on authentication popup.
*
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationWrapper.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationWrapper.php
new file mode 100644
index 0000000000000000000000000000000000000000..56e7cf257f15c80b34144b78ae07e70405f77e3e
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationWrapper.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Test\Block\Account;
+
+use Magento\Mtf\Block\Form;
+use Magento\Customer\Test\Fixture\Customer;
+
+/**
+ * Authentication wrapper block.
+ */
+class AuthenticationWrapper extends AuthenticationPopup
+{
+ /**
+ * 'Sign In' link.
+ *
+ * @var string
+ */
+ protected $signInLink = '[data-trigger="authentication"]';
+
+ /**
+ * Click on 'Sign In' link.
+ *
+ * @return void
+ */
+ public function signInLinkClick()
+ {
+ $this->_rootElement->find($this->signInLink)->click();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationWrapper.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationWrapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1bcb31c45dc391ed4d26457f74ed984812b3be57
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationWrapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<mapping strict="1">
+ <fields>
+ <email>
+ <selector>[id='login-email']</selector>
+ </email>
+ <password>
+ <selector>[id='login-password']</selector>
+ </password>
+ </fields>
+</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Renderer.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Renderer.php
index 832c376e6435708e0e7e2e632f79e20e769b21cb..fa654599932c3d0726313dc5666e1af2f2e20751 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Renderer.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Renderer.php
@@ -53,6 +53,16 @@ class Renderer
. "{{city}}, {{{$region}}}, {{postcode}}\n{{country_id}}\n{{depend}}T: {{telephone}}{{/depend}}"
. "{{depend}}\nF: {{fax}}{{/depend}}{{depend}}\nVAT: {{vat_id}}{{/depend}}";
break;
+ case "html_without_company":
+ $outputPattern = "{{depend}}{{prefix}} {{/depend}}{{firstname}} {{depend}}{{middlename}} {{/depend}}"
+ . "{{lastname}}{{depend}} {{suffix}}{{/depend}}\n{{/depend}}{{street}}\n"
+ . "{{city}}, {{{$region}}} {{postcode}}\n{{country_id}}\n{{depend}}{{telephone}}{{/depend}}";
+ break;
+ case "html_for_select_element":
+ $outputPattern = "{{depend}}{{prefix}} {{/depend}}{{firstname}} {{depend}}{{middlename}} {{/depend}}"
+ . "{{lastname}}{{depend}} {{suffix}}{{/depend}}, {{/depend}}{{street}}, "
+ . "{{city}}, {{{$region}}} {{postcode}}, {{country_id}}";
+ break;
case "oneline":
default:
$outputPattern = "{{depend}}{{prefix}} {{/depend}}{{firstname}} {{depend}}{{middlename}} {{/depend}}"
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddressFrontendAddressBook.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddressFrontendAddressBook.php
index a95a0ba98e3bf7b751007fbb69ea841c77c6ceea..6ede7c49a070db88608296637595d986498e923b 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddressFrontendAddressBook.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddressFrontendAddressBook.php
@@ -6,9 +6,10 @@
namespace Magento\Customer\Test\Constraint;
+use Magento\Customer\Test\Block\Address\Renderer;
use Magento\Customer\Test\Fixture\Address;
-use Magento\Customer\Test\Page\CustomerAccountIndex;
use Magento\Customer\Test\Page\CustomerAccountAddress;
+use Magento\Customer\Test\Page\CustomerAccountIndex;
use Magento\Mtf\Constraint\AbstractConstraint;
/**
@@ -20,25 +21,32 @@ class AssertCustomerDefaultAddressFrontendAddressBook extends AbstractConstraint
* Asserts that Default Billing Address and Default Shipping Address equal to data from fixture.
*
* @param CustomerAccountIndex $customerAccountIndex
- * @param CustomerAccountAddress $customerAccountAddress
- * @param Address $address
+ * @param CustomerAccountAddress $customerAddress
+ * @param Address|null $shippingAddress
+ * @param Address|null $billingAddress
* @return void
*/
public function processAssert(
CustomerAccountIndex $customerAccountIndex,
- CustomerAccountAddress $customerAccountAddress,
- Address $address
+ CustomerAccountAddress $customerAddress,
+ Address $shippingAddress,
+ Address $billingAddress = null
) {
+ $customerAccountIndex->open();
$customerAccountIndex->getAccountMenuBlock()->openMenuItem('Address Book');
- $addressRenderer = $this->objectManager->create(
- \Magento\Customer\Test\Block\Address\Renderer::class,
- ['address' => $address, 'type' => 'html']
- );
- $addressToVerify = $addressRenderer->render();
+
+ $shippingAddressRendered = $this->createAddressRenderer($shippingAddress)->render();
+ $validated =
+ $shippingAddressRendered == $customerAddress->getDefaultAddressBlock()->getDefaultShippingAddress();
+
+ if (null !== $billingAddress) {
+ $billingAddressRendered = $customerAddress->getDefaultAddressBlock()->getDefaultBillingAddress();
+ $validated =
+ $validated && ($billingAddressRendered == $this->createAddressRenderer($billingAddress)->render());
+ }
\PHPUnit_Framework_Assert::assertTrue(
- $addressToVerify == $customerAccountAddress->getDefaultAddressBlock()->getDefaultBillingAddress()
- && $addressToVerify == $customerAccountAddress->getDefaultAddressBlock()->getDefaultShippingAddress(),
+ $validated,
'Customer default address on address book tab is not matching the fixture.'
);
}
@@ -52,4 +60,18 @@ class AssertCustomerDefaultAddressFrontendAddressBook extends AbstractConstraint
{
return 'Default billing and shipping address form is correct.';
}
+
+ /**
+ * Instantiate Renderer object.
+ *
+ * @param Address $address
+ * @return Renderer
+ */
+ private function createAddressRenderer(Address $address)
+ {
+ return $this->objectManager->create(
+ Renderer::class,
+ ['address' => $address, 'type' => 'html']
+ );
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupChangedToDefaultOnCustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupChangedToDefaultOnCustomerForm.php
index 392a594c25c33db5fd89aee78a4c8bdce37df0fc..e489b6faf00526721ec894c74a0e3fe0de3ee0b5 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupChangedToDefaultOnCustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupChangedToDefaultOnCustomerForm.php
@@ -32,7 +32,7 @@ class AssertCustomerGroupChangedToDefaultOnCustomerForm extends AbstractConstrai
CustomerIndexNew $customerIndexEdit
) {
$customerIndexEdit->open(['id' => $customer->getId()]);
- $customerFormData = $customerIndexNew->getCustomerForm()->getData();
+ $customerFormData = $customerIndexNew->getCustomerForm()->getData($customer);
\PHPUnit_Framework_Assert::assertTrue(
$customerFormData['group_id'] == $defaultCustomerGroup->getCustomerGroupCode(),
"Customer group not set to default after group was deleted."
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Customer/Curl.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Customer/Curl.php
index ddb20b29e063a734545787c6194e1a24a894d2e8..f880983074576396646ed0dc10be2ebb12c6b708 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Customer/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Customer/Curl.php
@@ -32,7 +32,8 @@ class Curl extends AbstractCurl implements CustomerInterface
protected $mappingData = [
'country_id' => [
'United States' => 'US',
- 'United Kingdom' => 'GB'
+ 'United Kingdom' => 'GB',
+ 'Germany' => 'DE'
],
'gender' => [
'Male' => 1,
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Customer/Webapi.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Customer/Webapi.php
index 8873e71610de0eafe4e7e7e2ff7afa8d25ce6eaf..aa63bfa50f052096d0468b5df6e8c12e7c1075af 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Customer/Webapi.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Customer/Webapi.php
@@ -33,7 +33,8 @@ class Webapi extends AbstractWebapi implements CustomerInterface
],
'country_id' => [
'United States' => 'US',
- 'United Kingdom' => 'GB'
+ 'United Kingdom' => 'GB',
+ 'Germany' => 'DE'
],
'region_id' => [
'California' => 12,
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.xml
index 70191dc828af7aecada34068c5d0e93cce4736ee..ba85d0d13bfc68761ea562802f259dcda28ff738 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.xml
@@ -189,6 +189,18 @@
<field name="telephone" xsi:type="string">555-55-555-55</field>
</dataset>
+ <dataset name="UK_address_2_without_email">
+ <field name="firstname" xsi:type="string">Billy</field>
+ <field name="lastname" xsi:type="string">Holiday</field>
+ <field name="company" xsi:type="string">Magento %isolation%</field>
+ <field name="city" xsi:type="string">Liverpool</field>
+ <field name="street" xsi:type="string">99 Henry St</field>
+ <field name="postcode" xsi:type="string">SE1 7RW</field>
+ <field name="country_id" xsi:type="string">United Kingdom</field>
+ <field name="region" xsi:type="string">Liverpool</field>
+ <field name="telephone" xsi:type="string">555-55-555-55</field>
+ </dataset>
+
<dataset name="UK_address_without_email">
<field name="firstname" xsi:type="string">Jane</field>
<field name="lastname" xsi:type="string">Doe</field>
@@ -219,13 +231,59 @@
<dataset name="DE_address">
<field name="firstname" xsi:type="string">Jan</field>
<field name="lastname" xsi:type="string">Jansen</field>
+ <field name="email" xsi:type="string">JaneDoe_%isolation%@example.com</field>
<field name="company" xsi:type="string">Magento %isolation%</field>
<field name="city" xsi:type="string">Berlin</field>
<field name="street" xsi:type="string">Augsburger Strabe 41</field>
<field name="postcode" xsi:type="string">10789</field>
<field name="country_id" xsi:type="string">Germany</field>
- <field name="region_id" xsi:type="string">Berlin</field>
+ <field name="region" xsi:type="string">Berlin</field>
+ <field name="telephone" xsi:type="string">333-33-333-33</field>
+ </dataset>
+
+ <dataset name="DE_address_Frankfurt">
+ <field name="firstname" xsi:type="string">Jan</field>
+ <field name="lastname" xsi:type="string">Jansen</field>
+ <field name="company" xsi:type="string">Magento %isolation%</field>
+ <field name="city" xsi:type="string">Frankfurt</field>
+ <field name="street" xsi:type="string">Marzellenstrasse 13-17</field>
+ <field name="postcode" xsi:type="string">10789</field>
+ <field name="country_id" xsi:type="string">Germany</field>
+ <field name="region" xsi:type="string">Hessen</field>
<field name="telephone" xsi:type="string">333-33-333-33</field>
</dataset>
+
+ <dataset name="KE_Nairobi">
+ <field name="firstname" xsi:type="string">John</field>
+ <field name="lastname" xsi:type="string">Doe</field>
+ <field name="company" xsi:type="string">Magento %isolation%</field>
+ <field name="city" xsi:type="string">Nairobi</field>
+ <field name="street" xsi:type="string">6161 West Centinela Avenue</field>
+ <field name="telephone" xsi:type="string">555-55-555-55</field>
+ <field name="country_id" xsi:type="string">Kenya</field>
+ <field name="postcode" xsi:type="string">12345</field>
+ </dataset>
+
+ <dataset name="KE_Mombasa">
+ <field name="firstname" xsi:type="string">John</field>
+ <field name="lastname" xsi:type="string">Doe</field>
+ <field name="company" xsi:type="string">Magento %isolation%</field>
+ <field name="city" xsi:type="string">Mombasa</field>
+ <field name="street" xsi:type="string">6161 West Centinela Avenue</field>
+ <field name="telephone" xsi:type="string">555-55-555-55</field>
+ <field name="country_id" xsi:type="string">Kenya</field>
+ <field name="postcode" xsi:type="string">12345</field>
+ </dataset>
+
+ <dataset name="customer_UK_US_addresses">
+ <field name="firstname" xsi:type="string">John</field>
+ <field name="lastname" xsi:type="string">Doe%isolation%</field>
+ <field name="email" xsi:type="string">John.Doe%isolation%@example.com</field>
+ <field name="password" xsi:type="string">123123^q</field>
+ <field name="password_confirmation" xsi:type="string">123123^q</field>
+ <field name="address" xsi:type="array">
+ <item name="dataset" xsi:type="string">UK_address_default_billing, US_address_default_shipping</item>
+ </field>
+ </dataset>
</repository>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Customer.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Customer.xml
index 0892fac420357cc04c905252eac8cb58127865f9..3be7447c91dad863564835d08b459b6addfd86f5 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Customer.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Customer.xml
@@ -186,5 +186,30 @@
<item name="dataset" xsi:type="string">UK_address_with_VAT</item>
</field>
</dataset>
+
+ <dataset name="customer_UK_US_addresses">
+ <field name="firstname" xsi:type="string">John</field>
+ <field name="lastname" xsi:type="string">Doe%isolation%</field>
+ <field name="email" xsi:type="string">John.Doe%isolation%@example.com</field>
+ <field name="password" xsi:type="string">123123^q</field>
+ <field name="password_confirmation" xsi:type="string">123123^q</field>
+ <field name="address" xsi:type="array">
+ <item name="dataset" xsi:type="string">UK_address_default_billing, US_address_default_shipping</item>
+ </field>
+ </dataset>
+
+ <dataset name="customer_US_DE_UK">
+ <field name="firstname" xsi:type="string">John</field>
+ <field name="lastname" xsi:type="string">Doe%isolation%</field>
+ <field name="group_id" xsi:type="array">
+ <item name="dataset" xsi:type="string">General</item>
+ </field>
+ <field name="email" xsi:type="string">JohnDoe_%isolation%@example.com</field>
+ <field name="password" xsi:type="string">123123^q</field>
+ <field name="password_confirmation" xsi:type="string">123123^q</field>
+ <field name="address" xsi:type="array">
+ <item name="dataset" xsi:type="string">US_address, DE_address, UK_address</item>
+ </field>
+ </dataset>
</repository>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/GridFilteringTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/GridFilteringTest.xml
index 918f723981faac5a3a919caaf99ac9e75b0bf1bd..42a3103ce33d7615fcbfd06084bebfa965769b60 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/GridFilteringTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/GridFilteringTest.xml
@@ -8,6 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Ui\Test\TestCase\GridFilteringTest" summary="Grid UI Component Filtering" ticketId="MAGETWO-41329">
<variation name="CustomerGridFiltering">
+ <data name="tag" xsi:type="string">severity:S2</data>
<data name="description" xsi:type="string">Verify customer page grid filtering</data>
<data name="itemsCount" xsi:type="string">2</data>
<data name="fixtureName" xsi:type="string">customer</data>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/GridFullTextSearchTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/GridFullTextSearchTest.xml
index 00a2955be126a67b96d6ff8b03c706fe3b98d802..ef0bf7b7cea72e941840f103bb3700d66f06404c 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/GridFullTextSearchTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/GridFullTextSearchTest.xml
@@ -8,6 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Ui\Test\TestCase\GridFullTextSearchTest" summary="Grid UI Component Full Text Search" ticketId="MAGETWO-41023">
<variation name="CustomerGridFullTextSearch">
+ <data name="tag" xsi:type="string">severity:S2</data>
<data name="description" xsi:type="string">Verify customer page grid full text search</data>
<data name="itemsCount" xsi:type="string">2</data>
<data name="fixtureName" xsi:type="string">customer</data>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/GridSortingTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/GridSortingTest.xml
index b967fbd184526fd1d71fcf2055799842d0d018f1..7d6e7f6d8f1b4f3a2402e0ae1b659f60c941c63d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/GridSortingTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/GridSortingTest.xml
@@ -8,6 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Ui\Test\TestCase\GridSortingTest" summary="Grid UI Component Sorting" ticketId="MAGETWO-41328">
<variation name="CustomerGridSorting">
+ <data name="tag" xsi:type="string">severity:S2</data>
<data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">Verify customer page grid sorting</data>
<data name="columnsForSorting" xsi:type="array">
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php
index 34338371d45af849f54956588aee5a97c0f75ecd..b3d41a911af41d424ee6fcab048db42a8da8aa17 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php
@@ -156,6 +156,10 @@ class UpdateCustomerFrontendEntityTest extends Injectable
$this->customerAddressEdit->getEditForm()->fill($address);
$this->customerAddressEdit->getEditForm()->saveAddress();
- return ['customer' => $this->prepareCustomer($customer, $initialCustomer)];
+ return [
+ 'customer' => $this->prepareCustomer($customer, $initialCustomer),
+ 'shippingAddress' => $address,
+ 'billingAddress' => $address
+ ];
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateCustomerStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateCustomerStep.php
index f3be4e8b89cfdc916426280bb63c806565226ad1..4beb9207f4f29883e035558e6ba0b1e256ea08ed 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateCustomerStep.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateCustomerStep.php
@@ -46,7 +46,9 @@ class CreateCustomerStep implements TestStepInterface
{
$this->logoutCustomerOnFrontend = $logout;
$this->customer = $customer;
- if ($checkoutMethod === 'register' || $checkoutMethod === 'guest') {
+ if ($checkoutMethod === 'register'
+ || $checkoutMethod === 'guest'
+ || $checkoutMethod === 'register_before_checkout') {
$this->persistCustomer = false;
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Dhl/Test/TestCase/CityBasedShippingRateTest.xml b/dev/tests/functional/tests/app/Magento/Dhl/Test/TestCase/CityBasedShippingRateTest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e54439c8cd05c5537542d1769d58714d89fc4fb2
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Dhl/Test/TestCase/CityBasedShippingRateTest.xml
@@ -0,0 +1,44 @@
+<?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\Shipping\Test\TestCase\CityBasedShippingRateTest" summary="Shipping rates can be reloaded based on changes in City field value">
+ <variation name="CityBasedShippingRateDHLTestVariation" summary="Shipping rates can be reloaded based on changes in City field value for DHL shipping method" ticketId="MAGETWO-56124">
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
+ <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
+ <data name="checkoutMethod" xsi:type="string">guest</data>
+ <data name="customer/dataset" xsi:type="string">default</data>
+ <data name="shippingMethod/shipping_service" xsi:type="string">DHL</data>
+ <data name="shippingMethod/shipping_method" xsi:type="string">Express easy</data>
+ <data name="clearShippingAddress/postcode" xsi:type="string" />
+ <data name="clearShippingAddress/city" xsi:type="string" />
+ <data name="clearShippingAddress/country_id" xsi:type="string" />
+ <data name="shippingAddresses/0/country_id" xsi:type="string">Kenya</data>
+ <data name="shippingAddresses/1/country_id" xsi:type="string">Kenya</data>
+ <data name="shippingAddresses/1/postcode" xsi:type="string">12345</data>
+ <data name="shippingAddresses/2/country_id" xsi:type="string">Kenya</data>
+ <data name="shippingAddresses/2/postcode" xsi:type="string">12345</data>
+ <data name="shippingAddresses/2/city" xsi:type="string">Nairobi</data>
+ <data name="shippingAddresses/3/country_id" xsi:type="string">Kenya</data>
+ <data name="shippingAddresses/3/postcode" xsi:type="string">12345</data>
+ <data name="shippingAddresses/3/city" xsi:type="string">Mombasa</data>
+ <data name="shippingAddresses/4/country_id" xsi:type="string">Kenya</data>
+ <data name="shippingAddresses/4/city" xsi:type="string">Mombasa</data>
+ <data name="shippingAddresses/5/country_id" xsi:type="string">Kenya</data>
+ <data name="shippingAddresses/5/city" xsi:type="string">Nairobi</data>
+ <data name="isShippingAvailable" xsi:type="array">
+ <item name="0" xsi:type="boolean">false</item>
+ <item name="1" xsi:type="boolean">false</item>
+ <item name="2" xsi:type="boolean">true</item>
+ <item name="3" xsi:type="boolean">true</item>
+ <item name="4" xsi:type="boolean">true</item>
+ <item name="5" xsi:type="boolean">true</item>
+ </data>
+ <data name="configData" xsi:type="string">dhl_eu, shipping_origin_CH, config_base_currency_ch</data>
+ </variation>
+ </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertCurrencyRateAppliedOnProductPage.php b/dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertCurrencyRateAppliedOnProductPage.php
new file mode 100644
index 0000000000000000000000000000000000000000..4b8f3825df8bab870a272e3db20864118db25079
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertCurrencyRateAppliedOnProductPage.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Directory\Test\Constraint;
+
+use Magento\Catalog\Test\Page\Product\CatalogProductView;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
+
+/**
+ * Assert currency rate applied on product page.
+ */
+class AssertCurrencyRateAppliedOnProductPage extends AbstractConstraint
+{
+ /**
+ * Assert currency rate applied on product page.
+ *
+ * @param BrowserInterface $browser
+ * @param InjectableFixture $product
+ * @param CatalogProductView $view
+ * @param string $basePrice
+ */
+ public function processAssert(
+ BrowserInterface $browser,
+ InjectableFixture $product,
+ CatalogProductView $view,
+ $basePrice
+ ) {
+ $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
+ $this->assertPrice($view, $basePrice);
+ }
+
+ /**
+ * Assert price.
+ *
+ * @param CatalogProductView $view
+ * @param string $price
+ * @param string $currency [optional]
+ */
+ public function assertPrice(CatalogProductView $view, $price, $currency = '')
+ {
+ \PHPUnit_Framework_Assert::assertEquals(
+ $price,
+ $view->getViewBlock()->getPriceBlock()->getPrice($currency),
+ 'Wrong price is displayed on Product page.'
+ );
+ }
+
+ /**
+ * Returns a string representation of successful assertion.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return "Currency rate has been applied correctly on Product page.";
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Directory/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Directory/Test/Repository/ConfigData.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7046437a0f4e2916aaa21e7eca1b902794aa8b9d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Directory/Test/Repository/ConfigData.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * 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/Magento/Mtf/Repository/etc/repository.xsd">
+ <repository class="Magento\Config\Test\Repository\ConfigData">
+ <dataset name="config_base_currency_us_display_currency_uah">
+ <field name="currency/options/allow" xsi:type="array">
+ <item name="scope" xsi:type="string">currency</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="value" xsi:type="array">
+ <item name="Ukrainian Hryvnia" xsi:type="string">UAH</item>
+ <item name="US Dollar" xsi:type="string">USD</item>
+ </item>
+ </field>
+ <field name="currency/options/base" xsi:type="array">
+ <item name="scope" xsi:type="string">currency</item>
+ <item name="label" xsi:type="string">US Dollar</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="value" xsi:type="string">USD</item>
+ </field>
+ <field name="currency/options/default" xsi:type="array">
+ <item name="scope" xsi:type="string">currency</item>
+ <item name="label" xsi:type="string">Ukrainian Hryvnia</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="value" xsi:type="string">UAH</item>
+ </field>
+ </dataset>
+ </repository>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Directory/Test/TestCase/CreateCurrencyRateTest.php b/dev/tests/functional/tests/app/Magento/Directory/Test/TestCase/CreateCurrencyRateTest.php
index bc40a2ab98f6d913b80736346c7c06ef6f1c7f9e..c7841934035cadcf40b55931f748948427504652 100644
--- a/dev/tests/functional/tests/app/Magento/Directory/Test/TestCase/CreateCurrencyRateTest.php
+++ b/dev/tests/functional/tests/app/Magento/Directory/Test/TestCase/CreateCurrencyRateTest.php
@@ -6,11 +6,12 @@
namespace Magento\Directory\Test\TestCase;
+use Magento\Catalog\Test\TestStep\CreateProductsStep;
use Magento\Config\Test\Fixture\ConfigData;
use Magento\Mtf\TestCase\Injectable;
use Magento\Directory\Test\Fixture\CurrencyRate;
-use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\CurrencySymbol\Test\Page\Adminhtml\SystemCurrencyIndex;
+use Magento\Mtf\TestStep\TestStepFactory;
/**
* Preconditions:
@@ -41,35 +42,48 @@ class CreateCurrencyRateTest extends Injectable
*/
protected $currencyIndexPage;
+ /**
+ * Test step factory.
+ *
+ * @var TestStepFactory
+ */
+ private $stepFactory;
+
/**
* Inject data.
*
* @param SystemCurrencyIndex $currencyIndexPage
- * @return void
+ * @param TestStepFactory $stepFactory
*/
- public function __inject(SystemCurrencyIndex $currencyIndexPage)
+ public function __inject(SystemCurrencyIndex $currencyIndexPage, TestStepFactory $stepFactory)
{
$this->currencyIndexPage = $currencyIndexPage;
+ $this->stepFactory = $stepFactory;
}
/**
* Create currency rate test.
*
* @param CurrencyRate $currencyRate
- * @param CatalogProductSimple $product
- * @param $config
- * @return void
+ * @param ConfigData $config
+ * @param string $product
+ * @param array $productData [optional]
+ * @return array
*/
- public function test(CurrencyRate $currencyRate, CatalogProductSimple $product, ConfigData $config)
+ public function test(CurrencyRate $currencyRate, ConfigData $config, $product, array $productData = [])
{
// Preconditions:
- $product->persist();
+ $product = $this->stepFactory
+ ->create(CreateProductsStep::class, ['products' => [$product], 'data' => $productData])
+ ->run()['products'][0];
$config->persist();
// Steps:
$this->currencyIndexPage->open();
$this->currencyIndexPage->getCurrencyRateForm()->fill($currencyRate);
$this->currencyIndexPage->getFormPageActions()->save();
+
+ return ['product' => $product];
}
/**
diff --git a/dev/tests/functional/tests/app/Magento/Directory/Test/TestCase/CreateCurrencyRateTest.xml b/dev/tests/functional/tests/app/Magento/Directory/Test/TestCase/CreateCurrencyRateTest.xml
index dd42950c18a78175ce51fb7cfce85fe7fbc85a0c..e984cad9ca327aa2a0896e44fc85e365e9f24503 100644
--- a/dev/tests/functional/tests/app/Magento/Directory/Test/TestCase/CreateCurrencyRateTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Directory/Test/TestCase/CreateCurrencyRateTest.xml
@@ -13,12 +13,25 @@
<data name="currencyRate/data/currency_to" xsi:type="string">EUR</data>
<data name="currencyRate/data/rate" xsi:type="number">0.8</data>
<data name="currencySymbol/dataset" xsi:type="string">currency_symbols_eur</data>
- <data name="product/dataset" xsi:type="string">simple_10_dollar</data>
+ <data name="product" xsi:type="string">catalogProductSimple::simple_10_dollar</data>
<data name="config/dataset" xsi:type="string">config_currency_symbols_usd_and_eur</data>
<data name="basePrice" xsi:type="string">$10.00</data>
<data name="convertedPrice" xsi:type="string">€8.00</data>
<constraint name="Magento\Directory\Test\Constraint\AssertCurrencyRateSuccessSaveMessage" />
<constraint name="Magento\Directory\Test\Constraint\AssertCurrencyRateAppliedOnCatalogPage" />
</variation>
+ <variation name="CreateCurrencyRateTestVariation2">
+ <data name="currencyRate/data/currency_from" xsi:type="string">USD</data>
+ <data name="currencyRate/data/currency_to" xsi:type="string">UAH</data>
+ <data name="currencyRate/data/rate" xsi:type="number">2.000</data>
+ <data name="currencySymbol/dataSet" xsi:type="string">currency_symbols_uah</data>
+ <data name="product" xsi:type="string">catalogProductSimple::simple_10_dollar</data>
+ <data name="productData/0/custom_options/dataset" xsi:type="string">not_required_text_option</data>
+ <data name="config/dataset" xsi:type="string">config_base_currency_us_display_currency_uah</data>
+ <data name="basePrice" xsi:type="string">â‚´20.00</data>
+ <data name="tag" xsi:type="string">test_type:acceptance_test</data>
+ <constraint name="Magento\Directory\Test\Constraint\AssertCurrencyRateSuccessSaveMessage" />
+ <constraint name="Magento\Directory\Test\Constraint\AssertCurrencyRateAppliedOnProductPage" />
+ </variation>
</testCase>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/CityBasedShippingRateTest.xml b/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/CityBasedShippingRateTest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b6a2fd5776a27d307e7c0f8372438b42f38fd7f5
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/CityBasedShippingRateTest.xml
@@ -0,0 +1,44 @@
+<?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\Shipping\Test\TestCase\CityBasedShippingRateTest" summary="Shipping rates can be reloaded based on changes in City field value">
+ <variation name="CityBasedShippingRateFedexTestVariation" summary="Shipping rates can be reloaded based on changes in City field value for Fedex shipping method" ticketId="MAGETWO-56124">
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
+ <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
+ <data name="checkoutMethod" xsi:type="string">guest</data>
+ <data name="customer/dataset" xsi:type="string">default</data>
+ <data name="shippingMethod/shipping_service" xsi:type="string">Federal Express</data>
+ <data name="shippingMethod/shipping_method" xsi:type="string">International Economy</data>
+ <data name="clearShippingAddress/postcode" xsi:type="string" />
+ <data name="clearShippingAddress/city" xsi:type="string" />
+ <data name="clearShippingAddress/country_id" xsi:type="string" />
+ <data name="shippingAddresses/0/country_id" xsi:type="string">Kenya</data>
+ <data name="shippingAddresses/1/country_id" xsi:type="string">Kenya</data>
+ <data name="shippingAddresses/1/postcode" xsi:type="string">12345</data>
+ <data name="shippingAddresses/2/country_id" xsi:type="string">Kenya</data>
+ <data name="shippingAddresses/2/postcode" xsi:type="string">12345</data>
+ <data name="shippingAddresses/2/city" xsi:type="string">Nairobi</data>
+ <data name="shippingAddresses/3/country_id" xsi:type="string">Kenya</data>
+ <data name="shippingAddresses/3/postcode" xsi:type="string">12345</data>
+ <data name="shippingAddresses/3/city" xsi:type="string">Mombasa</data>
+ <data name="shippingAddresses/4/country_id" xsi:type="string">Kenya</data>
+ <data name="shippingAddresses/4/city" xsi:type="string">Mombasa</data>
+ <data name="shippingAddresses/5/country_id" xsi:type="string">Kenya</data>
+ <data name="shippingAddresses/5/city" xsi:type="string">Nairobi</data>
+ <data name="isShippingAvailable" xsi:type="array">
+ <item name="0" xsi:type="boolean">false</item>
+ <item name="1" xsi:type="boolean">true</item>
+ <item name="2" xsi:type="boolean">true</item>
+ <item name="3" xsi:type="boolean">true</item>
+ <item name="4" xsi:type="boolean">false</item>
+ <item name="5" xsi:type="boolean">false</item>
+ </data>
+ <data name="configData" xsi:type="string">fedex, shipping_origin_US_CA</data>
+ </variation>
+ </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Repository/ConfigData.xml
index f6450b86c511adb44b615d7d97c6bc8495e5049e..08d4506b3c05461975797ec3ec31a11b63674304 100644
--- a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Repository/ConfigData.xml
@@ -29,6 +29,40 @@
<item name="value" xsi:type="string">10</item>
</field>
</dataset>
+ <dataset name="layered_navigation_automatic_equalize_price_range">
+ <field name="catalog/layered_navigation/display_product_count" xsi:type="array">
+ <item name="scope" xsi:type="string">default</item>
+ <item name="scope_id" xsi:type="number">0</item>
+ <item name="value" label="Yes" xsi:type="string">1</item>
+ </field>
+ <field name="catalog/layered_navigation/price_range_calculation" xsi:type="array">
+ <item name="scope" xsi:type="string">default</item>
+ <item name="scope_id" xsi:type="number">0</item>
+ <item name="value" label="Automatic (equalize price ranges)" xsi:type="string">auto</item>
+ </field>
+ </dataset>
+ <dataset name="layered_navigation_automatic_equalize_product_counts">
+ <field name="catalog/layered_navigation/display_product_count" xsi:type="array">
+ <item name="scope" xsi:type="string">default</item>
+ <item name="scope_id" xsi:type="number">0</item>
+ <item name="value" label="Yes" xsi:type="string">1</item>
+ </field>
+ <field name="catalog/layered_navigation/price_range_calculation" xsi:type="array">
+ <item name="scope" xsi:type="string">default</item>
+ <item name="scope_id" xsi:type="number">0</item>
+ <item name="value" label="Automatic (equalize product counts)" xsi:type="string">improved</item>
+ </field>
+ <field name="catalog/layered_navigation/one_price_interval" xsi:type="array">
+ <item name="scope" xsi:type="string">default</item>
+ <item name="scope_id" xsi:type="number">0</item>
+ <item name="value" xsi:type="string">0</item>
+ </field>
+ <field name="catalog/layered_navigation/interval_division_limit" xsi:type="array">
+ <item name="scope" xsi:type="string">default</item>
+ <item name="scope_id" xsi:type="number">0</item>
+ <item name="value" xsi:type="string">3</item>
+ </field>
+ </dataset>
<dataset name="layered_navigation_manual_range_10_rollback">
<field name="catalog/layered_navigation/display_product_count" xsi:type="array">
<item name="scope" xsi:type="string">default</item>
@@ -41,5 +75,29 @@
<item name="value" label="Automatic (equalize price ranges)" xsi:type="string">auto</item>
</field>
</dataset>
+ <dataset name="layered_navigation_automatic_equalize_price_range_rollback">
+ <field name="catalog/layered_navigation/display_product_count" xsi:type="array">
+ <item name="scope" xsi:type="string">default</item>
+ <item name="scope_id" xsi:type="number">0</item>
+ <item name="value" label="Yes" xsi:type="string">1</item>
+ </field>
+ <field name="catalog/layered_navigation/price_range_calculation" xsi:type="array">
+ <item name="scope" xsi:type="string">default</item>
+ <item name="scope_id" xsi:type="number">0</item>
+ <item name="value" label="Automatic (equalize price ranges)" xsi:type="string">auto</item>
+ </field>
+ </dataset>
+ <dataset name="layered_navigation_automatic_equalize_product_counts_rollback">
+ <field name="catalog/layered_navigation/display_product_count" xsi:type="array">
+ <item name="scope" xsi:type="string">default</item>
+ <item name="scope_id" xsi:type="number">0</item>
+ <item name="value" label="Yes" xsi:type="string">1</item>
+ </field>
+ <field name="catalog/layered_navigation/price_range_calculation" xsi:type="array">
+ <item name="scope" xsi:type="string">default</item>
+ <item name="scope_id" xsi:type="number">0</item>
+ <item name="value" label="Automatic (equalize price ranges)" xsi:type="string">auto</item>
+ </field>
+ </dataset>
</repository>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/FilterProductListTest.php b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/FilterProductListTest.php
index 543880aea127310181be8b7e7d5663495e8202ba..c42686f62591b21e29a5d28f1f42ba5fa1044260 100644
--- a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/FilterProductListTest.php
+++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/FilterProductListTest.php
@@ -21,7 +21,7 @@ use Magento\Mtf\TestCase\Injectable;
* 3. Perform all assertions.
*
* @group Layered_Navigation
- * @ZephyrId MAGETWO-12419
+ * @ZephyrId MAGETWO-12419, MAGETWO-30617, MAGETWO-30700, MAGETWO-30702, MAGETWO-30703
*/
class FilterProductListTest extends Injectable
{
diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/FilterProductListTest.xml b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/FilterProductListTest.xml
index 8a9388df40c9fc32ade9df9df40c650605244f27..0737dfd0d7ad6d58a5c736fa6ec6270eac2ad1b9 100644
--- a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/FilterProductListTest.xml
+++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/FilterProductListTest.xml
@@ -10,6 +10,7 @@
<variation name="FilterProductListTestVariation1">
<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
<data name="configData" xsi:type="string">layered_navigation_manual_range_10</data>
+ <data name="runReindex" xsi:type="string">Yes</data>
<data name="category/dataset" xsi:type="string">default_anchor_subcategory</data>
<data name="category/data/category_products/dataset" xsi:type="string">catalogProductSimple::product_20_dollar, configurableProduct::filterable_two_options_with_zero_price</data>
<data name="layeredNavigation" xsi:type="array">
@@ -31,5 +32,66 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryForAssignedProducts" />
<constraint name="Magento\LayeredNavigation\Test\Constraint\AssertFilterProductList" />
</variation>
+ <variation name="FilterProductListTestVariation2" ticketId="MAGETWO-30617, MAGETWO-30702">
+ <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
+ <data name="configData" xsi:type="string">layered_navigation_automatic_equalize_price_range</data>
+ <data name="runReindex" xsi:type="string">Yes</data>
+ <data name="category/dataset" xsi:type="string">default_anchor_subcategory</data>
+ <data name="category/data/category_products/dataset" xsi:type="string">
+ catalogProductSimple::product_1_dollar, catalogProductSimple::product_5_dollar, catalogProductSimple::product_9_99_dollar, catalogProductSimple::product_10_dollar, catalogProductSimple::product_15_dollar, catalogProductSimple::product_21_dollar
+ </data>
+ <data name="layeredNavigation" xsi:type="array">
+ <item name="filters_0" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="title" xsi:type="string">Price</item>
+ <item name="linkPattern" xsi:type="string">`^.+0\.00 - .+9\.99 3$`m</item>
+ <item name="products" xsi:type="string">product_0, product_1, product_2</item>
+ </item>
+ </item>
+ <item name="filters_1" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="title" xsi:type="string">Price</item>
+ <item name="linkPattern" xsi:type="string">`^.+10\.00 - .+19\.99 2$`m</item>
+ <item name="products" xsi:type="string">product_3, product_4</item>
+ </item>
+ </item>
+ <item name="filters_2" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="title" xsi:type="string">Price</item>
+ <item name="linkPattern" xsi:type="string">`^.+20\.00 and above 1$`m</item>
+ <item name="products" xsi:type="string">product_5</item>
+ </item>
+ </item>
+ </data>
+ <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryForAssignedProducts" />
+ <constraint name="Magento\LayeredNavigation\Test\Constraint\AssertFilterProductList" />
+ </variation>
+ <variation name="FilterProductListTestVariation3" ticketId="MAGETWO-30700, MAGETWO-30703">
+ <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
+ <data name="configData" xsi:type="string">layered_navigation_automatic_equalize_product_counts</data>
+ <data name="runReindex" xsi:type="string">Yes</data>
+ <data name="category/dataset" xsi:type="string">default_anchor_subcategory</data>
+ <data name="category/data/category_products/dataset" xsi:type="string">
+ catalogProductSimple::product_1_dollar, catalogProductSimple::product_5_dollar, catalogProductSimple::product_9_99_dollar, catalogProductSimple::product_10_dollar, catalogProductSimple::product_15_dollar, catalogProductSimple::product_21_dollar
+ </data>
+ <data name="layeredNavigation" xsi:type="array">
+ <item name="filters_0" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="title" xsi:type="string">Price</item>
+ <item name="linkPattern" xsi:type="string">`^.+0\.00 - .+9\.99 3$`m</item>
+ <item name="products" xsi:type="string">product_0, product_1, product_2</item>
+ </item>
+ </item>
+ <item name="filters_1" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="title" xsi:type="string">Price</item>
+ <item name="linkPattern" xsi:type="string">`^.+10\.00 and above 3$`m</item>
+ <item name="products" xsi:type="string">product_3, product_4, product_5</item>
+ </item>
+ </item>
+ </data>
+ <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryForAssignedProducts" />
+ <constraint name="Magento\LayeredNavigation\Test\Constraint\AssertFilterProductList" />
+ </variation>
</testCase>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Repository/CreditCard.xml b/dev/tests/functional/tests/app/Magento/Payment/Test/Repository/CreditCard.xml
index f6c93407a0ccdb42eed3c22519c9d3b109e648a8..8e742ab30ba960dd022870fea86e08c74d71c3fd 100644
--- a/dev/tests/functional/tests/app/Magento/Payment/Test/Repository/CreditCard.xml
+++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Repository/CreditCard.xml
@@ -14,6 +14,13 @@
<field name="cc_cid" xsi:type="string">123</field>
</dataset>
+ <dataset name="visa_alt">
+ <field name="cc_number" xsi:type="string">4012888888881881</field>
+ <field name="cc_exp_month" xsi:type="string">02 - February</field>
+ <field name="cc_exp_year" xsi:type="string">2021</field>
+ <field name="cc_cid" xsi:type="string">123</field>
+ </dataset>
+
<dataset name="amex_default">
<field name="cc_number" xsi:type="string">378282246310005</field>
<field name="cc_exp_month" xsi:type="string">02 - February</field>
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/OnePageCheckoutTest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..11f9d9d5270e679df9cd5237b4a51139cb51475e
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/OnePageCheckoutTest.xml
@@ -0,0 +1,32 @@
+<?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\OnePageCheckoutTest" summary="Guest Checkout with PayPal Payflow Pro credit card">
+ <variation name="OnePageCheckoutPayflowProVariation1" summary="Guest Checkout with PayPal Payflow Pro credit card" ticketId="MAGETWO-60583">
+ <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+ <data name="customer/dataset" xsi:type="string">default</data>
+ <data name="shippingAddress/dataset" xsi:type="string">US_address_1</data>
+ <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
+ <data name="checkoutMethod" xsi:type="string">guest</data>
+ <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+ <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+ <data name="payment/method" xsi:type="string">payflowpro</data>
+ <data name="prices" xsi:type="array">
+ <item name="grandTotal" xsi:type="string">15.83</item>
+ </data>
+ <data name="creditCardClass" xsi:type="string">credit_card</data>
+ <data name="creditCard/dataset" xsi:type="string">visa_default</data>
+ <data name="isVaultPresent" xsi:type="boolean">false</data>
+ <data name="configData" xsi:type="string">payflowpro</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
+ <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+ <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
+ <constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
+ </variation>
+ </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Persistent/Test/Constraint/AssertCustomerIsRedirectedToCheckout.php b/dev/tests/functional/tests/app/Magento/Persistent/Test/Constraint/AssertCustomerIsRedirectedToCheckout.php
new file mode 100644
index 0000000000000000000000000000000000000000..779740551527f48712ea40db23e74e3d5a7e4d60
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Persistent/Test/Constraint/AssertCustomerIsRedirectedToCheckout.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Persistent\Test\Constraint;
+
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert first step on Checkout page is available.
+ */
+class AssertCustomerIsRedirectedToCheckout extends AbstractConstraint
+{
+ /**
+ * Assert first step on Checkout page is available.
+ *
+ * @param CheckoutOnepage $checkoutOnepage
+ * @return void
+ */
+ public function processAssert(CheckoutOnepage $checkoutOnepage)
+ {
+ $checkoutOnepage->open();
+ \PHPUnit_Framework_Assert::assertTrue(
+ !$checkoutOnepage->getMessagesBlock()->isVisible()
+ && $checkoutOnepage->getShippingMethodBlock()->isVisible(),
+ 'Checkout first step is not available.'
+ );
+ }
+
+ /**
+ * Returns string representation of successful assertion.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Checkout first step is available.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Persistent/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Persistent/Test/Repository/ConfigData.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5494453986157df4f836cd3fca77f96fa421d520
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Persistent/Test/Repository/ConfigData.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * 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/Magento/Mtf/Repository/etc/repository.xsd">
+ <repository class="Magento\Config\Test\Repository\ConfigData">
+ <dataset name="clearpersistence_on_signout">
+ <field name="persistent/options/enabled" xsi:type="array">
+ <item name="scope" xsi:type="string">persistent</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">Yes</item>
+ <item name="value" xsi:type="number">1</item>
+ </field>
+ <field name="persistent/options/logout_clear" xsi:type="array">
+ <item name="scope" xsi:type="string">persistent</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">No</item>
+ <item name="value" xsi:type="number">0</item>
+ </field>
+ </dataset>
+
+ <dataset name="clearpersistence_on_signout_rollback">
+ <field name="persistent/options/enabled" xsi:type="array">
+ <item name="scope" xsi:type="string">persistent</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">No</item>
+ <item name="value" xsi:type="number">0</item>
+ </field>
+ <field name="persistent/options/logout_clear" xsi:type="array">
+ <item name="scope" xsi:type="string">persistent</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">Yes</item>
+ <item name="value" xsi:type="number">1</item>
+ </field>
+ </dataset>
+ </repository>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Persistent/Test/TestCase/CheckoutWithPersistentShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Persistent/Test/TestCase/CheckoutWithPersistentShoppingCartTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..2211f9b12e2bf95764382b9d42f9e49578071dbf
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Persistent/Test/TestCase/CheckoutWithPersistentShoppingCartTest.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Persistent\Test\TestCase;
+
+use Magento\Customer\Test\Fixture\Customer;
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Magento\Customer\Test\Page\CustomerAccountCreate;
+use Magento\Cms\Test\Page\CmsIndex;
+use Magento\Catalog\Test\Page\Product\CatalogProductView;
+use Magento\Checkout\Test\Page\CheckoutCart;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Customer\Test\TestStep\LogoutCustomerOnFrontendStep;
+use Magento\Mtf\TestCase\Injectable;
+use Magento\Mtf\TestStep\TestStepFactory;
+
+/**
+ * Preconditions:
+ * Apply configs:
+ * 1. Enable Persistent Shopping Cart.
+ * 2. Disable Clear Persistence on Sign Out.
+ *
+ * Steps:
+ * 1. Go to frontend.
+ * 2. Click Register link.
+ * 3. Fill registry form.
+ * 4. Click 'Create account' button.
+ * 5. Add simple product to shopping cart.
+ * 6. Sign out.
+ *
+ * @ZephyrId MAGETWO-45381
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CheckoutWithPersistentShoppingCartTest extends Injectable
+{
+ /**
+ * Config data.
+ *
+ * @string $configData
+ */
+ private $configData;
+
+ /**
+ * Customer registry page.
+ *
+ * @var CustomerAccountCreate
+ */
+ private $customerAccountCreate;
+
+ /**
+ * Cms page.
+ *
+ * @var CmsIndex $cmsIndex.
+ */
+ private $cmsIndex;
+
+ /**
+ * Frontend product view page.
+ *
+ * @var CatalogProductView
+ */
+ private $catalogProductView;
+
+ /**
+ * Interface Browser.
+ *
+ * @var BrowserInterface.
+ */
+ private $browser;
+
+ /**
+ * Page of checkout page.
+ *
+ * @var CheckoutCart
+ */
+ private $checkoutCart;
+
+ /**
+ * Customer log out step.
+ *
+ * @var LogoutCustomerOnFrontendStep
+ */
+ private $logoutCustomerOnFrontendStep;
+
+ /**
+ * Factory for Test Steps.
+ *
+ * @var TestStepFactory
+ */
+ private $stepFactory;
+
+ /**
+ * Inject data.
+ *
+ * @param CustomerAccountCreate $customerAccountCreate
+ * @param CmsIndex $cmsIndex
+ * @param LogoutCustomerOnFrontendStep $logoutCustomerOnFrontendStep
+ * @param CatalogProductView $catalogProductView
+ * @param BrowserInterface $browser
+ * @param CheckoutCart $checkoutCart
+ * @param TestStepFactory $stepFactory
+ * @return void
+ */
+ public function __inject(
+ CustomerAccountCreate $customerAccountCreate,
+ CmsIndex $cmsIndex,
+ LogoutCustomerOnFrontendStep $logoutCustomerOnFrontendStep,
+ CatalogProductView $catalogProductView,
+ BrowserInterface $browser,
+ CheckoutCart $checkoutCart,
+ TestStepFactory $stepFactory
+ ) {
+ $this->customerAccountCreate = $customerAccountCreate;
+ $this->cmsIndex = $cmsIndex;
+ $this->logoutCustomerOnFrontendStep = $logoutCustomerOnFrontendStep;
+ $this->browser = $browser;
+ $this->catalogProductView = $catalogProductView;
+ $this->checkoutCart = $checkoutCart;
+ $this->stepFactory = $stepFactory;
+ }
+
+ /**
+ * Prepare data.
+ *
+ * @param CatalogProductSimple $product
+ * @return array
+ */
+ public function __prepare(CatalogProductSimple $product)
+ {
+ $product->persist();
+
+ return ['product' => $product];
+ }
+
+ /**
+ * Create Customer account on Storefront.
+ *
+ * @param string $configData
+ * @param CatalogProductSimple $product
+ * @param Customer $customer
+ * @return void
+ */
+ public function test($configData, CatalogProductSimple $product, Customer $customer)
+ {
+ $this->configData = $configData;
+ $this->stepFactory->create(
+ \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
+ ['configData' => $configData]
+ )->run();
+
+ // Steps
+ $this->cmsIndex->open();
+ $this->cmsIndex->getLinksBlock()->openLink('Create an Account');
+ $this->customerAccountCreate->getRegisterForm()->registerCustomer($customer);
+
+ // Ensure that shopping cart is empty
+ $this->checkoutCart->open()->getCartBlock()->clearShoppingCart();
+
+ $this->browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
+ $this->catalogProductView->getViewBlock()->addToCart($product);
+ $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
+ $this->logoutCustomerOnFrontendStep->run();
+ }
+
+ /**
+ * Clean data after running test.
+ *
+ * @return void
+ */
+ public function tearDown()
+ {
+ $this->stepFactory->create(
+ \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
+ ['configData' => $this->configData, 'rollback' => true]
+ )->run();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Persistent/Test/TestCase/CheckoutWithPersistentShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Persistent/Test/TestCase/CheckoutWithPersistentShoppingCartTest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..db4e85d066610fa472dd41da6503217d235beb03
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Persistent/Test/TestCase/CheckoutWithPersistentShoppingCartTest.xml
@@ -0,0 +1,17 @@
+<?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\Persistent\Test\TestCase\CheckoutWithPersistentShoppingCartTest" summary="Checkout with Persistent Shopping Cart" ticketId="MAGETWO-45381">
+ <variation name="RedirectCustomerToCheckoutTestVariation1" summary="Checkout with Persistent Shopping Cart">
+ <data name="issue" xsi:type="string">MAGETWO-59976: Customer can't open Product on Storefront if Persistent Cart is enabled</data>
+ <data name="customer/dataset" xsi:type="string">register_customer</data>
+ <data name="configData" xsi:type="string">clearpersistence_on_signout</data>
+ <constraint name="Magento\Persistent\Test\Constraint\AssertCustomerIsRedirectedToCheckout" />
+ </variation>
+ </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php
index 398553b2abd3c3da0691a9c26890ce2c5ef19c80..beb4d2219a68b17bc7507c1648a69764f0efe256 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php
@@ -178,10 +178,7 @@ class Actions extends Block
public function cancel()
{
$this->_rootElement->find($this->cancel)->click();
- $element = $this->browser->find($this->confirmModal);
- /** @var \Magento\Ui\Test\Block\Adminhtml\Modal $modal */
- $modal = $this->blockFactory->create(\Magento\Ui\Test\Block\Adminhtml\Modal::class, ['element' => $element]);
- $modal->acceptAlert();
+ $this->acceptAlert();
}
/**
@@ -202,6 +199,7 @@ class Actions extends Block
public function void()
{
$this->_rootElement->find($this->void)->click();
+ $this->acceptAlert();
}
/**
@@ -266,27 +264,36 @@ class Actions extends Block
}
/**
- * Accept order
+ * Accept order.
+ *
* @return void
*/
public function accept()
{
$acceptPayment = '#accept_payment';
$this->_rootElement->find($acceptPayment)->click();
- $element = $this->browser->find($this->confirmModal);
- /** @var Modal $modal */
- $modal = $this->blockFactory->create(Modal::class, ['element' => $element]);
- $modal->acceptAlert();
+ $this->acceptAlert();
}
/**
- * Deny order
+ * Deny order.
+ *
* @return void
*/
public function deny()
{
$denyPayment = '#deny_payment';
$this->_rootElement->find($denyPayment)->click();
+ $this->acceptAlert();
+ }
+
+ /**
+ * Accept alert.
+ *
+ * @return void
+ */
+ private function acceptAlert()
+ {
$element = $this->browser->find($this->confirmModal);
/** @var Modal $modal */
$modal = $this->blockFactory->create(Modal::class, ['element' => $element]);
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/History.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/History.php
index 740f8f03fe6394a18ceed667a0ba695262229cf2..8ae8bbb31584ef6ab7859b1c08ac62eb09f52016 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/History.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/History.php
@@ -56,6 +56,13 @@ class History extends Block
*/
protected $refundedAmount = '//div[@class="note-list-comment"][contains(text(), "We refunded")]';
+ /**
+ * Voided Amount.
+ *
+ * @var string
+ */
+ protected $voidedAmount = '//div[@class="note-list-comment"][contains(text(), "Voided authorization")]';
+
/**
* Note list locator.
*
@@ -117,6 +124,17 @@ class History extends Block
return $result;
}
+ /**
+ * Get the voided amount from the comments history.
+ *
+ * @return string
+ */
+ public function getVoidedAmount()
+ {
+ $this->waitCommentsHistory();
+ return $this->_rootElement->find($this->voidedAmount, Locator::SELECTOR_XPATH)->getText();
+ }
+
/**
* Gets the status which presented in comment
*
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Addresses.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Addresses.php
new file mode 100644
index 0000000000000000000000000000000000000000..063f3f0d2a566bfc2443dc875324daec7f26c8a9
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Addresses.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Block\Adminhtml\Order\View;
+
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Block for information about addresses on order page.
+ */
+class Addresses extends Block
+{
+ /**
+ * Billing address.
+ *
+ * @var string
+ */
+ private $billingAddress = '.order-billing-address address';
+
+ /**
+ * New address button selector.
+ *
+ * @var string
+ */
+ private $newAddressButton = '.action-show-popup';
+
+ /**
+ * Shipping address.
+ *
+ * @var string
+ */
+ private $shippingAddress = '.order-shipping-address address';
+
+ /**
+ * Get customer's billing address from the data inside block.
+ *
+ * @return string
+ */
+ public function getCustomerBillingAddress()
+ {
+ return $this->_rootElement->find($this->billingAddress, Locator::SELECTOR_CSS)->getText();
+ }
+
+ /**
+ * Get customer's shipping address from the data inside block.
+ *
+ * @return string
+ */
+ public function getCustomerShippingAddress()
+ {
+ return $this->_rootElement->find($this->shippingAddress, Locator::SELECTOR_CSS)->getText();
+ }
+
+ /**
+ * Checks if new address button is visible.
+ *
+ * @return bool
+ */
+ public function isNewAddressButtonVisible()
+ {
+ $button = $this->_rootElement->find($this->newAddressButton);
+ return $button->isVisible();
+ }
+
+ /**
+ * Clicks new address button.
+ *
+ * @return void
+ */
+ public function clickNewAddressButton()
+ {
+ $this->_rootElement->find($this->newAddressButton)->click();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php
index d1f27d14a6619f71fc2e459adad23888d4fb51b7..4b3768295799695fbb45db1a17e75acb193b91f7 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php
@@ -9,7 +9,7 @@ namespace Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Invoices;
/**
* Invoices grid on order view page.
*/
-class Grid extends \Magento\Backend\Test\Block\Widget\Grid
+class Grid extends \Magento\Ui\Test\Block\Adminhtml\DataGrid
{
/**
* Locator value for link in action column.
@@ -34,6 +34,9 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
'id' => [
'selector' => 'input[name="increment_id"]',
],
+ 'order_id' => [
+ 'selector' => 'input[name="order_increment_id"]',
+ ],
'status' => [
'selector' => 'select[name="state"]',
'input' => 'select',
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Transactions.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Transactions.php
index 80309405fcd05e9206e5732c1f6c3e4eb973c620..64e449c805b2807844c88bfa36a821b20adcfd04 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Transactions.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Transactions.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Block\Adminhtml\Order\View\Tab;
use Magento\Backend\Test\Block\Widget\Tab;
use Magento\Mtf\Client\Locator;
-use Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Shipments\Grid;
+use Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Transactions\Grid;
/**
* Transactions tab.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceStatusInOrdersGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceStatusInOrdersGrid.php
new file mode 100644
index 0000000000000000000000000000000000000000..6695786923b5c00c71e12101855421554e940281
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceStatusInOrdersGrid.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Test\Constraint;
+
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert invoice status on order page in Admin.
+ */
+class AssertInvoiceStatusInOrdersGrid extends AbstractConstraint
+{
+ /**
+ * Assert invoice status on order page in Admin.
+ *
+ * @param SalesOrderView $salesOrderView
+ * @param string $invoiceStatus
+ * @param string $orderId
+ * @return void
+ */
+ public function processAssert(
+ SalesOrderView $salesOrderView,
+ $invoiceStatus,
+ $orderId
+ ) {
+ $salesOrderView->open(['order_id' => $orderId]);
+ $salesOrderView->getOrderForm()->openTab('invoices');
+ /** @var \Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Invoices\Grid $grid */
+ $grid = $salesOrderView->getOrderForm()->getTab('invoices')->getGridBlock();
+ $filter = [
+ 'order_id' => $orderId,
+ 'status' => $invoiceStatus,
+ ];
+ \PHPUnit_Framework_Assert::assertTrue(
+ $grid->isRowVisible($filter),
+ 'Invoice status is incorrect.'
+ );
+ }
+
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Invoice status is correct.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderAddresses.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderAddresses.php
new file mode 100644
index 0000000000000000000000000000000000000000..6964153ca3df6584b09e5942ec05434fbc5ae790
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderAddresses.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Constraint;
+
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Customer\Test\Fixture\Address;
+
+/**
+ * Assert that Order Billing and Shipping addresses are correct on order page in backend.
+ */
+class AssertOrderAddresses extends AbstractConstraint
+{
+ /**
+ * Assert that Order Billing and Shipping addresses are correct on order page in backend.
+ *
+ * @param SalesOrderView $salesOrderView
+ * @param string $orderId
+ * @param Address $shippingAddress
+ * @param Address $billingAddress
+ * @return void
+ */
+ public function processAssert(
+ SalesOrderView $salesOrderView,
+ $orderId,
+ Address $shippingAddress,
+ Address $billingAddress
+ ) {
+
+ $selectedShippingAddress = $this->objectManager->create(
+ \Magento\Customer\Test\Block\Address\Renderer::class,
+ ['address' => $shippingAddress, 'type' => 'html']
+ )->render();
+
+ $selectedBillingAddress = $this->objectManager->create(
+ \Magento\Customer\Test\Block\Address\Renderer::class,
+ ['address' => $billingAddress, 'type' => 'html']
+ )->render();
+
+ $salesOrderView->open(['order_id' => $orderId]);
+ $orderBillingAddress = $salesOrderView->getAddressesBlock()->getCustomerBillingAddress();
+ $orderShippingAddress = $salesOrderView->getAddressesBlock()->getCustomerShippingAddress();
+
+ \PHPUnit_Framework_Assert::assertTrue(
+ $selectedBillingAddress == $orderBillingAddress && $selectedShippingAddress == $orderShippingAddress,
+ 'Billing and shipping addresses from the address book and from the order page are not the same.'
+ );
+ }
+
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Billing and shipping addresses from the address book and from the order page are the same.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessVoidedMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessVoidedMessage.php
new file mode 100644
index 0000000000000000000000000000000000000000..05a4934015611996694b5a506edc39c8994c545c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessVoidedMessage.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Test\Constraint;
+
+use Magento\Sales\Test\Page\Adminhtml\OrderStatusIndex;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert that success message about order void is present.
+ */
+class AssertOrderSuccessVoidedMessage extends AbstractConstraint
+{
+ /* tags */
+ const SEVERITY = 'low';
+ /* end tags */
+
+ /**
+ * Message about successful void.
+ */
+ const SUCCESS_MESSAGE = 'The payment has been voided.';
+
+ /**
+ * Assert that success message is displayed after order is voided.
+ *
+ * @param OrderStatusIndex $orderStatusIndexPage
+ * @return void
+ */
+ public function processAssert(OrderStatusIndex $orderStatusIndexPage)
+ {
+ $actualMessage = $orderStatusIndexPage->getMessagesBlock()->getSuccessMessage();
+ \PHPUnit_Framework_Assert::assertEquals(
+ self::SUCCESS_MESSAGE,
+ $actualMessage,
+ 'Wrong success message is displayed.'
+ . "\nExpected: " . self::SUCCESS_MESSAGE
+ . "\nActual: " . $actualMessage
+ );
+ }
+
+ /**
+ * Text of voided order message assert.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Order successful void message is present.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertTransactionStatus.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertTransactionStatus.php
new file mode 100644
index 0000000000000000000000000000000000000000..fb975ae4bd1c6bfdc8f5ce3fea9f094f1e4e45e4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertTransactionStatus.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Test\Constraint;
+
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert that transactions status is closed on order page in Admin.
+ */
+class AssertTransactionStatus extends AbstractConstraint
+{
+ /**
+ * Assert that transactions status is closed on order page in Admin.
+ *
+ * @param OrderIndex $salesOrder
+ * @param SalesOrderView $salesOrderView
+ * @param array $transactions
+ * @param string $orderId
+ * @return void
+ */
+ public function processAssert(
+ OrderIndex $salesOrder,
+ SalesOrderView $salesOrderView,
+ array $transactions,
+ $orderId
+ ) {
+ $salesOrder->open();
+ $salesOrder->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]);
+ $salesOrderView->getOrderForm()->openTab('transactions');
+ $actualTransactions = $salesOrderView->getOrderForm()->getTab('transactions')->getGridBlock()->getIds();
+
+ foreach ($transactions as $transaction) {
+ foreach ($actualTransactions as $actualTransaction) {
+ if ($actualTransaction['transactionType'] === $transaction['transactionType']) {
+ \PHPUnit_Framework_Assert::assertEquals(
+ $transaction['statusIsClosed'],
+ $actualTransaction['statusIsClosed'],
+ 'The ' . $transaction['transactionType'] . ' transaction status is not closed.'
+ );
+ break;
+ }
+ }
+ }
+ }
+
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Transactions status is closed.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertVoidInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertVoidInCommentsHistory.php
new file mode 100644
index 0000000000000000000000000000000000000000..bc3e90ee7f776c74fa8b55fb95be6ac19d49ffca
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertVoidInCommentsHistory.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Test\Constraint;
+
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert that comment about voided amount exists in Comments History section on order page in Admin.
+ */
+class AssertVoidInCommentsHistory extends AbstractConstraint
+{
+ /**
+ * Message about voided amount in order.
+ */
+ const VOIDED_AMOUNT = 'Voided authorization. Amount: $';
+
+ /**
+ * Assert that comment about voided amount exist in Comments History section on order page in Admin.
+ *
+ * @param SalesOrderView $salesOrderView
+ * @param OrderIndex $salesOrder
+ * @param string $orderId
+ * @param array $prices
+ * @return void
+ */
+ public function processAssert(
+ SalesOrderView $salesOrderView,
+ OrderIndex $salesOrder,
+ $orderId,
+ array $prices
+ ) {
+ $salesOrder->open();
+ $salesOrder->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]);
+
+ \PHPUnit_Framework_Assert::assertContains(
+ self::VOIDED_AMOUNT . $prices['grandTotal'],
+ $salesOrderView->getOrderHistoryBlock()->getVoidedAmount(),
+ 'Incorrect voided amount value for the order #' . $orderId
+ );
+ }
+
+ /**
+ * Returns string representation of successful assertion.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return "Message about voided amount is available in Comments History section.";
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesOrderView.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesOrderView.xml
index 674b42732d2cd955db0e05b03ef79a8021492642..39c228e63f2c6ddbf53859694cc15e03ef03b05b 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesOrderView.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesOrderView.xml
@@ -17,5 +17,6 @@
<block name="informationBlock" class="Magento\Sales\Test\Block\Adminhtml\Order\View\Info" locator=".order-account-information" strategy="css selector" />
<block name="orderInfoBlock" class="Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info" locator="[data-ui-id='sales-order-tabs-tab-content-order-info']" strategy="css selector" />
<block name="orderInvoiceGrid" class="Magento\Sales\Test\Block\Adminhtml\Invoice\Grid" locator="//div[contains(@data-bind, 'sales_order_view_invoice_grid.sales_order_view_invoice_grid')]" strategy="xpath" />
+ <block name="addressesBlock" class="Magento\Sales\Test\Block\Adminhtml\Order\View\Addresses" locator=".admin__page-section.order-addresses" strategy="css selector" />
</page>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOnlineInvoiceEntityTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOnlineInvoiceEntityTest.php
index c3b00b4b7f7942176300450faf9a0b42c956942b..393085f7d7a87c9fb491259bbd55ecbb6a9330e5 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOnlineInvoiceEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOnlineInvoiceEntityTest.php
@@ -40,6 +40,7 @@ class CreateOnlineInvoiceEntityTest extends Scenario
/* tags */
const MVP = 'yes';
const TEST_TYPE = '3rd_party_test';
+ const SEVERITY = 'S0';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.php
index 284a09f42332fa456107017db9fb9bb5c78b3e65..218d10ad4bb1c6c6da47e04b7ac3da5963564c4a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.php
@@ -28,7 +28,7 @@ use Magento\Mtf\TestCase\Scenario;
* 12. Perform all assertions.
*
* @group Order_Management
- * @ZephyrId MAGETWO-28696
+ * @ZephyrId MAGETWO-28696, MAGETWO-17063
*/
class CreateOrderBackendTest extends Scenario
{
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.xml
index bd592e9d71aaa1e9d74279af53c80ac3b319e376..2fb8f91d6d99794a426a91663f7a8ccef531a916 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.xml
@@ -7,16 +7,16 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Sales\Test\TestCase\CreateOrderBackendTest" summary="Create Order from Admin within Offline Payment Methods" ticketId="MAGETWO-28696">
- <variation name="CreateOrderBackendTestVariation1">
+ <variation name="CreateOrderBackendTestVariation1" ticketId="MAGETWO-17063">
<data name="description" xsi:type="string">Create order with simple product for registered US customer using Fixed shipping method and Cash on Delivery payment method</data>
- <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
+ <data name="products/0" xsi:type="string">catalogProductSimple::with_one_custom_option</data>
<data name="customer/dataset" xsi:type="string">default</data>
<data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
<data name="saveAddress" xsi:type="string">No</data>
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
<data name="prices" xsi:type="array">
- <item name="grandTotal" xsi:type="string">565.00</item>
+ <item name="grandTotal" xsi:type="string">425.00</item>
</data>
<data name="payment/method" xsi:type="string">cashondelivery</data>
<data name="status" xsi:type="string">Pending</data>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridFilteringTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridFilteringTest.xml
index b4c3a7568a2a1dd4fb62fe0d013b6425d372d27d..78c2676765418ebcbbae5ed21a8b0b0cb9ab1da8 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridFilteringTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridFilteringTest.xml
@@ -8,6 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Ui\Test\TestCase\GridFilteringTest" summary="Grid UI Component Filtering" ticketId="MAGETWO-41328">
<variation name="SalesOrderGridFiltering">
+ <data name="tag" xsi:type="string">severity:S2</data>
<data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">Verify sales order grid filtering</data>
<data name="steps" xsi:type="array">
@@ -33,6 +34,7 @@
<constraint name="\Magento\Ui\Test\Constraint\AssertGridFiltering"/>
</variation>
<variation name="SalesInvoiceGridFiltering">
+ <data name="tag" xsi:type="string">severity:S3</data>
<data name="description" xsi:type="string">Verify sales invoice grid filtering</data>
<data name="steps" xsi:type="array">
<item name="0" xsi:type="string">Magento\Sales\Test\TestStep\CreateInvoiceStep</item>
@@ -56,6 +58,7 @@
<constraint name="Magento\Ui\Test\Constraint\AssertGridFiltering"/>
</variation>
<variation name="SalesShipmentGridFiltering">
+ <data name="tag" xsi:type="string">severity:S3</data>
<data name="description" xsi:type="string">Verify sales shipment grid filtering</data>
<data name="steps" xsi:type="array">
<item name="0" xsi:type="string">Magento\Sales\Test\TestStep\CreateShipmentStep</item>
@@ -79,6 +82,7 @@
<constraint name="Magento\Ui\Test\Constraint\AssertGridFiltering"/>
</variation>
<variation name="SalesCreditMemoGridFiltering">
+ <data name="tag" xsi:type="string">severity:S3</data>
<data name="description" xsi:type="string">Verify sales credit memo grid filtering</data>
<data name="steps" xsi:type="array">
<item name="0" xsi:type="array">
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridFullTextSearchTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridFullTextSearchTest.xml
index 0979d0dcbff250a7f0bdb2d5151f60004f72efd0..86278c52a1e26f28c82b799de7a1f45a1f4273e9 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridFullTextSearchTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridFullTextSearchTest.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Ui\Test\TestCase\GridFullTextSearchTest" summary="Grid UI Component Full Text Search" ticketId="MAGETWO-41023">
<variation name="SalesOrderGridFullTextSearch">
- <data name="tag" xsi:type="string">stable:no</data>
+ <data name="tag" xsi:type="string">severity:S2, stable:no</data>
<data name="description" xsi:type="string">Verify sales order grid full text search</data>
<data name="steps" xsi:type="array">
<item name="0" xsi:type="string">-</item>
@@ -24,7 +24,7 @@
<constraint name="Magento\Ui\Test\Constraint\AssertGridFullTextSearch"/>
</variation>
<variation name="SalesInvoiceGridFullTextSearch">
- <data name="tag" xsi:type="string">stable:no</data>
+ <data name="tag" xsi:type="string">severity:S3, stable:no</data>
<data name="description" xsi:type="string">Verify sales invoice grid full text search</data>
<data name="steps" xsi:type="array">
<item name="0" xsi:type="string">Magento\Sales\Test\TestStep\CreateInvoiceStep</item>
@@ -41,6 +41,7 @@
<constraint name="Magento\Ui\Test\Constraint\AssertGridFullTextSearch"/>
</variation>
<variation name="SalesShipmentGridFullTextSearch">
+ <data name="tag" xsi:type="string">severity:S3</data>
<data name="description" xsi:type="string">Verify sales shipment grid full text search</data>
<data name="steps" xsi:type="array">
<item name="0" xsi:type="string">Magento\Sales\Test\TestStep\CreateShipmentStep</item>
@@ -57,7 +58,7 @@
<constraint name="Magento\Ui\Test\Constraint\AssertGridFullTextSearch"/>
</variation>
<variation name="SalesCreditMemoGridFullTextSearch">
- <data name="tag" xsi:type="string">stable:no</data>
+ <data name="tag" xsi:type="string">severity:S3, stable:no</data>
<data name="description" xsi:type="string">Verify sales credit memo grid full text search</data>
<data name="steps" xsi:type="array">
<item name="0" xsi:type="array">
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml
index f82f232625841ddfdd77e66812970a4de31efea6..75d5c7fd09d95200255119b7b00c7167eb8c0142 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml
@@ -8,6 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Ui\Test\TestCase\GridSortingTest" summary="Grid UI Component Sorting" ticketId="MAGETWO-41328">
<variation name="SalesOrderGridSorting">
+ <data name="tag" xsi:type="string">severity:S2</data>
<data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="description" xsi:type="string">Verify sales order grid storting</data>
<data name="steps" xsi:type="array">
@@ -27,6 +28,7 @@
<constraint name="\Magento\Ui\Test\Constraint\AssertGridSorting"/>
</variation>
<variation name="SalesInvoiceGridSorting">
+ <data name="tag" xsi:type="string">severity:S3</data>
<data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="description" xsi:type="string">Verify sales invoince grid storting</data>
<data name="steps" xsi:type="array">
@@ -45,6 +47,7 @@
<constraint name="\Magento\Ui\Test\Constraint\AssertGridSorting"/>
</variation>
<variation name="SalesShipmentGridSorting">
+ <data name="tag" xsi:type="string">severity:S3</data>
<data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="description" xsi:type="string">Verify sales shipment grid storting</data>
<data name="steps" xsi:type="array">
@@ -63,6 +66,7 @@
<constraint name="\Magento\Ui\Test\Constraint\AssertGridSorting"/>
</variation>
<variation name="SalesCreditMemoGridSorting">
+ <data name="tag" xsi:type="string">severity:S3</data>
<data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="description" xsi:type="string">Verify sales credit memo grid storting</data>
<data name="steps" xsi:type="array">
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/VoidAuthorizationTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/VoidAuthorizationTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..fecf2eed85160415ac6fbb81b6c5261d7d451168
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/VoidAuthorizationTest.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ * 1. Configure shipping method.
+ * 2. Configure payment method.
+ * 3. Create products.
+ *
+ * Steps:
+ * 1. Go to Storefront.
+ * 2. Add products to the cart.
+ * 3. Click the 'Proceed to Checkout' button.
+ * 4. Select checkout method according to dataset.
+ * 5. Fill billing information and select the 'Ship to this address' option.
+ * 6. Select shipping method.
+ * 7. Select payment method.
+ * 8. Place order.
+ * 9. Open created order.
+ * 10. Click 'Void' button.
+ * 11. Perform assertions.
+ *
+ * @group Order_Management
+ * @ZephyrId MAGETWO-39444
+ */
+class VoidAuthorizationTest extends Scenario
+{
+ /* tags */
+ const MVP = 'yes';
+ const TEST_TYPE = '3rd_party_test';
+ const SEVERITY = 'S0';
+ /* end tags */
+
+ /**
+ * Void order authorization.
+ *
+ * @return void
+ */
+ public function test()
+ {
+ $this->executeScenario();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CreateBraintreeCreditMemoStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateOnlineCreditMemoStep.php
similarity index 93%
rename from dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CreateBraintreeCreditMemoStep.php
rename to dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateOnlineCreditMemoStep.php
index 085fc142a33736e1aec9fb2cc1a0771e37ffd34e..84491c1992e5d682c59a1848516fcf084ce42507 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CreateBraintreeCreditMemoStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateOnlineCreditMemoStep.php
@@ -4,9 +4,8 @@
* See COPYING.txt for license details.
*/
-namespace Magento\Braintree\Test\TestStep;
+namespace Magento\Sales\Test\TestStep;
-use Magento\Mtf\ObjectManager;
use Magento\Mtf\TestStep\TestStepInterface;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Sales\Test\Page\Adminhtml\OrderCreditMemoNew;
@@ -15,9 +14,9 @@ use Magento\Sales\Test\Page\Adminhtml\OrderInvoiceView;
use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
/**
- * Create credit memo for order placed via Braintree credit card payment method.
+ * Create credit memo for order placed using online payment methods.
*/
-class CreateBraintreeCreditMemoStep implements TestStepInterface
+class CreateOnlineCreditMemoStep implements TestStepInterface
{
/**
* Orders Page.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php
index fa37c94be3cdda2b7814a2dab3d11b0a4272dc04..0a82770fab38bbe574b77b0bb4e08eadbdc01a3f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php
@@ -23,21 +23,42 @@ class SubmitOrderStep implements TestStepInterface
*
* @var OrderCreateIndex
*/
- protected $orderCreateIndex;
+ private $orderCreateIndex;
/**
* Sales order view.
*
* @var SalesOrderView
*/
- protected $salesOrderView;
+ private $salesOrderView;
/**
* Factory for fixtures.
*
* @var FixtureFactory
*/
- protected $fixtureFactory;
+ private $fixtureFactory;
+
+ /**
+ * Customer fixture.
+ *
+ * @var Customer
+ */
+ private $customer;
+
+ /**
+ * Billing Address fixture.
+ *
+ * @var Address
+ */
+ private $billingAddress;
+
+ /**
+ * Products fixtures.
+ *
+ * @var array|\Magento\Mtf\Fixture\FixtureInterface[]
+ */
+ private $products;
/**
* @constructor
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/VoidAuthorizationStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/VoidAuthorizationStep.php
new file mode 100644
index 0000000000000000000000000000000000000000..6897233c7242cf3a2289a93111912c6021a99f2d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/VoidAuthorizationStep.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Test\TestStep;
+
+use Magento\Sales\Test\Fixture\OrderInjectable;
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+
+/**
+ * Void authorization for created order.
+ */
+class VoidAuthorizationStep implements TestStepInterface
+{
+ /**
+ * Sales order index page.
+ *
+ * @var OrderIndex
+ */
+ protected $orderIndex;
+
+ /**
+ * Order instance.
+ *
+ * @var OrderInjectable
+ */
+ protected $order;
+
+ /**
+ * Order view page.
+ *
+ * @var SalesOrderView
+ */
+ private $salesOrderView;
+
+ /**
+ * @param OrderInjectable $order
+ * @param OrderIndex $orderIndex
+ * @param SalesOrderView $salesOrderView
+ */
+ public function __construct(OrderInjectable $order, OrderIndex $orderIndex, SalesOrderView $salesOrderView)
+ {
+ $this->orderIndex = $orderIndex;
+ $this->order = $order;
+ $this->salesOrderView = $salesOrderView;
+ }
+
+ /**
+ * Void authorization.
+ *
+ * @return void
+ */
+ public function run()
+ {
+ $this->orderIndex->open();
+ $this->orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $this->order->getId()]);
+ $this->salesOrderView->getPageActions()->void();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/di.xml
index ea687be19d3c34b0eeb5093690e54243731543ff..df10cccbd82136f027f4ee6b236cafe272cdbdc8 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/di.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/di.xml
@@ -8,32 +8,87 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
<type name="Magento\Sales\Test\Constraint\AssertOrderStatusInGrid">
<arguments>
- <argument name="severity" xsi:type="string">high</argument>
+ <argument name="severity" xsi:type="string">S0</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Sales\Test\Constraint\AssertInvoiceStatusInOrdersGrid">
+ <arguments>
+ <argument name="severity" xsi:type="string">S1</argument>
</arguments>
</type>
<type name="Magento\Sales\Test\Constraint\AssertOrderStatusDuplicateStatus">
<arguments>
- <argument name="severity" xsi:type="string">high</argument>
+ <argument name="severity" xsi:type="string">S0</argument>
</arguments>
</type>
<type name="Magento\Sales\Test\Constraint\AssertOrderCancelSuccessMessage">
<arguments>
- <argument name="severity" xsi:type="string">high</argument>
+ <argument name="severity" xsi:type="string">S0</argument>
</arguments>
</type>
<type name="Magento\Sales\Test\Constraint\AssertOrderMassOnHoldSuccessMessage">
<arguments>
- <argument name="severity" xsi:type="string">high</argument>
+ <argument name="severity" xsi:type="string">S0</argument>
</arguments>
</type>
<type name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory">
<arguments>
- <argument name="severity" xsi:type="string">high</argument>
+ <argument name="severity" xsi:type="string">S0</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal">
+ <arguments>
+ <argument name="severity" xsi:type="string">S0</argument>
</arguments>
</type>
<type name="Magento\Sales\Test\Constraint\AssertCaptureInCommentsHistory">
<arguments>
- <argument name="severity" xsi:type="string">high</argument>
+ <argument name="severity" xsi:type="string">S0</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Sales\Test\Constraint\AssertVoidInCommentsHistory">
+ <arguments>
+ <argument name="severity" xsi:type="string">S0</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Sales\Test\Constraint\AssertRefundSuccessCreateMessage">
+ <arguments>
+ <argument name="severity" xsi:type="string">S0</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Sales\Test\Constraint\AssertOrderSuccessVoidedMessage">
+ <arguments>
+ <argument name="severity" xsi:type="string">S0</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Sales\Test\Constraint\AssertRefundInCreditMemoTab">
+ <arguments>
+ <argument name="severity" xsi:type="string">S0</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Sales\Test\Constraint\AssertRefundInCommentsHistory">
+ <arguments>
+ <argument name="severity" xsi:type="string">S0</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Sales\Test\Constraint\AssertInvoiceSuccessCreateMessage">
+ <arguments>
+ <argument name="severity" xsi:type="string">S0</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Sales\Test\Constraint\AssertInvoiceItems">
+ <arguments>
+ <argument name="severity" xsi:type="string">S1</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Sales\Test\Constraint\AssertTransactionStatus">
+ <arguments>
+ <argument name="severity" xsi:type="string">S2</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect">
+ <arguments>
+ <argument name="severity" xsi:type="string">S0</argument>
</arguments>
</type>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/testcase.xml
index eebdf2128dc70e8dc90a0867040e1e3682462768..030b0f4f32df0eacd76c99cbe55537df1c734cf5 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/testcase.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/testcase.xml
@@ -35,6 +35,22 @@
<step name="selectPaymentMethodForOrder" module="Magento_Sales" next="submitOrder" />
<step name="submitOrder" module="Magento_Sales" />
</scenario>
+ <scenario name="VoidAuthorizationTest" firstStep="setupConfiguration">
+ <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
+ <step name="createProducts" module="Magento_Catalog" next="createTaxRule" />
+ <step name="createTaxRule" module="Magento_Tax" next="addProductsToTheCart" />
+ <step name="addProductsToTheCart" module="Magento_Checkout" next="estimateShippingAndTax" />
+ <step name="estimateShippingAndTax" module="Magento_Checkout" next="clickProceedToCheckout" />
+ <step name="clickProceedToCheckout" module="Magento_Checkout" next="createCustomer" />
+ <step name="createCustomer" module="Magento_Customer" next="selectCheckoutMethod" />
+ <step name="selectCheckoutMethod" module="Magento_Checkout" next="fillShippingAddress" />
+ <step name="fillShippingAddress" module="Magento_Checkout" next="fillShippingMethod" />
+ <step name="fillShippingMethod" module="Magento_Checkout" next="selectPaymentMethod" />
+ <step name="selectPaymentMethod" module="Magento_Checkout" next="fillBillingInformation" />
+ <step name="fillBillingInformation" module="Magento_Checkout" next="placeOrder" />
+ <step name="placeOrder" module="Magento_Checkout" next="voidAuthorization" />
+ <step name="voidAuthorization" module="Magento_Sales" />
+ </scenario>
<scenario name="PrintOrderFrontendGuestTest" firstStep="createProducts">
<step name="createProducts" module="Magento_Catalog" next="createCustomer" />
<step name="createCustomer" module="Magento_Customer" next="openSalesOrders" />
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
index d0ad41011004a3fef531865ca1c6265f9406684e..141638e6b31b948665a46a08d8b5ea12cc0dfc74 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
@@ -399,5 +399,30 @@
<constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleSuccessSaveMessage" />
<constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleForm" />
</variation>
+ <variation name="CreateSalesRuleEntityTestVariation16" summary="Variation to check free shipping">
+ <data name="salesRule/data/name" xsi:type="string">Cart Price Rule1 %isolation%</data>
+ <data name="salesRule/data/description" xsi:type="string">Cart Price Rule Description %isolation%</data>
+ <data name="salesRule/data/is_active" xsi:type="string">Yes</data>
+ <data name="salesRule/data/website_ids/0" xsi:type="string">Main Website</data>
+ <data name="salesRule/data/customer_group_ids/0" xsi:type="string">NOT LOGGED IN</data>
+ <data name="salesRule/data/coupon_type" xsi:type="string">No Coupon</data>
+ <data name="salesRule/data/simple_action" xsi:type="string">Percent of product price discount</data>
+ <data name="salesRule/data/conditions_serialized" xsi:type="string">[Subtotal|greater than|0]</data>
+ <data name="salesRule/data/discount_amount" xsi:type="string">50</data>
+ <data name="salesRule/data/apply_to_shipping" xsi:type="string">No</data>
+ <data name="salesRule/data/simple_free_shipping" xsi:type="string">For matching items only</data>
+ <data name="salesRule/data/store_labels/0" xsi:type="string">Sales Cart Rule labels</data>
+ <data name="cartPrice/sub_total" xsi:type="string">100.00</data>
+ <data name="cartPrice/grand_total" xsi:type="string">50.00</data>
+ <data name="cartPrice/discount" xsi:type="string">50.00</data>
+ <data name="address/data/country_id" xsi:type="string">United States</data>
+ <data name="address/data/region_id" xsi:type="string">California</data>
+ <data name="address/data/postcode" xsi:type="string">95814</data>
+ <data name="productForSalesRule1/dataset" xsi:type="string">simple_for_salesrule_1</data>
+ <data name="productQuantity/productForSalesRule1" xsi:type="string">1</data>
+ <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleSuccessSaveMessage" />
+ <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
+ <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleFreeShippingIsApplied" />
+ </variation>
</testCase>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertCityBasedShippingRateChanged.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertCityBasedShippingRateChanged.php
new file mode 100644
index 0000000000000000000000000000000000000000..a10b47a2f9950f311d4c8ebcbdd3babb46faf6a8
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertCityBasedShippingRateChanged.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Shipping\Test\Constraint;
+
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Check that Shipping rate changes due to City change.
+ */
+class AssertCityBasedShippingRateChanged extends AbstractConstraint
+{
+ /**
+ * Assert that Shipping rate changed on City change.
+ *
+ * @param CheckoutOnepage $checkoutOnepage
+ * @param array $shippingMethod
+ * @param bool $isShippingAvailable
+ * @return void
+ */
+ public function processAssert(CheckoutOnepage $checkoutOnepage, $shippingMethod, $isShippingAvailable)
+ {
+ if ($isShippingAvailable) {
+ \PHPUnit_Framework_Assert::assertTrue(
+ $checkoutOnepage->getShippingMethodBlock()->isLoaderAppeared(),
+ 'Shipping rate has not been changed.'
+ );
+ }
+ $shippingAvaialability = $isShippingAvailable ? 'avaiable' : 'unavailable';
+ \PHPUnit_Framework_Assert::assertEquals(
+ $isShippingAvailable,
+ $checkoutOnepage->getShippingMethodBlock()->isShippingMethodAvaiable($shippingMethod),
+ "Shipping rates for {$shippingMethod['shipping_service']} should be $shippingAvaialability."
+ );
+ }
+
+ /**
+ * Returns a string representation of successful assertion.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return "Shipping rate has been changed.";
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/CityBasedShippingRateTest.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/CityBasedShippingRateTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..294cf129c607308425fc6e9a3574b047d8b2ff18
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/CityBasedShippingRateTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Shipping\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ * 1. Configure shipping method.
+ * 2. Create products.
+ * 3. Create and setup customer.
+ *
+ * Steps:
+ * 1. Go to Frontend.
+ * 2. Add products to the cart.
+ * 3. Click the 'Proceed to Checkout' button.
+ * 4. Fill shipping information.
+ * 5. Perform assertions.
+ *
+ * @group Shipping
+ * @ZephyrId MAGETWO-56124
+ */
+class CityBasedShippingRateTest extends Scenario
+{
+ /* tags */
+ const MVP = 'yes';
+ const TEST_TYPE = '3rd_party_test';
+ const SEVERITY = 'S1';
+ /* end tags */
+
+ /**
+ * Runs City Based Shipping Rate test.
+ *
+ * @return void
+ */
+ public function test()
+ {
+ $this->executeScenario();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/TestStep/FillShippingAddressesStep.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestStep/FillShippingAddressesStep.php
new file mode 100644
index 0000000000000000000000000000000000000000..8a0f5ea7e269d71234e3cdacbc8c570c6bb040ed
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestStep/FillShippingAddressesStep.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Shipping\Test\TestStep;
+
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Customer\Test\Fixture\Address;
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Shipping\Test\Constraint\AssertCityBasedShippingRateChanged;
+
+/**
+ * Fill shipping addresses and assert rates relouding.
+ */
+class FillShippingAddressesStep implements TestStepInterface
+{
+ /**
+ * Onepage checkout page.
+ *
+ * @var CheckoutOnepage
+ */
+ private $checkoutOnepage;
+
+ /**
+ * Address fixture.
+ *
+ * @var Address[]
+ */
+ private $shippingAddresses;
+
+ /**
+ * Assert City based Shipping rate.
+ *
+ * @var array
+ */
+ private $assertRate;
+
+ /**
+ * @var array
+ */
+ private $isShippingAvailable;
+
+ /**
+ * Shipping method.
+ *
+ * @var array
+ */
+ private $shippingMethod;
+
+ /**
+ * @param CheckoutOnepage $checkoutOnepage
+ * @param FixtureFactory $fixtureFactory
+ * @param AssertCityBasedShippingRateChanged $assertRate
+ * @param array $shippingMethod
+ * @param array $shippingAddresses
+ * @param array $clearShippingAddress
+ * @param array $isShippingAvailable
+ */
+ public function __construct(
+ CheckoutOnepage $checkoutOnepage,
+ FixtureFactory $fixtureFactory,
+ AssertCityBasedShippingRateChanged $assertRate,
+ array $shippingMethod,
+ array $shippingAddresses,
+ array $clearShippingAddress,
+ array $isShippingAvailable
+ ) {
+ $this->checkoutOnepage = $checkoutOnepage;
+ $this->assertRate = $assertRate;
+
+ foreach ($shippingAddresses as $address) {
+ $data = array_merge($clearShippingAddress, $address);
+ $this->shippingAddresses[] = $fixtureFactory->createByCode('address', ['data' => $data]);
+ }
+ $this->isShippingAvailable = $isShippingAvailable;
+ $this->shippingMethod = $shippingMethod;
+ }
+
+ /**
+ * Fill shipping address and assert if the shipping rates is reloaded.
+ *
+ * @return void
+ */
+ public function run()
+ {
+ foreach ($this->shippingAddresses as $key => $shippingAddress) {
+ $this->checkoutOnepage->getShippingBlock()->fill($shippingAddress);
+ $this->assertRate->processAssert(
+ $this->checkoutOnepage,
+ $this->shippingMethod,
+ $this->isShippingAvailable[$key]
+ );
+ }
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/di.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d0d24b810fb44bd0caa7dec1e6b302006904b102
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/di.xml
@@ -0,0 +1,14 @@
+<?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="urn:magento:framework:ObjectManager/etc/config.xsd">
+ <type name="Magento\Shipping\Test\Constraint\AssertCityBasedShippingRateChanged">
+ <arguments>
+ <argument name="severity" xsi:type="string">S1</argument>
+ </arguments>
+ </type>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/testcase.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b1fabed80066b6933f58f89e69aa59ea20042d65
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/testcase.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * 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/Magento/Mtf/TestCase/etc/testcase.xsd">
+ <scenario name="CityBasedShippingRateTest" 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" next="createCustomer" />
+ <step name="createCustomer" module="Magento_Customer" next="selectCheckoutMethod" />
+ <step name="selectCheckoutMethod" module="Magento_Checkout" next="fillShippingAddresses" />
+ <step name="fillShippingAddresses" module="Magento_Shipping" />
+ </scenario>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php
index cc2826c6d840e9d76304ff78015c5e1d49121145..8d11cfea1295ff3f1a874cd02fa606dbf44ec4db 100644
--- a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php
+++ b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php
@@ -63,6 +63,26 @@ class Topmenu extends Block
$category[0]->click();
}
+ /**
+ * Hover on category from top menu by name.
+ *
+ * @param string $categoryName
+ * @return void
+ */
+ public function hoverCategoryByName($categoryName)
+ {
+ $rootElement = $this->_rootElement;
+ $category = $this->waitLoadTopMenu($categoryName);
+ if ($category[1]) {
+ $rootElement->waitUntil(
+ function () use ($category) {
+ return $category[0]->isVisible() ? true : null;
+ }
+ );
+ }
+ $category[0]->hover();
+ }
+
/**
* Check is visible category in top menu by name
*
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/Modal.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/Modal.php
index e7033698568343a7c71e99e5150d77225f90f702..a57616d4d4d0be023c34d3631b6b7ea29a855a03 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/Modal.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/Modal.php
@@ -41,6 +41,13 @@ class Modal extends Block
*/
protected $inputFieldSelector = '[data-role="promptField"]';
+ /**
+ * Locator value for accept warning button.
+ *
+ * @var string
+ */
+ protected $acceptWarningSelector = '.action-primary';
+
/**
* Modal overlay selector.
*
@@ -48,6 +55,13 @@ class Modal extends Block
*/
protected $modalOverlay = '.modals-overlay';
+ /**
+ * Selector for spinner element.
+ *
+ * @var string
+ */
+ protected $loadingMask = '[data-role="loader"]';
+
/**
* Press OK on an alert, confirm, prompt a dialog.
*
@@ -59,6 +73,18 @@ class Modal extends Block
$this->_rootElement->find($this->acceptButtonSelector)->click();
}
+ /**
+ * Press OK on a warning popup.
+ *
+ * @return void
+ */
+ public function acceptWarning()
+ {
+ $this->waitModalAnimationFinished();
+ $this->_rootElement->find($this->acceptWarningSelector)->click();
+ $this->waitForElementNotVisible($this->loadingMask);
+ }
+
/**
* Press Cancel on an alert, confirm, prompt a dialog.
*
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFilteringTest.php b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFilteringTest.php
index 4b923dd4344a93be0e2bf3491c30eecf823f76ba..7a3da9b3fa7cd1d74bf0cc707f8b0be2ddc1214e 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFilteringTest.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFilteringTest.php
@@ -28,6 +28,7 @@ use Magento\Ui\Test\Block\Adminhtml\DataGrid;
class GridFilteringTest extends Injectable
{
/* tags */
+ const SEVERITY = 'S2';
const STABLE = 'no';
const MVP = 'no';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFullTextSearchTest.php b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFullTextSearchTest.php
index 510d2d61c0acd2100b295ee1422015b1833d9c36..a16d61e112a83a2b008f49d9b95e072aec06d7ec 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFullTextSearchTest.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFullTextSearchTest.php
@@ -28,6 +28,7 @@ use Magento\Ui\Test\Block\Adminhtml\DataGrid;
class GridFullTextSearchTest extends Injectable
{
/* tags */
+ const SEVERITY = 'S2';
const STABLE = 'no';
const MVP = 'no';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridSortingTest.php b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridSortingTest.php
index d1f543c7b989137c209bdbd63e6c4755644e9e8b..319ef215bcb142677d847a2c3e6ce0af6ba80199 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridSortingTest.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridSortingTest.php
@@ -28,6 +28,7 @@ use Magento\Ui\Test\Block\Adminhtml\DataGrid;
class GridSortingTest extends Injectable
{
/* tags */
+ const SEVERITY = 'S2';
const MVP = 'no';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Ui/Test/etc/di.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8982c1966306252a5d0113ac49e8efdb011e8ddb
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/etc/di.xml
@@ -0,0 +1,24 @@
+<?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="urn:magento:framework:ObjectManager/etc/config.xsd">
+ <type name="Magento\Ui\Test\Constraint\AssertGridFiltering">
+ <arguments>
+ <argument name="severity" xsi:type="string">S2</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Ui\Test\Constraint\AssertGridFullTextSearch">
+ <arguments>
+ <argument name="severity" xsi:type="string">S2</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Ui\Test\Constraint\AssertGridSorting">
+ <arguments>
+ <argument name="severity" xsi:type="string">S2</argument>
+ </arguments>
+ </type>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertCategoryUrlWithCustomStoreView.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertCategoryUrlWithCustomStoreView.php
new file mode 100644
index 0000000000000000000000000000000000000000..a33ace2ff35ba4c8e91d028b7940244885b67f65
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertCategoryUrlWithCustomStoreView.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\UrlRewrite\Test\Constraint;
+
+use Magento\Catalog\Test\Fixture\Category;
+use Magento\Cms\Test\Page\CmsIndex;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Store\Test\Fixture\Store;
+
+/**
+ * Assert that Category URL key has been changed after changing Category parent.
+ */
+class AssertCategoryUrlWithCustomStoreView extends AbstractConstraint
+{
+ /**
+ * Assert that displayed category data on category page equals to passed from fixture.
+ *
+ * @param Store $storeView
+ * @param Category $childCategory
+ * @param Category $parentCategory
+ * @param Category $categoryUpdates
+ * @param CmsIndex $cmsIndex
+ * @param BrowserInterface $browser
+ */
+ public function processAssert(
+ Store $storeView,
+ Category $childCategory,
+ Category $parentCategory,
+ Category $categoryUpdates,
+ CmsIndex $cmsIndex,
+ BrowserInterface $browser
+ ) {
+ $cmsIndex->open();
+ $cmsIndex->getStoreSwitcherBlock()->selectStoreView($storeView->getName());
+ $cmsIndex->getTopmenu()->hoverCategoryByName($parentCategory->getName());
+ $cmsIndex->getTopmenu()->selectCategoryByName(
+ $childCategory->getName()
+ );
+ $actualUrl = strtolower($parentCategory->getUrlKey() . '/' . $categoryUpdates->getUrlKey());
+ $result = (bool)strpos($browser->getUrl(), $actualUrl);
+
+ \PHPUnit_Framework_Assert::assertTrue(
+ $result,
+ "Category URL is not correct."
+ );
+ }
+
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Category URL is correct.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php
index b94e716ceac64e0038d50dcd22499fa51c779eeb..3630bd697b8593a966f4ed93b67794b80b6da185 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php
@@ -7,8 +7,8 @@
namespace Magento\UrlRewrite\Test\Constraint;
use Magento\Catalog\Test\Fixture\Category;
-use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
/**
* Class AssertUrlRewriteCategoryInGrid
@@ -17,16 +17,20 @@ use Magento\Mtf\Constraint\AbstractConstraint;
class AssertUrlRewriteCategoryInGrid extends AbstractConstraint
{
/**
- * Assert that url rewrite category in grid
+ * Assert that url rewrite category in grid.
*
* @param Category $category
* @param UrlRewriteIndex $urlRewriteIndex
+ * @param string $filterByPath
* @return void
*/
- public function processAssert(Category $category, UrlRewriteIndex $urlRewriteIndex)
- {
+ public function processAssert(
+ Category $category,
+ UrlRewriteIndex $urlRewriteIndex,
+ $filterByPath = 'target_path'
+ ) {
$urlRewriteIndex->open();
- $filter = ['target_path' => strtolower($category->getUrlKey())];
+ $filter = [$filterByPath => strtolower($category->getUrlKey())];
\PHPUnit_Framework_Assert::assertTrue(
$urlRewriteIndex->getUrlRedirectGrid()->isRowVisible($filter, true, false),
'URL Rewrite with request path "' . $category->getUrlKey() . '" is absent in grid.'
@@ -34,7 +38,7 @@ class AssertUrlRewriteCategoryInGrid extends AbstractConstraint
}
/**
- * URL rewrite category present in grid
+ * URL rewrite category present in grid.
*
* @return string
*/
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..659b29590622919363f3d98743208a4132ade678
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\UrlRewrite\Test\TestCase;
+
+use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryIndex;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit;
+use Magento\Catalog\Test\Fixture\Category;
+use Magento\Mtf\TestCase\Injectable;
+use Magento\Store\Test\Fixture\Store;
+
+/**
+ * Test for Url rewrites in catalog categories after changing url key for store view and moving category.
+ *
+ * Preconditions:
+ * 1. Create additional Store View in Main Website Store.
+ * 2. Create sub-categories "first-test" and "second-test" in Default Category.
+ * 3. Add one or more any products to created sub-categories.
+ * 4. Reindex and clean caches.
+ *
+ * Steps:
+ * 1. Log in to backend.
+ * 2. Navigate to Products > Categories.
+ * 3. On the categories editing page change store view to created additional view.
+ * 4. Change URL key for category "first-test" from default to "first-test-2". Save.
+ * 5. Change store view to "All store views".
+ * 6. Move category "first-test" inside "second-test".
+ * 7. Perform all assertions.
+ *
+ * @ZephyrId MAGETWO-45385
+ */
+class CategoryUrlRewriteTest extends Injectable
+{
+ /**
+ * CatalogCategoryIndex page.
+ *
+ * @var CatalogCategoryIndex
+ */
+ private $catalogCategoryIndex;
+
+ /**
+ * CatalogCategoryEdit page.
+ *
+ * @var CatalogCategoryEdit
+ */
+ private $catalogCategoryEdit;
+
+ /**
+ * Inject page end prepare default category.
+ *
+ * @param CatalogCategoryIndex $catalogCategoryIndex
+ * @param CatalogCategoryEdit $catalogCategoryEdit
+ * @return array
+ */
+ public function __inject(
+ CatalogCategoryIndex $catalogCategoryIndex,
+ CatalogCategoryEdit $catalogCategoryEdit
+ ) {
+ $this->catalogCategoryIndex = $catalogCategoryIndex;
+ $this->catalogCategoryEdit = $catalogCategoryEdit;
+ }
+
+ /**
+ * Runs test.
+ *
+ * @param Store $storeView
+ * @param Category $childCategory
+ * @param Category $parentCategory
+ * @param Category $categoryUpdates
+ * @return array
+ */
+ public function test(Store $storeView, Category $childCategory, Category $parentCategory, Category $categoryUpdates)
+ {
+ // Preconditions:
+ $storeView->persist();
+ $parentCategory->persist();
+ $childCategory->persist();
+
+ // Steps:
+ $this->catalogCategoryIndex->open();
+ $this->catalogCategoryIndex->getTreeCategories()->selectCategory($childCategory);
+ $this->catalogCategoryEdit->getFormPageActions()->selectStoreView($storeView->getName());
+ $this->catalogCategoryEdit->getEditForm()->fill($categoryUpdates);
+ $this->catalogCategoryEdit->getFormPageActions()->save();
+ $this->catalogCategoryIndex->getTreeCategories()->assignCategory(
+ $parentCategory->getName(),
+ $childCategory->getName()
+ );
+ $this->catalogCategoryEdit->getModalBlock()->acceptWarning();
+
+ return [
+ 'storeView' => $storeView,
+ 'childCategory' => $childCategory,
+ 'parentCategory' => $parentCategory
+ ];
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d39650944a203af72f92a30ff7918f4182b6cb37
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * 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\UrlRewrite\Test\TestCase\CategoryUrlRewriteTest" summary="Check url rewrites in catalog categories after changing url key for store view and moving category." ticketId="MAGETWO-45385">
+ <variation name="CategoryUrlRewriteTestVariation1">
+ <data name="storeView/dataset" xsi:type="string">custom</data>
+ <data name="childCategory/dataset" xsi:type="string">default</data>
+ <data name="childCategory/data/category_products/dataset" xsi:type="string">catalogProductSimple::default</data>
+ <data name="parentCategory/dataset" xsi:type="string">default</data>
+ <data name="parentCategory/data/category_products/dataset" xsi:type="string">catalogProductSimple::default</data>
+ <data name="categoryUpdates/data/use_default_url_key" xsi:type="string">No</data>
+ <data name="categoryUpdates/data/url_key" xsi:type="string">UrlKey%isolation%</data>
+ <constraint name="Magento\UrlRewrite\Test\Constraint\AssertCategoryUrlWithCustomStoreView" />
+ </variation>
+ </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserPasswordChangedSuccessfully.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserPasswordChangedSuccessfully.php
new file mode 100644
index 0000000000000000000000000000000000000000..fec96f699ea65babe062ffc25d4563304ab187ac
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserPasswordChangedSuccessfully.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\User\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\User\Test\Page\Adminhtml\UserIndex;
+
+/**
+ * Assert to check change password error appearance.
+ */
+class AssertUserPasswordChangedSuccessfully extends AbstractConstraint
+{
+ /**
+ * Fail message when provided password have been in use.
+ */
+ const FAIL_MESSAGE = 'Sorry, but this password has already been used. Please create another.';
+
+ /**
+ * Asserts that failed message equals to expected message.
+ *
+ * @param UserIndex $userIndex
+ * @return void
+ */
+ public function processAssert(UserIndex $userIndex)
+ {
+ $errorMessage = $userIndex->getMessagesBlock()->getErrorMessage();
+ \PHPUnit_Framework_Assert::assertEquals(
+ self::FAIL_MESSAGE,
+ $errorMessage,
+ 'Password update failed with error: "' . self::FAIL_MESSAGE . '"'
+ );
+ }
+
+ /**
+ * Returns success message if there is fail message.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Password validation completed successfully.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdatePasswordUserEntityPciRequirementsTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdatePasswordUserEntityPciRequirementsTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..df95519e5ffe44c5dcc8b7d27adf2e3519eb4958
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdatePasswordUserEntityPciRequirementsTest.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\User\Test\TestCase;
+
+use Magento\Backend\Test\Page\AdminAuthLogin;
+use Magento\Backend\Test\Page\Adminhtml\Dashboard;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
+use Magento\User\Test\Fixture\User;
+use Magento\User\Test\Page\Adminhtml\UserEdit;
+
+/**
+ * Preconditions:
+ * 1. Admin user with assigned full access role is created.
+ *
+ * Steps:
+ * 1. Login to Magento admin module with valid credentials.
+ * 2. Navigate to System > All Users
+ * 3. Click on admin record to open > Account Information page.
+ * 4. Update password providing a new password.
+ * 5. Save user
+ * 6. Repeat Steps 4-5 4 times with different passwords.
+ * 7. Update password providing an original password for the user.
+ *
+ * @ZephyrId MAGETWO-48104
+ */
+class UpdatePasswordUserEntityPciRequirementsTest extends Injectable
+{
+ /**
+ * User edit page on backend.
+ *
+ * @var UserEdit
+ */
+ protected $userEdit;
+
+ /**
+ * Dashboard page on backend.
+ *
+ * @var Dashboard
+ */
+ protected $dashboard;
+
+ /**
+ * Authorization page on backend.
+ *
+ * @var AdminAuthLogin
+ */
+ protected $adminAuth;
+
+ /**
+ * Fixture factory.
+ *
+ * @var FixtureFactory
+ */
+ protected $fixtureFactory;
+
+ /**
+ * Setup necessary data for test.
+ *
+ * @param UserEdit $userEdit
+ * @param Dashboard $dashboard
+ * @param AdminAuthLogin $adminAuth
+ * @param FixtureFactory $fixtureFactory
+ * @return void
+ */
+ public function __inject(
+ UserEdit $userEdit,
+ Dashboard $dashboard,
+ AdminAuthLogin $adminAuth,
+ FixtureFactory $fixtureFactory
+ ) {
+ $this->userEdit = $userEdit;
+ $this->dashboard = $dashboard;
+ $this->adminAuth = $adminAuth;
+ $this->fixtureFactory = $fixtureFactory;
+ }
+
+ /**
+ * Run Test.
+ *
+ * @param User $user
+ * @param array $passwords
+ * @return void
+ */
+ public function test(
+ User $user,
+ array $passwords
+ ) {
+ // Preconditions
+ $user->persist();
+ $initialPassword = $user->getPassword();
+ $currentPassword = $user->getPassword();
+ $passwords[] = $initialPassword;
+
+ // Steps
+ $this->adminAuth->open();
+ $this->adminAuth->getLoginBlock()->fill($user);
+ $this->adminAuth->getLoginBlock()->submit();
+
+ foreach ($passwords as $password) {
+ $data = [
+ 'password' => $password,
+ 'password_confirmation' => $password,
+ 'current_password' => $currentPassword,
+
+ ];
+ $updatedUser = $this->fixtureFactory->createByCode('user', ['data' => $data]);
+
+ $this->userEdit->open(['user_id' => $user->getUserId()]);
+ $this->userEdit->getUserForm()->fill($updatedUser);
+ $this->userEdit->getPageActions()->save();
+ $currentPassword = $password;
+ }
+ }
+
+ /**
+ * Logout Admin User from account.
+ *
+ * @return void
+ */
+ public function tearDown()
+ {
+ if ($this->dashboard->getAdminPanelHeader()->isVisible()) {
+ $this->dashboard->getAdminPanelHeader()->logOut();
+ }
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdatePasswordUserEntityPciRequirementsTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdatePasswordUserEntityPciRequirementsTest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c2a24b0f102e22804b4e0e1b9c466176f8e32efa
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdatePasswordUserEntityPciRequirementsTest.xml
@@ -0,0 +1,19 @@
+<?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\User\Test\TestCase\UpdatePasswordUserEntityPciRequirementsTest" summary="PCI password requirements for admin users while changing a passworrd" ticketId="MAGETWO-48104">
+ <variation name="UpdatePasswordUserEntityPciRequirementsTestVariation1">
+ <data name="user/dataset" xsi:type="string">custom_admin_with_default_role</data>
+ <data name="passwords/0" xsi:type="string">123123^q0</data>
+ <data name="passwords/1" xsi:type="string">123123^q1</data>
+ <data name="passwords/2" xsi:type="string">123123^q2</data>
+ <data name="passwords/3" xsi:type="string">123123^q3</data>
+ <constraint name="Magento\User\Test\Constraint\AssertUserPasswordChangedSuccessfully" />
+ </variation>
+ </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/Block/Onepage/Payment/Method/Vault.php b/dev/tests/functional/tests/app/Magento/Vault/Test/Block/Onepage/Payment/Method/Vault.php
new file mode 100644
index 0000000000000000000000000000000000000000..c416381a0b2137ec0273a6e1b1b14ea93a80a2c1
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/Block/Onepage/Payment/Method/Vault.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Vault\Test\Block\Onepage\Payment\Method;
+
+use Magento\Mtf\Client\Locator;
+use Magento\Checkout\Test\Block\Onepage\Payment\Method;
+
+/**
+ * Checkout payment method vault block.
+ */
+class Vault extends Method
+{
+ /**
+ * Credit card selector.
+ *
+ * @var string
+ */
+ private $creditCardSelector = './/*[contains(@for, "_vault_item")]/span[text()="%s"]';
+
+ /**
+ * Save credit card check box.
+ *
+ * @var string
+ */
+ protected $vaultCheckbox = '#%s_enable_vault';
+
+ /**
+ * Save credit card.
+ *
+ * @param string $paymentMethod
+ * @param string $creditCardSave
+ * @return void
+ */
+ public function saveCreditCard($paymentMethod, $creditCardSave)
+ {
+ $saveCard = sprintf($this->vaultCheckbox, $paymentMethod);
+ $this->_rootElement->find($saveCard, Locator::SELECTOR_CSS, 'checkbox')->setValue($creditCardSave);
+ }
+
+ /**
+ * Check if Save credit card check box is visible.
+ *
+ * @param string $paymentMethod
+ * @return bool
+ */
+ public function isVaultVisible($paymentMethod)
+ {
+ $saveCard = sprintf($this->vaultCheckbox, $paymentMethod);
+ return $this->_rootElement->find($saveCard, Locator::SELECTOR_CSS, 'checkbox')->isVisible();
+ }
+
+ /**
+ * Verify if saved credit card is present as a payment option.
+ *
+ * @param string $creditCard
+ * @return bool
+ */
+ public function isSavedCreditCardPresent($creditCard)
+ {
+ $paymentLabelSelector = sprintf($this->creditCardSelector, $creditCard);
+ return $this->_rootElement->find($paymentLabelSelector, Locator::SELECTOR_XPATH)->isVisible();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/Block/VaultPayment.php b/dev/tests/functional/tests/app/Magento/Vault/Test/Block/VaultPayment.php
deleted file mode 100644
index 2afa11baee329097bb2c3847c64a73b853a9a226..0000000000000000000000000000000000000000
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/Block/VaultPayment.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Copyright © 2016 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Vault\Test\Block;
-
-use Magento\Mtf\Block\Block;
-use Magento\Mtf\Client\ElementInterface;
-use Magento\Mtf\Client\Locator;
-use Magento\Mtf\Fixture\InjectableFixture;
-
-class VaultPayment extends Block
-{
- /**
- * Credit card selector.
- */
- private $creditCardSelector = './/*[contains(@for, "_vault_item")]/span[text()="%s"]';
-
- /**
- * Verify if saved credit card is present as a payment option.
- *
- * @param string $creditCard
- * @return bool
- */
- public function isSavedCreditCardPresent($creditCard)
- {
- $paymentLabelSelector = sprintf($this->creditCardSelector, $creditCard);
- return $this->browser->find($paymentLabelSelector, Locator::SELECTOR_XPATH)->isVisible();
- }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/Constraint/AssertSaveCreditCardOptionNotPresent.php b/dev/tests/functional/tests/app/Magento/Vault/Test/Constraint/AssertSaveCreditCardOptionNotPresent.php
new file mode 100644
index 0000000000000000000000000000000000000000..dbe14c977c2d4988d017b50422e4c10bf5f4aec5
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/Constraint/AssertSaveCreditCardOptionNotPresent.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Test\Constraint;
+
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert that 'Save for later use' checkbox is not present in credit card form.
+ */
+class AssertSaveCreditCardOptionNotPresent extends AbstractConstraint
+{
+ /**
+ * Assert that 'Save for later use' checkbox is not present in credit card form.
+ *
+ * @param CheckoutOnepage $checkoutOnepage
+ * @param string $payment
+ * @return void
+ */
+ public function processAssert(CheckoutOnepage $checkoutOnepage, $payment)
+ {
+ \PHPUnit_Framework_Assert::assertFalse(
+ $checkoutOnepage->getVaultPaymentBlock()->isVaultVisible($payment),
+ 'Save for later use checkbox is present.'
+ );
+ }
+
+ /**
+ * Returns string representation of successful assertion.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Save for later use checkbox is not present in credit card form.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/Page/CheckoutOnepage.xml b/dev/tests/functional/tests/app/Magento/Vault/Test/Page/CheckoutOnepage.xml
index 9568a88096186d25a17916de4d24ceb2fe9a5612..fd1412e15649f6db9302e5bc23ea4474334ea384 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/Page/CheckoutOnepage.xml
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/Page/CheckoutOnepage.xml
@@ -7,6 +7,6 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
<page name="CheckoutOnepage" mca="checkout" module="Magento_Checkout">
- <block name="vaultPaymentBlock" class="Magento\Vault\Test\Block\VaultPayment" locator="#checkout-step-payment" strategy="css selector" />
+ <block name="vaultPaymentBlock" class="Magento\Vault\Test\Block\Onepage\Payment\Method\Vault" locator="#checkout-step-payment" strategy="css selector" />
</page>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.xml b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.xml
index ac69bfb9f47e4550e6ab4592cccbdf56cf682da3..2cafc815fed1dfc1865d1f2627f536d1ba909563 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.xml
@@ -26,7 +26,7 @@
<item name="method" xsi:type="string">payflowpro</item>
<item name="creditCardClass" xsi:type="string">credit_card</item>
<item name="creditCard" xsi:type="array">
- <item name="dataset" xsi:type="string">amex_default</item>
+ <item name="dataset" xsi:type="string">visa_alt</item>
</item>
</item>
<item name="2" xsi:type="array">
@@ -43,7 +43,7 @@
<item name="method" xsi:type="string">payflowpro</item>
<item name="creditCardClass" xsi:type="string">credit_card</item>
<item name="creditCard" xsi:type="array">
- <item name="dataset" xsi:type="string">amex_default</item>
+ <item name="dataset" xsi:type="string">visa_alt</item>
</item>
<item name="vault" xsi:type="array">
<item name="method" xsi:type="string">payflowpro_cc_vault</item>
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/CheckSaveCreditCardOptionStep.php b/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/CheckSaveCreditCardOptionStep.php
new file mode 100644
index 0000000000000000000000000000000000000000..eee0f1be86ef79198a7864df8be90e8a225ea840
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/CheckSaveCreditCardOptionStep.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Test\TestStep;
+
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Vault\Test\Constraint\AssertSaveCreditCardOptionNotPresent;
+
+/**
+ * Check if customer cannot save credit card for later use if vault is disabled.
+ */
+class CheckSaveCreditCardOptionStep implements TestStepInterface
+{
+ /**
+ * Onepage checkout page.
+ *
+ * @var CheckoutOnepage
+ */
+ private $checkoutOnepage;
+
+ /**
+ * Assert that 'Save for later use' checkbox is not present in credit card form.
+ *
+ * @var AssertSaveCreditCardOptionNotPresent
+ */
+ private $assertSaveCreditCardOptionNotPresent;
+
+ /**
+ * Payment method.
+ *
+ * @var array
+ */
+ private $payment;
+
+ /**
+ * If 'Save for later use' checkbox is present in credit card form.
+ *
+ * @var null|bool
+ */
+ private $isVaultPresent;
+
+ /**
+ * @param CheckoutOnepage $checkoutOnepage
+ * @param AssertSaveCreditCardOptionNotPresent $assertSaveCreditCardOptionNotPresent
+ * @param array $payment
+ * @param null|bool $isVaultPresent
+ */
+ public function __construct(
+ CheckoutOnepage $checkoutOnepage,
+ AssertSaveCreditCardOptionNotPresent $assertSaveCreditCardOptionNotPresent,
+ array $payment,
+ $isVaultPresent = null
+ ) {
+ $this->checkoutOnepage = $checkoutOnepage;
+ $this->assertSaveCreditCardOptionNotPresent = $assertSaveCreditCardOptionNotPresent;
+ $this->payment = $payment;
+ $this->isVaultPresent = $isVaultPresent;
+ }
+
+ /**
+ * Run step that verifies if 'Save for later use' checkbox is not present in credit card form.
+ *
+ * @return void
+ */
+ public function run()
+ {
+ if ($this->isVaultPresent === false) {
+ $this->assertSaveCreditCardOptionNotPresent->processAssert(
+ $this->checkoutOnepage,
+ $this->payment['method']
+ );
+ }
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/SaveCreditCardStep.php b/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/SaveCreditCardStep.php
index 0f06f5f636bdc14dcdb1c3b300c2fd4c6f5186eb..63fe8c2401336eef268f89f226e1ec484a54ffd9 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/SaveCreditCardStep.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/SaveCreditCardStep.php
@@ -57,7 +57,7 @@ class SaveCreditCardStep implements TestStepInterface
*/
public function run()
{
- $this->checkoutOnepage->getPaymentBlock()->getSelectedPaymentMethodBlock()->saveCreditCard(
+ $this->checkoutOnepage->getVaultPaymentBlock()->saveCreditCard(
$this->payment['method'],
$this->creditCardSave
);
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Vault/Test/etc/testcase.xml
index cd34b9664820892b4275c93e7b7e43afaaf2f1e4..ee55d7ef5ba905973cbbfb38effab1ccc7f750e0 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/etc/testcase.xml
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/etc/testcase.xml
@@ -56,7 +56,8 @@
<step name="selectCheckoutMethod" module="Magento_Checkout" next="fillShippingAddress" />
<step name="fillShippingAddress" module="Magento_Checkout" next="fillShippingMethod" />
<step name="fillShippingMethod" module="Magento_Checkout" next="selectPaymentMethod" />
- <step name="selectPaymentMethod" module="Magento_Checkout" next="fillBillingInformation" />
+ <step name="selectPaymentMethod" module="Magento_Checkout" next="checkSaveCreditCardOption" />
+ <step name="checkSaveCreditCardOption" module="Magento_Vault" next="fillBillingInformation" />
<step name="fillBillingInformation" module="Magento_Checkout" next="placeOrder" />
<step name="placeOrder" module="Magento_Checkout" next="openOrder" />
<step name="openOrder" module="Magento_Sales" next="reorder" />
@@ -64,4 +65,7 @@
<step name="useVaultPaymentToken" module="Magento_Vault" next="submitOrder" />
<step name="submitOrder" module="Magento_Sales" />
</scenario>
+ <scenario name="OnePageCheckoutTest">
+ <step name="checkSaveCreditCardOption" module="Magento_Vault" prev="selectPaymentMethod" next="placeOrder" />
+ </scenario>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyComparedProducts.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyComparedProducts.php
index 745c3afe0aa91cc794d99e7312b620128d3306b4..c32ba27b671655a47a8400391f5fc7a7671d7083 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyComparedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyComparedProducts.php
@@ -118,6 +118,7 @@ class AssertWidgetRecentlyComparedProducts extends AbstractConstraint
protected function removeCompareProducts()
{
$this->cmsIndex->open();
+ $this->cmsIndex->getCompareLinkBlock()->waitForCompareProductsLinks();
$this->cmsIndex->getLinksBlock()->openLink("Compare Products");
$this->catalogProductCompare->getCompareProductsBlock()->removeAllProducts();
}
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetEntityTest.xml b/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetEntityTest.xml
index 225759df91f179dbd911fca662c05476c4830a69..57920ead79a7d113e37123d3603462759728393c 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetEntityTest.xml
@@ -42,7 +42,7 @@
<constraint name="Magento\Widget\Test\Constraint\AssertWidgetRecentlyViewedProducts" />
</variation>
<variation name="CreateWidgetEntityTestVariation4">
- <data name="tag" xsi:type="string">severity:S1, stable:no</data>
+ <data name="tag" xsi:type="string">severity:S1</data>
<data name="widget/data/code" xsi:type="string">Recently Compared Products</data>
<data name="widget/data/theme_id" xsi:type="string">Magento Luma</data>
<data name="widget/data/title" xsi:type="string">Title_%isolation%</data>
diff --git a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricingTest.php b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricingTest.php
index b8c72e9a3ebb19cdabc75933d56c0566e3f71bb8..4226ec190020cb4670c693ca681193b09ab30884 100644
--- a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricingTest.php
+++ b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricingTest.php
@@ -59,7 +59,9 @@ class AdvancedPricingTest extends \PHPUnit_Framework_TestCase
$csvfile = uniqid('importexport_') . '.csv';
- $this->exportData($csvfile);
+ $exportContent = $this->exportData($csvfile);
+ $this->assertDiscountTypes($exportContent);
+
$this->importData($csvfile);
while ($index > 0) {
@@ -72,6 +74,24 @@ class AdvancedPricingTest extends \PHPUnit_Framework_TestCase
}
}
+ /**
+ * Assert for correct tier prices discount types.
+ *
+ * @param string $exportContent
+ * @return void
+ */
+ private function assertDiscountTypes($exportContent)
+ {
+ $this->assertContains(
+ '2.0000,8.0000,Fixed',
+ $exportContent
+ );
+ $this->assertContains(
+ '10.0000,50.00,Discount',
+ $exportContent
+ );
+ }
+
/**
* @magentoAppArea adminhtml
* @magentoDbIsolation enabled
diff --git a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricingTest.php b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricingTest.php
index e5fd4cc0d9630080eb7c06f2558b02be889f8a57..bdbd06e2d626630c993ac72052d1119b5e323fbf 100644
--- a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricingTest.php
+++ b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricingTest.php
@@ -48,34 +48,52 @@ class AdvancedPricingTest extends \PHPUnit_Framework_TestCase
[
'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
'value' => '300.0000',
- 'qty' => '10.0000'
+ 'qty' => '10.0000',
+ 'percentage_value' => null
],
[
'customer_group_id' => '1',
'value' => '11.0000',
- 'qty' => '11.0000'
+ 'qty' => '11.0000',
+ 'percentage_value' => null
],
[
'customer_group_id' => '3',
'value' => '14.0000',
- 'qty' => '14.0000'
+ 'qty' => '14.0000',
+ 'percentage_value' => null
+ ],
+ [
+ 'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
+ 'value' => '160.5000',
+ 'qty' => '20.0000',
+ 'percentage_value' => '50.0000'
]
],
'AdvancedPricingSimple 2' => [
[
'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
'value' => '1000000.0000',
- 'qty' => '100.0000'
+ 'qty' => '100.0000',
+ 'percentage_value' => null
],
[
'customer_group_id' => '0',
'value' => '12.0000',
- 'qty' => '12.0000'
+ 'qty' => '12.0000',
+ 'percentage_value' => null
],
[
'customer_group_id' => '2',
'value' => '13.0000',
- 'qty' => '13.0000'
+ 'qty' => '13.0000',
+ 'percentage_value' => null
+ ],
+ [
+ 'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
+ 'value' => '327.0000',
+ 'qty' => '200.0000',
+ 'percentage_value' => '50.0000'
]
]
];
@@ -121,18 +139,40 @@ class AdvancedPricingTest extends \PHPUnit_Framework_TestCase
foreach ($productIdList as $sku => $productId) {
$product->load($productId);
$tierPriceCollection = $product->getTierPrices();
- $this->assertEquals(3, count($tierPriceCollection));
+ $this->assertEquals(4, count($tierPriceCollection));
+ $index = 0;
/** @var \Magento\Catalog\Model\Product\TierPrice $tierPrice */
foreach ($tierPriceCollection as $tierPrice) {
- $this->assertEquals(0, $tierPrice->getExtensionAttributes()->getPercentageValue());
+ $this->checkPercentageDiscount($tierPrice, $sku, $index);
$this->assertEquals(0, $tierPrice->getExtensionAttributes()->getWebsiteId());
$tierPriceData = $tierPrice->getData();
unset($tierPriceData['extension_attributes']);
$this->assertContains($tierPriceData, $this->expectedTierPrice[$sku]);
+ $index ++;
}
}
}
+ /**
+ * Check percentage discount type.
+ *
+ * @param \Magento\Catalog\Model\Product\TierPrice $tierPrice
+ * @param string $sku
+ * @param int $index
+ * @return void
+ */
+ private function checkPercentageDiscount(
+ \Magento\Catalog\Model\Product\TierPrice $tierPrice,
+ $sku,
+ $index
+ ) {
+ $this->assertEquals(
+ $this->expectedTierPrice[$sku][$index]['percentage_value'],
+ $tierPrice->getExtensionAttributes()->getPercentageValue()
+ );
+ $tierPrice->setData('percentage_value', $tierPrice->getExtensionAttributes()->getPercentageValue());
+ }
+
/**
* @magentoAppArea adminhtml
* @magentoDbIsolation enabled
@@ -241,14 +281,16 @@ class AdvancedPricingTest extends \PHPUnit_Framework_TestCase
foreach ($productIdList as $sku => $productId) {
$product->load($productId);
$tierPriceCollection = $product->getTierPrices();
- $this->assertEquals(3, count($tierPriceCollection));
+ $this->assertEquals(4, count($tierPriceCollection));
+ $index = 0;
/** @var \Magento\Catalog\Model\Product\TierPrice $tierPrice */
foreach ($tierPriceCollection as $tierPrice) {
- $this->assertEquals(0, $tierPrice->getExtensionAttributes()->getPercentageValue());
+ $this->checkPercentageDiscount($tierPrice, $sku, $index);
$this->assertEquals(0, $tierPrice->getExtensionAttributes()->getWebsiteId());
$tierPriceData = $tierPrice->getData();
unset($tierPriceData['extension_attributes']);
$this->assertContains($tierPriceData, $this->expectedTierPrice[$sku]);
+ $index ++;
}
}
}
diff --git a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Import/_files/import_advanced_pricing.csv b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Import/_files/import_advanced_pricing.csv
index 37c0dff622f56e9bcbba0bfab9136b5aab0de4cd..0c25cb37bf220f3f453d67065bd9b46fcc7a768b 100644
--- a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Import/_files/import_advanced_pricing.csv
+++ b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Import/_files/import_advanced_pricing.csv
@@ -1,7 +1,9 @@
-sku,tier_price_website,tier_price_customer_group,tier_price_qty,tier_price
-"AdvancedPricingSimple 1","All Websites [USD]","ALL GROUPS",10.0000,300.0000
-"AdvancedPricingSimple 2","All Websites [USD]","ALL GROUPS",100.0000,1000000.0000
-"AdvancedPricingSimple 1","All Websites [USD]",General,11.0000,11.0000
-"AdvancedPricingSimple 2","All Websites [USD]","NOT LOGGED IN",12.0000,12.0000
-"AdvancedPricingSimple 1","All Websites [USD]",Retailer,14.0000,14.0000
-"AdvancedPricingSimple 2","All Websites [USD]",Wholesale,13.0000,13.0000
+sku,tier_price_website,tier_price_customer_group,tier_price_qty,tier_price,tier_price_value_type
+"AdvancedPricingSimple 1","All Websites [USD]","ALL GROUPS",10.0000,300.0000,Fixed
+"AdvancedPricingSimple 2","All Websites [USD]","ALL GROUPS",100.0000,1000000.0000,Fixed
+"AdvancedPricingSimple 1","All Websites [USD]",General,11.0000,11.0000,Fixed
+"AdvancedPricingSimple 2","All Websites [USD]","NOT LOGGED IN",12.0000,12.0000,Fixed
+"AdvancedPricingSimple 1","All Websites [USD]",Retailer,14.0000,14.0000,Fixed
+"AdvancedPricingSimple 2","All Websites [USD]",Wholesale,13.0000,13.0000,Fixed
+"AdvancedPricingSimple 1","All Websites [USD]","ALL GROUPS",20.0000,50,Discount
+"AdvancedPricingSimple 2","All Websites [USD]","ALL GROUPS",200.0000,50,Discount
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/BundlePriceAbstract.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/BundlePriceAbstract.php
new file mode 100644
index 0000000000000000000000000000000000000000..a6f5653b276c00891d6113fc200c30aa66b9cedc
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/BundlePriceAbstract.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Model\Product;
+
+/**
+ * Abstract class for testing bundle prices
+ */
+abstract class BundlePriceAbstract extends \PHPUnit_Framework_TestCase
+{
+ /** Fixed price type for product custom option */
+ const CUSTOM_OPTION_PRICE_TYPE_FIXED = 'fixed';
+
+ /** Percent price type for product custom option */
+ const CUSTOM_OPTION_PRICE_TYPE_PERCENT = 'percent';
+
+ /** @var \Magento\TestFramework\Helper\Bootstrap */
+ protected $objectManager;
+
+ /** @var \Magento\Catalog\Api\ProductRepositoryInterface */
+ protected $productRepository;
+
+ protected function setUp()
+ {
+ $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+ $this->productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+ }
+
+ /**
+ * Get test cases
+ * @return array
+ */
+ abstract public function getTestCases();
+
+ /**
+ * @param array $strategyModifiers
+ * @param string $productSku
+ * @return void
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ * @throws \Magento\Framework\Exception\InputException
+ * @throws \Magento\Framework\Exception\StateException
+ * @throws \Magento\Framework\Exception\CouldNotSaveException
+ */
+ protected function prepareFixture($strategyModifiers, $productSku)
+ {
+ $bundleProduct = $this->productRepository->get($productSku);
+
+ foreach ($strategyModifiers as $modifier) {
+ if (method_exists($this, $modifier['modifierName'])) {
+ array_unshift($modifier['data'], $bundleProduct);
+ $bundleProduct = call_user_func_array([$this, $modifier['modifierName']], $modifier['data']);
+ } else {
+ throw new \Magento\Framework\Exception\InputException(
+ __('Modifier %s does not exists', $modifier['modifierName'])
+ );
+ }
+ }
+
+ $this->productRepository->save($bundleProduct);
+ }
+
+ /**
+ * Add simple product to bundle
+ *
+ * @param \Magento\Catalog\Model\Product $bundleProduct
+ * @param array $optionsData
+ * @return \Magento\Catalog\Model\Product
+ */
+ protected function addSimpleProduct(\Magento\Catalog\Model\Product $bundleProduct, array $optionsData)
+ {
+ $options = [];
+
+ foreach ($optionsData as $optionData) {
+ $links = [];
+ $linksData = $optionData['links'];
+ unset($optionData['links']);
+
+ $option = $this->objectManager->create(\Magento\Bundle\Api\Data\OptionInterfaceFactory::class)
+ ->create(['data' => $optionData])
+ ->setSku($bundleProduct->getSku());
+
+ foreach ($linksData as $linkData) {
+ $links[] = $this->objectManager->create(\Magento\Bundle\Api\Data\LinkInterfaceFactory::class)
+ ->create(['data' => $linkData]);
+ }
+
+ $option->setProductLinks($links);
+ $options[] = $option;
+ }
+
+ $extension = $bundleProduct->getExtensionAttributes();
+ $extension->setBundleProductOptions($options);
+ $bundleProduct->setExtensionAttributes($extension);
+
+ return $bundleProduct;
+ }
+
+ /**
+ * @param \Magento\Catalog\Model\Product $bundleProduct
+ * @param array $optionsData
+ * @return \Magento\Catalog\Model\Product
+ */
+ protected function addCustomOption(\Magento\Catalog\Model\Product $bundleProduct, array $optionsData)
+ {
+ /** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory $customOptionFactory */
+ $customOptionFactory = $this->objectManager
+ ->create(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class);
+
+ $options = [];
+ foreach ($optionsData as $optionData) {
+ $customOption = $customOptionFactory->create(
+ [
+ 'data' => $optionData
+ ]
+ );
+ $customOption->setProductSku($bundleProduct->getSku());
+ $customOption->setOptionId(null);
+
+ $options[] = $customOption;
+ }
+
+ $bundleProduct->setOptions($options);
+ $bundleProduct->setCanSaveCustomOptions(true);
+
+ return $bundleProduct;
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundlePriceCalculatorTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundlePriceCalculatorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..b97fb29b2ba54f0984bbf3b9b652161de3aaff9f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundlePriceCalculatorTest.php
@@ -0,0 +1,327 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Model\Product;
+
+/**
+ * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
+ * @magentoAppArea frontend
+ */
+class DynamicBundlePriceCalculatorTest extends BundlePriceAbstract
+{
+ /**
+ * @param array $strategyModifiers
+ * @param array $expectedResults
+ * @dataProvider getTestCases
+ * @magentoAppIsolation enabled
+ */
+ public function testPriceForDynamicBundle(array $strategyModifiers, array $expectedResults)
+ {
+ $this->prepareFixture($strategyModifiers, 'bundle_product');
+ $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
+
+ /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
+ $priceInfo = $bundleProduct->getPriceInfo();
+ $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
+
+ $this->assertEquals(
+ $expectedResults['minimalPrice'],
+ $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
+ 'Failed to check minimal price on product'
+ );
+
+ $this->assertEquals(
+ $expectedResults['maximalPrice'],
+ $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
+ 'Failed to check maximal price on product'
+ );
+ }
+
+ /**
+ * @param array $strategyModifiers
+ * @param array $expectedResults
+ * @dataProvider getTestCases
+ * @magentoAppIsolation enabled
+ * @magentoConfigFixture current_store catalog/price/scope 1
+ */
+ public function testPriceForDynamicBundleInWebsiteScope(array $strategyModifiers, array $expectedResults)
+ {
+ $this->prepareFixture($strategyModifiers, 'bundle_product');
+ $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
+
+ /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
+ $priceInfo = $bundleProduct->getPriceInfo();
+ $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
+
+ $this->assertEquals(
+ $expectedResults['minimalPrice'],
+ $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
+ 'Failed to check minimal price on product'
+ );
+
+ $this->assertEquals(
+ $expectedResults['maximalPrice'],
+ $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
+ 'Failed to check maximal price on product'
+ );
+ }
+
+ /**
+ * Test cases for current test
+ * @return array
+ */
+ public function getTestCases()
+ {
+ return [
+ '#1 Testing price for dynamic bundle product with one simple' => [
+ 'strategy' => $this->getBundleConfiguration1(),
+ 'expectedResults' => [
+ // just price from simple1
+ 'minimalPrice' => 10,
+ // just price from simple1
+ 'maximalPrice' => 10
+ ]
+ ],
+
+ '#2 Testing price for dynamic bundle product with three simples and different qty' => [
+ 'strategy' => $this->getBundleConfiguration2(),
+ 'expectedResults' => [
+ // min price from simples 3*10 or 30
+ 'minimalPrice' => 30,
+ // (3 * 10) + (2 * 20) + 30
+ 'maximalPrice' => 100
+ ]
+ ],
+
+ '#3 Testing price for dynamic bundle product with four simples and different price' => [
+ 'strategy' => $this->getBundleConfiguration3(),
+ 'expectedResults' => [
+ // 10
+ 'minimalPrice' => 10,
+ // 10 + 20 + 30
+ 'maximalPrice' => 60
+ ]
+ ],
+
+ '#4 Testing price for dynamic bundle with two non required options' => [
+ 'strategy' => $this->getBundleConfiguration4(),
+ 'expectedResults' => [
+ // 1 * 10
+ 'minimalPrice' => 10,
+ // 3 * 20 + 1 * 10 + 3 * 20
+ 'maximalPrice' => 130
+ ]
+ ],
+
+ '#5 Testing price for dynamic bundle with two required options' => [
+ 'strategy' => $this->getBundleConfiguration5(),
+ 'expectedResults' => [
+ // 1 * 10 + 1 * 10
+ 'minimalPrice' => 20,
+ // 3 * 20 + 1 * 10 + 3 * 20
+ 'maximalPrice' => 130
+ ]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle product with one simple
+ *
+ * @return array
+ */
+ private function getBundleConfiguration1()
+ {
+ $optionsData = [
+ [
+ 'title' => 'op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ ]
+ ],
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle product with three simples and different qty
+ *
+ * @return array
+ */
+ private function getBundleConfiguration2()
+ {
+ $optionsData = [
+ [
+ 'title' => 'op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 3,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 2,
+ ],
+ [
+ 'sku' => 'simple3',
+ 'qty' => 1,
+ ],
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle product with three simples and different price
+ *
+ * @return array
+ */
+ private function getBundleConfiguration3()
+ {
+ $optionsData = [
+ [
+ 'title' => 'op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple3',
+ 'qty' => 1,
+ ]
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with two non required options and special price
+ * @return array
+ */
+ private function getBundleConfiguration4()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => false,
+ 'type' => 'radio',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ],
+ [
+ 'title' => 'Op2',
+ 'required' => false,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with two required options
+ * @return array
+ */
+ private function getBundleConfiguration5()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'radio',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ],
+ [
+ 'title' => 'Op2',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithCatalogPriceRuleCalculatorTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithCatalogPriceRuleCalculatorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..5a85dfa3104bf6b109389569fdd285da0210acc1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithCatalogPriceRuleCalculatorTest.php
@@ -0,0 +1,433 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Model\Product;
+
+/**
+ * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_with_catalog_rule.php
+ * @magentoAppArea frontend
+ */
+class DynamicBundleWithCatalogPriceRuleCalculatorTest extends BundlePriceAbstract
+{
+ /**
+ * @param array $strategyModifiers
+ * @param array $expectedResults
+ * @dataProvider getTestCases
+ * @magentoAppIsolation enabled
+ */
+ public function testPriceForDynamicBundle(array $strategyModifiers, array $expectedResults)
+ {
+ $this->prepareFixture($strategyModifiers, 'bundle_product');
+ $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
+
+ /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
+ $priceInfo = $bundleProduct->getPriceInfo();
+ $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
+
+ $this->assertEquals(
+ $expectedResults['minimalPrice'],
+ $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
+ 'Failed to check minimal price on product'
+ );
+
+ $this->assertEquals(
+ $expectedResults['maximalPrice'],
+ $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
+ 'Failed to check maximal price on product'
+ );
+ }
+
+ /**
+ * Test cases for current test
+ * @return array
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function getTestCases()
+ {
+ return [
+ '#1 Testing price for dynamic bundle with one required option' => [
+ 'strategy' => $this->getBundleProductConfiguration1(),
+ 'expectedResults' => [
+ // 10 * 0.9
+ 'minimalPrice' => 9,
+
+ // 10 * 0.9
+ 'maximalPrice' => 9
+ ]
+ ],
+
+ '#3 Testing price for dynamic bundle with one non required option' => [
+ 'strategy' => $this->getBundleProductConfiguration3(),
+ 'expectedResults' => [
+ // 0.9 * 2 * 10
+ 'minimalPrice' => 18,
+
+ // 0.9 * 2 * 10
+ 'maximalPrice' => 18
+ ]
+ ],
+
+ '#4 Testing price for dynamic bundle with one required checkbox type option and 2 simples' => [
+ 'strategy' => $this->getBundleProductConfiguration4(),
+ 'expectedResults' => [
+ // 0.9 * 1 * 10
+ 'minimalPrice' => 9,
+
+ // 0.9 * 1 * 10 + 3 * 0.9 * 20
+ 'maximalPrice' => 63
+ ]
+ ],
+
+ '#5 Testing price for dynamic bundle with one required multi type option and 2 simples' => [
+ 'strategy' => $this->getBundleProductConfiguration5(),
+ 'expectedResults' => [
+ // 0.9 * 1 * 10
+ 'minimalPrice' => 9,
+
+ // 0.9 * 1 * 10 + 3 * 0.9 * 20
+ 'maximalPrice' => 63
+ ]
+ ],
+
+ '#6 Testing price for dynamic bundle with one required radio type option and 2 simples' => [
+ 'strategy' => $this->getBundleProductConfiguration6(),
+ 'expectedResults' => [
+ // 0.9 * 1 * 10
+ 'minimalPrice' => 9,
+
+ // 0.9 * 3 * 20
+ 'maximalPrice' => 54
+ ]
+ ],
+
+ '#7 Testing price for dynamic bundle with two required options' => [
+ 'strategy' => $this->getBundleProductConfiguration7(),
+ 'expectedResults' => [
+ // 0.9 * 1 * 10 + 0.9 * 1 * 10
+ 'minimalPrice' => 18,
+
+ // 3 * 0.9 * 20 + 1 * 0.9 * 10 + 3 * 0.9 * 20
+ 'maximalPrice' => 117
+ ]
+ ],
+
+ '#8 Testing price for dynamic bundle with one required option and one non required' => [
+ 'strategy' => $this->getBundleProductConfiguration8(),
+ 'expectedResults' => [
+ // 1 * 0.9 * 10
+ 'minimalPrice' => 9,
+
+ // 3 * 0.9 * 20 + 1 * 0.9 * 10 + 3 * 0.9 * 20
+ 'maximalPrice' => 117
+ ]
+ ],
+
+ '#9 Testing price for dynamic bundle with two non required options' => [
+ 'strategy' => $this->getBundleProductConfiguration9(),
+ 'expectedResults' => [
+ // 0.9 * 1 * 10
+ 'minimalPrice' => 9,
+
+ // 3 * 0.9 * 20 + 1 * 0.9 * 10 + 3 * 0.9 * 20
+ 'maximalPrice' => 117
+ ]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with one required option
+ * @return array
+ */
+ private function getBundleProductConfiguration1()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ ]
+ ],
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with one non required option
+ * @return array
+ */
+ private function getBundleProductConfiguration3()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'type' => 'checkbox',
+ 'required' => false,
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 2,
+ ],
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with one required checkbox type option and 2 simples
+ * @return array
+ */
+ private function getBundleProductConfiguration4()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'type' => 'checkbox',
+ 'required' => true,
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with one required multi type option and 2 simples
+ * @return array
+ */
+ private function getBundleProductConfiguration5()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'multi',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with one required radio type option and 2 simples
+ * @return array
+ */
+ private function getBundleProductConfiguration6()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'radio',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with two required options
+ * @return array
+ */
+ private function getBundleProductConfiguration7()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'radio',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ],
+ [
+ 'title' => 'Op2',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with one required option and one non required
+ * @return array
+ */
+ private function getBundleProductConfiguration8()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => false,
+ 'type' => 'radio',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ],
+ [
+ 'title' => 'Op2',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with two non required options
+ * @return array
+ */
+ private function getBundleProductConfiguration9()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => false,
+ 'type' => 'radio',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ],
+ [
+ 'title' => 'Op2',
+ 'required' => false,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithSpecialPriceCalculatorTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithSpecialPriceCalculatorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..f701c93789c16c65a512ce36d6dc12b6b01b99ca
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithSpecialPriceCalculatorTest.php
@@ -0,0 +1,339 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Model\Product;
+
+/**
+ * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_with_special_price.php
+ * @magentoAppArea frontend
+ */
+class DynamicBundleWithSpecialPriceCalculatorTest extends BundlePriceAbstract
+{
+ /**
+ * @param array $strategyModifiers
+ * @param array $expectedResults
+ * @dataProvider getTestCases
+ * @magentoAppIsolation enabled
+ */
+ public function testPriceForDynamicBundle(array $strategyModifiers, array $expectedResults)
+ {
+ $this->prepareFixture($strategyModifiers, 'bundle_product');
+ $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
+
+ /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
+ $priceInfo = $bundleProduct->getPriceInfo();
+ $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
+
+ $this->assertEquals(
+ $expectedResults['minimalPrice'],
+ $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
+ 'Failed to check minimal price on product'
+ );
+
+ $this->assertEquals(
+ $expectedResults['maximalPrice'],
+ $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
+ 'Failed to check maximal price on product'
+ );
+
+ if (isset($expectedResults['regularMinimalPrice'])) {
+ $priceCode = \Magento\Catalog\Pricing\Price\RegularPrice::PRICE_CODE;
+ $this->assertEquals(
+ $expectedResults['regularMinimalPrice'],
+ $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
+ 'Failed to check minimal regular price on product'
+ );
+ }
+
+ if (isset($expectedResults['regularMaximalPrice'])) {
+ $priceCode = \Magento\Catalog\Pricing\Price\RegularPrice::PRICE_CODE;
+ $this->assertEquals(
+ $expectedResults['regularMaximalPrice'],
+ $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
+ 'Failed to check maximal regular price on product'
+ );
+ }
+ }
+
+ /**
+ * Test cases for current test
+ * @return array
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function getTestCases()
+ {
+ return [
+ '#1 Testing price for dynamic bundle with one required option and special price' => [
+ 'strategy' => $this->getBundleConfiguration1(),
+ 'expectedResults' => [
+ // 0.5 * 10
+ 'minimalPrice' => 5,
+ // 0.5 * 10
+ 'maximalPrice' => 5
+ ]
+ ],
+
+ '#2 Testing price for dynamic bundle with one non required option and special price' => [
+ 'strategy' => $this->getBundleConfiguration2(),
+ 'expectedResults' => [
+ // 0.5 * 2 * 10
+ 'minimalPrice' => 10,
+ // 0.5 * 2 * 10
+ 'maximalPrice' => 10
+ ]
+ ],
+
+ '
+ #3 Testing price for dynamic bundle
+ with one required checkbox type option, two simples and special price
+ ' => [
+ 'strategy' => $this->getBundleConfiguration3(),
+ 'expectedResults' => [
+ // 0.5 * 1 * 10
+ 'minimalPrice' => 5,
+ // 0.5 * (1 * 10 + 3 * 30)
+ 'maximalPrice' => 50
+ ]
+ ],
+
+ '
+ #4 Testing price for dynamic bundle
+ with one required multi type option, two simples with special price
+ ' => [
+ 'strategy' => $this->getBundleConfiguration4(),
+ 'expectedResults' => [
+ // 0.5 * (min (1 * 9.9, 2.5 * 4))
+ 'minimalPrice' => 4.95,
+ // 0.5 * ( 1 * 9.9 + 2.5 * 4)
+ 'maximalPrice' => 9.95
+ ]
+ ],
+
+ '#5 Testing price for dynamic bundle with one required option, one non required and special price' => [
+ 'strategy' => $this->getBundleConfiguration5(),
+ 'expectedResults' => [
+ // 0.5 * (3 * 2.5)
+ 'minimalPrice' => 3.75,
+ // 0.5 * (3 * 13 + 1 * 30 + 1 * 10)
+ 'maximalPrice' => 39.5,
+ // 1 * 10
+ 'regularMinimalPrice' => '10',
+ // 3 * 20 + (30 * 1 + 13 * 3)
+ 'regularMaximalPrice' => '129',
+ ]
+ ],
+
+ '#6 Testing price for dynamic bundle with one simple product with special price' => [
+ 'strategy' => $this->getBundleConfiguration6(),
+ 'expectedResults' => [
+ // 0.5 * min(4 * 2.5, 1 * 9.9)
+ 'minimalPrice' => 4.95,
+ // 0.5 * max(4 * 2.5, 1 * 9.9)
+ 'maximalPrice' => 5
+ ]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with one required option
+ * @return array
+ */
+ private function getBundleConfiguration1()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with one non required option and special price
+ * @return array
+ */
+ private function getBundleConfiguration2()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'type' => 'checkbox',
+ 'required' => false,
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 2,
+ ],
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with one required checkbox type option, two simples and special price
+ * @return array
+ */
+ private function getBundleConfiguration3()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple3',
+ 'qty' => 3,
+ ],
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with one required multi type option, two simples and special price
+ * @return array
+ */
+ private function getBundleConfiguration4()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple5',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 4,
+ ],
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with one required option, one non required and special price
+ * @return array
+ */
+ private function getBundleConfiguration5()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'radio',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ],
+ [
+ 'title' => 'Op2',
+ 'required' => false,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple3',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple4',
+ 'qty' => 3,
+ ],
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with one simple product with special price
+ * @return array
+ */
+ private function getBundleConfiguration6()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'radio',
+ 'links' => [
+ [
+ 'sku' => 'simple2',
+ 'qty' => 4,
+ ],
+ [
+ 'sku' => 'simple5',
+ 'qty' => 1,
+ ],
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithTierPriceCalculatorTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithTierPriceCalculatorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..0be5adcb304f772218e588795f3f6ef26ce0721c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithTierPriceCalculatorTest.php
@@ -0,0 +1,635 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Model\Product;
+
+use \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
+
+/**
+ * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
+ * @magentoAppArea frontend
+ */
+class DynamicBundleWithTierPriceCalculatorTest extends BundlePriceAbstract
+{
+ /** @var ProductTierPriceInterfaceFactory */
+ private $tierPriceFactory;
+
+ protected function setUp()
+ {
+ parent::setUp();
+ $this->tierPriceFactory = $this->objectManager->create(ProductTierPriceInterfaceFactory::class);
+ }
+
+ /**
+ * @param array $strategyModifiers
+ * @param array $expectedResults
+ * @dataProvider getTestCases
+ * @magentoAppIsolation enabled
+ */
+ public function testPriceForDynamicBundle(array $strategyModifiers, array $expectedResults)
+ {
+ $this->prepareFixture($strategyModifiers, 'bundle_product');
+ $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
+
+ /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
+ $priceInfo = $bundleProduct->getPriceInfo();
+ $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
+
+ $this->assertEquals(
+ $expectedResults['minimalPrice'],
+ $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
+ 'Failed to check minimal price on product'
+ );
+
+ $this->assertEquals(
+ $expectedResults['maximalPrice'],
+ $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
+ 'Failed to check maximal price on product'
+ );
+ }
+
+ /**
+ * Test cases for current test
+ * @return array
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function getTestCases()
+ {
+ return [
+ '
+ #1 Testing product price for dynamic bundle
+ with one required option and tier price
+ ' => [
+ 'strategy' => $this->getBundleConfiguration1(),
+ 'expectedResults' => [
+ // 0.5 * 10
+ 'minimalPrice' => 5,
+ // 0.5 * 10
+ 'maximalPrice' => 5
+ ]
+ ],
+
+ '
+ #2 Testing product price for dynamic bundle
+ with one non required option and tier price
+ ' => [
+ 'strategy' => $this->getBundleConfiguration2(),
+ 'expectedResults' => [
+ // 0.5 * 2 * 10
+ 'minimalPrice' => 10,
+ // 0.5 * 2 * 10
+ 'maximalPrice' => 10
+ ]
+ ],
+
+ '
+ #3 Testing product price for dynamic bundle
+ with one required checkbox type option and tier price
+ ' => [
+ 'strategy' => $this->getBundleConfiguration3(),
+ 'expectedResults' => [
+ // 0.5 * 1 * 10
+ 'minimalPrice' => 5,
+ // 0.5 * (1 * 10 + 3 * 20)
+ 'maximalPrice' => 35
+ ]
+ ],
+
+ '
+ #4 Testing product price for dynamic bundle
+ with one required multi type option and tier price
+ ' => [
+ 'strategy' => $this->getBundleConfiguration4(),
+ 'expectedResults' => [
+ // 0.5 * 1 * 10
+ 'minimalPrice' => 5,
+ // 0.5 * (1 * 10 + 3 * 20)
+ 'maximalPrice' => 35
+ ]
+ ],
+
+ '
+ #5 Testing product price for dynamic bundle
+ with one required radio type option and tier price
+ ' => [
+ 'strategy' => $this->getBundleConfiguration5(),
+ 'expectedResults' => [
+ // 0.5 * 1 * 10
+ 'minimalPrice' => 5,
+ // 0.5 * 3 * 20
+ 'maximalPrice' => 30
+ ]
+ ],
+
+ '
+ #6 Testing product price for dynamic bundle
+ with two required options and tier price
+ ' => [
+ 'strategy' => $this->getBundleConfiguration6(),
+ 'expectedResults' => [
+ // 0.5 * (1 * 10 + 1 * 10)
+ 'minimalPrice' => 10,
+ // 0.5 * (3 * 20 + 1 * 10 + 3 * 20)
+ 'maximalPrice' => 65
+ ]
+ ],
+
+ '
+ #7 Testing product price for dynamic bundle
+ with one required option, one non required option and tier price
+ ' => [
+ 'strategy' => $this->getBundleConfiguration7(),
+ 'expectedResults' => [
+ // 0.5 * (1 * 10)
+ 'minimalPrice' => 5,
+ // 0.5 * (3 * 20 + 1 * 10 + 3 * 20)
+ 'maximalPrice' => 65
+ ]
+ ],
+
+ '
+ #8 Testing product price for dynamic bundle
+ with two non required options and tier price
+ ' => [
+ 'strategy' => $this->getBundleConfiguration8(),
+ 'expectedResults' => [
+ // 0.5 * (1 * 10)
+ 'minimalPrice' => 5,
+ // 0.5 * (3 * 20 + 1 * 10 + 3 * 20)
+ 'maximalPrice' => 65
+ ]
+ ],
+
+ '
+ #9 Testing product price for dynamic bundle
+ with tier price and with simple with tier price
+ ' => [
+ 'strategy' => $this->getBundleConfiguration9(),
+ 'expectedResults' => [
+ // 0.5 * 1 * 2.5
+ 'minimalPrice' => 1.25,
+ // 0.5 * 3 * 20
+ 'maximalPrice' => 30
+ ]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with one required option and tier price
+ * @return array
+ */
+ private function getBundleConfiguration1()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ ]
+ ]
+ ];
+
+ $tierPriceData = [
+ 'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+ 'qty' => 1,
+ 'value' => 50
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addTierPrice',
+ 'data' => [$tierPriceData]
+ ],
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with one non required option and tier price
+ * @return array
+ */
+ private function getBundleConfiguration2()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'type' => 'checkbox',
+ 'required' => false,
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 2,
+ ],
+ ]
+ ]
+ ];
+
+ $tierPriceData = [
+ 'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+ 'qty' => 1,
+ 'value' => 50
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addTierPrice',
+ 'data' => [$tierPriceData]
+ ],
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with one required checkbox type option and tier price
+ * @return array
+ */
+ private function getBundleConfiguration3()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ]
+ ];
+
+ $tierPriceData = [
+ 'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+ 'qty' => 1,
+ 'value' => 50
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addTierPrice',
+ 'data' => [$tierPriceData]
+ ],
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with one required multi type option and tier price
+ * @return array
+ */
+ private function getBundleConfiguration4()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'multi',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ]
+ ];
+
+ $tierPriceData = [
+ 'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+ 'qty' => 1,
+ 'value' => 50
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addTierPrice',
+ 'data' => [$tierPriceData]
+ ],
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with one required radio type option and tier price
+ * @return array
+ */
+ private function getBundleConfiguration5()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'radio',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ]
+ ];
+
+ $tierPriceData = [
+ 'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+ 'qty' => 1,
+ 'value' => 50
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addTierPrice',
+ 'data' => [$tierPriceData]
+ ],
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with two required options and tier price
+ * @return array
+ */
+ private function getBundleConfiguration6()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'radio',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ],
+ [
+ 'title' => 'Op2',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ]
+ ];
+
+ $tierPriceData = [
+ 'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+ 'qty' => 1,
+ 'value' => 50
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addTierPrice',
+ 'data' => [$tierPriceData]
+ ],
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with one required option, one non required option and tier price
+ * @return array
+ */
+ private function getBundleConfiguration7()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => false,
+ 'type' => 'radio',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ],
+ [
+ 'title' => 'Op2',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ]
+ ];
+
+ $tierPriceData = [
+ 'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+ 'qty' => 1,
+ 'value' => 50
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addTierPrice',
+ 'data' => [$tierPriceData]
+ ],
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with two non required options and tier price
+ * @return array
+ */
+ private function getBundleConfiguration8()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => false,
+ 'type' => 'radio',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ],
+ [
+ 'title' => 'Op2',
+ 'required' => false,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ]
+ ];
+
+ $tierPriceData = [
+ 'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+ 'qty' => 1,
+ 'value' => 50
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addTierPrice',
+ 'data' => [$tierPriceData]
+ ],
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Dynamic bundle with tier price and with simple with tier price
+ * @return array
+ */
+ private function getBundleConfiguration9()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'radio',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'qty' => 3,
+ ],
+ ]
+ ]
+ ];
+
+ $tierPriceData = [
+ 'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+ 'qty' => 1,
+ 'value' => 50
+ ];
+
+ $tierPriceSimpleProductData = [
+ 'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+ 'qty' => 1,
+ 'value' => 2.5
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addTierPrice',
+ 'data' => [$tierPriceData]
+ ],
+ [
+ 'modifierName' => 'addTierPriceForSimple',
+ 'data' => ['simple1', $tierPriceSimpleProductData]
+ ],
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * @param \Magento\Catalog\Model\Product $product
+ * @param array $tirePriceData
+ * @return \Magento\Catalog\Model\Product
+ */
+ protected function addTierPrice(\Magento\Catalog\Model\Product $product, $tirePriceData)
+ {
+ $tierPrice = $this->tierPriceFactory->create([
+ 'data' => $tirePriceData
+ ]);
+ $product->setTierPrices([$tierPrice]);
+
+ return $product;
+ }
+
+ /**
+ * @param \Magento\Catalog\Model\Product $bundleProduct
+ * @param string $sku
+ * @param array $tirePriceData
+ * @return \Magento\Catalog\Model\Product
+ */
+ protected function addTierPriceForSimple(\Magento\Catalog\Model\Product $bundleProduct, $sku, $tirePriceData)
+ {
+ $simple = $this->productRepository->get($sku, false, null, true);
+ $simple = $this->addTierPrice($simple, $tirePriceData);
+ $this->productRepository->save($simple);
+
+ return $bundleProduct;
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..07b455a0feeaf75af21e7edb39bf7af0ffb9aad6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorTest.php
@@ -0,0 +1,394 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Model\Product;
+
+use \Magento\Bundle\Api\Data\LinkInterface;
+
+/**
+ * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
+ * @magentoAppArea frontend
+ */
+class FixedBundlePriceCalculatorTest extends BundlePriceAbstract
+{
+ /**
+ * @param array $strategyModifiers
+ * @param array $expectedResults
+ * @dataProvider getTestCases
+ * @magentoAppIsolation enabled
+ */
+ public function testPriceForFixedBundle(array $strategyModifiers, array $expectedResults)
+ {
+ $this->prepareFixture($strategyModifiers, 'bundle_product');
+ $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
+
+ /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
+ $priceInfo = $bundleProduct->getPriceInfo();
+ $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
+
+ $this->assertEquals(
+ $expectedResults['minimalPrice'],
+ $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
+ 'Failed to check minimal price on product'
+ );
+
+ $this->assertEquals(
+ $expectedResults['maximalPrice'],
+ $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
+ 'Failed to check maximal price on product'
+ );
+ }
+
+ /**
+ * @param array $strategyModifiers
+ * @param array $expectedResults
+ * @dataProvider getTestCases
+ * @magentoAppIsolation enabled
+ * @magentoConfigFixture current_store catalog/price/scope 1
+ */
+ public function testPriceForFixedBundleInWebsiteScope(array $strategyModifiers, array $expectedResults)
+ {
+ $this->prepareFixture($strategyModifiers, 'bundle_product');
+ $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
+
+ /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
+ $priceInfo = $bundleProduct->getPriceInfo();
+ $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
+
+ $this->assertEquals(
+ $expectedResults['minimalPrice'],
+ $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
+ 'Failed to check minimal price on product'
+ );
+
+ $this->assertEquals(
+ $expectedResults['maximalPrice'],
+ $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
+ 'Failed to check maximal price on product'
+ );
+ }
+
+ /**
+ * Test cases for current test
+ * @return array
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function getTestCases()
+ {
+ return [
+ '#1 Testing price for fixed bundle product with one simple' => [
+ 'strategy' => $this->getProductWithOneSimple(),
+ 'expectedResults' => [
+ // 110 + 10 (price from simple1)
+ 'minimalPrice' => 120,
+ // 110 + 10 (sum of simple price)
+ 'maximalPrice' => 120
+ ]
+ ],
+
+ '#2 Testing price for fixed bundle product with three simples and different qty' => [
+ 'strategy' => $this->getProductWithDifferentQty(),
+ 'expectedResults' => [
+ // 110 + 10 (min price from simples)
+ 'minimalPrice' => 120,
+ // 110 + (3 * 10) + (2 * 10) + 10
+ 'maximalPrice' => 170
+ ]
+ ],
+
+ '#3 Testing price for fixed bundle product with three simples and different price' => [
+ 'strategy' => $this->getProductWithDifferentPrice(),
+ 'expectedResults' => [
+ // 110 + 10
+ 'minimalPrice' => 120,
+ // 110 + 60
+ 'maximalPrice' => 170
+ ]
+ ],
+
+ '#4 Testing price for fixed bundle product with three simples' => [
+ 'strategy' => $this->getProductWithSamePrice(),
+ 'expectedResults' => [
+ // 110 + 10
+ 'minimalPrice' => 120,
+ // 110 + 30
+ 'maximalPrice' => 140
+ ]
+ ],
+
+ '
+ #5 Testing price for fixed bundle product
+ with fixed sub items, fixed options and without any discounts
+ ' => [
+ 'strategy' => $this->getBundleConfiguration3(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 110 + 1 * 20 + 100
+ 'minimalPrice' => 230,
+
+ // 110 + 1 * 20 + 100
+ 'maximalPrice' => 230
+ ]
+ ],
+
+ '
+ #6 Testing price for fixed bundle product
+ with percent sub items, percent options and without any discounts
+ ' => [
+ 'strategy' => $this->getBundleConfiguration3(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 110 + 110 * 0.2 + 110 * 1
+ 'minimalPrice' => 242,
+
+ // 110 + 110 * 0.2 + 110 * 1
+ 'maximalPrice' => 242
+ ]
+ ],
+
+ '
+ #7 Testing price for fixed bundle product
+ with fixed sub items, percent options and without any discounts
+ ' => [
+ 'strategy' => $this->getBundleConfiguration3(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 110 + 1 * 20 + 110 * 1
+ 'minimalPrice' => 240,
+
+ // 110 + 1 * 20 + 110 * 1
+ 'maximalPrice' => 240
+ ]
+ ],
+
+ '
+ #8 Testing price for fixed bundle product
+ with percent sub items, fixed options and without any discounts
+ ' => [
+ 'strategy' => $this->getBundleConfiguration3(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 110 + 110 * 0.2 + 100
+ 'minimalPrice' => 232,
+
+ // 110 + 110 * 0.2 + 100
+ 'maximalPrice' => 232
+ ]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with one simple
+ * @return array
+ */
+ private function getProductWithOneSimple()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'price' => 10,
+ 'qty' => 1,
+ 'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+ ],
+ ]
+ ],
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with three simples and different qty
+ * @return array
+ */
+ private function getProductWithDifferentQty()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'price' => 10,
+ 'qty' => 3,
+ 'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'price' => 10,
+ 'qty' => 2,
+ 'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+ ],
+ [
+ 'sku' => 'simple3',
+ 'price' => 10,
+ 'qty' => 1,
+ 'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+ ],
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with three simples and different price
+ * @return array
+ */
+ private function getProductWithSamePrice()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'price' => 10,
+ 'qty' => 1,
+ 'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'price' => 10,
+ 'qty' => 1,
+ 'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+ ],
+ [
+ 'sku' => 'simple3',
+ 'price' => 10,
+ 'qty' => 1,
+ 'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+ ]
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with three simples
+ * @return array
+ */
+ private function getProductWithDifferentPrice()
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'price' => 10,
+ 'qty' => 1,
+ 'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+ ],
+ [
+ 'sku' => 'simple2',
+ 'price' => 20,
+ 'qty' => 1,
+ 'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+ ],
+ [
+ 'sku' => 'simple3',
+ 'price' => 30,
+ 'qty' => 1,
+ 'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+ ]
+ ]
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with required option, custom option and without any discounts
+ * @param $selectionsPriceType
+ * @param $customOptionsPriceType
+ * @return array
+ */
+ private function getBundleConfiguration3($selectionsPriceType, $customOptionsPriceType)
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ 'price' => 20,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ],
+ ];
+
+ $customOptionsData = [
+ [
+ 'price_type' => $customOptionsPriceType,
+ 'title' => 'Test Field',
+ 'type' => 'field',
+ 'is_require' => 1,
+ 'price' => 100,
+ 'sku' => '1-text',
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ [
+ 'modifierName' => 'addCustomOption',
+ 'data' => [$customOptionsData]
+ ],
+ ];
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithCatalogPriceRuleCalculatorTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithCatalogPriceRuleCalculatorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..57c8ba0cbbde199fe1fb5ffb8ac9b517456540c9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithCatalogPriceRuleCalculatorTest.php
@@ -0,0 +1,810 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Model\Product;
+
+use \Magento\Bundle\Api\Data\LinkInterface;
+
+/**
+ * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_catalog_rule.php
+ * @magentoAppArea frontend
+ */
+class FixedBundleWithCatalogPriceRuleCalculatorTest extends BundlePriceAbstract
+{
+ /**
+ * @param array $strategyModifiers
+ * @param array $expectedResults
+ * @dataProvider getTestCases
+ * @magentoAppIsolation enabled
+ */
+ public function testPriceForFixedBundle(array $strategyModifiers, array $expectedResults)
+ {
+ $this->prepareFixture($strategyModifiers, 'bundle_product');
+ $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
+
+ /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
+ $priceInfo = $bundleProduct->getPriceInfo();
+ $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
+
+ $this->assertEquals(
+ $expectedResults['minimalPrice'],
+ $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
+ 'Failed to check minimal price on product'
+ );
+
+ $this->assertEquals(
+ $expectedResults['maximalPrice'],
+ $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
+ 'Failed to check maximal price on product'
+ );
+ }
+
+ /**
+ * Test cases for current test
+ * @return array
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function getTestCases()
+ {
+ return [
+ '
+ #1 Testing price for fixed bundle product
+ with catalog price rule and without sub items and options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration1(),
+ 'expectedResults' => [
+ // 110 * 0.9
+ 'minimalPrice' => 99,
+
+ // 110 * 0.9
+ 'maximalPrice' => 99
+ ]
+ ],
+
+ '
+ #2 Testing price for fixed bundle product
+ with catalog price rule, fixed sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration2(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 1 * 20 + 100
+ 'minimalPrice' => 219,
+
+ // 0.9 * 110 + 1 * 20 + 100
+ 'maximalPrice' => 219
+ ]
+ ],
+
+ '
+ #3 Testing price for fixed bundle product
+ with catalog price rule, percent sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration2(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 0.9 * 110 * 0.2 + 0.9 * 110 * 1
+ 'minimalPrice' => 217.8,
+
+ // 0.9 * 110 + 0.9 * 110 * 0.2 + 0.9 * 110 * 1
+ 'maximalPrice' => 217.8
+ ]
+ ],
+
+ '
+ #4 Testing price for fixed bundle product
+ with catalog price rule, fixed sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration2(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 1 * 20 + 0.9 * 110 * 1
+ 'minimalPrice' => 218,
+
+ // 0.9 * 110 + 1 * 20 + 0.9 * 110 * 1
+ 'maximalPrice' => 218
+ ]
+ ],
+
+ '
+ #5 Testing price for fixed bundle product
+ with catalog price rule, percent sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration2(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 0.9 * 110 * 0.2 + 100
+ 'minimalPrice' => 218.8,
+
+ // 0.9 * 110 + 0.9 * 110 * 0.2 + 100
+ 'maximalPrice' => 218.8
+ ]
+ ],
+
+ '
+ #6 Testing price for fixed bundle product
+ with catalog price rule, fixed sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration3(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 100
+ 'minimalPrice' => 199,
+
+ // 0.9 * 110 + 2 * 20 + 100
+ 'maximalPrice' => 239
+ ]
+ ],
+
+ '
+ #7 Testing price for fixed bundle product
+ with catalog price rule, percent sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration3(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 0.9 * 110 * 1
+ 'minimalPrice' => 198,
+
+ // 0.9 * 110 + 2 * 0.9 * 110 * 0.2 + 1 * 0.9 * 110
+ 'maximalPrice' => 237.6
+ ]
+ ],
+
+ '
+ #8 Testing price for fixed bundle product
+ with catalog price rule, fixed sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration3(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 1 * 0.9 * 110
+ 'minimalPrice' => 198,
+
+ // 0.9 * 110 + 2 * 20 + 1 * 0.9 * 110
+ 'maximalPrice' => 238
+ ]
+ ],
+
+ '
+ #9 Testing price for fixed bundle product
+ with catalog price rule, percent sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration3(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 100
+ 'minimalPrice' => 199,
+
+ // 0.9 * 110 + 2 * 0.2 * 0.9 * 110 + 100
+ 'maximalPrice' => 238.6
+ ]
+ ],
+
+ '
+ #10 Testing price for fixed bundle product
+ with catalog price rule, fixed sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration4(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 3 * 10 + 100
+ 'minimalPrice' => 229,
+
+ // 0.9 * 110 + 3 * 10 + 1 * 40 + 100
+ 'maximalPrice' => 269
+ ]
+ ],
+
+ '
+ #11 Testing price for fixed bundle product
+ with catalog price rule, percent sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration4(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 3 * 0.9 * 110 * 0.1 + 0.9 * 110 * 1
+ 'minimalPrice' => 227.7,
+
+ // 0.9 * 110 + 3 * 0.9 * 110 * 0.1 + 1 * 0.9 * 110 * 0.4 + 0.9 * 110 * 1
+ 'maximalPrice' => 267.3
+ ]
+ ],
+
+ '
+ #12 Testing price for fixed bundle product
+ with catalog price rule, fixed sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration4(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 3 * 10 + 1 * 0.9 * 110
+ 'minimalPrice' => 228,
+
+ // 0.9 * 110 + 3 * 10 + 1 * 40 + 1 * 0.9 * 110
+ 'maximalPrice' => 268
+ ]
+ ],
+
+ '
+ #13 Testing price for fixed bundle product
+ with catalog price rule, percent sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration4(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 3 * 0.9 * 110 * 0.1 + 100
+ 'minimalPrice' => 228.7,
+
+ // 0.9 * 110 + 3 * 0.9 * 110 * 0.1 + 1 * 0.9 * 110 * 0.4 + 100
+ 'maximalPrice' => 268.3
+ ]
+ ],
+
+ '
+ #14 Testing price for fixed bundle product
+ with catalog price rule, fixed sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration5(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 1 * 40 + 100
+ 'minimalPrice' => 239,
+
+ // 0.9 * 110 + 1 * 40 + 3 * 15 + 100
+ 'maximalPrice' => 284
+ ]
+ ],
+
+ '
+ #15 Testing price for fixed bundle product
+ with catalog price rule, percent sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration5(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 1 * 0.9 * 110 * 0.4 + 1 * 0.9 * 110
+ 'minimalPrice' => 237.6,
+
+ // 0.9 * 110 + 1 * 0.9 * 110 * 0.4 + 3 * 0.9 * 110 * 0.15 + 0.9 * 110 * 1
+ 'maximalPrice' => 282.15
+ ]
+ ],
+
+ '
+ #16 Testing price for fixed bundle product
+ with catalog price rule, fixed sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration5(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 1 * 40 + 1 * 0.9 * 110
+ 'minimalPrice' => 238,
+
+ // 0.9 * 110 + 1 * 40 + 3 * 15 + 1 * 0.9 * 110
+ 'maximalPrice' => 283
+ ]
+ ],
+
+ '
+ #17 Testing price for fixed bundle product
+ with catalog price rule, percent sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration5(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 1 * 0.9 * 110 * 0.4 + 100
+ 'minimalPrice' => 238.6,
+
+ // 0.9 * 110 + 1 * 0.9 * 110 * 0.4 + 3 * 0.9 * 110 * 0.15 + 100
+ 'maximalPrice' => 283.15
+ ]
+ ],
+
+ '
+ #18 Testing price for fixed bundle product
+ with catalog price rule, fixed sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration6(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 1 * 40 + 100
+ 'minimalPrice' => 239,
+
+ // 0.9 * 110 + 3 * 15 + 100
+ 'maximalPrice' => 244
+ ]
+ ],
+
+ '
+ #19 Testing price for fixed bundle product
+ with catalog price rule, percent sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration6(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 1 * 0.9 * 110 * 0.4 + 1 * 0.9 * 110
+ 'minimalPrice' => 237.6,
+
+ // 0.9 * 110 + 3 * 0.9 * 110 * 0.15 + 1 * 0.9 * 110
+ 'maximalPrice' => 242.55
+ ]
+ ],
+
+ '
+ #20 Testing price for fixed bundle product
+ with catalog price rule, fixed sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration6(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 1 * 40 + 0.9 * 110 * 1
+ 'minimalPrice' => 238,
+
+ // 0.9 * 110 + 3 * 15 + 0.9 * 110 * 1
+ 'maximalPrice' => 243
+ ]
+ ],
+
+ '
+ #21 Testing price for fixed bundle product
+ with catalog price rule, percent sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration6(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 1 * 0.9 * 110 * 0.4 + 100
+ 'minimalPrice' => 238.6,
+
+ // 0.9 * 110 + 3 * 0.9 * 110 * 0.15 + 100
+ 'maximalPrice' => 243.55
+ ]
+ ],
+
+ '
+ #22 Testing price for fixed bundle product
+ with catalog price rule, fixed sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration7(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 1 * 40 + 1 * 20 + 100
+ 'minimalPrice' => 259,
+
+ // 0.9 * 110 + 3 * 15 + 1 * 20 + 3 * 10 + 100
+ 'maximalPrice' => 294
+ ]
+ ],
+
+ '
+ #23 Testing price for fixed bundle product
+ with catalog price rule, percent sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration7(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 1 * 0.9 * 110 * 0.4 + 1 * 0.9 * 110 * 0.2 + 0.9 * 110 * 1
+ 'minimalPrice' => 257.4,
+
+ // 0.9 * 110 + 3 * 0.9 * 110 * 0.15 + 1 * 0.9 * 110 * 0.2 + 3 * 0.9 * 110 * 0.1 + 0.9 * 110 * 1
+ 'maximalPrice' => 292.05
+ ]
+ ],
+
+ '
+ #24 Testing price for fixed bundle product
+ with catalog price rule, fixed sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration7(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 1 * 40 + 1 * 20 + 1 * 0.9 * 110
+ 'minimalPrice' => 258,
+
+ // 0.9 * 110 + 3 * 15 + 1 * 20 + 3 * 10 + 1 * 0.9 * 110
+ 'maximalPrice' => 293
+ ]
+ ],
+
+ '
+ #25 Testing price for fixed bundle product
+ with catalog price rule, percent sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration7(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.9 * 110 + 1 * 0.9 * 110 * 0.4 + 1 * 0.9 * 110 * 0.2 + 100
+ 'minimalPrice' => 258.4,
+
+ // 0.9 * 110 + 3 * 0.9 * 110 * 0.15 + 1 * 0.9 * 110 * 0.2 + 3 * 0.9 * 110 * 0.1 + 100
+ 'maximalPrice' => 293.05
+ ]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with catalog price rule and without sub items and options
+ * @return array
+ */
+ private function getBundleConfiguration1()
+ {
+ return [];
+ }
+
+ /**
+ * Fixed bundle product with catalog price rule, one required option and one custom option
+ * @param string $selectionsPriceType
+ * @param string $customOptionsPriceType
+ * @return array
+ */
+ private function getBundleConfiguration2($selectionsPriceType, $customOptionsPriceType)
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ 'price' => 20,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ]
+ ];
+
+ $customOptionsData = [
+ [
+ 'price_type' => $customOptionsPriceType,
+ 'title' => 'Test Field',
+ 'type' => 'field',
+ 'is_require' => 1,
+ 'price' => 100,
+ 'sku' => '1-text',
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ [
+ 'modifierName' => 'addCustomOption',
+ 'data' => [$customOptionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with catalog price rule, one non required option and one custom option
+ * @param string $selectionsPriceType
+ * @param string $customOptionsPriceType
+ * @return array
+ */
+ private function getBundleConfiguration3($selectionsPriceType, $customOptionsPriceType)
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'type' => 'checkbox',
+ 'required' => false,
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'price' => 20,
+ 'qty' => 2,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ]
+ ];
+
+ $customOptionsData = [
+ [
+ 'price_type' => $customOptionsPriceType,
+ 'title' => 'Test Field',
+ 'type' => 'field',
+ 'is_require' => 1,
+ 'price' => 100,
+ 'sku' => '1-text',
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ [
+ 'modifierName' => 'addCustomOption',
+ 'data' => [$customOptionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with catalog price rule, one checkbox type option with 2 simples and one custom option
+ * @param string $selectionsPriceType
+ * @param string $customOptionsPriceType
+ * @return array
+ */
+ private function getBundleConfiguration4($selectionsPriceType, $customOptionsPriceType)
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ 'price' => 40,
+ 'price_type' => $selectionsPriceType
+ ],
+ [
+ 'sku' => 'simple2',
+ 'price' => 10,
+ 'qty' => 3,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ]
+ ];
+
+ $customOptionsData = [
+ [
+ 'price_type' => $customOptionsPriceType,
+ 'title' => 'Test Field',
+ 'type' => 'field',
+ 'is_require' => 1,
+ 'price' => 100,
+ 'sku' => '1-text',
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ [
+ 'modifierName' => 'addCustomOption',
+ 'data' => [$customOptionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with catalog price rule, one multi type option with 2 simples and one custom option
+ * @param string $selectionsPriceType
+ * @param string $customOptionsPriceType
+ * @return array
+ */
+ private function getBundleConfiguration5($selectionsPriceType, $customOptionsPriceType)
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'multi',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ 'price' => 40,
+ 'price_type' => $selectionsPriceType
+ ],
+ [
+ 'sku' => 'simple2',
+ 'price' => 15,
+ 'qty' => 3,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ]
+ ];
+
+ $customOptionsData = [
+ [
+ 'price_type' => $customOptionsPriceType,
+ 'title' => 'Test Field',
+ 'type' => 'field',
+ 'is_require' => 1,
+ 'price' => 100,
+ 'sku' => '1-text',
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ [
+ 'modifierName' => 'addCustomOption',
+ 'data' => [$customOptionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with catalog price rule, one radio type option with 2 simples and one custom option
+ * @param string $selectionsPriceType
+ * @param string $customOptionsPriceType
+ * @return array
+ */
+ private function getBundleConfiguration6($selectionsPriceType, $customOptionsPriceType)
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'radio',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ 'price' => 40,
+ 'price_type' => $selectionsPriceType
+ ],
+ [
+ 'sku' => 'simple2',
+ 'price' => 15,
+ 'qty' => 3,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ]
+ ];
+
+ $customOptionsData = [
+ [
+ 'price_type' => $customOptionsPriceType,
+ 'title' => 'Test Field',
+ 'type' => 'field',
+ 'is_require' => 1,
+ 'price' => 100,
+ 'sku' => '1-text',
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ [
+ 'modifierName' => 'addCustomOption',
+ 'data' => [$customOptionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with catalog price rule, two required options and one custom option
+ * @param string $selectionsPriceType
+ * @param string $customOptionsPriceType
+ * @return array
+ */
+ private function getBundleConfiguration7($selectionsPriceType, $customOptionsPriceType)
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'radio',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ 'price' => 40,
+ 'price_type' => $selectionsPriceType
+ ],
+ [
+ 'sku' => 'simple2',
+ 'price' => 15,
+ 'qty' => 3,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ],
+ [
+ 'title' => 'Op2',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ 'price' => 20,
+ 'price_type' => $selectionsPriceType
+ ],
+ [
+ 'sku' => 'simple2',
+ 'price' => 10,
+ 'qty' => 3,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ]
+ ];
+
+ $customOptionsData = [
+ [
+ 'price_type' => $customOptionsPriceType,
+ 'title' => 'Test Field',
+ 'type' => 'field',
+ 'is_require' => 1,
+ 'price' => 100,
+ 'sku' => '1-text',
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ [
+ 'modifierName' => 'addCustomOption',
+ 'data' => [$customOptionsData]
+ ],
+ ];
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithSpecialPriceCalculatorTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithSpecialPriceCalculatorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..183e5cc330438326ad49e304c4dff15017bc11d9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithSpecialPriceCalculatorTest.php
@@ -0,0 +1,822 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Model\Product;
+
+use \Magento\Bundle\Api\Data\LinkInterface;
+
+/**
+ * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_special_price.php
+ * @magentoAppArea frontend
+ */
+class FixedBundleWithSpecialPriceCalculatorTest extends BundlePriceAbstract
+{
+ /**
+ * @param array $strategyModifiers
+ * @param array $expectedResults
+ * @dataProvider getTestCases
+ * @magentoAppIsolation enabled
+ */
+ public function testPriceForFixedBundle(array $strategyModifiers, array $expectedResults)
+ {
+ $this->prepareFixture($strategyModifiers, 'bundle_product');
+ $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
+
+ /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
+ $priceInfo = $bundleProduct->getPriceInfo();
+ $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
+
+ $this->assertEquals(
+ $expectedResults['minimalPrice'],
+ $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
+ 'Failed to check minimal price on product'
+ );
+
+ $this->assertEquals(
+ $expectedResults['maximalPrice'],
+ $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
+ 'Failed to check maximal price on product'
+ );
+ }
+
+ /**
+ * Test cases for current test
+ * @return array
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function getTestCases()
+ {
+ return [
+ '
+ #1 Testing price for fixed bundle product
+ with special price and without any sub items and options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration1(),
+ 'expectedResults' => [
+ // 110 * 0.5
+ 'minimalPrice' => 55,
+
+ // 110 * 0.5
+ 'maximalPrice' => 55
+ ]
+ ],
+
+ '
+ #2 Testing price for fixed bundle product
+ with special price, fixed sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration2(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 20) + 100
+ 'minimalPrice' => 165,
+
+ // 0.5 * (110 + 1 * 20) + 100
+ 'maximalPrice' => 165
+ ]
+ ],
+
+ '
+ #3 Testing price for fixed bundle product
+ with special price, percent sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration2(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 110 * 0.2 + 110 * 1)
+ 'minimalPrice' => 121,
+
+ // 0.5 * (110 + 110 * 0.2 + 110 * 1)
+ 'maximalPrice' => 121
+ ]
+ ],
+
+ '
+ #4 Testing price for fixed bundle product
+ with special price, fixed sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration2(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 20 + 110 * 1)
+ 'minimalPrice' => 120,
+
+ // 0.5 * (110 + 1 * 20 + 110 * 1)
+ 'maximalPrice' => 120
+ ]
+ ],
+
+ '
+ #5 Testing price for fixed bundle product
+ with special price, percent sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration2(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 110 * 0.2) + 100
+ 'minimalPrice' => 166,
+
+ // 0.5 * (110 + 110 * 0.2) + 100
+ 'maximalPrice' => 166
+ ]
+ ],
+
+ '
+ #6 Testing price for fixed bundle product
+ with special price, fixed sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration3(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * 110 + 100
+ 'minimalPrice' => 155,
+
+ // 0.5 * (110 + 2 * 20) + 100
+ 'maximalPrice' => 175
+ ]
+ ],
+
+ '
+ #7 Testing price for fixed bundle product
+ with special price, percent sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration3(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 110 * 1)
+ 'minimalPrice' => 110,
+
+ // 0.5 * (110 + 2 * 110 * 0.2 + 1 * 110)
+ 'maximalPrice' => 132
+ ]
+ ],
+
+ '
+ #8 Testing price for fixed bundle product
+ with special price, fixed sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration3(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 110)
+ 'minimalPrice' => 110,
+
+ // 0.5 * (110 + 2 * 20 + 1 * 110)
+ 'maximalPrice' => 130
+ ]
+ ],
+
+ '
+ #9 Testing price for fixed bundle product
+ with special price, percent sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration3(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * 110 + 100
+ 'minimalPrice' => 155,
+
+ // 0.5 * (110 + 2 * 0.2 * 110) + 100
+ 'maximalPrice' => 177
+ ]
+ ],
+
+ '
+ #10 Testing price for fixed bundle product
+ with special price, fixed sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration4(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 3 * 10) + 100
+ 'minimalPrice' => 170,
+
+ // 0.5 * (110 + 3 * 10 + 1 * 40) + 100
+ 'maximalPrice' => 190
+ ]
+ ],
+
+ '
+ #11 Testing price for fixed bundle product
+ with special price, percent sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration4(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 3 * 110 * 0.1 + 110 * 1)
+ 'minimalPrice' => 126.5,
+
+ // 0.5 * (110 + 3 * 110 * 0.1 + 1 * 110 * 0.4 + 110 * 1)
+ 'maximalPrice' => 148.5
+ ]
+ ],
+
+ '
+ #12 Testing price for fixed bundle product
+ with special price, fixed sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration4(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 3 * 10 + 1 * 110)
+ 'minimalPrice' => 125,
+
+ // 0.5 * (110 + 3 * 10 + 1 * 40 + 1 * 110)
+ 'maximalPrice' => 145
+ ]
+ ],
+
+ '
+ #13 Testing price for fixed bundle product
+ with special price, percent sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration4(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 3 * 110 * 0.1) + 100
+ 'minimalPrice' => 171.5,
+
+ // 0.5 * (110 + 3 * 110 * 0.1 + 1 * 110 * 0.4) + 100
+ 'maximalPrice' => 193.5
+ ]
+ ],
+
+ '
+ #14 Testing price for fixed bundle product
+ with special price, fixed sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration5(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 40) + 100
+ 'minimalPrice' => 175,
+
+ // 0.5 * (110 + 1 * 40 + 3 * 15) + 100
+ 'maximalPrice' => 197.5
+ ]
+ ],
+
+ '
+ #15 Testing price for fixed bundle product
+ with special price, percent sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration5(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 110 * 0.4 + 1 * 110)
+ 'minimalPrice' => 132,
+
+ // 0.5 * (110 + 1 * 110 * 0.4 + 3 * 110 * 0.15 + 110 * 1)
+ 'maximalPrice' => 156.75
+ ]
+ ],
+
+ '
+ #16 Testing price for fixed bundle product
+ with special price, fixed sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration5(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 40 + 1 * 110)
+ 'minimalPrice' => 130,
+
+ // 0.5 * (110 + 1 * 40 + 3 * 15 + 1 * 110)
+ 'maximalPrice' => 152.5
+ ]
+ ],
+
+ '
+ #17 Testing price for fixed bundle product
+ with special price, percent sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration5(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 110 * 0.4) + 100
+ 'minimalPrice' => 177,
+
+ // 0.5 * (110 + 1 * 110 * 0.4 + 3 * 110 * 0.15) + 100
+ 'maximalPrice' => 201.75
+ ]
+ ],
+
+ '
+ #18 Testing price for fixed bundle product
+ with special price, fixed sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration6(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 40) + 100
+ 'minimalPrice' => 175,
+
+ // 0.5 * (110 + 3 * 15) + 100
+ 'maximalPrice' => 177.5
+ ]
+ ],
+
+ '
+ #19 Testing price for fixed bundle product
+ with special price, percent sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration6(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 110 * 0.4 + 1 * 110)
+ 'minimalPrice' => 132,
+
+ // 0.5 * (110 + 3 * 110 * 0.15 + 1 * 110)
+ 'maximalPrice' => 134.75
+ ]
+ ],
+
+ '
+ #20 Testing price for fixed bundle product
+ with special price, fixed sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration6(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 40 + 110 * 1)
+ 'minimalPrice' => 130,
+
+ // 0.5 * (110 + 3 * 15 + 110 * 1)
+ 'maximalPrice' => 132.5
+ ]
+ ],
+
+ '
+ #21 Testing price for fixed bundle product
+ with special price, percent sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration6(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 110 * 0.4) + 100
+ 'minimalPrice' => 177,
+
+ // 0.5 * (110 + 3 * 110 * 0.15) + 100
+ 'maximalPrice' => 179.75
+ ]
+ ],
+
+ '
+ #22 Testing price for fixed bundle product
+ with special price, fixed sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration7(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 40 + 1 * 20) + 100
+ 'minimalPrice' => 185,
+
+ // 0.5 * (110 + 3 * 15 + 1 * 20 + 3 * 10) + 100
+ 'maximalPrice' => 202.5
+ ]
+ ],
+
+ '
+ #23 Testing price for fixed bundle product
+ with special price, percent sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration7(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 110 * 0.4 + 1 * 110 * 0.2 + 110 * 1)
+ 'minimalPrice' => 143,
+
+ // 0.5 * (110 + 3 * 110 * 0.15 + 1 * 110 * 0.2 + 3 * 110 * 0.1 + 110 * 1)
+ 'maximalPrice' => 162.25
+ ]
+ ],
+
+ '
+ #24 Testing price for fixed bundle product
+ with special price, fixed sub items and percent options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration7(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 40 + 1 * 20 + 1 * 110)
+ 'minimalPrice' => 140,
+
+ // 0.5 * (110 + 3 * 15 + 1 * 20 + 3 * 10 + 1 * 110)
+ 'maximalPrice' => 157.5
+ ]
+ ],
+
+ '
+ #25 Testing price for fixed bundle product
+ with special price, percent sub items and fixed options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration7(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 110 * 0.4 + 1 * 110 * 0.2) + 100
+ 'minimalPrice' => 188,
+
+ // 0.5 * (110 + 3 * 110 * 0.15 + 1 * 110 * 0.2 + 3 * 110 * 0.1) + 100
+ 'maximalPrice' => 207.25
+ ]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with special price and without any sub items and options
+ * @return array
+ */
+ private function getBundleConfiguration1()
+ {
+ return [];
+ }
+
+ /**
+ * Fixed bundle product with required option, custom option and with special price
+ * @param $selectionsPriceType
+ * @param $customOptionsPriceType
+ * @return array
+ */
+ private function getBundleConfiguration2(
+ $selectionsPriceType,
+ $customOptionsPriceType
+ ) {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ 'price' => 20,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ]
+ ];
+
+ $customOptionsData = [
+ [
+ 'price_type' => $customOptionsPriceType,
+ 'title' => 'Test Field',
+ 'type' => 'field',
+ 'is_require' => 1,
+ 'price' => 100,
+ 'sku' => '1-text',
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ [
+ 'modifierName' => 'addCustomOption',
+ 'data' => [$customOptionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with non required option, custom option and with special price
+ * @param $selectionsPriceType
+ * @param $customOptionsPriceType
+ * @return array
+ */
+ private function getBundleConfiguration3(
+ $selectionsPriceType,
+ $customOptionsPriceType
+ ) {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'type' => 'checkbox',
+ 'required' => false,
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'price' => 20,
+ 'qty' => 2,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ]
+ ];
+
+ $customOptionsData = [
+ [
+ 'price_type' => $customOptionsPriceType,
+ 'title' => 'Test Field',
+ 'type' => 'field',
+ 'is_require' => 1,
+ 'price' => 100,
+ 'sku' => '1-text',
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ [
+ 'modifierName' => 'addCustomOption',
+ 'data' => [$customOptionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with checkbox type option, custom option and with special price
+ * @param $selectionsPriceType
+ * @param $customOptionsPriceType
+ * @return array
+ */
+ private function getBundleConfiguration4(
+ $selectionsPriceType,
+ $customOptionsPriceType
+ ) {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ 'price' => 40,
+ 'price_type' => $selectionsPriceType
+ ],
+ [
+ 'sku' => 'simple2',
+ 'price' => 10,
+ 'qty' => 3,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ]
+ ];
+
+ $customOptionsData = [
+ [
+ 'price_type' => $customOptionsPriceType,
+ 'title' => 'Test Field',
+ 'type' => 'field',
+ 'is_require' => 1,
+ 'price' => 100,
+ 'sku' => '1-text',
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ [
+ 'modifierName' => 'addCustomOption',
+ 'data' => [$customOptionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with multi type option, custom option and with special price
+ * @param $selectionsPriceType
+ * @param $customOptionsPriceType
+ * @return array
+ */
+ private function getBundleConfiguration5(
+ $selectionsPriceType,
+ $customOptionsPriceType
+ ) {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'multi',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ 'price' => 40,
+ 'price_type' => $selectionsPriceType
+ ],
+ [
+ 'sku' => 'simple2',
+ 'price' => 15,
+ 'qty' => 3,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ]
+ ];
+
+ $customOptionsData = [
+ [
+ 'price_type' => $customOptionsPriceType,
+ 'title' => 'Test Field',
+ 'type' => 'field',
+ 'is_require' => 1,
+ 'price' => 100,
+ 'sku' => '1-text',
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ [
+ 'modifierName' => 'addCustomOption',
+ 'data' => [$customOptionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with radio type option, custom option and with special price
+ * @param $selectionsPriceType
+ * @param $customOptionsPriceType
+ * @return array
+ */
+ private function getBundleConfiguration6(
+ $selectionsPriceType,
+ $customOptionsPriceType
+ ) {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'radio',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ 'price' => 40,
+ 'price_type' => $selectionsPriceType
+ ],
+ [
+ 'sku' => 'simple2',
+ 'price' => 15,
+ 'qty' => 3,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ]
+ ];
+
+ $customOptionsData = [
+ [
+ 'price_type' => $customOptionsPriceType,
+ 'title' => 'Test Field',
+ 'type' => 'field',
+ 'is_require' => 1,
+ 'price' => 100,
+ 'sku' => '1-text',
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ [
+ 'modifierName' => 'addCustomOption',
+ 'data' => [$customOptionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with two required options, custom option and with special price
+ * @param $selectionsPriceType
+ * @param $customOptionsPriceType
+ * @return array
+ */
+ private function getBundleConfiguration7(
+ $selectionsPriceType,
+ $customOptionsPriceType
+ ) {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'radio',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ 'price' => 40,
+ 'price_type' => $selectionsPriceType
+ ],
+ [
+ 'sku' => 'simple2',
+ 'price' => 15,
+ 'qty' => 3,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ],
+ [
+ 'title' => 'Op2',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ 'price' => 20,
+ 'price_type' => $selectionsPriceType
+ ],
+ [
+ 'sku' => 'simple2',
+ 'price' => 10,
+ 'qty' => 3,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ]
+ ];
+
+ $customOptionsData = [
+ [
+ 'price_type' => $customOptionsPriceType,
+ 'title' => 'Test Field',
+ 'type' => 'field',
+ 'is_require' => 1,
+ 'price' => 100,
+ 'sku' => '1-text',
+ ]
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ [
+ 'modifierName' => 'addCustomOption',
+ 'data' => [$customOptionsData]
+ ],
+ ];
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithTierPriceCalculatorTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithTierPriceCalculatorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..bd148080631aea892cccb0fab6fd0321d08c231b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithTierPriceCalculatorTest.php
@@ -0,0 +1,908 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Model\Product;
+
+use \Magento\Bundle\Api\Data\LinkInterface;
+use \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
+
+/**
+ * Class FixedBundleWithTierPRiceCalculatorTest
+ * @package Magento\Bundle\Model\Product
+ * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
+ * @magentoAppArea frontend
+ */
+class FixedBundleWithTierPriceCalculatorTest extends BundlePriceAbstract
+{
+ /** @var ProductTierPriceInterfaceFactory */
+ private $tierPriceFactory;
+
+ protected function setUp()
+ {
+ parent::setUp();
+ $this->tierPriceFactory = $this->objectManager->create(ProductTierPriceInterfaceFactory::class);
+ }
+
+ /**
+ * @param array $strategyModifiers
+ * @param array $expectedResults
+ * @dataProvider getTestCases
+ * @magentoAppIsolation enabled
+ */
+ public function testPriceForFixedBundle(array $strategyModifiers, array $expectedResults)
+ {
+ $this->prepareFixture($strategyModifiers, 'bundle_product');
+ $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
+
+ /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
+ $priceInfo = $bundleProduct->getPriceInfo();
+ $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
+
+ $this->assertEquals(
+ $expectedResults['minimalPrice'],
+ $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
+ 'Failed to check minimal price on product'
+ );
+
+ $this->assertEquals(
+ $expectedResults['maximalPrice'],
+ $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
+ 'Failed to check maximal price on product'
+ );
+ }
+
+ /**
+ * Test cases for current test
+ * @return array
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function getTestCases()
+ {
+ return [
+ '
+ #1 Testing product price
+ with tier price and without any sub items and options
+ ' => [
+ 'strategy' => $this->getBundleConfiguration1(),
+ 'expectedResults' => [
+ // 110 * 0.5
+ 'minimalPrice' => 55,
+
+ // 110 * 0.5
+ 'maximalPrice' => 55
+ ]
+ ],
+
+ '
+ #2 Testing product price
+ with tier price, fixed sub items and fixed options
+ ' => [
+ 'strategy' => $this->getProductConfiguration2(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 20) + 100
+ 'minimalPrice' => 165,
+
+ // 0.5 * (110 + 1 * 20) + 100
+ 'maximalPrice' => 165
+ ]
+ ],
+
+ '
+ #3 Testing product price
+ with tier price, percent sub items and percent options
+ ' => [
+ 'strategy' => $this->getProductConfiguration2(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 110 * 0.2 + 110 * 1)
+ 'minimalPrice' => 121,
+
+ // 0.5 * (110 + 110 * 0.2 + 110 * 1)
+ 'maximalPrice' => 121
+ ]
+ ],
+
+ '
+ #4 Testing product price
+ with tier price, fixed sub items and percent options
+ ' => [
+ 'strategy' => $this->getProductConfiguration2(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 20 + 110 * 1)
+ 'minimalPrice' => 120,
+
+ // 0.5 * (110 + 1 * 20 + 110 * 1)
+ 'maximalPrice' => 120
+ ]
+ ],
+
+ '
+ #5 Testing product price
+ with tier price, percent sub items and fixed options
+ ' => [
+ 'strategy' => $this->getProductConfiguration2(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 110 * 0.2) + 100
+ 'minimalPrice' => 166,
+
+ // 0.5 * (110 + 110 * 0.2) + 100
+ 'maximalPrice' => 166
+ ]
+ ],
+
+ '
+ #6 Testing product price
+ with tier price, fixed sub items and fixed options
+ ' => [
+ 'strategy' => $this->getProductConfiguration3(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * 110 + 100
+ 'minimalPrice' => 155,
+
+ // 0.5 * (110 + 2 * 20) + 100
+ 'maximalPrice' => 175
+ ]
+ ],
+
+ '
+ #7 Testing product price
+ with tier price, percent sub items and percent options
+ ' => [
+ 'strategy' => $this->getProductConfiguration3(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 110 * 1)
+ 'minimalPrice' => 110,
+
+ // 0.5 * (110 + 2 * 110 * 0.2 + 1 * 110)
+ 'maximalPrice' => 132
+ ]
+ ],
+
+ '
+ #8 Testing product price
+ with tier price, fixed sub items and percent options
+ ' => [
+ 'strategy' => $this->getProductConfiguration3(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 110)
+ 'minimalPrice' => 110,
+
+ // 0.5 * (110 + 2 * 20 + 1 * 110)
+ 'maximalPrice' => 130
+ ]
+ ],
+
+ '
+ #9 Testing product price
+ with tier price, percent sub items and fixed options
+ ' => [
+ 'strategy' => $this->getProductConfiguration3(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * 110 + 100
+ 'minimalPrice' => 155,
+
+ // 0.5 * (110 + 2 * 0.2 * 110) + 100
+ 'maximalPrice' => 177
+ ]
+ ],
+
+ '
+ #10 Testing product price
+ with tier price, fixed sub items and fixed options
+ ' => [
+ 'strategy' => $this->getProductConfiguration4(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 3 * 10) + 100
+ 'minimalPrice' => 170,
+
+ // 0.5 * (110 + 3 * 10 + 1 * 40) + 100
+ 'maximalPrice' => 190
+ ]
+ ],
+
+ '
+ #11 Testing product price
+ with tier price, percent sub items and percent options
+ ' => [
+ 'strategy' => $this->getProductConfiguration4(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 3 * 110 * 0.1 + 110 * 1)
+ 'minimalPrice' => 126.5,
+
+ // 0.5 * (110 + 3 * 110 * 0.1 + 1 * 110 * 0.4 + 110 * 1)
+ 'maximalPrice' => 148.5
+ ]
+ ],
+
+ '
+ #12 Testing product price
+ with tier price, fixed sub items and percent options
+ ' => [
+ 'strategy' => $this->getProductConfiguration4(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 3 * 10 + 1 * 110)
+ 'minimalPrice' => 125,
+
+ // 0.5 * (110 + 3 * 10 + 1 * 40 + 1 * 110)
+ 'maximalPrice' => 145
+ ]
+ ],
+
+ '
+ #13 Testing product price
+ with tier price, percent sub items and fixed options
+ ' => [
+ 'strategy' => $this->getProductConfiguration4(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 3 * 110 * 0.1) + 100
+ 'minimalPrice' => 171.5,
+
+ // 0.5 * (110 + 3 * 110 * 0.1 + 1 * 110 * 0.4) + 100
+ 'maximalPrice' => 193.5
+ ]
+ ],
+
+ '
+ #14 Testing product price
+ with tier price, fixed sub items and fixed options
+ ' => [
+ 'strategy' => $this->getProductConfiguration5(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 40) + 100
+ 'minimalPrice' => 175,
+
+ // 0.5 * (110 + 1 * 40 + 3 * 15) + 100
+ 'maximalPrice' => 197.5
+ ]
+ ],
+
+ '
+ #15 Testing product price
+ with tier price, percent sub items and percent options
+ ' => [
+ 'strategy' => $this->getProductConfiguration5(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 110 * 0.4 + 1 * 110)
+ 'minimalPrice' => 132,
+
+ // 0.5 * (110 + 1 * 110 * 0.4 + 3 * 110 * 0.15 + 110 * 1)
+ 'maximalPrice' => 156.75
+ ]
+ ],
+
+ '
+ #16 Testing product price
+ with tier price, fixed sub items and percent options
+ ' => [
+ 'strategy' => $this->getProductConfiguration5(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 40 + 1 * 110)
+ 'minimalPrice' => 130,
+
+ // 0.5 * (110 + 1 * 40 + 3 * 15 + 1 * 110)
+ 'maximalPrice' => 152.5
+ ]
+ ],
+
+ '
+ #17 Testing product price
+ with tier price, percent sub items and fixed options
+ ' => [
+ 'strategy' => $this->getProductConfiguration5(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 110 * 0.4) + 100
+ 'minimalPrice' => 177,
+
+ // 0.5 * (110 + 1 * 110 * 0.4 + 3 * 110 * 0.15) + 100
+ 'maximalPrice' => 201.75
+ ]
+ ],
+
+ '
+ #18 Testing product price
+ with tier price, fixed sub items and fixed options
+ ' => [
+ 'strategy' => $this->getProductConfiguration6(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 40) + 100
+ 'minimalPrice' => 175,
+
+ // 0.5 * (110 + 3 * 15) + 100
+ 'maximalPrice' => 177.5
+ ]
+ ],
+
+ '
+ #19 Testing product price
+ with tier price, percent sub items and percent options
+ ' => [
+ 'strategy' => $this->getProductConfiguration6(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 110 * 0.4 + 1 * 110)
+ 'minimalPrice' => 132,
+
+ // 0.5 * (110 + 3 * 110 * 0.15 + 1 * 110)
+ 'maximalPrice' => 134.75
+ ]
+ ],
+
+ '
+ #20 Testing product price
+ with tier price, fixed sub items and percent options
+ ' => [
+ 'strategy' => $this->getProductConfiguration6(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 40 + 110 * 1)
+ 'minimalPrice' => 130,
+
+ // 0.5 * (110 + 3 * 15 + 110 * 1)
+ 'maximalPrice' => 132.5
+ ]
+ ],
+
+ '
+ #21 Testing product price
+ with tier price, percent sub items and fixed options
+ ' => [
+ 'strategy' => $this->getProductConfiguration6(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 110 * 0.4) + 100
+ 'minimalPrice' => 177,
+
+ // 0.5 * (110 + 3 * 110 * 0.15) + 100
+ 'maximalPrice' => 179.75
+ ]
+ ],
+
+ '
+ #22 Testing product price
+ with tier price, fixed sub items and fixed options
+ ' => [
+ 'strategy' => $this->getProductConfiguration7(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 40 + 1 * 20) + 100
+ 'minimalPrice' => 185,
+
+ // 0.5 * (110 + 3 * 15 + 1 * 20 + 3 * 10) + 100
+ 'maximalPrice' => 202.5
+ ]
+ ],
+
+ '
+ #23 Testing product price
+ with tier price, percent sub items and percent options
+ ' => [
+ 'strategy' => $this->getProductConfiguration7(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 110 * 0.4 + 1 * 110 * 0.2 + 110 * 1)
+ 'minimalPrice' => 143,
+
+ // 0.5 * (110 + 3 * 110 * 0.15 + 1 * 110 * 0.2 + 3 * 110 * 0.1 + 110 * 1)
+ 'maximalPrice' => 162.25
+ ]
+ ],
+
+ '
+ #24 Testing product price
+ with tier price, fixed sub items and percent options
+ ' => [
+ 'strategy' => $this->getProductConfiguration7(
+ LinkInterface::PRICE_TYPE_FIXED,
+ self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 40 + 1 * 20 + 1 * 110)
+ 'minimalPrice' => 140,
+
+ // 0.5 * (110 + 3 * 15 + 1 * 20 + 3 * 10 + 1 * 110)
+ 'maximalPrice' => 157.5
+ ]
+ ],
+
+ '
+ #25 Testing product price
+ with tier price, percent sub items and fixed options
+ ' => [
+ 'strategy' => $this->getProductConfiguration7(
+ LinkInterface::PRICE_TYPE_PERCENT,
+ self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+ ),
+ 'expectedResults' => [
+ // 0.5 * (110 + 1 * 110 * 0.4 + 1 * 110 * 0.2) + 100
+ 'minimalPrice' => 188,
+
+ // 0.5 * (110 + 3 * 110 * 0.15 + 1 * 110 * 0.2 + 3 * 110 * 0.1) + 100
+ 'maximalPrice' => 207.25
+ ]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product without sub items and options and with tier price
+ * @return array
+ */
+ private function getBundleConfiguration1()
+ {
+ $tierPriceData = [
+ 'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+ 'qty' => 1,
+ 'value' => 50
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addTierPrice',
+ 'data' => [$tierPriceData]
+ ]
+ ];
+ }
+
+ /**
+ * Fixed bundle product with required option, custom option and with tier price
+ * @param $selectionsPriceType
+ * @param $customOptionsPriceType
+ * @return array
+ */
+ private function getProductConfiguration2($selectionsPriceType, $customOptionsPriceType)
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ 'price' => 20,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ]
+ ];
+
+ $customOptionsData = [
+ [
+ 'price_type' => $customOptionsPriceType,
+ 'title' => 'Test Field',
+ 'type' => 'field',
+ 'is_require' => 1,
+ 'price' => 100,
+ 'sku' => '1-text',
+ ]
+ ];
+
+ $tierPriceData = [
+ 'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+ 'qty' => 1,
+ 'value' => 50
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addTierPrice',
+ 'data' => [$tierPriceData]
+ ],
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ [
+ 'modifierName' => 'addCustomOption',
+ 'data' => [$customOptionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with non required option, custom option and with tier price
+ * @param $selectionsPriceType
+ * @param $customOptionsPriceType
+ * @return array
+ */
+ private function getProductConfiguration3($selectionsPriceType, $customOptionsPriceType)
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'type' => 'checkbox',
+ 'required' => false,
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'price' => 20,
+ 'qty' => 2,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ]
+ ];
+
+ $customOptionsData = [
+ [
+ 'price_type' => $customOptionsPriceType,
+ 'title' => 'Test Field',
+ 'type' => 'field',
+ 'is_require' => 1,
+ 'price' => 100,
+ 'sku' => '1-text',
+ ]
+ ];
+
+ $tierPriceData = [
+ 'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+ 'qty' => 1,
+ 'value' => 50
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addTierPrice',
+ 'data' => [$tierPriceData]
+ ],
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ [
+ 'modifierName' => 'addCustomOption',
+ 'data' => [$customOptionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with checkbox type option, custom option and with tier price
+ * @param $selectionsPriceType
+ * @param $customOptionsPriceType
+ * @return array
+ */
+ private function getProductConfiguration4($selectionsPriceType, $customOptionsPriceType)
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ 'price' => 40,
+ 'price_type' => $selectionsPriceType
+ ],
+ [
+ 'sku' => 'simple2',
+ 'price' => 10,
+ 'qty' => 3,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ]
+ ];
+
+ $customOptionsData = [
+ [
+ 'price_type' => $customOptionsPriceType,
+ 'title' => 'Test Field',
+ 'type' => 'field',
+ 'is_require' => 1,
+ 'price' => 100,
+ 'sku' => '1-text',
+ ]
+ ];
+
+ $tierPriceData = [
+ 'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+ 'qty' => 1,
+ 'value' => 50
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addTierPrice',
+ 'data' => [$tierPriceData]
+ ],
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ [
+ 'modifierName' => 'addCustomOption',
+ 'data' => [$customOptionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with multi type option, custom option and with tier price
+ * @param $selectionsPriceType
+ * @param $customOptionsPriceType
+ * @return array
+ */
+ private function getProductConfiguration5($selectionsPriceType, $customOptionsPriceType)
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'multi',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ 'price' => 40,
+ 'price_type' => $selectionsPriceType
+ ],
+ [
+ 'sku' => 'simple2',
+ 'price' => 15,
+ 'qty' => 3,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ]
+ ];
+
+ $customOptionsData = [
+ [
+ 'price_type' => $customOptionsPriceType,
+ 'title' => 'Test Field',
+ 'type' => 'field',
+ 'is_require' => 1,
+ 'price' => 100,
+ 'sku' => '1-text',
+ ]
+ ];
+
+ $tierPriceData = [
+ 'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+ 'qty' => 1,
+ 'value' => 50
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addTierPrice',
+ 'data' => [$tierPriceData]
+ ],
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ [
+ 'modifierName' => 'addCustomOption',
+ 'data' => [$customOptionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with radio type option, custom option and with tier price
+ * @param $selectionsPriceType
+ * @param $customOptionsPriceType
+ * @return array
+ */
+ private function getProductConfiguration6($selectionsPriceType, $customOptionsPriceType)
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'radio',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ 'price' => 40,
+ 'price_type' => $selectionsPriceType
+ ],
+ [
+ 'sku' => 'simple2',
+ 'price' => 15,
+ 'qty' => 3,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ]
+ ];
+
+ $customOptionsData = [
+ [
+ 'price_type' => $customOptionsPriceType,
+ 'title' => 'Test Field',
+ 'type' => 'field',
+ 'is_require' => 1,
+ 'price' => 100,
+ 'sku' => '1-text',
+ ]
+ ];
+
+ $tierPriceData = [
+ 'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+ 'qty' => 1,
+ 'value' => 50
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addTierPrice',
+ 'data' => [$tierPriceData]
+ ],
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ [
+ 'modifierName' => 'addCustomOption',
+ 'data' => [$customOptionsData]
+ ],
+ ];
+ }
+
+ /**
+ * Fixed bundle product with two required options, custom option and with tier price
+ * @param $selectionsPriceType
+ * @param $customOptionsPriceType
+ * @return array
+ */
+ private function getProductConfiguration7($selectionsPriceType, $customOptionsPriceType)
+ {
+ $optionsData = [
+ [
+ 'title' => 'Op1',
+ 'required' => true,
+ 'type' => 'radio',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ 'price' => 40,
+ 'price_type' => $selectionsPriceType
+ ],
+ [
+ 'sku' => 'simple2',
+ 'price' => 15,
+ 'qty' => 3,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ],
+ [
+ 'title' => 'Op2',
+ 'required' => true,
+ 'type' => 'checkbox',
+ 'links' => [
+ [
+ 'sku' => 'simple1',
+ 'qty' => 1,
+ 'price' => 20,
+ 'price_type' => $selectionsPriceType
+ ],
+ [
+ 'sku' => 'simple2',
+ 'price' => 10,
+ 'qty' => 3,
+ 'price_type' => $selectionsPriceType
+ ],
+ ]
+ ]
+ ];
+
+ $customOptionsData = [
+ [
+ 'price_type' => $customOptionsPriceType,
+ 'title' => 'Test Field',
+ 'type' => 'field',
+ 'is_require' => 1,
+ 'price' => 100,
+ 'sku' => '1-text',
+ ]
+ ];
+
+ $tierPriceData = [
+ 'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+ 'qty' => 1,
+ 'value' => 50
+ ];
+
+ return [
+ [
+ 'modifierName' => 'addTierPrice',
+ 'data' => [$tierPriceData]
+ ],
+ [
+ 'modifierName' => 'addSimpleProduct',
+ 'data' => [$optionsData]
+ ],
+ [
+ 'modifierName' => 'addCustomOption',
+ 'data' => [$customOptionsData]
+ ],
+ ];
+ }
+
+ /**
+ * @param \Magento\Catalog\Model\Product $product
+ * @param array $tirePriceData
+ * @return \Magento\Catalog\Model\Product
+ */
+ protected function addTierPrice(\Magento\Catalog\Model\Product $product, $tirePriceData)
+ {
+ $tierPrice = $this->tierPriceFactory->create([
+ 'data' => $tirePriceData
+ ]);
+ $product->setTierPrices([$tierPrice]);
+
+ return $product;
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/IsSaleableTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/IsSaleableTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..7882475314072fa850ebd824b820ce3626884738
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/IsSaleableTest.php
@@ -0,0 +1,392 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Model\Product;
+
+/**
+ * Test class for \Magento\Bundle\Model\Product\Type (bundle product type)
+ *
+ * @magentoDataFixture Magento/Bundle/_files/issaleable_product.php
+ */
+class IsSaleableTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Framework\ObjectManagerInterface
+ */
+ protected $objectManager;
+
+ /**
+ * @var \Magento\Catalog\Api\ProductRepositoryInterface
+ */
+ protected $productRepository;
+
+ protected function setUp()
+ {
+ $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+ $this->productRepository = $this->objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+ }
+
+ /**
+ * Check bundle product is saleable if his status is enabled
+ *
+ * @magentoAppIsolation enabled
+ * @covers \Magento\Bundle\Model\Product\Type::isSalable
+ */
+ public function testIsSaleableOnEnabledStatus()
+ {
+ $bundleProduct = $this->productRepository->get('bundle-product');
+ $bundleProduct->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED);
+
+ $this->assertTrue(
+ $bundleProduct->isSalable(),
+ 'Bundle product supposed to be saleable
+ if his status is enabled'
+ );
+ }
+
+ /**
+ * Check bundle product is NOT saleable if his status is disabled
+ *
+ * @magentoAppIsolation enabled
+ * @covers \Magento\Bundle\Model\Product\Type::isSalable
+ */
+ public function testIsSaleableOnDisabledStatus()
+ {
+ $bundleProduct = $this->productRepository->get('bundle-product');
+ $bundleProduct->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED);
+
+ $this->assertFalse(
+ $bundleProduct->isSalable(),
+ 'Bundle product supposed to be non saleable
+ if his status is disabled'
+ );
+ }
+
+ /**
+ * Check bundle product is saleable if his status is enabled
+ * and it has internal data is_salable = true
+ *
+ * @magentoAppIsolation enabled
+ * @covers \Magento\Bundle\Model\Product\Type::isSalable
+ */
+ public function testIsSaleableOnEnabledStatusAndIsSalableIsTrue()
+ {
+ $bundleProduct = $this->productRepository->get('bundle-product');
+ $bundleProduct->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED);
+ $bundleProduct->setData('is_salable', true);
+
+ $this->assertTrue(
+ $bundleProduct->isSalable(),
+ 'Bundle product supposed to be saleable
+ if his status is enabled and it has data is_salable = true'
+ );
+ }
+
+ /**
+ * Check bundle product is NOT saleable if
+ * his status is enabled but his data is_salable = false
+ *
+ * @magentoAppIsolation enabled
+ * @covers \Magento\Bundle\Model\Product\Type::isSalable
+ */
+ public function testIsSaleableOnEnabledStatusAndIsSalableIsFalse()
+ {
+ $bundleProduct = $this->productRepository->get('bundle-product');
+ $bundleProduct->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED);
+ $bundleProduct->setData('is_salable', false);
+
+ $this->assertFalse(
+ $bundleProduct->isSalable(),
+ 'Bundle product supposed to be non saleable
+ if his status is enabled but his data is_salable = false'
+ );
+ }
+
+ /**
+ * Check bundle product is saleable if it has all_items_salable = true
+ *
+ * @magentoAppIsolation enabled
+ * @covers \Magento\Bundle\Model\Product\Type::isSalable
+ */
+ public function testIsSaleableOnAllItemsSalableIsTrue()
+ {
+ $bundleProduct = $this->productRepository->get('bundle-product');
+ $bundleProduct->setData('all_items_salable', true);
+
+ $this->assertTrue(
+ $bundleProduct->isSalable(),
+ 'Bundle product supposed to be saleable
+ if it has data all_items_salable = true'
+ );
+ }
+
+ /**
+ * Check bundle product is NOT saleable if it has all_items_salable = false
+ *
+ * @magentoAppIsolation enabled
+ * @covers \Magento\Bundle\Model\Product\Type::isSalable
+ */
+ public function testIsSaleableOnAllItemsSalableIsFalse()
+ {
+ $bundleProduct = $this->productRepository->get('bundle-product');
+ $bundleProduct->setData('all_items_salable', false);
+
+ $this->assertFalse(
+ $bundleProduct->isSalable(),
+ 'Bundle product supposed to be non saleable
+ if it has data all_items_salable = false'
+ );
+ }
+
+ /**
+ * Check bundle product is NOT saleable if it has no options
+ *
+ * @magentoAppIsolation enabled
+ * @covers \Magento\Bundle\Model\Product\Type::isSalable
+ */
+ public function testIsSaleableOnBundleWithoutOptions()
+ {
+ $optionRepository = $this->objectManager->create(\Magento\Bundle\Api\ProductOptionRepositoryInterface::class);
+ $bundleProduct = $this->productRepository->get('bundle-product');
+
+ // TODO: make cleaner option deletion after fix MAGETWO-59465
+ $ea = $bundleProduct->getExtensionAttributes();
+ foreach ($ea->getBundleProductOptions() as $option) {
+ $optionRepository->delete($option);
+ }
+ $ea->setBundleProductOptions([]);
+ $bundleProduct->setExtensionAttributes($ea);
+
+ $bundleProduct = $this->productRepository->save($bundleProduct);
+
+ $this->assertFalse(
+ $bundleProduct->isSalable(),
+ 'Bundle product supposed to be non saleable
+ if it has no options'
+ );
+ }
+
+ /**
+ * Check bundle product is NOT saleable if it has no selections
+ *
+ * @magentoAppIsolation enabled
+ * @covers \Magento\Bundle\Model\Product\Type::isSalable
+ */
+ public function testIsSaleableOnBundleWithoutSelections()
+ {
+ $bundleProduct = $this->productRepository->get('bundle-product', true, null, true);
+ $bundleType = $bundleProduct->getTypeInstance();
+ /** @var \Magento\Bundle\Model\LinkManagement $linkManager */
+ $linkManager = $this->objectManager->create(\Magento\Bundle\Model\LinkManagement::class);
+
+ /** @var \Magento\Bundle\Model\Product\Type $bundleType */
+ $options = $bundleType->getOptionsCollection($bundleProduct);
+ $selections = $bundleType->getSelectionsCollection($options->getAllIds(), $bundleProduct);
+
+ foreach ($selections as $link) {
+ /** @var \Magento\Bundle\Model\Selection $link */
+ $linkManager->removeChild('bundle-product', $link->getOptionId(), $link->getSku());
+ }
+
+ $bundleProduct = $this->productRepository->get('bundle-product', false, null, true);
+ $this->assertFalse(
+ $bundleProduct->isSalable(),
+ 'Bundle product supposed to be non saleable
+ if it has no selections'
+ );
+ }
+
+ /**
+ * Check bundle product is NOT saleable if
+ * all his selections are not saleable
+ *
+ * @magentoAppIsolation enabled
+ * @covers \Magento\Bundle\Model\Product\Type::isSalable
+ */
+ public function testIsSaleableOnBundleWithoutSaleableSelections()
+ {
+ $productsSku = ['simple1', 'simple2', 'simple3', 'simple4', 'simple5'];
+ foreach ($productsSku as $productSku) {
+ $product = $this->productRepository->get($productSku);
+ $product->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED);
+ $this->productRepository->save($product);
+ }
+
+ $bundleProduct = $this->productRepository->get('bundle-product');
+
+ $this->assertFalse(
+ $bundleProduct->isSalable(),
+ 'Bundle product supposed to be non saleable
+ if all his selections are not saleable'
+ );
+ }
+
+ /**
+ * Check bundle product is NOT saleable if
+ * it has at least one required option without saleable selections
+ *
+ * @magentoAppIsolation enabled
+ * @covers \Magento\Bundle\Model\Product\Type::isSalable
+ */
+ public function testIsSaleableOnBundleWithoutSaleableSelectionsOnRequiredOption()
+ {
+ $productsSku = ['simple1', 'simple2', 'simple3'];
+ foreach ($productsSku as $productSku) {
+ $product = $this->productRepository->get($productSku);
+ $product->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED);
+ $this->productRepository->save($product);
+ }
+
+ $bundleProduct = $this->productRepository->get('bundle-product');
+
+ $this->assertFalse(
+ $bundleProduct->isSalable(),
+ 'Bundle product supposed to be non saleable
+ if it has at least one required option with no saleable selections'
+ );
+ }
+
+ /**
+ * Check bundle product is NOT saleable if
+ * there are not enough qty of selection on required option
+ *
+ * @magentoAppIsolation enabled
+ * @covers \Magento\Bundle\Model\Product\Type::isSalable
+ */
+ public function testIsSaleableOnBundleWithNotEnoughQtyOfSelection()
+ {
+ $this->setQtyForSelections(['simple1', 'simple2', 'simple3'], 1);
+
+ $bundleProduct = $this->productRepository->get('bundle-product');
+
+ $this->assertFalse(
+ $bundleProduct->isSalable(),
+ 'Bundle product supposed to be non saleable
+ if there are not enough qty of selections on required options'
+ );
+ }
+
+ /**
+ * Check bundle product is saleable if
+ * all his selections have selection_can_change_qty = 1
+ *
+ * @magentoAppIsolation enabled
+ * @covers \Magento\Bundle\Model\Product\Type::isSalable
+ */
+ public function testIsSaleableOnBundleWithSelectionCanChangeQty()
+ {
+ $this->setQtyForSelections(['simple1', 'simple2', 'simple3', 'simple4', 'simple5'], 1);
+ $bundleProduct = $this->productRepository->get('bundle-product');
+ $options = $bundleProduct->getExtensionAttributes()->getBundleProductOptions();
+
+ foreach ($options as $productOption) {
+ $links = $productOption->getProductLinks();
+ foreach ($links as $link) {
+ $link->setSelectionCanChangeQuantity(1);
+ }
+
+ $productOption->setProductLinks($links);
+ }
+
+ $extension = $bundleProduct->getExtensionAttributes();
+ $extension->setBundleProductOptions($options);
+ $bundleProduct->setExtensionAttributes($extension);
+
+ $bundleProduct = $this->productRepository->save($bundleProduct);
+
+ $this->assertTrue(
+ $bundleProduct->isSalable(),
+ 'Bundle product supposed to be saleable
+ if all his selections have selection_can_change_qty = 1'
+ );
+ }
+
+ /**
+ * Check bundle product is not saleable if
+ * all his options are not required and selections are not saleable
+ *
+ * @magentoAppIsolation enabled
+ * @covers \Magento\Bundle\Model\Product\Type::isSalable
+ */
+ public function testIsSaleableOnBundleWithoutRequiredOptions()
+ {
+ // making selections as not saleable
+ $productsSku = ['simple1', 'simple2', 'simple3', 'simple4', 'simple5'];
+ foreach ($productsSku as $productSku) {
+ $product = $this->productRepository->get($productSku);
+ $product->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED);
+ $this->productRepository->save($product);
+ }
+
+ $bundleProduct = $this->productRepository->get('bundle-product');
+
+ // setting all options as not required
+ $options = $bundleProduct->getExtensionAttributes()->getBundleProductOptions();
+ foreach ($options as $productOption) {
+ $productOption->setRequired(false);
+ }
+
+ $extension = $bundleProduct->getExtensionAttributes();
+ $extension->setBundleProductOptions($options);
+ $bundleProduct->setExtensionAttributes($extension);
+ $bundleProduct = $this->productRepository->save($bundleProduct);
+
+ $this->assertFalse(
+ $bundleProduct->isSalable(),
+ 'Bundle product supposed to be not saleable
+ if all his options are not required and selections are not saleable'
+ );
+ }
+
+ /**
+ * Check bundle product is saleable if
+ * it has at least one not required option with saleable selections
+ *
+ * @magentoAppIsolation enabled
+ * @covers \Magento\Bundle\Model\Product\Type::isSalable
+ */
+ public function testIsSaleableOnBundleWithOneSaleableSelection()
+ {
+ // making selections as not saleable except simple3
+ $productsSku = ['simple1', 'simple2', 'simple4', 'simple5'];
+
+ foreach ($productsSku as $productSku) {
+ $product = $this->productRepository->get($productSku);
+ $product->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED);
+ $this->productRepository->save($product);
+ }
+
+ $bundleProduct = $this->productRepository->get('bundle-product');
+
+ // setting all options as not required
+ $options = $bundleProduct->getExtensionAttributes()->getBundleProductOptions();
+ foreach ($options as $productOption) {
+ $productOption->setRequired(false);
+ }
+
+ $extension = $bundleProduct->getExtensionAttributes();
+ $extension->setBundleProductOptions($options);
+ $bundleProduct->setExtensionAttributes($extension);
+
+ $bundleProduct = $this->productRepository->save($bundleProduct);
+
+ $this->assertTrue(
+ $bundleProduct->isSalable(),
+ 'Bundle product supposed to be saleable
+ if it has at least one not required option with saleable selection'
+ );
+ }
+
+ private function setQtyForSelections($productsSku, $qty)
+ {
+ foreach ($productsSku as $productSku) {
+ $product = $this->productRepository->get($productSku);
+ $ea = $product->getExtensionAttributes();
+ $ea->getStockItem()->setQty($qty);
+ $this->productRepository->save($product);
+ }
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
new file mode 100644
index 0000000000000000000000000000000000000000..e05a72fe17d432774ad4e7dcc0fbcdfcdc79bb9b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/../../../../Magento/Bundle/_files/multiple_products.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE)
+ ->setId(42)
+ ->setAttributeSetId(4)
+ ->setWebsiteIds([1])
+ ->setName('Bundle Product')
+ ->setSku('bundle_product')
+ ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+ ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+ ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+ ->setPriceView(0)
+ ->setPriceType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC)
+ ->setShipmentType(0);
+
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_rollback.php
new file mode 100644
index 0000000000000000000000000000000000000000..33db954a6eee8043d0bc6b9022637cbc63a3ac13
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_rollback.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/../../../../Magento/Bundle/_files/multiple_products_rollback.php';
+
+/** @var \Magento\Framework\Registry $registry */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+ $product = $productRepository->get('bundle_product', false, null, true);
+ $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+ //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_with_catalog_rule.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_with_catalog_rule.php
new file mode 100644
index 0000000000000000000000000000000000000000..bb67fb6dfb19cdc5bed47899104a52098fca7014
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_with_catalog_rule.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/dynamic_bundle_product.php';
+require __DIR__ . '/../../../CatalogRule/_files/catalog_rule_10_off_not_logged.php';
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_with_catalog_rule_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_with_catalog_rule_rollback.php
new file mode 100644
index 0000000000000000000000000000000000000000..50cb07079c24f59bef6f3253244caed3c129f660
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_with_catalog_rule_rollback.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/dynamic_bundle_product_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_with_special_price.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_with_special_price.php
new file mode 100644
index 0000000000000000000000000000000000000000..4b29c72e16217e721cc90897772c29cbbf114f28
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_with_special_price.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/dynamic_bundle_product.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$productRepository
+ ->get('bundle_product')
+ ->setSpecialPrice(50)
+ ->save();
+
+$productRepository
+ ->get('simple2')
+ ->setSpecialPrice(2.5)
+ ->save();
+
+$productRepository
+ ->get('simple5')
+ ->setSpecialPrice(9.9)
+ ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_with_special_price_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_with_special_price_rollback.php
new file mode 100644
index 0000000000000000000000000000000000000000..50cb07079c24f59bef6f3253244caed3c129f660
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_with_special_price_rollback.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/dynamic_bundle_product_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
new file mode 100644
index 0000000000000000000000000000000000000000..68dcbbe1c0cf679e756681a098fe2fd1799b5ae3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/../../../../Magento/Bundle/_files/multiple_products.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE)
+ ->setId(42)
+ ->setAttributeSetId(4)
+ ->setWebsiteIds([1])
+ ->setName('Bundle Product')
+ ->setSku('bundle_product')
+ ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+ ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+ ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+ ->setPriceView(0)
+ ->setPriceType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED)
+ ->setPrice(110.0)
+ ->setShipmentType(0);
+
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_rollback.php
new file mode 100644
index 0000000000000000000000000000000000000000..33db954a6eee8043d0bc6b9022637cbc63a3ac13
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_rollback.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/../../../../Magento/Bundle/_files/multiple_products_rollback.php';
+
+/** @var \Magento\Framework\Registry $registry */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+ $product = $productRepository->get('bundle_product', false, null, true);
+ $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+ //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_catalog_rule.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_catalog_rule.php
new file mode 100644
index 0000000000000000000000000000000000000000..6e6c48b8ac9da79c744c53b4442e8434f95d36de
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_catalog_rule.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/fixed_bundle_product.php';
+require __DIR__ . '/../../../CatalogRule/_files/catalog_rule_10_off_not_logged.php';
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_catalog_rule_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_catalog_rule_rollback.php
new file mode 100644
index 0000000000000000000000000000000000000000..8a0059e1208517d5c96086f1d985b52db3ce528c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_catalog_rule_rollback.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/fixed_bundle_product_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_special_price.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_special_price.php
new file mode 100644
index 0000000000000000000000000000000000000000..3d3e92f7ac625dcb78313b8bd6d4cf65ee1c6ee9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_special_price.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/fixed_bundle_product.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$productRepository
+ ->get('bundle_product')
+ ->setSpecialPrice(50)
+ ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_special_price_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_special_price_rollback.php
new file mode 100644
index 0000000000000000000000000000000000000000..8a0059e1208517d5c96086f1d985b52db3ce528c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_special_price_rollback.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/fixed_bundle_product_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/issaleable_product.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/issaleable_product.php
new file mode 100644
index 0000000000000000000000000000000000000000..0075f3ab8ec8670f13f39f5ca2e5fc13f97cb25b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/issaleable_product.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/multiple_products.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Catalog\Model\ProductRepository $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE)
+ ->setId(3)
+ ->setAttributeSetId(4)
+ ->setWebsiteIds([1])
+ ->setName('Bundle Product')
+ ->setSku('bundle-product')
+ ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+ ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+ ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+ ->setPriceView(1)
+ ->setPriceType(1)
+ ->setPrice(10.0)
+ ->setShipmentType(0)
+ ->setBundleOptionsData(
+ [
+ // Required "Drop-down" option
+ [
+ 'title' => 'Option 1',
+ 'default_title' => 'Option 1',
+ 'type' => 'select',
+ 'required' => 1,
+ 'delete' => '',
+ ],
+ // Required "Radio Buttons" option
+ [
+ 'title' => 'Option 2',
+ 'default_title' => 'Option 2',
+ 'type' => 'radio',
+ 'required' => 1,
+ 'delete' => '',
+ ],
+ // Required "Checkbox" option
+ [
+ 'title' => 'Option 3',
+ 'default_title' => 'Option 3',
+ 'type' => 'checkbox',
+ 'required' => 1,
+ 'delete' => '',
+ ],
+ // Required "Multiple Select" option
+ [
+ 'title' => 'Option 4',
+ 'default_title' => 'Option 4',
+ 'type' => 'multi',
+ 'required' => 1,
+ 'delete' => '',
+ ],
+ // Non-required "Multiple Select" option
+ [
+ 'title' => 'Option 5',
+ 'default_title' => 'Option 5',
+ 'type' => 'multi',
+ 'required' => 0,
+ 'delete' => '',
+ ]
+ ]
+ )->setBundleSelectionsData(
+ [
+ [
+ [
+ 'product_id' => 10,
+ 'selection_qty' => 10,
+ 'selection_can_change_qty' => 0,
+ 'delete' => '',
+ 'option_id' => 1
+ ],
+ [
+ 'product_id' => 11,
+ 'selection_qty' => 10,
+ 'selection_can_change_qty' => 0,
+ 'delete' => '',
+ 'option_id' => 1
+ ],
+ [
+ 'product_id' => 12,
+ 'selection_qty' => 10,
+ 'selection_can_change_qty' => 0,
+ 'delete' => '',
+ 'option_id' => 1
+ ]
+ ],
+ [
+ [
+ 'product_id' => 10,
+ 'selection_qty' => 10,
+ 'selection_can_change_qty' => 0,
+ 'delete' => '',
+ 'option_id' => 2
+ ],
+ [
+ 'product_id' => 11,
+ 'selection_qty' => 10,
+ 'selection_can_change_qty' => 0,
+ 'delete' => '',
+ 'option_id' => 2
+ ],
+ [
+ 'product_id' => 13,
+ 'selection_qty' => 10,
+ 'selection_can_change_qty' => 0,
+ 'delete' => '',
+ 'option_id' => 2
+ ]
+ ],
+ [
+ [
+ 'product_id' => 10,
+ 'selection_qty' => 10,
+ 'delete' => '',
+ 'option_id' => 3
+ ],
+ [
+ 'product_id' => 11,
+ 'selection_qty' => 10,
+ 'delete' => '',
+ 'option_id' => 3
+ ],
+ [
+ 'product_id' => 14,
+ 'selection_qty' => 10,
+ 'selection_can_change_qty' => 0,
+ 'delete' => '',
+ 'option_id' => 3
+ ]
+ ],
+ [
+ [
+ 'product_id' => 13,
+ 'selection_qty' => 10,
+ 'delete' => '',
+ 'option_id' => 4
+ ],
+ [
+ 'product_id' => 14,
+ 'selection_qty' => 10,
+ 'delete' => '',
+ 'option_id' => 4
+ ],
+ [
+ 'product_id' => 12,
+ 'selection_qty' => 10,
+ 'selection_can_change_qty' => 0,
+ 'delete' => '',
+ 'option_id' => 4
+ ]
+ ],
+ [
+ [
+ 'product_id' => 10,
+ 'selection_qty' => 10,
+ 'delete' => '',
+ 'option_id' => 5
+ ],
+ [
+ 'product_id' => 11,
+ 'selection_qty' => 10,
+ 'delete' => '',
+ 'option_id' => 5
+ ]
+ ]
+ ]
+ );
+
+if ($product->getBundleOptionsData()) {
+ $options = [];
+ foreach ($product->getBundleOptionsData() as $key => $optionData) {
+ if (!(bool)$optionData['delete']) {
+ $option = $objectManager->create(\Magento\Bundle\Api\Data\OptionInterfaceFactory::class)
+ ->create(['data' => $optionData]);
+ $option->setSku($product->getSku());
+ $option->setOptionId(null);
+
+ $links = [];
+ $bundleLinks = $product->getBundleSelectionsData();
+ if (!empty($bundleLinks[$key])) {
+ foreach ($bundleLinks[$key] as $linkData) {
+ if (!(bool)$linkData['delete']) {
+ $link = $objectManager->create(\Magento\Bundle\Api\Data\LinkInterfaceFactory::class)
+ ->create(['data' => $linkData]);
+ $linkProduct = $productRepository->getById($linkData['product_id']);
+ $link->setSku($linkProduct->getSku());
+ $link->setQty($linkData['selection_qty']);
+ $links[] = $link;
+ }
+ }
+ $option->setProductLinks($links);
+ $options[] = $option;
+ }
+ }
+ }
+ $extension = $product->getExtensionAttributes();
+ $extension->setBundleProductOptions($options);
+ $product->setExtensionAttributes($extension);
+}
+
+$productRepository->save($product, true);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/issaleable_product_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/issaleable_product_rollback.php
new file mode 100644
index 0000000000000000000000000000000000000000..a24861525f00955081474a727f53868464347726
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/issaleable_product_rollback.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/multiple_products_rollback.php';
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+try {
+ $product = $productRepository->get('bundle-product');
+ $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+ //Product already removed
+}
+
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/multiple_products.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/multiple_products.php
new file mode 100644
index 0000000000000000000000000000000000000000..08624244df1627dce063e8347897067b90e9eef4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/multiple_products.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+ ->setId(10)
+ ->setAttributeSetId(4)
+ ->setName('Simple Product')
+ ->setSku('simple1')
+ ->setTaxClassId('none')
+ ->setDescription('description')
+ ->setShortDescription('short description')
+ ->setOptionsContainer('container1')
+ ->setMsrpDisplayActualPriceType(\Magento\Msrp\Model\Product\Attribute\Source\Type::TYPE_IN_CART)
+ ->setPrice(10)
+ ->setWeight(1)
+ ->setMetaTitle('meta title')
+ ->setMetaKeyword('meta keyword')
+ ->setMetaDescription('meta description')
+ ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+ ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+ ->setWebsiteIds([1])
+ ->setCateroryIds([])
+ ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+
+$productRepository->save($product);
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+ ->setId(11)
+ ->setAttributeSetId(4)
+ ->setName('Simple Product2')
+ ->setSku('simple2')
+ ->setTaxClassId('none')
+ ->setDescription('description')
+ ->setShortDescription('short description')
+ ->setOptionsContainer('container1')
+ ->setMsrpDisplayActualPriceType(\Magento\Msrp\Model\Product\Attribute\Source\Type::TYPE_ON_GESTURE)
+ ->setPrice(20)
+ ->setWeight(1)
+ ->setMetaTitle('meta title')
+ ->setMetaKeyword('meta keyword')
+ ->setMetaDescription('meta description')
+ ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG)
+ ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+ ->setWebsiteIds([1])
+ ->setCateroryIds([])
+ ->setStockData(['use_config_manage_stock' => 1, 'qty' => 50, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+
+$productRepository->save($product);
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+ ->setId(12)
+ ->setAttributeSetId(4)
+ ->setName('Simple Product 3')
+ ->setSku('simple3')
+ ->setTaxClassId('none')
+ ->setDescription('description')
+ ->setShortDescription('short description')
+ ->setPrice(30)
+ ->setWeight(1)
+ ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG)
+ ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+ ->setWebsiteIds([1])
+ ->setCateroryIds([])
+ ->setStockData(['use_config_manage_stock' => 1, 'qty' => 140, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+
+$productRepository->save($product);
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+ ->setId(13)
+ ->setAttributeSetId(4)
+ ->setName('Simple Product 4')
+ ->setSku('simple4')
+ ->setTaxClassId('none')
+ ->setDescription('description')
+ ->setShortDescription('short description')
+ ->setOptionsContainer('container1')
+ ->setMsrpDisplayActualPriceType(\Magento\Msrp\Model\Product\Attribute\Source\Type::TYPE_IN_CART)
+ ->setPrice(13)
+ ->setWeight(12)
+ ->setMetaTitle('meta title')
+ ->setMetaKeyword('meta keyword')
+ ->setMetaDescription('meta description')
+ ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+ ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+ ->setWebsiteIds([1])
+ ->setCateroryIds([])
+ ->setStockData(['use_config_manage_stock' => 1, 'qty' => 20, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+
+$productRepository->save($product);
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+ ->setId(14)
+ ->setAttributeSetId(4)
+ ->setName('Simple Product 5')
+ ->setSku('simple5')
+ ->setTaxClassId('none')
+ ->setDescription('description')
+ ->setShortDescription('short description')
+ ->setOptionsContainer('container1')
+ ->setMsrpDisplayActualPriceType(\Magento\Msrp\Model\Product\Attribute\Source\Type::TYPE_IN_CART)
+ ->setPrice(14)
+ ->setWeight(10)
+ ->setMetaTitle('meta title')
+ ->setMetaKeyword('meta keyword')
+ ->setMetaDescription('meta description')
+ ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+ ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+ ->setWebsiteIds([1])
+ ->setCateroryIds([])
+ ->setStockData(['use_config_manage_stock' => 1, 'qty' => 15, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/multiple_products_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/multiple_products_rollback.php
new file mode 100644
index 0000000000000000000000000000000000000000..c13f33bcbf7bbcaff71badcb9ab31dff455a2613
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/multiple_products_rollback.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+foreach (['simple1', 'simple2', 'simple3', 'simple4', 'simple5'] as $sku) {
+ try {
+ $product = $productRepository->get($sku, false, null, true);
+ $productRepository->delete($product);
+ } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+ //Product already removed
+ }
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
index f84c661126b04b9a30ec2ca84ef7d3f570d2a1bb..5db10afdee00284a4faa7249e273bb3d47ab5daf 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
@@ -233,7 +233,7 @@ class CategoryTest extends \Magento\TestFramework\TestCase\AbstractBackendContro
'display_mode' => true,
'meta_title' => true,
'custom_design' => true,
- 'page_layout' => false,
+ 'page_layout' => true,
'is_active' => true,
'include_in_menu' => true,
'landing_page' => true,
@@ -242,7 +242,7 @@ class CategoryTest extends \Magento\TestFramework\TestCase\AbstractBackendContro
'description' => true,
'meta_keywords' => true,
'meta_description' => true,
- 'custom_layout_update' => false,
+ 'custom_layout_update' => true,
'custom_design_from' => true,
'custom_design_to' => true,
'filter_price_range' => false
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
index 3c27a65c4a74385f546c108c077c128ebb4edcfb..78f792fe78fb14b5a8d9d2b710fc14482a94b743 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
@@ -290,6 +290,18 @@ class ProductTest extends \PHPUnit_Framework_TestCase
$this->assertTrue((bool)$this->_model->isSaleable());
$this->assertTrue((bool)$this->_model->isAvailable());
$this->assertTrue($this->_model->isInStock());
+ }
+
+ /**
+ * @covers \Magento\Catalog\Model\Product::isSalable
+ * @covers \Magento\Catalog\Model\Product::isSaleable
+ * @covers \Magento\Catalog\Model\Product::isAvailable
+ * @covers \Magento\Catalog\Model\Product::isInStock
+ */
+ public function testIsNotSalableWhenStatusDisabled()
+ {
+ $this->_model = $this->productRepository->get('simple');
+
$this->_model->setStatus(0);
$this->assertFalse((bool)$this->_model->isSalable());
$this->assertFalse((bool)$this->_model->isSaleable());
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/dropdown_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/dropdown_attribute.php
new file mode 100644
index 0000000000000000000000000000000000000000..56e84046b255bf89c5f6aa6c1cb75cb7c7d584ba
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/dropdown_attribute.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* Create attribute */
+/** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+$attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+);
+
+if (!$attribute->loadByCode(4, 'dropdown_attribute')->getId()) {
+ /** @var $installer \Magento\Catalog\Setup\CategorySetup */
+ $installer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ \Magento\Catalog\Setup\CategorySetup::class
+ );
+
+ $attribute->setData(
+ [
+ 'attribute_code' => 'dropdown_attribute',
+ 'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
+ 'is_global' => 0,
+ 'is_user_defined' => 1,
+ 'frontend_input' => 'select',
+ 'is_unique' => 0,
+ 'is_required' => 0,
+ 'is_searchable' => 0,
+ 'is_visible_in_advanced_search' => 0,
+ 'is_comparable' => 0,
+ 'is_filterable' => 0,
+ 'is_filterable_in_search' => 0,
+ 'is_used_for_promo_rules' => 0,
+ 'is_html_allowed_on_front' => 1,
+ 'is_visible_on_front' => 0,
+ 'used_in_product_listing' => 0,
+ 'used_for_sort_by' => 0,
+ 'frontend_label' => ['Drop-Down Attribute'],
+ 'backend_type' => 'varchar',
+ 'backend_model' => \Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend::class,
+ 'option' => [
+ 'value' => [
+ 'option_1' => ['Option 1'],
+ 'option_2' => ['Option 2'],
+ 'option_3' => ['Option 3'],
+ ],
+ 'order' => [
+ 'option_1' => 1,
+ 'option_2' => 2,
+ 'option_3' => 3,
+ ],
+ ],
+ ]
+ );
+ $attribute->save();
+
+ /* Assign attribute to attribute set */
+ $installer->addAttributeToGroup('catalog_product', 'Default', 'Attributes', $attribute->getId());
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index 8775eb7d54d0fd59c8c09aeaf000149a24f3d2bf..ff21749ccf372d3dae8d07d64406b21e87465b49 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -569,52 +569,9 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
*/
public function testSaveMediaImage()
{
- $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
- $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create(\Magento\Framework\Filesystem::class);
- $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
-
- $source = $this->objectManager->create(
- \Magento\ImportExport\Model\Import\Source\Csv::class,
- [
- 'file' => __DIR__ . '/_files/import_media.csv',
- 'directory' => $directory
- ]
- );
- $this->_model->setParameters(
- [
- 'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
- 'entity' => 'catalog_product',
- 'import_images_file_dir' => 'pub/media/import'
- ]
- );
- $appParams = \Magento\TestFramework\Helper\Bootstrap::getInstance()
- ->getBootstrap()
- ->getApplication()
- ->getInitParams()[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS];
- $uploader = $this->_model->getUploader();
+ $this->importDataForMediaTest('import_media.csv');
+ $product = $this->getProductBySku('simple_new');
- $destDir = $directory->getRelativePath($appParams[DirectoryList::MEDIA][DirectoryList::PATH] . '/catalog/product');
- $tmpDir = $directory->getRelativePath($appParams[DirectoryList::MEDIA][DirectoryList::PATH] . '/import');
-
- $directory->create($destDir);
- $this->assertTrue($uploader->setDestDir($destDir));
- $this->assertTrue($uploader->setTmpDir($tmpDir));
- $errors = $this->_model->setSource(
- $source
- )->validateData();
-
- $this->assertTrue($errors->getErrorsCount() == 0);
- $this->_model->importData();
- $this->assertTrue($this->_model->getErrorAggregator()->getErrorsCount() == 0);
-
- $resource = $objectManager->get(\Magento\Catalog\Model\ResourceModel\Product::class);
- $productId = $resource->getIdBySku('simple_new');
-
- $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- \Magento\Catalog\Model\Product::class
- );
- $product->load($productId);
$this->assertEquals('/m/a/magento_image.jpg', $product->getData('swatch_image'));
$gallery = $product->getMediaGalleryImages();
$this->assertInstanceOf(\Magento\Framework\Data\Collection::class, $gallery);
@@ -626,6 +583,25 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
$this->assertEquals('Image Label', $item->getLabel());
}
+ /**
+ * Test that image labels updates after import
+ *
+ * @magentoDataFixture mediaImportImageFixture
+ * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
+ */
+ public function testUpdateImageLabel()
+ {
+ $this->importDataForMediaTest('import_media_update_label.csv');
+ $product = $this->getProductBySku('simple');
+
+ $gallery = $product->getMediaGalleryImages();
+ $items = $gallery->getItems();
+ $this->assertCount(1, $items);
+ $item = array_pop($items);
+ $this->assertInstanceOf(\Magento\Framework\DataObject::class, $item);
+ $this->assertEquals('Updated Image Label', $item->getLabel());
+ }
+
/**
* Copy a fixture image into media import directory
*/
@@ -1433,6 +1409,68 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
$product2->getData('multiselect_attribute'));
}
+ /**
+ * Import and check data from file
+ *
+ * @param string $fileName
+ */
+ private function importDataForMediaTest($fileName)
+ {
+ $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
+ $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+
+ $source = $this->objectManager->create(
+ \Magento\ImportExport\Model\Import\Source\Csv::class,
+ [
+ 'file' => __DIR__ . '/_files/' . $fileName,
+ 'directory' => $directory
+ ]
+ );
+ $this->_model->setParameters(
+ [
+ 'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
+ 'entity' => 'catalog_product',
+ 'import_images_file_dir' => 'pub/media/import'
+ ]
+ );
+ $appParams = \Magento\TestFramework\Helper\Bootstrap::getInstance()
+ ->getBootstrap()
+ ->getApplication()
+ ->getInitParams()[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS];
+ $uploader = $this->_model->getUploader();
+
+ $mediaPath = $appParams[DirectoryList::MEDIA][DirectoryList::PATH];
+ $destDir = $directory->getRelativePath($mediaPath . '/catalog/product');
+ $tmpDir = $directory->getRelativePath($mediaPath . '/import');
+
+ $directory->create($destDir);
+ $this->assertTrue($uploader->setDestDir($destDir));
+ $this->assertTrue($uploader->setTmpDir($tmpDir));
+ $errors = $this->_model->setSource(
+ $source
+ )->validateData();
+ $this->assertTrue($errors->getErrorsCount() == 0);
+
+ $this->_model->importData();
+ $this->assertTrue($this->_model->getErrorAggregator()->getErrorsCount() == 0);
+ }
+
+ /**
+ * Load product by given product sku
+ *
+ * @param string $sku
+ * @return \Magento\Catalog\Model\Product
+ */
+ private function getProductBySku($sku)
+ {
+ $resource = $this->objectManager->get(\Magento\Catalog\Model\ResourceModel\Product::class);
+ $productId = $resource->getIdBySku($sku);
+ $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
+ $product->load($productId);
+
+ return $product;
+ }
+
/**
* @param array $row
* @param string|null $behavior
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_update_label.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_update_label.csv
new file mode 100644
index 0000000000000000000000000000000000000000..4e62e28af7ff3c55232e5636334cb6023cbf2604
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_update_label.csv
@@ -0,0 +1,2 @@
+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label1,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,related_skus,crosssell_skus,upsell_skus,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,associated_skus
+simple,,Default,simple,,base,New Product,,,,1,Taxable Goods,"Catalog, Search",10,,,,new-product,New Product,New Product,New Product ,magento_image.jpg,,magento_image.jpg,,magento_image.jpg,,magento_image.jpg,,10/20/15 07:05,10/20/15 07:05,,,Block after Info Column,,,,,,,,,,,,,"has_options=1,quantity_and_stock_status=In Stock,required_options=1",100,0,1,0,0,1,1,1,10000,1,1,1,1,1,0,1,1,0,0,0,1,,,,magento_image.jpg,Updated Image Label,,,,,,,,
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Model/ResourceModel/UpdateHandlerTest.php b/dev/tests/integration/testsuite/Magento/Eav/Model/ResourceModel/UpdateHandlerTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..1f8b20b7b041119a0394e0d3d8b83de3aeb727c4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Eav/Model/ResourceModel/UpdateHandlerTest.php
@@ -0,0 +1,256 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Eav\Model\ResourceModel;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * @magentoAppArea adminhtml
+ * @magentoAppIsolation enabled
+ */
+class UpdateHandlerTest extends \Magento\TestFramework\Indexer\TestCase
+{
+ /**
+ * @covers \Magento\Eav\Model\ResourceModel\UpdateHandler::execute
+ * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ * @dataProvider getAllStoresDataProvider
+ * @param $code
+ * @param $snapshotValue
+ * @param $newValue
+ * @param $expected
+ */
+ public function testExecuteProcessForAllStores($code, $snapshotValue, $newValue, $expected)
+ {
+ if ($snapshotValue !== '-') {
+ $entity = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+ $entity->setStoreId(0);
+ $entity->load(1);
+ $entity->setData($code, $snapshotValue);
+ $entity->save();
+ }
+
+ $entity = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+ $entity->setStoreId(0);
+ $entity->load(1);
+
+ $updateHandler = Bootstrap::getObjectManager()->create(UpdateHandler::class);
+ $entityData = array_merge($entity->getData(), [$code => $newValue]);
+ $updateHandler->execute(\Magento\Catalog\Api\Data\ProductInterface::class, $entityData);
+
+ $resultEntity = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+ $resultEntity->setStoreId(0);
+ $resultEntity->load(1);
+
+ $this->assertSame($expected, $resultEntity->getData($code));
+ }
+
+ /**
+ * @covers \Magento\Eav\Model\ResourceModel\UpdateHandlerTest::execute
+ * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoDataFixture Magento/Store/_files/second_store.php
+ * @dataProvider getCustomStoreDataProvider
+ * @param $code
+ * @param $snapshotValue
+ * @param $newValue
+ * @param $expected
+ */
+ public function testExecuteProcessForCustomStore($code, $snapshotValue, $newValue, $expected)
+ {
+ $store = Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
+ $store->load('fixture_second_store', 'code');
+
+ Bootstrap::getObjectManager()
+ ->create(\Magento\CatalogSearch\Model\Indexer\Fulltext\Processor::class)
+ ->reindexAll();
+
+ if ($snapshotValue !== '-') {
+ $entity = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+ $entity->setStoreId($store->getId());
+ $entity->load(1);
+ $entity->setData($code, $snapshotValue);
+ $entity->save();
+ }
+
+ $entity = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+ $entity->setStoreId($store->getId());
+ $entity->load(1);
+
+ $updateHandler = Bootstrap::getObjectManager()->create(UpdateHandler::class);
+ $entityData = array_merge($entity->getData(), [$code => $newValue]);
+ $updateHandler->execute(\Magento\Catalog\Api\Data\ProductInterface::class, $entityData);
+
+ $resultEntity = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+ $resultEntity->setStoreId($store->getId());
+ $resultEntity->load(1);
+
+ $this->assertSame($expected, $resultEntity->getData($code));
+ }
+
+ /**
+ * @covers \Magento\Eav\Model\ResourceModel\UpdateHandlerTest::execute
+ * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoDataFixture Magento/Catalog/_files/dropdown_attribute.php
+ * @magentoDataFixture Magento/Store/_files/second_store.php
+ * @dataProvider getCustomAttributeDataProvider
+ * @param $code
+ * @param $defaultStoreValue
+ * @param $snapshotValue
+ * @param $newValue
+ * @param $expected
+ */
+ public function testExecuteProcessForCustomAttributeInCustomStore(
+ $code,
+ $defaultStoreValue,
+ $snapshotValue,
+ $newValue,
+ $expected
+ ) {
+ $store = Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
+ $store->load('fixture_second_store', 'code');
+
+ Bootstrap::getObjectManager()
+ ->create(\Magento\CatalogSearch\Model\Indexer\Fulltext\Processor::class)
+ ->reindexAll();
+
+ $attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+ );
+ $attribute->loadByCode(4, $code);
+
+ $options = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection::class
+ );
+ $options->setAttributeFilter($attribute->getId());
+ $optionIds = $options->getAllIds();
+
+ $entity = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+ $entity->setStoreId(0);
+ $entity->load(1);
+ $entity->setData($code, $optionIds[$defaultStoreValue]);
+ $entity->save();
+
+ if ($snapshotValue !== '-') {
+ /** @var $options \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection */
+ $entity = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+ $entity->setStoreId($store->getId());
+ $entity->load(1);
+
+ if ($snapshotValue) {
+ $snapshotValue = $optionIds[$snapshotValue];
+ }
+
+ $entity->setData($code, $snapshotValue);
+ $entity->save();
+ }
+
+ $entity = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+ $entity->setStoreId($store->getId());
+ $entity->load(1);
+
+ $updateHandler = Bootstrap::getObjectManager()->create(UpdateHandler::class);
+
+ if ($newValue) {
+ $newValue = $optionIds[$newValue];
+ }
+
+ $entityData = array_merge($entity->getData(), [$code => $newValue]);
+ $updateHandler->execute(\Magento\Catalog\Api\Data\ProductInterface::class, $entityData);
+
+ $resultEntity = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+ $resultEntity->setStoreId($store->getId());
+ $resultEntity->load(1);
+
+ if ($expected !== null) {
+ $expected = $optionIds[$expected];
+ }
+
+ $this->assertSame($expected, $resultEntity->getData($code));
+ }
+
+ /**
+ * @return array
+ */
+ public function getAllStoresDataProvider()
+ {
+ return [
+ ['description', '', 'not_empty_value', 'not_empty_value'], //0
+ ['description', '', '', null], //1
+ ['description', '', null, null], //2
+ ['description', '', false, null], //3
+
+ ['description', 'not_empty_value', 'not_empty_value2', 'not_empty_value2'], //4
+ ['description', 'not_empty_value', '', null], //5
+ ['description', 'not_empty_value', null, null], //6
+ ['description', 'not_empty_value', false, null], //7
+
+ ['description', null, 'not_empty_value', 'not_empty_value'], //8
+ ['description', null, '', null], //9
+ ['description', null, false, null], //10
+
+ ['description', false, 'not_empty_value', 'not_empty_value'], //11
+ ['description', false, '', null], //12
+ ['description', false, null, null], //13
+ ];
+ }
+
+ /**
+ * @return array
+ */
+ public function getCustomStoreDataProvider()
+ {
+ return [
+ ['description', '', 'not_empty_value', 'not_empty_value'], //0
+ ['description', '', '', null], //1
+ ['description', '', null, 'Description with <b>html tag</b>'], //2
+ ['description', '', false, 'Description with <b>html tag</b>'], //3
+
+ ['description', 'not_empty_value', 'not_empty_value2', 'not_empty_value2'], //4
+ ['description', 'not_empty_value', '', null], //5
+ ['description', 'not_empty_value', null, 'Description with <b>html tag</b>'], //6
+ ['description', 'not_empty_value', false, 'Description with <b>html tag</b>'], //7
+
+ ['description', null, 'not_empty_value', 'not_empty_value'], //8
+ ['description', null, '', null], //9
+ ['description', null, false, 'Description with <b>html tag</b>'], //10
+
+ ['description', false, 'not_empty_value', 'not_empty_value'], //11
+ ['description', false, '', null], //12
+ ['description', false, null, 'Description with <b>html tag</b>'], //13
+ ];
+ }
+
+ /**
+ * @return array
+ */
+ public function getCustomAttributeDataProvider()
+ {
+ return [
+ ['dropdown_attribute', 0, '', 1, 1], //0
+ ['dropdown_attribute', 0, '', '', null], //1
+ ['dropdown_attribute', 0, '', null, 0], //2
+ ['dropdown_attribute', 0, '', false, 0], //3
+
+ ['dropdown_attribute', 0, 1, 2, 2], //4
+ ['dropdown_attribute', 0, 1, '', null], //5
+ ['dropdown_attribute', 0, 1, null, 0], //6
+ ['dropdown_attribute', 0, 1, false, 0], //7
+
+ ['dropdown_attribute', 0, null, 1, 1], //8
+ ['dropdown_attribute', 0, null, '', null], //9
+ ['dropdown_attribute', 0, null, false, 0], //10
+
+ ['dropdown_attribute', 0, false, 1, 1], //11
+ ['dropdown_attribute', 0, false, '', null], //12
+ ['dropdown_attribute', 0, false, null, 0], //13
+
+ ['dropdown_attribute', 0, '-', 1, 1], //14
+ ['dropdown_attribute', 0, '-', '', null], //15
+ ['dropdown_attribute', 0, '-', null, 0], //16
+ ['dropdown_attribute', 0, '-', false, 0], //17
+ ];
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/SampleData/Model/DependencyTest.php b/dev/tests/integration/testsuite/Magento/SampleData/Model/DependencyTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..4ff9104cec879f48f48edc28f9f9860a599519d9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SampleData/Model/DependencyTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\SampleData\Model;
+
+use Magento\Framework\Composer\ComposerInformation;
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Config\Composer\PackageFactory;
+
+class DependencyTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\SampleData\Model\Dependency
+ */
+ private $model;
+
+ /**
+ * @var ComposerInformation|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $composerInformationMock;
+
+ /**
+ * @var ComponentRegistrar|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $componentRegistrarMock;
+
+ protected function setUp()
+ {
+ $this->composerInformationMock = $this->getMockBuilder(ComposerInformation::class)
+ ->disableOriginalConstructor()
+ ->disableOriginalClone()
+ ->getMock();
+ $this->componentRegistrarMock = $this->getMockBuilder(ComponentRegistrar::class)
+ ->disableOriginalConstructor()
+ ->disableOriginalClone()
+ ->getMock();
+
+ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+ $this->model = $objectManager->create(
+ \Magento\SampleData\Model\Dependency::class,
+ [
+ 'composerInformation' => $this->composerInformationMock,
+ 'filesystem' => $objectManager->get(Filesystem::class),
+ 'packageFactory' => $objectManager->get(PackageFactory::class),
+ 'componentRegistrar' => $this->componentRegistrarMock
+ ]
+ );
+ }
+
+ public function testGetSampleDataPackages()
+ {
+ $this->composerInformationMock->expects($this->once())
+ ->method('getSuggestedPackages')
+ ->willReturn([]);
+ $this->componentRegistrarMock->expects($this->once())
+ ->method('getPaths')
+ ->with(ComponentRegistrar::MODULE)
+ ->willReturn([
+ __DIR__ . '/../_files/Modules/FirstModule',
+ __DIR__ . '/../_files/Modules/SecondModule',
+ __DIR__ . '/../_files/Modules/ThirdModule',
+ __DIR__ . '/../_files/Modules/FourthModule'
+ ]);
+
+ $this->assertSame(
+ ['magento/module-first-sample-data' => '777.7.*'],
+ $this->model->getSampleDataPackages()
+ );
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/FirstModule/composer.json b/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/FirstModule/composer.json
new file mode 100644
index 0000000000000000000000000000000000000000..d3f063976ea9180bc790e3597e771179f8f26563
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/FirstModule/composer.json
@@ -0,0 +1,9 @@
+{
+ "name": "magento/module-first",
+ "description": "N/A",
+ "suggest": {
+ "magento/module-first-sample-data": "Sample Data version:777.7.*"
+ },
+ "type": "magento2-module",
+ "version": "777.7.7"
+}
diff --git a/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/SecondModule/composer.json b/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/SecondModule/composer.json
new file mode 100644
index 0000000000000000000000000000000000000000..b9e027b7bb6f5625dee2d8a64c26a9be6056c36b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/SecondModule/composer.json
@@ -0,0 +1,9 @@
+{
+ "name": "magento/module-second",
+ "description": "N/A",
+ "suggest": {
+ "magento/module-some-module": "Some Module:888.8.*"
+ },
+ "type": "magento2-module",
+ "version": "777.7.7"
+}
diff --git a/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/ThirdModule/composer.json b/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/ThirdModule/composer.json
new file mode 100644
index 0000000000000000000000000000000000000000..2a0d642e8e282ecb2cec8ccb755a1dd3284f5a48
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/ThirdModule/composer.json
@@ -0,0 +1,6 @@
+{
+ "name": "magento/module-second",
+ "description": "N/A",
+ "type": "magento2-module",
+ "version": "777.7.7"
+}
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php
index 383cc31a84228631d62864e9e2f6c2d78551d9d5..41b0fdaff08c5b0b8b7291347a2a121cf0a4c68b 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php
@@ -125,6 +125,7 @@ class SubtotalTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected['subtotal'], $total->getSubtotal());
$this->assertEquals($expected['subtotal'] + $expected['tax_amount'], $total->getSubtotalInclTax());
+ $this->assertEquals($expected['subtotal'] + $expected['tax_amount'], $address->getBaseSubtotalTotalInclTax());
$this->assertEquals($expected['discount_amount'], $total->getDiscountAmount());
$items = $address->getAllItems();
/** @var \Magento\Quote\Model\Quote\Address\Item $item */
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/utils/percentage-price-calculator.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/utils/percentage-price-calculator.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..8785e41c2920c9e5f132ab3fda3270611f10838b
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/utils/percentage-price-calculator.test.js
@@ -0,0 +1,67 @@
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define(['Magento_Catalog/js/utils/percentage-price-calculator'], function (percentagePriceCalculator) {
+ 'use strict';
+
+ var basePrice = 100,
+ negativeBasePrice = -10,
+ decimalBasePrice = '100,1',
+ zeroBasePrice = 0;
+
+ describe('Check valid calculation', function () {
+ it('5%', function () {
+ expect(percentagePriceCalculator(basePrice, '5%')).toBe('95.00');
+ });
+ it('0%', function () {
+ expect(percentagePriceCalculator(basePrice, '0%')).toBe('100.00');
+ });
+ it('100%', function () {
+ expect(percentagePriceCalculator(basePrice, '100%')).toBe('0.00');
+ });
+ it('110%', function () {
+ expect(percentagePriceCalculator(basePrice, '110%')).toBe('0.00');
+ });
+ it('5.5%', function () {
+ expect(percentagePriceCalculator(basePrice, '5.5%')).toBe('94.50');
+ });
+ it('.5%', function () {
+ expect(percentagePriceCalculator(basePrice, '.5%')).toBe('99.50');
+ });
+ it('-7%', function () {
+ expect(percentagePriceCalculator(basePrice, '-7%')).toBe('107.00');
+ });
+ });
+
+ describe('Check invalid input calculation', function () {
+ it('invalid with %', function () {
+ expect(percentagePriceCalculator(basePrice, '7p%')).toBe('');
+ expect(percentagePriceCalculator(basePrice, '-%')).toBe('');
+ });
+ it('without %', function () {
+ expect(percentagePriceCalculator(basePrice, '7p')).toBe('7p');
+ expect(percentagePriceCalculator(basePrice, '0')).toBe('0');
+ expect(percentagePriceCalculator(basePrice, 'qwe')).toBe('qwe');
+ });
+ it('just %', function () {
+ expect(percentagePriceCalculator(basePrice, '%')).toBe('');
+ });
+ it('empty', function () {
+ expect(percentagePriceCalculator(basePrice, '')).toBe('');
+ });
+ });
+
+ describe('Other', function () {
+ it('negative base price', function () {
+ expect(percentagePriceCalculator(negativeBasePrice, '10%')).toBe('-9.00');
+ });
+ it('decimal base price', function () {
+ expect(percentagePriceCalculator(decimalBasePrice, '10%')).toBe('90.09');
+ });
+ it('zero base price', function () {
+ expect(percentagePriceCalculator(zeroBasePrice, '10%')).toBe('0.00');
+ });
+ });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/select.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/select.test.js
index db5855b0a692bb7ac0c9b75de35d228abe309016..5d75b8c595366169166d3964bbd95d988b1d5606 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/select.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/select.test.js
@@ -121,7 +121,7 @@ define([
{
value: 'valLast'
}];
- model.caption = false;
+ model.caption('');
expect(model.normalizeData('')).toEqual('valFirst');
});
});
diff --git a/lib/internal/Magento/Framework/App/Http.php b/lib/internal/Magento/Framework/App/Http.php
index b98998c55a40155ea785a9680c9b2e02beb85da9..e3de37bfc01f937618ae53ca897f16dc0b7fb188 100644
--- a/lib/internal/Magento/Framework/App/Http.php
+++ b/lib/internal/Magento/Framework/App/Http.php
@@ -241,8 +241,7 @@ class Http implements \Magento\Framework\AppInterface
. "because the Magento setup directory cannot be accessed. \n"
. 'You can install Magento using either the command line or you must restore access '
. 'to the following directory: ' . $setupInfo->getDir($projectRoot) . "\n";
- $newMessage .= 'If you are using the sample nginx configuration, please go to '
- . $this->_request->getScheme(). '://' . $this->_request->getHttpHost() . $setupInfo->getUrl();
+
throw new \Exception($newMessage, 0, $exception);
}
}
diff --git a/lib/internal/Magento/Framework/App/SetupInfo.php b/lib/internal/Magento/Framework/App/SetupInfo.php
index b52daaac333e8c7f978aea2bcd156a68782bd6f1..731ec97ee7dd2d5dae8c2a372f454f11cf5755a7 100644
--- a/lib/internal/Magento/Framework/App/SetupInfo.php
+++ b/lib/internal/Magento/Framework/App/SetupInfo.php
@@ -147,6 +147,14 @@ class SetupInfo
{
$setupDir = $this->getDir($this->projectRoot);
$isSubDir = false !== strpos($setupDir . '/', $this->docRoot . '/');
+ // Setup is not accessible from pub folder
+ $setupDir = rtrim($setupDir, '/');
+ $lastOccurrence = strrpos($setupDir, '/pub/setup');
+
+ if (false !== $lastOccurrence) {
+ $setupDir = substr_replace($setupDir, '/setup', $lastOccurrence, strlen('/pub/setup'));
+ }
+
return $isSubDir && realpath($setupDir);
}
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php b/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php
index 99ca759490f14d66d47988c70e34bf5d4e021ea2..61f0a34d8a0d78ebfe4d685d5f6ce5d30d1a057a 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php
@@ -193,6 +193,13 @@ class SetupInfoTest extends \PHPUnit_Framework_TestCase
],
true
],
+ 'root within doc root + pub, existent sub-directory' => [
+ [
+ 'DOCUMENT_ROOT' => __DIR__ . '/_files/pub/',
+ 'SCRIPT_FILENAME' => __DIR__ . '/_files/pub/index.php',
+ ],
+ true
+ ],
];
}
}
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/_files/pub/index.php b/lib/internal/Magento/Framework/App/Test/Unit/_files/pub/index.php
new file mode 100644
index 0000000000000000000000000000000000000000..2a0cd37c68d37453c3e881693f25953bac966c1e
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Test/Unit/_files/pub/index.php
@@ -0,0 +1,5 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/_files/setup/index.php b/lib/internal/Magento/Framework/App/Test/Unit/_files/setup/index.php
new file mode 100644
index 0000000000000000000000000000000000000000..2a0cd37c68d37453c3e881693f25953bac966c1e
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Test/Unit/_files/setup/index.php
@@ -0,0 +1,5 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
index ecfb67320cb0d58decdf67de64d2058814f1eaf8..bae8f7c118c08b298bdc17b86db65181af075c3a 100644
--- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -276,8 +276,8 @@ class PluginList extends Scoped implements InterceptionPluginList
$data = $this->_cache->load($cacheId);
if ($data) {
list($this->_data, $this->_inherited, $this->_processed) = unserialize($data);
- foreach ($this->_scopePriorityScheme as $scope) {
- $this->_loadedScopes[$scope] = true;
+ foreach ($this->_scopePriorityScheme as $scopeCode) {
+ $this->_loadedScopes[$scopeCode] = true;
}
} else {
$virtualTypes = [];
@@ -285,18 +285,17 @@ class PluginList extends Scoped implements InterceptionPluginList
if (false == isset($this->_loadedScopes[$scopeCode])) {
$data = $this->_reader->read($scopeCode);
unset($data['preferences']);
- if (!count($data)) {
- continue;
- }
- $this->_inherited = [];
- $this->_processed = [];
- $this->merge($data);
- $this->_loadedScopes[$scopeCode] = true;
- foreach ($data as $class => $config) {
- if (isset($config['type'])) {
- $virtualTypes[] = $class;
+ if (count($data) > 0) {
+ $this->_inherited = [];
+ $this->_processed = [];
+ $this->merge($data);
+ foreach ($data as $class => $config) {
+ if (isset($config['type'])) {
+ $virtualTypes[] = $class;
+ }
}
}
+ $this->_loadedScopes[$scopeCode] = true;
}
if ($this->isCurrentScope($scopeCode)) {
break;
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php b/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
index b3fe011a0a490727c0682f1863aa731622753264..ac1e510f28b226a9c6386a35ca31192b7900cdc4 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
@@ -256,4 +256,33 @@ class PluginListTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(null, $this->_model->getNext('Type', 'method'));
}
+
+ /**
+ * @covers \Magento\Framework\Interception\PluginList\PluginList::getNext
+ * @covers \Magento\Framework\Interception\PluginList\PluginList::_loadScopedData
+ */
+ public function testLoadScopeDataWithEmptyData()
+ {
+ $this->_objectManagerMock->expects($this->any())
+ ->method('get')
+ ->will($this->returnArgument(0));
+ $this->_configScopeMock->expects($this->any())
+ ->method('getCurrentScope')
+ ->will($this->returnValue('emptyscope'));
+
+ $this->assertEquals(
+ [4 => ['simple_plugin']],
+ $this->_model->getNext(
+ \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item::class,
+ 'getName'
+ )
+ );
+ $this->assertEquals(
+ \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemPlugin\Simple::class,
+ $this->_model->getPlugin(
+ \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item::class,
+ 'simple_plugin'
+ )
+ );
+ }
}
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/_files/reader_mock_map.php b/lib/internal/Magento/Framework/Interception/Test/Unit/_files/reader_mock_map.php
index 87bbe0d35dd2561799cd5d2024347c8fb48c2b73..37c5316171fde594cacc8d3e3976c6d6aab95cde 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/_files/reader_mock_map.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/_files/reader_mock_map.php
@@ -77,5 +77,11 @@ return [
],
]
]
+ ],
+ [
+ 'emptyscope',
+ [
+
+ ]
]
];
diff --git a/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php b/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
index 947c526c919a677ab6a66ba53e7a01110e5f1a74..34815c996d163967ece79e3381a4f55a0b212017 100644
--- a/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
@@ -254,12 +254,18 @@ abstract class AbstractExtensibleModel extends AbstractModel implements
$data = parent::getData($key, $index);
if ($data === null) {
/** Try to find necessary data in custom attributes */
- $data = parent::getData(self::CUSTOM_ATTRIBUTES . "/{$key}", $index);
+ $data = isset($this->_data[self::CUSTOM_ATTRIBUTES][$key])
+ ? $this->_data[self::CUSTOM_ATTRIBUTES][$key]
+ : null;
if ($data instanceof \Magento\Framework\Api\AttributeValue) {
$data = $data->getValue();
}
+ if (null !== $index && isset($data[$index])) {
+ return $data[$index];
+ }
}
}
+
return $data;
}
diff --git a/lib/internal/Magento/Framework/Test/Unit/ObjectManager/Config/CompiledTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/CompiledTest.php
similarity index 98%
rename from lib/internal/Magento/Framework/Test/Unit/ObjectManager/Config/CompiledTest.php
rename to lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/CompiledTest.php
index 3dd9f5065a1421ec822d4a81377ea81a5c3f8f52..1fcf3176540db6279e3fec6754fb3a7a22b3cc59 100644
--- a/lib/internal/Magento/Framework/Test/Unit/ObjectManager/Config/CompiledTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/CompiledTest.php
@@ -3,7 +3,7 @@
* Copyright © 2016 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Framework\Test\Unit\ObjectManager\Config;
+namespace Magento\Framework\ObjectManager\Test\Unit\Config;
use Magento\Framework\ObjectManager\Config\Compiled as CompiledConfig;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
diff --git a/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php b/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php
index 701cabfa358f07bced72d6ee7d164e18f418a71e..6f157f578ffa5be8a1d78dd753621f5dcdfffbc8 100644
--- a/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php
+++ b/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php
@@ -23,7 +23,7 @@ abstract class AbstractPrice implements PriceInterface
const PRICE_CODE = 'abstract_price';
/**
- * @var AmountInterface
+ * @var AmountInterface[]
*/
protected $amount;
diff --git a/lib/internal/Magento/Framework/Stdlib/ArrayManager.php b/lib/internal/Magento/Framework/Stdlib/ArrayManager.php
index f8b758bb9d9dfa480fd3657cee0ea3ed6c0b0f81..edce214cc3091d55ba27ca382fed2fc201a11731 100644
--- a/lib/internal/Magento/Framework/Stdlib/ArrayManager.php
+++ b/lib/internal/Magento/Framework/Stdlib/ArrayManager.php
@@ -30,7 +30,7 @@ class ArrayManager
/**
* Check if node exists
*
- * @param string $path
+ * @param array|string $path
* @param array $data
* @param string $delimiter
* @return bool
@@ -43,7 +43,7 @@ class ArrayManager
/**
* Retrieve node
*
- * @param string $path
+ * @param array|string $path
* @param array $data
* @param null $defaultValue
* @param string $delimiter
@@ -57,7 +57,7 @@ class ArrayManager
/**
* Set value into node and return modified data
*
- * @param string $path
+ * @param array|string $path
* @param array $data
* @param mixed $value
* @param string $delimiter
@@ -75,7 +75,7 @@ class ArrayManager
/**
* Set value into existing node and return modified data
*
- * @param string $path
+ * @param array|string $path
* @param array $data
* @param mixed $value
* @param string $delimiter
@@ -93,7 +93,7 @@ class ArrayManager
/**
* Move value from one location to another
*
- * @param string $path
+ * @param array|string $path
* @param string $targetPath
* @param array $data
* @param bool $overwrite
@@ -120,7 +120,7 @@ class ArrayManager
/**
* Merge value with node and return modified data
*
- * @param string $path
+ * @param array|string $path
* @param array $data
* @param array $value
* @param string $delimiter
@@ -141,7 +141,7 @@ class ArrayManager
/**
* Populate nested array if possible and needed
*
- * @param string $path
+ * @param array|string $path
* @param array $data
* @param string $delimiter
* @return array
@@ -156,7 +156,7 @@ class ArrayManager
/**
* Remove node and return modified data
*
- * @param string $path
+ * @param array|string $path
* @param array $data
* @param string $delimiter
* @return array
@@ -173,7 +173,7 @@ class ArrayManager
/**
* Finds node in nested array and saves its index and parent node reference
*
- * @param string $path
+ * @param array|string $path
* @param array $data
* @param string $delimiter
* @param bool $populate
@@ -181,6 +181,10 @@ class ArrayManager
*/
protected function find($path, array &$data, $delimiter, $populate = false)
{
+ if (is_array($path)) {
+ $path = implode($delimiter, $path);
+ }
+
if ($path === null) {
return false;
}
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayManagerTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayManagerTest.php
index 4d469236e64bb8d9bd4265103814c37abcdbf047..9ba8dbcf789857863794a1a1ea99b6c47368e477 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayManagerTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayManagerTest.php
@@ -139,6 +139,12 @@ class ArrayManagerTest extends \PHPUnit_Framework_TestCase
'data' => ['existing' => ['path' => 1]],
'value' => 'valuable data',
'result' => ['existing' => ['path' => 1], 'new' => ['path' => [2 => 'valuable data']]]
+ ],
+ 3 => [
+ 'path' => ['new', 'path/2'],
+ 'data' => ['existing' => ['path' => 1]],
+ 'value' => 'valuable data',
+ 'result' => ['existing' => ['path' => 1], 'new' => ['path' => [2 => 'valuable data']]]
]
];
}
@@ -178,6 +184,12 @@ class ArrayManagerTest extends \PHPUnit_Framework_TestCase
'data' => ['existing' => ['path' => 1]],
'value' => 'valuable data',
'result' => ['existing' => ['path' => 1]]
+ ],
+ 3 => [
+ 'path' => ['new', 'path', '2'],
+ 'data' => ['existing' => ['path' => 1]],
+ 'value' => 'valuable data',
+ 'result' => ['existing' => ['path' => 1]]
]
];
}
@@ -228,6 +240,13 @@ class ArrayManagerTest extends \PHPUnit_Framework_TestCase
'data' => ['valid' => ['path' => 'value'], 'target' => ['path' => 'exists']],
'overwrite' => true,
'result' => ['valid' => [], 'target' => ['path' => 'value']]
+ ],
+ 4 => [
+ 'path' => ['valid', 'path'],
+ 'targetPath' => 'target/path',
+ 'data' => ['valid' => ['path' => 'value'], 'target' => ['path' => 'exists']],
+ 'overwrite' => true,
+ 'result' => ['valid' => [], 'target' => ['path' => 'value']]
]
];
}
@@ -267,7 +286,13 @@ class ArrayManagerTest extends \PHPUnit_Framework_TestCase
'data' => [],
'value' => [true],
'result' => []
- ]
+ ],
+ 3 => [
+ 'path' => ['0', 'path/1'],
+ 'data' => [['path' => [false, ['value' => false]]]],
+ 'value' => ['value' => true, 'new_value' => false],
+ 'result' => [['path' => [false, ['value' => true, 'new_value' => false]]]]
+ ],
];
}
@@ -337,7 +362,12 @@ class ArrayManagerTest extends \PHPUnit_Framework_TestCase
'path' => 'invalid',
'data' => [true],
'result' => [true]
- ]
+ ],
+ 3 => [
+ 'path' => ['simple'],
+ 'data' => ['simple' => true, 'complex' => false],
+ 'result' => ['complex' => false]
+ ],
];
}
@@ -550,7 +580,7 @@ class ArrayManagerTest extends \PHPUnit_Framework_TestCase
'offset' => -6,
'length' => 3,
'result' => 'path/0/goes'
- ]
+ ],
];
}
diff --git a/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Checksum.php b/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Checksum.php
index bfdd516de7e366a3df4773776abec8e118b3916f..44b5bb65c49d36f690490e130f68c3868f162ce6 100644
--- a/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Checksum.php
+++ b/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Checksum.php
@@ -6,6 +6,8 @@
namespace Magento\Framework\View\Asset\MergeStrategy;
use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Asset\Source;
/**
* Skip merging if all of the files that need to be merged were not modified
@@ -25,6 +27,11 @@ class Checksum implements \Magento\Framework\View\Asset\MergeStrategyInterface
*/
protected $filesystem;
+ /**
+ * @var Source
+ */
+ private $assetSource;
+
/**
* @param \Magento\Framework\View\Asset\MergeStrategyInterface $strategy
* @param \Magento\Framework\Filesystem $filesystem
@@ -37,17 +44,31 @@ class Checksum implements \Magento\Framework\View\Asset\MergeStrategyInterface
$this->filesystem = $filesystem;
}
+ /**
+ * @deprecated
+ * @return Source
+ */
+ private function getAssetSource()
+ {
+ if (!$this->assetSource) {
+ $this->assetSource = ObjectManager::getInstance()->get(Source::class);
+ }
+ return $this->assetSource;
+ }
+
/**
* {@inheritdoc}
*/
public function merge(array $assetsToMerge, \Magento\Framework\View\Asset\LocalInterface $resultAsset)
{
- $sourceDir = $this->filesystem->getDirectoryRead(DirectoryList::ROOT);
+ $rootDir = $this->filesystem->getDirectoryRead(DirectoryList::ROOT);
$mTime = null;
/** @var \Magento\Framework\View\Asset\MergeableInterface $asset */
foreach ($assetsToMerge as $asset) {
- $mTime .= $sourceDir->stat($sourceDir->getRelativePath($asset->getSourceFile()))['mtime'];
+ $sourceFile = $this->getAssetSource()->findSource($asset);
+ $mTime .= $rootDir->stat($rootDir->getRelativePath($sourceFile))['mtime'];
}
+
if (null === $mTime) {
return; // nothing to merge
}
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/ChecksumTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/ChecksumTest.php
index 9c7859116c4cbcc3da0947e6a39e5f1295dc4a8b..b20420640ebe42b31472299b2879f2f13f6abbe1 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/ChecksumTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/ChecksumTest.php
@@ -8,6 +8,7 @@ namespace Magento\Framework\View\Test\Unit\Asset\MergeStrategy;
use \Magento\Framework\View\Asset\MergeStrategy\Checksum;
use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\View\Asset\Source;
class ChecksumTest extends \PHPUnit_Framework_TestCase
{
@@ -31,6 +32,11 @@ class ChecksumTest extends \PHPUnit_Framework_TestCase
*/
private $resultAsset;
+ /**
+ * @var Source|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $assetSource;
+
/**
* @var \Magento\Framework\View\Asset\MergeStrategy\Checksum
*/
@@ -53,6 +59,15 @@ class ChecksumTest extends \PHPUnit_Framework_TestCase
->with(DirectoryList::STATIC_VIEW)
->will($this->returnValue($this->targetDir));
$this->checksum = new Checksum($this->mergerMock, $filesystem);
+ $this->assetSource = $this->getMockBuilder(Source::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $reflection = new \ReflectionClass(Checksum::class);
+ $reflectionProperty = $reflection->getProperty('assetSource');
+ $reflectionProperty->setAccessible(true);
+ $reflectionProperty->setValue($this->checksum, $this->assetSource);
+
$this->resultAsset = $this->getMock(\Magento\Framework\View\Asset\File::class, [], [], '', false);
}
@@ -114,9 +129,17 @@ class ChecksumTest extends \PHPUnit_Framework_TestCase
private function getAssetsToMerge()
{
$one = $this->getMock(\Magento\Framework\View\Asset\File::class, [], [], '', false);
- $one->expects($this->once())->method('getSourceFile')->will($this->returnValue('/dir/file/one.txt'));
$two = $this->getMock(\Magento\Framework\View\Asset\File::class, [], [], '', false);
- $two->expects($this->once())->method('getSourceFile')->will($this->returnValue('/dir/file/two.txt'));
+ $one->expects($this->never())
+ ->method('getSourceFile');
+ $two->expects($this->never())
+ ->method('getSourceFile');
+
+ $this->assetSource->expects($this->exactly(2))
+ ->method('findSource')
+ ->withConsecutive([$one], [$two])
+ ->willReturnOnConsecutiveCalls('/dir/file/one.txt', '/dir/file/two.txt');
+
$this->sourceDir->expects($this->exactly(2))
->method('getRelativePath')
->will($this->onConsecutiveCalls('file/one.txt', 'file/two.txt'));
diff --git a/pub/media/.htaccess b/pub/media/.htaccess
index 865ebd31b528b8183593ee5e55894dedc53a46fd..0a3087c096319f5d9974d643d33317ee0a4c4af2 100644
--- a/pub/media/.htaccess
+++ b/pub/media/.htaccess
@@ -11,6 +11,10 @@ php_flag engine 0
AddHandler cgi-script .php .pl .py .jsp .asp .htm .shtml .sh .cgi
Options -ExecCGI
+<FilesMatch ".+\.(ph(p[3457]?|t|tml)|[aj]sp|p[ly]|sh|cgi|shtml?|html?)$">
+SetHandler default-handler
+</FilesMatch>
+
<IfModule mod_rewrite.c>
############################################
diff --git a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
index bbd0a44254e89ce2e84d3bbe7e043ac80c76a435..ad2ad3d7b6969dcf241bd9f273ae4330d9fedcd2 100644
--- a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
@@ -71,7 +71,7 @@ class UpgradeCommand extends AbstractSetupCommand
$installer->installSchema();
$installer->installDataFixtures();
if (!$keepGenerated) {
- $output->writeln('<info>Please re-run Magento compile command</info>');
+ $output->writeln('<info>Please re-run Magento compile command. Use the command "setup:di:compile"</info>');
}
return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
diff --git a/setup/src/Magento/Setup/Fixtures/BundleProductsFixture.php b/setup/src/Magento/Setup/Fixtures/BundleProductsFixture.php
new file mode 100644
index 0000000000000000000000000000000000000000..aa9caf8102e80da530c80bfe0b8ee932598da2e8
--- /dev/null
+++ b/setup/src/Magento/Setup/Fixtures/BundleProductsFixture.php
@@ -0,0 +1,427 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup\Fixtures;
+
+use Magento\Setup\Model\Complex\Generator;
+use Magento\Setup\Model\Complex\Pattern;
+
+/**
+ * Class BundleProductsFixture
+ */
+class BundleProductsFixture extends Fixture
+{
+ /**
+ * @var int
+ */
+ protected $priority = 42;
+
+ //@codingStandardsIgnoreStart
+ /**
+ * Get CSV template headers
+ * @SuppressWarnings(PHPMD)
+ * @return array
+ */
+ protected function getHeaders()
+ {
+ return [
+ 'sku',
+ 'store_view_code',
+ 'attribute_set_code',
+ 'product_type',
+ 'categories',
+ 'product_websites',
+ 'color',
+ 'bundle_variation',
+ 'cost',
+ 'country_of_manufacture',
+ 'created_at',
+ 'custom_design',
+ 'custom_design_from',
+ 'custom_design_to',
+ 'custom_layout_update',
+ 'description',
+ 'enable_googlecheckout',
+ 'gallery',
+ 'gift_message_available',
+ 'gift_wrapping_available',
+ 'gift_wrapping_price',
+ 'has_options',
+ 'image',
+ 'image_label',
+ 'is_returnable',
+ 'manufacturer',
+ 'meta_description',
+ 'meta_keyword',
+ 'meta_title',
+ 'minimal_price',
+ 'msrp',
+ 'msrp_display_actual_price_type',
+ 'name',
+ 'news_from_date',
+ 'news_to_date',
+ 'options_container',
+ 'page_layout',
+ 'price',
+ 'quantity_and_stock_status',
+ 'related_tgtr_position_behavior',
+ 'related_tgtr_position_limit',
+ 'required_options',
+ 'short_description',
+ 'small_image',
+ 'small_image_label',
+ 'special_from_date',
+ 'special_price',
+ 'special_to_date',
+ 'product_online',
+ 'tax_class_name',
+ 'thumbnail',
+ 'thumbnail_label',
+ 'updated_at',
+ 'upsell_tgtr_position_behavior',
+ 'upsell_tgtr_position_limit',
+ 'url_key',
+ 'url_path',
+ 'variations',
+ 'visibility',
+ 'weight',
+ 'qty',
+ 'min_qty',
+ 'use_config_min_qty',
+ 'is_qty_decimal',
+ 'backorders',
+ 'use_config_backorders',
+ 'min_sale_qty',
+ 'use_config_min_sale_qty',
+ 'max_sale_qty',
+ 'use_config_max_sale_qty',
+ 'is_in_stock',
+ 'notify_stock_qty',
+ 'use_config_notify_stock_qty',
+ 'manage_stock',
+ 'use_config_manage_stock',
+ 'use_config_qty_increments',
+ 'qty_increments',
+ 'use_config_enable_qty_inc',
+ 'enable_qty_increments',
+ 'is_decimal_divided',
+ 'bundle_values',
+ ];
+ }
+
+ private function generateBundleProduct($productCategory, $productWebsite, $variation, $suffix)
+ {
+ return [
+ 'sku' => 'Bundle Product %s' . $suffix,
+ 'store_view_code' => '',
+ 'attribute_set_code' => 'Default',
+ 'product_type' => 'bundle',
+ 'categories' => $productCategory,
+ 'product_websites' => $productWebsite,
+ 'color' => '',
+ 'bundle_variation' => '',
+ 'cost' => '',
+ 'country_of_manufacture' => '',
+ 'created_at' => '2013-10-25 15:12:39',
+ 'custom_design' => '',
+ 'custom_design_from' => '',
+ 'custom_design_to' => '',
+ 'custom_layout_update' => '',
+ 'description' => '<p>Bundle product description %s</p>',
+ 'enable_googlecheckout' => '1',
+ 'gallery' => '',
+ 'gift_message_available' => '',
+ 'gift_wrapping_available' => '',
+ 'gift_wrapping_price' => '',
+ 'has_options' => '1',
+ 'image' => '',
+ 'image_label' => '',
+ 'is_returnable' => 'Use config',
+ 'manufacturer' => '',
+ 'meta_description' => 'Bundle Product %s <p>Bundle product description %s</p>',
+ 'meta_keyword' => 'Bundle Product %s',
+ 'meta_title' => 'Bundle Product %s',
+ 'minimal_price' => '',
+ 'msrp' => '',
+ 'msrp_display_actual_price_type' => 'Use config',
+ 'name' => 'Bundle Product %s' . $suffix,
+ 'news_from_date' => '',
+ 'news_to_date' => '',
+ 'options_container' => 'Block after Info Column',
+ 'page_layout' => '',
+ 'price' => '10',
+ 'quantity_and_stock_status' => 'In Stock',
+ 'related_tgtr_position_behavior' => '',
+ 'related_tgtr_position_limit' => '',
+ 'required_options' => '1',
+ 'short_description' => '',
+ 'small_image' => '',
+ 'small_image_label' => '',
+ 'special_from_date' => '',
+ 'special_price' => '',
+ 'special_to_date' => '',
+ 'product_online' => '1',
+ 'tax_class_name' => 'Taxable Goods',
+ 'thumbnail' => '',
+ 'thumbnail_label' => '',
+ 'updated_at' => '2013-10-25 15:12:39',
+ 'upsell_tgtr_position_behavior' => '',
+ 'upsell_tgtr_position_limit' => '',
+ 'url_key' => "bundle-product-%s{$suffix}",
+ 'url_path' => "bundle-product-%s{$suffix}",
+ 'visibility' => 'Catalog, Search',
+ 'weight' => '',
+ 'qty' => 333,
+ 'min_qty' => '0.0000',
+ 'use_config_min_qty' => '1',
+ 'is_qty_decimal' => '0',
+ 'backorders' => '0',
+ 'use_config_backorders' => '1',
+ 'min_sale_qty' => '1.0000',
+ 'use_config_min_sale_qty' => '1',
+ 'max_sale_qty' => '0.0000',
+ 'use_config_max_sale_qty' => '1',
+ 'is_in_stock' => '1',
+ 'notify_stock_qty' => '',
+ 'use_config_notify_stock_qty' => '1',
+ 'manage_stock' => '1',
+ 'use_config_manage_stock' => '1',
+ 'use_config_qty_increments' => '1',
+ 'qty_increments' => '0.0000',
+ 'use_config_enable_qty_inc' => '1',
+ 'enable_qty_increments' => '0',
+ 'is_decimal_divided' => '0',
+ 'bundle_price_type' => 'dynamic',
+ 'bundle_sku_type' => 'dynamic',
+ 'bundle_price_view' => 'Price range',
+ 'bundle_weight_type' => 'dynamic',
+ 'bundle_values' => $variation,
+ 'bundle_shipment_type' => 'separately',
+ ];
+ }
+
+ /**
+ * Get CSV template rows
+ *
+ * @param Closure|mixed $productCategory
+ * @param Closure|mixed $productWebsite
+ *
+ * @SuppressWarnings(PHPMD)
+ *
+ * @return array
+ */
+ protected function getRows($productCategory, $productWebsite, $optionsNumber, $suffix = '')
+ {
+ $data = [];
+ $variation = [];
+ for ($i = 1; $i <= $optionsNumber; $i++) {
+ $productData = [
+ 'sku' => "Bundle Product %s-option {$i}{$suffix}",
+ 'store_view_code' => '',
+ 'attribute_set_code' => 'Default',
+ 'product_type' => 'simple',
+ 'categories' => $productCategory,
+ 'product_websites' => $productWebsite,
+ 'cost' => '',
+ 'country_of_manufacture' => '',
+ 'created_at' => '2013-10-25 15:12:32',
+ 'custom_design' => '',
+ 'custom_design_from' => '',
+ 'custom_design_to' => '',
+ 'custom_layout_update' => '',
+ 'description' => '<p>Bundle product option description %s</p>',
+ 'enable_googlecheckout' => '1',
+ 'gallery' => '',
+ 'gift_message_available' => '',
+ 'gift_wrapping_available' => '',
+ 'gift_wrapping_price' => '',
+ 'has_options' => '0',
+ 'image' => '',
+ 'image_label' => '',
+ 'is_returnable' => 'Use config',
+ 'manufacturer' => '',
+ 'meta_description' => 'Bundle Product Option %s <p>Bundle product description 1</p>',
+ 'meta_keyword' => 'Bundle Product 1',
+ 'meta_title' => 'Bundle Product %s',
+ 'minimal_price' => '',
+ 'msrp' => '',
+ 'msrp_display_actual_price_type' => 'Use config',
+ 'name' => "Bundle Product {$suffix} - %s-option {$i}",
+ 'news_from_date' => '',
+ 'news_to_date' => '',
+ 'options_container' => 'Block after Info Column',
+ 'page_layout' => '',
+ 'price' => function () { return mt_rand(1, 1000) / 10; },
+ 'quantity_and_stock_status' => 'In Stock',
+ 'related_tgtr_position_behavior' => '',
+ 'related_tgtr_position_limit' => '',
+ 'required_options' => '0',
+ 'short_description' => '',
+ 'small_image' => '',
+ 'small_image_label' => '',
+ 'special_from_date' => '',
+ 'special_price' => '',
+ 'special_to_date' => '',
+ 'product_online' => '1',
+ 'tax_class_name' => 'Taxable Goods',
+ 'thumbnail' => '',
+ 'thumbnail_label' => '',
+ 'updated_at' => '2013-10-25 15:12:32',
+ 'upsell_tgtr_position_behavior' => '',
+ 'upsell_tgtr_position_limit' => '',
+ 'url_key' => "simple-of-bundle-product-{$suffix}-%s-option-{$i}",
+ 'url_path' => "simple-of-bundle-product-{$suffix}-%s-option-{$i}",
+ 'visibility' => 'Not Visible Individually',
+ 'weight' => '1',
+ 'qty' => '111.0000',
+ 'min_qty' => '0.0000',
+ 'use_config_min_qty' => '1',
+ 'use_config_backorders' => '1',
+ 'use_config_min_sale_qty' => '1',
+ 'use_config_max_sale_qty' => '1',
+ 'is_in_stock' => '1',
+ 'use_config_notify_stock_qty' => '1',
+ 'use_config_manage_stock' => '1',
+ 'use_config_qty_increments' => '1',
+ 'use_config_enable_qty_inc' => '1',
+ 'enable_qty_increments' => '0',
+ 'is_decimal_divided' => '0',
+ ];
+ $variation[] = implode(
+ ',',
+ [
+ 'name=Bundle Option 1',
+ 'type=select',
+ 'required=1',
+ 'sku=' . $productData['sku'],
+ 'price=' . mt_rand(1, 1000) / 10,
+ 'default=0',
+ 'default_qty=1',
+ ]
+ );
+ $data[] = $productData;
+ }
+
+ $data[] = $this->generateBundleProduct($productCategory, $productWebsite, implode('|', $variation), $suffix);
+ return $data;
+ }
+
+ /**
+ * {@inheritdoc}
+ * @SuppressWarnings(PHPMD)
+ */
+ public function execute()
+ {
+ $bundlesCount = $this->fixtureModel->getValue('bundle_products', 0);
+ if (!$bundlesCount) {
+ return;
+ }
+ $this->fixtureModel->resetObjectManager();
+
+ /** @var \Magento\Store\Model\StoreManager $storeManager */
+ $storeManager = $this->fixtureModel->getObjectManager()->create('Magento\Store\Model\StoreManager');
+ /** @var $category \Magento\Catalog\Model\Category */
+ $category = $this->fixtureModel->getObjectManager()->get('Magento\Catalog\Model\Category');
+
+ $result = [];
+ //Get all websites
+ $websites = $storeManager->getWebsites();
+ foreach ($websites as $website) {
+ $websiteCode = $website->getCode();
+ //Get all groups
+ $websiteGroups = $website->getGroups();
+ foreach ($websiteGroups as $websiteGroup) {
+ $websiteGroupRootCategory = $websiteGroup->getRootCategoryId();
+ $category->load($websiteGroupRootCategory);
+ $categoryResource = $category->getResource();
+ $rootCategoryName = $category->getName();
+ //Get all categories
+ $resultsCategories = $categoryResource->getAllChildren($category);
+ foreach ($resultsCategories as $resultsCategory) {
+ $category->load($resultsCategory);
+ $structure = explode('/', $category->getPath());
+ $pathSize = count($structure);
+ if ($pathSize > 1) {
+ $path = [];
+ for ($i = 1; $i < $pathSize; $i++) {
+ $path[] = $category->load($structure[$i])->getName();
+ }
+ array_shift($path);
+ $resultsCategoryName = implode('/', $path);
+ } else {
+ $resultsCategoryName = $category->getName();
+ }
+ //Deleted root categories
+ if (trim($resultsCategoryName) != '') {
+ $result[$resultsCategory] = [$websiteCode, $resultsCategoryName, $rootCategoryName];
+ }
+ }
+ }
+ }
+ $result = array_values($result);
+
+ $productWebsite = function ($index) use ($result) {
+ return $result[$index % count($result)][0];
+ };
+ $productCategory = function ($index) use ($result) {
+ return $result[$index % count($result)][2] . '/' . $result[$index % count($result)][1];
+ };
+
+ /**
+ * Create bundle products
+ */
+ $pattern = new Pattern();
+ $pattern->setHeaders($this->getHeaders());
+ $pattern->setRowsSet(
+ $this->getRows(
+ $productCategory,
+ $productWebsite,
+ $this->fixtureModel->getValue('bundle_products_variation', 5000)
+ )
+ );
+
+ /** @var \Magento\ImportExport\Model\Import $import */
+ $import = $this->fixtureModel->getObjectManager()->create(
+ 'Magento\ImportExport\Model\Import',
+ [
+ 'data' => [
+ 'entity' => 'catalog_product',
+ 'behavior' => 'append',
+ 'validation_strategy' => 'validation-stop-on-errors',
+ ],
+ ]
+ );
+
+ $source = new Generator($pattern, $bundlesCount);
+ // it is not obvious, but the validateSource() will actually save import queue data to DB
+ if (!$import->validateSource($source)) {
+ throw new \Exception($import->getFormatedLogTrace());
+ }
+ // this converts import queue into actual entities
+ if (!$import->importSource()) {
+ throw new \Exception($import->getFormatedLogTrace());
+ }
+ }
+ // @codingStandardsIgnoreEnd
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getActionTitle()
+ {
+ return 'Generating bundle products';
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function introduceParamLabels()
+ {
+ return [
+ 'bundle_products' => 'Bundle products',
+ ];
+ }
+}
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php
index 6209df88bd5f06880fad8c645128af079d61b482..dcbdc876db607a010e543b76c62d5410a4ca0132 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php
@@ -11,7 +11,12 @@ use Magento\Framework\Console\Cli;
class UpgradeCommandTest extends \PHPUnit_Framework_TestCase
{
- public function testExecute()
+ /**
+ * @param array $options
+ * @param string $expectedString
+ * @dataProvider executeDataProvider
+ */
+ public function testExecute($options = [], $expectedString = '')
{
$installerFactory = $this->getMock(\Magento\Setup\Model\InstallerFactory::class, [], [], '', false);
$installer = $this->getMock(\Magento\Setup\Model\Installer::class, [], [], '', false);
@@ -20,6 +25,25 @@ class UpgradeCommandTest extends \PHPUnit_Framework_TestCase
$installer->expects($this->at(2))->method('installDataFixtures');
$installerFactory->expects($this->once())->method('create')->willReturn($installer);
$commandTester = new CommandTester(new UpgradeCommand($installerFactory));
- $this->assertSame(Cli::RETURN_SUCCESS, $commandTester->execute([]));
+ $this->assertSame(Cli::RETURN_SUCCESS, $commandTester->execute($options));
+ $this->assertEquals($expectedString, $commandTester->getDisplay());
+ }
+
+ /**
+ * @return array
+ */
+ public function executeDataProvider()
+ {
+ return [
+ [
+ 'options' => [],
+ 'expectedString' => 'Please re-run Magento compile command. Use the command "setup:di:compile"'
+ . PHP_EOL
+ ],
+ [
+ 'options' => ['--keep-generated' => true],
+ 'expectedString' => ''
+ ],
+ ];
}
}