diff --git a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
index 1a76acf17475670674c064c8384d628b87d924a7..607ac6e03a75a8beeb644c84a11400eee09012d9 100644
--- a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
+++ b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
@@ -295,6 +295,10 @@ define([
case 'hidden':
optionHash = 'bundle-option-' + optionName + '##' + optionValue;
optionQty = optionConfig[optionValue].qty || 0;
+ canQtyCustomize = optionConfig[optionValue].customQty === '1';
+ qtyField = element.data('qtyField');
+ qtyField.data('option', element);
+ toggleQtyField(qtyField, optionQty, optionId, optionValue, canQtyCustomize);
tempChanges = utils.deepClone(optionConfig[optionValue].prices);
tempChanges = applyTierPrice(tempChanges, optionQty, optionConfig);
tempChanges = applyQty(tempChanges, optionQty);
diff --git a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
index d9702c5073fb653c132c89d761e9ddf14faa34c1..f1bb89d4424f7f4436abea0c137a0457a0ad13c8 100644
--- a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
@@ -124,7 +124,7 @@ class AbstractProduct extends \Magento\Framework\View\Element\Template
*/
public function getAddToCartUrl($product, $additional = [])
{
- if ($product->getTypeInstance()->hasRequiredOptions($product)) {
+ if (!$product->getTypeInstance()->isPossibleBuyFromList($product)) {
if (!isset($additional['_escape'])) {
$additional['_escape'] = true;
}
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
index 4375092591d194962b108e2ba0351b1a03fa7e5c..40516e55e930c4021699dad26b43a4e83fe26a80 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
@@ -281,7 +281,7 @@ class FlatTableBuilder
if (!empty($columnValueNames)) {
$select->joinLeft(
$temporaryValueTableName,
- sprintf('e.%1$s = %2$s.%1$s', $linkField, $temporaryTableName),
+ sprintf('e.%1$s = %2$s.%1$s', $linkField, $temporaryValueTableName),
$columnValueNames
);
$allColumns = array_merge($allColumns, $columnValueNames);
diff --git a/app/code/Magento/Catalog/Model/Product/Image.php b/app/code/Magento/Catalog/Model/Product/Image.php
index 7d8b464db3b34cd116d2c8c7adae86113040e67f..34e1ad30ad434add33508bb63c7b8b1a78ddc9fb 100644
--- a/app/code/Magento/Catalog/Model/Product/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Image.php
@@ -498,8 +498,7 @@ class Image extends \Magento\Framework\Model\AbstractModel
$path = [
$this->_catalogProductMediaConfig->getBaseMediaPath(),
'cache',
- $this->_storeManager->getStore()->getId(),
- $path[] = $this->getDestinationSubdir(),
+ $this->getDestinationSubdir(),
];
if (!empty($this->_width) || !empty($this->_height)) {
$path[] = "{$this->_width}x{$this->_height}";
diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
index 6de6ea6c6c6bca8029aee2be5749d555690d48c8..11b8d03fc7ee5cc23dd627e65ad9651a5b243b7d 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
@@ -1092,4 +1092,15 @@ abstract class AbstractType
{
return [];
}
+
+ /**
+ * Check if product can be potentially buyed from the category page or some other list
+ *
+ * @param \Magento\Catalog\Model\Product $product
+ * @return bool
+ */
+ public function isPossibleBuyFromList($product)
+ {
+ return !$this->hasRequiredOptions($product);
+ }
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php
index f420f140b35820e3cbcebf986ed305217523aab2..39e3263722a7c3f84fce9f6ce3e5b8ee2f2899d6 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php
@@ -154,9 +154,9 @@ class ListProductTest extends \PHPUnit_Framework_TestCase
];
$this->typeInstanceMock->expects($this->once())
- ->method('hasRequiredOptions')
+ ->method('isPossibleBuyFromList')
->with($this->equalTo($this->productMock))
- ->will($this->returnValue(false));
+ ->will($this->returnValue(true));
$this->cartHelperMock->expects($this->any())
->method('getAddUrl')
->with($this->equalTo($this->productMock), $this->equalTo([]))
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/FlatTableBuilderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/FlatTableBuilderTest.php
index 7e5a8305467e8e979a9ccc79d39d7ffdb70bb339..d90261f068f5023d8987bab6d64585032385c8ee 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/FlatTableBuilderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/FlatTableBuilderTest.php
@@ -107,44 +107,42 @@ class FlatTableBuilderTest extends \PHPUnit_Framework_TestCase
public function testBuild()
{
- list($storeId, $changedIds, $valueFieldSuffix, $tableDropSuffix, $fillTmpTables) = [1, [], '', '', true];
+ $storeId = 1;
+ $changedIds = [];
+ $valueFieldSuffix = '_value';
+ $tableDropSuffix = '';
+ $fillTmpTables = true;
$tableName = 'catalog_product_entity';
$attributeTable = 'catalog_product_entity_int';
$temporaryTableName = 'catalog_product_entity_int_tmp_indexer';
- $temporaryValueTableName = 'catalog_product_entity_int_tmp_indexer';
+ $temporaryValueTableName = 'catalog_product_entity_int_tmp_indexer_value';
$linkField = 'entity_id';
$statusId = 22;
+ $eavCustomField = 'space_weight';
+ $eavCustomValueField = $eavCustomField . $valueFieldSuffix;
$this->flatIndexerMock->expects($this->once())->method('getAttributes')->willReturn([]);
$this->flatIndexerMock->expects($this->exactly(3))->method('getFlatColumns')
- ->willReturnOnConsecutiveCalls(
- [],
- [$linkField => []],
- [$linkField => []]
- );
+ ->willReturnOnConsecutiveCalls([], [$eavCustomValueField => []], [$eavCustomValueField => []]);
$this->flatIndexerMock->expects($this->once())->method('getFlatIndexes')->willReturn([]);
$statusAttributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute::class)
->disableOriginalConstructor()
->getMock();
+ $eavCustomAttributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute::class)
+ ->disableOriginalConstructor()
+ ->getMock();
$this->flatIndexerMock->expects($this->once())->method('getTablesStructure')
->willReturn(
[
- 'catalog_product_entity' => [
- $linkField => $statusAttributeMock
- ],
+ 'catalog_product_entity' => [$linkField => $statusAttributeMock],
'catalog_product_entity_int' => [
- $linkField => $statusAttributeMock
+ $linkField => $statusAttributeMock,
+ $eavCustomField => $eavCustomAttributeMock
]
]
);
$this->flatIndexerMock->expects($this->atLeastOnce())->method('getTable')
- ->withConsecutive(
- [$tableName],
- ['catalog_product_website']
- )
- ->willReturnOnConsecutiveCalls(
- $tableName,
- 'catalog_product_website'
- );
+ ->withConsecutive([$tableName], ['catalog_product_website'])
+ ->willReturnOnConsecutiveCalls($tableName, 'catalog_product_website');
$this->flatIndexerMock->expects($this->once())->method('getAttribute')
->with('status')
->willReturn($statusAttributeMock);
@@ -155,6 +153,9 @@ class FlatTableBuilderTest extends \PHPUnit_Framework_TestCase
$statusAttributeMock->expects($this->atLeastOnce())->method('getBackend')->willReturn(
$backendMock
);
+ $eavCustomAttributeMock->expects($this->atLeastOnce())->method('getBackend')->willReturn(
+ $backendMock
+ );
$statusAttributeMock->expects($this->atLeastOnce())->method('getId')->willReturn($statusId);
$tableMock = $this->getMockBuilder(\Magento\Framework\DB\Ddl\Table::class)
->disableOriginalConstructor()
@@ -185,12 +186,12 @@ class FlatTableBuilderTest extends \PHPUnit_Framework_TestCase
[
$temporaryTableName,
"e.{$linkField} = {$temporaryTableName}.{$linkField}",
- [$linkField]
+ [$linkField, $eavCustomField]
],
[
$temporaryValueTableName,
- "e.{$linkField} = " . $temporaryValueTableName . ".{$linkField}",
- [$linkField]
+ "e.{$linkField} = {$temporaryValueTableName}.{$linkField}",
+ [$eavCustomValueField]
]
)->willReturnSelf();
$this->metadataPoolMock->expects($this->atLeastOnce())->method('getMetadata')->with(ProductInterface::class)
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php
index a032ffa33b37561117fac3f6e603cb77dd34152d..44f7f87cc2c62afc2c09d262bbd2721683fcfea3 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php
@@ -180,7 +180,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
$this->image->setBaseFile('/somefile.png');
$this->assertEquals('catalog/product/somefile.png', $this->image->getBaseFile());
$this->assertEquals(
- 'catalog/product/cache/1//beff4985b56e3afdbeabfc89641a4582/somefile.png',
+ 'catalog/product/cache//beff4985b56e3afdbeabfc89641a4582/somefile.png',
$this->image->getNewFile()
);
}
@@ -302,7 +302,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
$this->testSetGetBaseFile();
$url = $this->image->getUrl();
$this->assertEquals(
- 'http://magento.com/media/catalog/product/cache/1//beff4985b56e3afdbeabfc89641a4582/somefile.png',
+ 'http://magento.com/media/catalog/product/cache//beff4985b56e3afdbeabfc89641a4582/somefile.png',
$url
);
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ImagesTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ImagesTest.php
index 2172e184a9a2ed400d80eb89314855c69fb2c7c1..7a55bd31e3deef64ddeaf5b452cc1b7eb389517c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ImagesTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ImagesTest.php
@@ -24,7 +24,9 @@ class ImagesTest extends AbstractModifierTest
public function testModifyData()
{
- $this->assertSame($this->getSampleData(), $this->getModel()->modifyData($this->getSampleData()));
+ $this->productMock->expects($this->once())->method('getId')->willReturn(2051);
+ $actualResult = $this->getModel()->modifyData($this->getSampleData());
+ $this->assertSame("", $actualResult[2051]['product']['media_gallery']['images'][0]['label']);
}
public function testModifyMeta()
@@ -40,4 +42,24 @@ class ImagesTest extends AbstractModifierTest
$this->assertSame([], $this->getModel()->modifyMeta($meta));
}
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getSampleData()
+ {
+ return [
+ 2051 => [
+ 'product' => [
+ 'media_gallery' => [
+ 'images' => [
+ [
+ 'label' => null
+ ]
+ ]
+ ]
+ ]
+ ]
+ ];
+ }
}
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Images.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Images.php
index 810a06df4a42f76392ee54525eb5bf6ffc5f489f..a8536cacc79668797ac961e1082c7b8c0f020e76 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Images.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Images.php
@@ -51,6 +51,21 @@ class Images extends AbstractModifier
*/
public function modifyData(array $data)
{
+ /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
+ $product = $this->locator->getProduct();
+ $modelId = $product->getId();
+ if (
+ isset($data[$modelId][self::DATA_SOURCE_DEFAULT]['media_gallery'])
+ && !empty($data[$modelId][self::DATA_SOURCE_DEFAULT]['media_gallery'])
+ && !empty($data[$modelId][self::DATA_SOURCE_DEFAULT]['media_gallery']['images'])
+ ) {
+ foreach ($data[$modelId][self::DATA_SOURCE_DEFAULT]['media_gallery']['images'] as $index => $image) {
+ if (!isset($image['label'])) {
+ $data[$modelId][self::DATA_SOURCE_DEFAULT]['media_gallery']['images'][$index]['label'] = "";
+ }
+ }
+ };
+
return $data;
}
}
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
index 45c9f73e051c788c55f24d2f95f1e286c7d6bd02..7db4f5d745626c0da12d9a4032bc5466c57f282b 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
@@ -84,6 +84,17 @@ define([
}
if (res.backUrl) {
+ var eventData = {
+ 'form': form,
+ 'redirectParameters': []
+ }
+ // trigger global event, so other modules will be able add parameters to redirect url
+ $('body').trigger('catalogCategoryAddToCartRedirect', eventData);
+ if (eventData.redirectParameters.length > 0) {
+ var parameters = res.backUrl.split('#');
+ parameters.push(eventData.redirectParameters.join('&'));
+ res.backUrl = parameters.join('#');
+ }
window.location = res.backUrl;
return;
}
diff --git a/app/code/Magento/CatalogInventory/Setup/UpgradeData.php b/app/code/Magento/CatalogInventory/Setup/UpgradeData.php
index db3408c01b77f9fc620ee0862f2f71f2eec232c5..1741ffce9cdfa1bc0374666a704386241e935f67 100644
--- a/app/code/Magento/CatalogInventory/Setup/UpgradeData.php
+++ b/app/code/Magento/CatalogInventory/Setup/UpgradeData.php
@@ -54,7 +54,7 @@ class UpgradeData implements UpgradeDataInterface
public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
{
$setup->startSetup();
- if (version_compare($context->getVersion(), '2.0.2') < 0) {
+ if (version_compare($context->getVersion(), '2.2.0') < 0) {
$this->upgradeCatalogInventoryStockItem($setup);
}
$setup->endSetup();
diff --git a/app/code/Magento/CatalogInventory/etc/events.xml b/app/code/Magento/CatalogInventory/etc/events.xml
index a1476c2c3f8b161568a042725d6b04c37aeb1be9..d9db59b7a17663b48b2ba2df7677d4147cba11b5 100644
--- a/app/code/Magento/CatalogInventory/etc/events.xml
+++ b/app/code/Magento/CatalogInventory/etc/events.xml
@@ -33,9 +33,6 @@
<event name="sales_order_item_cancel">
<observer name="inventory" instance="Magento\CatalogInventory\Observer\CancelOrderItemObserver"/>
</event>
- <event name="sales_order_creditmemo_save_after">
- <observer name="inventory" instance="Magento\CatalogInventory\Observer\RefundOrderInventoryObserver"/>
- </event>
<event name="catalog_product_save_after">
<observer name="inventory" instance="Magento\CatalogInventory\Observer\SaveInventoryDataObserver"/>
</event>
diff --git a/app/code/Magento/CatalogInventory/etc/module.xml b/app/code/Magento/CatalogInventory/etc/module.xml
index 711d18bead9c9ece376e74f3b13aced3419b7806..7aff70e2258312c49a6a6cde35bb87c5cb0e8400 100644
--- a/app/code/Magento/CatalogInventory/etc/module.xml
+++ b/app/code/Magento/CatalogInventory/etc/module.xml
@@ -6,7 +6,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
- <module name="Magento_CatalogInventory" setup_version="2.0.2">
+ <module name="Magento_CatalogInventory" setup_version="2.2.0">
<sequence>
<module name="Magento_Catalog"/>
</sequence>
diff --git a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
index 080714bd228de24f0aa69cae014cb554ef814c53..212846aaa01d7efd067eb14a546b8dcb3467fc1f 100644
--- a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
+++ b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
@@ -15,7 +15,6 @@
$mode = 'grid';
$image = 'new_products_content_widget_grid';
- $title = $block->getTitle() ? __($block->getTitle()) : '';
$items = $block->getProductCollection()->getItems();
$showWishlist = true;
@@ -25,9 +24,9 @@
$description = false;
?>
<div class="block widget block-products-list <?php /* @noEscape */ echo $mode; ?>">
- <?php if ($title): ?>
+ <?php if ($block->getTitle()): ?>
<div class="block-title">
- <strong><?php echo $block->escapeHtml($title); ?></strong>
+ <strong><?php echo $block->escapeHtml(__($block->getTitle())); ?></strong>
</div>
<?php endif ?>
<div class="block-content">
@@ -64,27 +63,23 @@
<div class="actions-primary">
<?php if ($_item->isSaleable()): ?>
<?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
- <button class="action tocart primary"
- data-mage-init='{"redirectUrl":{"url":"<?php echo $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
- type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
- <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+ <button class="action tocart primary" data-mage-init='{"redirectUrl":{"url":"<?php echo $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?php echo $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+ <span><?php echo $block->escapeHtml(__('Add to Cart')) ?></span>
</button>
<?php else: ?>
<?php
$postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
$postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
?>
- <button class="action tocart primary"
- data-post='<?php /* @noEscape */ echo $postData; ?>'
- type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
- <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+ <button class="action tocart primary" data-post='<?php /* @noEscape */ echo $postData; ?>' type="button" title="<?php echo $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+ <span><?php echo $block->escapeHtml(__('Add to Cart')) ?></span>
</button>
<?php endif; ?>
<?php else: ?>
<?php if ($_item->getIsSalable()): ?>
- <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+ <div class="stock available"><span><?php echo $block->escapeHtml(__('In stock')) ?></span></div>
<?php else: ?>
- <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+ <div class="stock unavailable"><span><?php echo $block->escapeHtml(__('Out of stock')) ?></span></div>
<?php endif; ?>
<?php endif; ?>
</div>
@@ -93,18 +88,14 @@
<div class="actions-secondary" data-role="add-to-links">
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
<a href="#"
- data-post='<?php /* @noEscape */ echo $block->getAddToWishlistParams($_item); ?>'
- class="action towishlist" data-action="add-to-wishlist"
- title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
- <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+ data-post='<?php /* @noEscape */ echo $block->getAddToWishlistParams($_item); ?>' class="action towishlist" data-action="add-to-wishlist" title="<?php echo $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
+ <span><?php echo $block->escapeHtml(__('Add to Wish List')) ?></span>
</a>
<?php endif; ?>
<?php if ($block->getAddToCompareUrl() && $showCompare): ?>
<?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
- <a href="#" class="action tocompare"
- data-post='<?php /* @noEscape */ echo $compareHelper->getPostDataParams($_item);?>'
- title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
- <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+ <a href="#" class="action tocompare" data-post='<?php /* @noEscape */ echo $compareHelper->getPostDataParams($_item);?>' title="<?php echo $block->escapeHtmlAttr(__('Add to Compare')) ?>">
+ <span><?php echo $block->escapeHtml(__('Add to Compare')) ?></span>
</a>
<?php endif; ?>
</div>
diff --git a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
index 2b3f65728068bee22560f06943f88eea69e36d79..0498b22d550e7f8c78cc2af53819a31aebeb3d47 100644
--- a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
@@ -90,26 +90,17 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
if ($codeLength) {
$escaper = $this->_objectManager->get(\Magento\Framework\Escaper::class);
+ $coupon = $this->couponFactory->create();
+ $coupon->load($couponCode, 'code');
if (!$itemsCount) {
- if ($isCodeLengthValid) {
- $coupon = $this->couponFactory->create();
- $coupon->load($couponCode, 'code');
- if ($coupon->getId()) {
- $this->_checkoutSession->getQuote()->setCouponCode($couponCode)->save();
- $this->messageManager->addSuccess(
- __(
- 'You used coupon code "%1".',
- $escaper->escapeHtml($couponCode)
- )
- );
- } else {
- $this->messageManager->addError(
- __(
- 'The coupon code "%1" is not valid.',
- $escaper->escapeHtml($couponCode)
- )
- );
- }
+ if ($isCodeLengthValid && $coupon->getId()) {
+ $this->_checkoutSession->getQuote()->setCouponCode($couponCode)->save();
+ $this->messageManager->addSuccess(
+ __(
+ 'You used coupon code "%1".',
+ $escaper->escapeHtml($couponCode)
+ )
+ );
} else {
$this->messageManager->addError(
__(
@@ -119,7 +110,7 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
);
}
} else {
- if ($isCodeLengthValid && $couponCode == $cartQuote->getCouponCode()) {
+ if ($isCodeLengthValid && $coupon->getId() && $couponCode == $cartQuote->getCouponCode()) {
$this->messageManager->addSuccess(
__(
'You used coupon code "%1".',
diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php
index 16ffb7c2b1437da5e7ffadcc6ebe2fc4b3c479d3..93100df3d8c32182912d59f96f9149200f5f0139 100644
--- a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php
@@ -69,6 +69,16 @@ class CouponPostTest extends \PHPUnit_Framework_TestCase
*/
protected $quoteRepository;
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $redirect;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $redirectFactory;
+
/**
* @return void
*/
@@ -204,6 +214,12 @@ class CouponPostTest extends \PHPUnit_Framework_TestCase
->method('getCouponCode')
->willReturn('OLDCODE');
+ $coupon = $this->getMock(\Magento\SalesRule\Model\Coupon::class, [], [], '', false);
+ $this->couponFactory->expects($this->once())
+ ->method('create')
+ ->willReturn($coupon);
+ $coupon->expects($this->once())->method('load')->willReturnSelf();
+ $coupon->expects($this->once())->method('getId')->willReturn(1);
$this->quote->expects($this->any())
->method('getItemsCount')
->willReturn(1);
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
index e06b8922b2252fd497db66a79db35af8c543db09..eba77927be79ea6189884f412be03be7ec7a76be 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
@@ -7,9 +7,10 @@
define([
'jquery',
'mage/template',
+ 'underscore',
'jquery/ui',
'mage/validation'
-], function ($, mageTemplate) {
+], function ($, mageTemplate, _) {
'use strict';
$.widget('mage.regionUpdater', {
@@ -124,6 +125,8 @@ define([
* @private
*/
_clearError: function () {
+ var args = ['clearError', this.options.regionListId, this.options.regionInputId, this.options.postcodeId];
+
if (this.options.clearError && typeof this.options.clearError === 'function') {
this.options.clearError.call(this);
} else {
@@ -133,8 +136,8 @@ define([
this.options.form = $(this.options.form);
- this.options.form && this.options.form.data('validator') && this.options.form.validation('clearError',
- this.options.regionListId, this.options.regionInputId, this.options.postcodeId);
+ this.options.form && this.options.form.data('validator') &&
+ this.options.form.validation.apply(this.options.form, _.compact(args));
// Clean up errors on region & zip fix
$(this.options.regionInputId).removeClass('mage-error').parent().find('[generated]').remove();
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
index a6185c454189770f39d00ae0c54c95086dc1fcf1..827f2ee938e41378a158090c16a383e62fa9e74e 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
@@ -21,11 +21,11 @@ $_height = $block->getImagesHeight();
<?php endif; ?>
</p>
<?php if ($block->getFileWidth($file)): ?>
- <small><?php echo $block->escapeHtml($block->getFileWidth($file)) ?>x<?php echo $block->escapeHtml($block->getFileHeight($file)) ?> <?php /* @escapeNotVerified */ echo __('px.') ?></small><br/>
+ <small><?php echo $block->escapeHtml($block->getFileWidth($file)) ?>x<?php echo $block->escapeHtml($block->getFileHeight($file)) ?> <?php echo $block->escapeHtml(__('px.')) ?></small><br/>
<?php endif; ?>
<small><?php echo $block->escapeHtml($block->getFileShortName($file)); ?></small>
</div>
<?php endforeach; ?>
<?php else: ?>
- <div class="empty"><?php /* @escapeNotVerified */ echo __('No files found') ?></div>
+ <div class="empty"><?php echo $block->escapeHtml(__('No files found')) ?></div>
<?php endif; ?>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
index 6a29cb1497175d418723af26a041c6bb80a990f8..3233bb17c09a319f27a987e47cb4cdd16661c20d 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
@@ -11,7 +11,7 @@
<div id="<?php echo $block->getHtmlId() ?>" class="uploader">
<span class="fileinput-button form-buttons">
- <span><?php /* @escapeNotVerified */ echo __('Browse Files...') ?></span>
+ <span><?php echo $block->escapeHtml(__('Browse Files...')) ?></span>
<input class="fileupload" type="file" name="<?php echo $block->escapeHtmlAttr($block->getConfig()->getFileField()) ?>" data-url="<?php echo $block->escapeUrl($block->getConfig()->getUrl()) ?>" multiple>
</span>
<div class="clear"></div>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
index 90a00c32015b7733b54e08cda63217c897f0bf58..2e6204496eba453a40c8288ed041db7781ec27e7 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
@@ -11,9 +11,9 @@
<div class="tree-panel" >
<div class="categories-side-col">
<div class="tree-actions">
- <a onclick="jQuery('[data-role=tree]').jstree('close_all');"><?php /* @escapeNotVerified */ echo __('Collapse All'); ?></a>
+ <a onclick="jQuery('[data-role=tree]').jstree('close_all');"><?php echo $block->escapeHtml(__('Collapse All')) ?></a>
<span class="separator">|</span>
- <a onclick="jQuery('[data-role=tree]').jstree('open_all');"><?php /* @escapeNotVerified */ echo __('Expand All'); ?></a>
+ <a onclick="jQuery('[data-role=tree]').jstree('open_all');"><?php echo $block->escapeHtml(__('Expand All')) ?></a>
</div>
</div>
<div data-role="tree" data-mage-init='<?php echo $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getTreeWidgetOptions())); ?>'>
diff --git a/app/code/Magento/Cms/view/frontend/templates/widget/link/link_block.phtml b/app/code/Magento/Cms/view/frontend/templates/widget/link/link_block.phtml
index 55c1b02be8797a45a9f4b27914e3195d7695da61..82a27c7aa0d78f1b44f44c9ca9f108d8df1ae586 100644
--- a/app/code/Magento/Cms/view/frontend/templates/widget/link/link_block.phtml
+++ b/app/code/Magento/Cms/view/frontend/templates/widget/link/link_block.phtml
@@ -3,9 +3,13 @@
* Copyright © 2016 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
+
+/**
+ * @var \Magento\Cms\Block\Widget\Page\Link $block
+ */
?>
<div class="widget block block-cms-link">
- <a <?php /* @escapeNotVerified */ echo $block->getLinkAttributes() ?>>
+ <a <?php /* @noEscape */ echo $block->getLinkAttributes() ?>>
<span><?php echo $block->escapeHtml($block->getLabel()) ?></span>
</a>
</div>
diff --git a/app/code/Magento/Cms/view/frontend/templates/widget/link/link_inline.phtml b/app/code/Magento/Cms/view/frontend/templates/widget/link/link_inline.phtml
index 382b492db3da5c815530d87f13ee959d82e2c083..d906826507d73b50f1c8cbf50a85f8ae2e09c5c8 100644
--- a/app/code/Magento/Cms/view/frontend/templates/widget/link/link_inline.phtml
+++ b/app/code/Magento/Cms/view/frontend/templates/widget/link/link_inline.phtml
@@ -3,9 +3,13 @@
* Copyright © 2016 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
+
+/**
+ * @var \Magento\Cms\Block\Widget\Page\Link $block
+ */
?>
<span class="widget block block-cms-link-inline">
- <a <?php /* @escapeNotVerified */ echo $block->getLinkAttributes() ?>>
+ <a <?php /* @noEscape */ echo $block->getLinkAttributes() ?>>
<span><?php echo $block->escapeHtml($block->getLabel()) ?></span>
</a>
</span>
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index 0b8a4aee9feced6e4f104208b7563bda16b6305c..0bd2f23418221770d4562eb67d6af9d3e8bd4646 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -1287,4 +1287,19 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
}
return $this->catalogConfig;
}
+
+ /**
+ * @inheritdoc
+ */
+ public function isPossibleBuyFromList($product)
+ {
+ $isAllCustomOptionsDisplayed = true;
+ foreach ($this->getConfigurableAttributes($product) as $attribute) {
+ $eavAttribute = $attribute->getProductAttribute();
+
+ $isAllCustomOptionsDisplayed = ($isAllCustomOptionsDisplayed && $eavAttribute->getUsedInProductListing());
+ }
+
+ return $isAllCustomOptionsDisplayed;
+ }
}
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml b/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
index e75831e28cf166290fbb042d6e09705a67442b82..75967a670279fba002fbce666b9f9d440669724b 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
@@ -35,7 +35,8 @@ $_attributes = $block->decorateArray($block->getAllowAttributes());
"#product_addtocart_form": {
"configurable": {
"spConfig": <?php /* @escapeNotVerified */ echo $block->getJsonConfig() ?>,
- "onlyMainImg": <?php /* @escapeNotVerified */ echo $block->getVar('change_only_base_image', 'Magento_ConfigurableProduct') ?: 'false'; ?>
+ "gallerySwitchStrategy": "<?php /* @escapeNotVerified */ echo $block->getVar('gallery_switch_strategy',
+ 'Magento_ConfigurableProduct') ?: 'replace'; ?>"
}
}
}
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
index 7bea20e78620134fff06d4cd259fee029f4fe637..59b313bcb497ddb64e1fdca9bc480afdbbb2f1d9 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
@@ -29,7 +29,16 @@ define([
mediaGallerySelector: '[data-gallery-role=gallery-placeholder]',
mediaGalleryInitial: null,
slyOldPriceSelector: '.sly-old-price',
- onlyMainImg: false
+
+ /**
+ * Defines the mechanism of how images of a gallery should be
+ * updated when user switches between configurations of a product.
+ *
+ * As for now value of this option can be either 'replace' or 'prepend'.
+ *
+ * @type {String}
+ */
+ gallerySwitchStrategy: 'replace'
},
/**
@@ -85,10 +94,10 @@ define([
this.inputSimpleProduct = this.element.find(options.selectSimpleProduct);
- gallery.on('gallery:loaded', function () {
- var galleryObject = gallery.data('gallery');
- options.mediaGalleryInitial = galleryObject.returnCurrentImages();
- });
+ gallery.data('gallery') ?
+ this._onGalleryLoaded(gallery) :
+ gallery.on('gallery:loaded', this._onGalleryLoaded.bind(this, gallery));
+
},
/**
@@ -259,46 +268,33 @@ define([
*/
_changeProductImage: function () {
var images,
- initialImages = $.extend(true, [], this.options.mediaGalleryInitial),
+ initialImages = this.options.mediaGalleryInitial,
galleryObject = $(this.options.mediaGallerySelector).data('gallery');
- if (this.options.spConfig.images[this.simpleProduct]) {
- images = $.extend(true, [], this.options.spConfig.images[this.simpleProduct]);
+ if (!galleryObject) {
+ return;
}
- function updateGallery(imagesArr) {
- var imgToUpdate,
- mainImg;
+ images = this.options.spConfig.images[this.simpleProduct];
- mainImg = imagesArr.filter(function (img) {
- return img.isMain;
- });
+ if (images) {
+ if (this.options.gallerySwitchStrategy === 'prepend') {
+ images = images.concat(initialImages);
+ }
- imgToUpdate = mainImg.length ? mainImg[0] : imagesArr[0];
- galleryObject.updateDataByIndex(0, imgToUpdate);
- galleryObject.seek(1);
- }
+ images = $.extend(true, [], images);
- if (galleryObject) {
- if (images) {
- images.map(function (img) {
- img.type = 'image';
- });
+ images.forEach(function (img) {
+ img.type = 'image';
+ });
- if (this.options.onlyMainImg) {
- updateGallery(images);
- } else {
- galleryObject.updateData(images)
- }
- } else {
- if (this.options.onlyMainImg) {
- updateGallery(initialImages);
- } else {
- galleryObject.updateData(this.options.mediaGalleryInitial);
- $(this.options.mediaGallerySelector).AddFotoramaVideoEvents();
- }
- }
+ galleryObject.updateData(images);
+ } else {
+ galleryObject.updateData(initialImages);
+ $(this.options.mediaGallerySelector).AddFotoramaVideoEvents();
}
+
+ galleryObject.first();
},
/**
@@ -506,8 +502,18 @@ define([
} else {
$(this.options.slyOldPriceSelector).hide();
}
- }
+ },
+ /**
+ * Callback which fired after gallery gets initialized.
+ *
+ * @param {HTMLElement} element - DOM element associated with gallery.
+ */
+ _onGalleryLoaded: function (element) {
+ var galleryObject = element.data('gallery');
+
+ this.options.mediaGalleryInitial = galleryObject.returnCurrentImages();
+ }
});
return $.mage.configurable;
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
index 59e12d72ded6c6cd4de5aaf323acd5f1ffbbd122..fd2ceaf09695bfb4a413bc6f680f254ca4edca4c 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
@@ -72,6 +72,7 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index
) {
$metadataForm = $this->getMetadataForm($entityType, $formCode, $scope);
$formData = $metadataForm->extractData($this->getRequest(), $scope);
+ $formData = $metadataForm->compactData($formData);
// Initialize additional attributes
/** @var \Magento\Framework\DataObject $object */
@@ -81,11 +82,6 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index
$formData[$attributeCode] = isset($requestData[$attributeCode]) ? $requestData[$attributeCode] : false;
}
- $result = $metadataForm->compactData($formData);
-
- // Re-initialize additional attributes
- $formData = array_replace($result, $formData);
-
// Unset unused attributes
$formAttributes = $metadataForm->getAttributes();
foreach ($formAttributes as $attribute) {
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
index 8fb48fe9f87e76dcf4f5d489a830bb15bf910c79..11fd1b5a7fc3356f54cc1e72b76e111b22446383 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
@@ -304,33 +304,28 @@ class SaveTest extends \PHPUnit_Framework_TestCase
],
'subscription' => $subscription,
];
- $filteredData = [
+ $extractedData = [
'entity_id' => $customerId,
'code' => 'value',
'coolness' => false,
'disable_auto_group_change' => 'false',
];
- $dataToCompact = [
+ $compactedData = [
'entity_id' => $customerId,
'code' => 'value',
'coolness' => false,
'disable_auto_group_change' => 'false',
- CustomerInterface::DEFAULT_BILLING => false,
- CustomerInterface::DEFAULT_SHIPPING => false,
- 'confirmation' => false,
- 'sendemail_store_id' => false,
- 'extension_attributes' => false,
+ CustomerInterface::DEFAULT_BILLING => 2,
+ CustomerInterface::DEFAULT_SHIPPING => 2
];
- $addressFilteredData = [
+ $addressExtractedData = [
'entity_id' => $addressId,
- 'default_billing' => 'true',
- 'default_shipping' => 'true',
'code' => 'value',
'coolness' => false,
'region' => 'region',
'region_id' => 'region_id',
];
- $addressDataToCompact = [
+ $addressCompactedData = [
'entity_id' => $addressId,
'default_billing' => 'true',
'default_shipping' => 'true',
@@ -430,11 +425,11 @@ class SaveTest extends \PHPUnit_Framework_TestCase
$customerFormMock->expects($this->once())
->method('extractData')
->with($this->requestMock, 'customer')
- ->willReturn($filteredData);
+ ->willReturn($extractedData);
$customerFormMock->expects($this->once())
->method('compactData')
- ->with($dataToCompact)
- ->willReturn($filteredData);
+ ->with($extractedData)
+ ->willReturn($compactedData);
$customerFormMock->expects($this->once())
->method('getAttributes')
->willReturn($attributes);
@@ -445,11 +440,11 @@ class SaveTest extends \PHPUnit_Framework_TestCase
$customerAddressFormMock->expects($this->once())
->method('extractData')
->with($this->requestMock, 'address/' . $addressId)
- ->willReturn($addressFilteredData);
+ ->willReturn($addressExtractedData);
$customerAddressFormMock->expects($this->once())
->method('compactData')
- ->with($addressDataToCompact)
- ->willReturn($addressFilteredData);
+ ->with($addressExtractedData)
+ ->willReturn($addressCompactedData);
$customerAddressFormMock->expects($this->once())
->method('getAttributes')
->willReturn($attributes);
@@ -625,8 +620,6 @@ class SaveTest extends \PHPUnit_Framework_TestCase
'_template_' => '_template_',
$addressId => [
'entity_id' => $addressId,
- 'default_billing' => 'false',
- 'default_shipping' => 'false',
'code' => 'value',
'coolness' => false,
'region' => 'region',
@@ -635,32 +628,12 @@ class SaveTest extends \PHPUnit_Framework_TestCase
],
'subscription' => $subscription,
];
- $filteredData = [
+ $extractedData = [
'coolness' => false,
'disable_auto_group_change' => 'false',
];
- $dataToCompact = [
- 'coolness' => false,
- 'disable_auto_group_change' => 'false',
- CustomerInterface::DEFAULT_BILLING => false,
- CustomerInterface::DEFAULT_SHIPPING => false,
- 'confirmation' => false,
- 'sendemail_store_id' => false,
- 'extension_attributes' => false,
- ];
- $addressFilteredData = [
+ $addressExtractedData = [
'entity_id' => $addressId,
- 'default_billing' => 'false',
- 'default_shipping' => 'false',
- 'code' => 'value',
- 'coolness' => false,
- 'region' => 'region',
- 'region_id' => 'region_id',
- ];
- $addressDataToCompact = [
- 'entity_id' => $addressId,
- 'default_billing' => 'false',
- 'default_shipping' => 'false',
'code' => 'value',
'coolness' => false,
'region' => 'region',
@@ -739,11 +712,11 @@ class SaveTest extends \PHPUnit_Framework_TestCase
$customerFormMock->expects($this->once())
->method('extractData')
->with($this->requestMock, 'customer')
- ->willReturn($filteredData);
+ ->willReturn($extractedData);
$customerFormMock->expects($this->once())
->method('compactData')
- ->with($dataToCompact)
- ->willReturn($filteredData);
+ ->with($extractedData)
+ ->willReturn($extractedData);
$customerFormMock->expects($this->once())
->method('getAttributes')
->willReturn($attributes);
@@ -754,11 +727,11 @@ class SaveTest extends \PHPUnit_Framework_TestCase
$customerAddressFormMock->expects($this->once())
->method('extractData')
->with($this->requestMock, 'address/' . $addressId)
- ->willReturn($addressFilteredData);
+ ->willReturn($addressExtractedData);
$customerAddressFormMock->expects($this->once())
->method('compactData')
- ->with($addressDataToCompact)
- ->willReturn($addressFilteredData);
+ ->with($addressExtractedData)
+ ->willReturn($addressExtractedData);
$customerAddressFormMock->expects($this->once())
->method('getAttributes')
->willReturn($attributes);
@@ -910,19 +883,10 @@ class SaveTest extends \PHPUnit_Framework_TestCase
],
'subscription' => $subscription,
];
- $filteredData = [
+ $extractedData = [
'coolness' => false,
'disable_auto_group_change' => 'false',
];
- $dataToCompact = [
- 'coolness' => false,
- 'disable_auto_group_change' => 'false',
- CustomerInterface::DEFAULT_BILLING => false,
- CustomerInterface::DEFAULT_SHIPPING => false,
- 'confirmation' => false,
- 'sendemail_store_id' => false,
- 'extension_attributes' => false,
- ];
/** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
$attributeMock = $this->getMockBuilder(
@@ -971,11 +935,11 @@ class SaveTest extends \PHPUnit_Framework_TestCase
$customerFormMock->expects($this->once())
->method('extractData')
->with($this->requestMock, 'customer')
- ->willReturn($filteredData);
+ ->willReturn($extractedData);
$customerFormMock->expects($this->once())
->method('compactData')
- ->with($dataToCompact)
- ->willReturn($filteredData);
+ ->with($extractedData)
+ ->willReturn($extractedData);
$customerFormMock->expects($this->once())
->method('getAttributes')
->willReturn($attributes);
@@ -1062,19 +1026,10 @@ class SaveTest extends \PHPUnit_Framework_TestCase
],
'subscription' => $subscription,
];
- $filteredData = [
+ $extractedData = [
'coolness' => false,
'disable_auto_group_change' => 'false',
];
- $dataToCompact = [
- 'coolness' => false,
- 'disable_auto_group_change' => 'false',
- CustomerInterface::DEFAULT_BILLING => false,
- CustomerInterface::DEFAULT_SHIPPING => false,
- 'confirmation' => false,
- 'sendemail_store_id' => false,
- 'extension_attributes' => false,
- ];
/** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
$attributeMock = $this->getMockBuilder(
@@ -1124,11 +1079,11 @@ class SaveTest extends \PHPUnit_Framework_TestCase
$customerFormMock->expects($this->once())
->method('extractData')
->with($this->requestMock, 'customer')
- ->willReturn($filteredData);
+ ->willReturn($extractedData);
$customerFormMock->expects($this->once())
->method('compactData')
- ->with($dataToCompact)
- ->willReturn($filteredData);
+ ->with($extractedData)
+ ->willReturn($extractedData);
$customerFormMock->expects($this->once())
->method('getAttributes')
->willReturn($attributes);
@@ -1214,18 +1169,9 @@ class SaveTest extends \PHPUnit_Framework_TestCase
],
'subscription' => $subscription,
];
- $filteredData = [
- 'coolness' => false,
- 'disable_auto_group_change' => 'false',
- ];
- $dataToCompact = [
+ $extractedData = [
'coolness' => false,
'disable_auto_group_change' => 'false',
- CustomerInterface::DEFAULT_BILLING => false,
- CustomerInterface::DEFAULT_SHIPPING => false,
- 'confirmation' => false,
- 'sendemail_store_id' => false,
- 'extension_attributes' => false,
];
/** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
@@ -1275,11 +1221,11 @@ class SaveTest extends \PHPUnit_Framework_TestCase
$customerFormMock->expects($this->once())
->method('extractData')
->with($this->requestMock, 'customer')
- ->willReturn($filteredData);
+ ->willReturn($extractedData);
$customerFormMock->expects($this->once())
->method('compactData')
- ->with($dataToCompact)
- ->willReturn($filteredData);
+ ->with($extractedData)
+ ->willReturn($extractedData);
$customerFormMock->expects($this->once())
->method('getAttributes')
->willReturn($attributes);
diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
index 9eed3d2b044ca166d35703d35e1fd1995e181108..28697fa5cf85faf8bb33dd61c9f5816fc0b60eed 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
@@ -1146,7 +1146,7 @@ class AccountManagementTest extends \PHPUnit_Framework_TestCase
$storeId = 1;
- mt_srand(mt_rand() + (100000000 * microtime()) % PHP_INT_MAX);
+ mt_srand(mt_rand() + (100000000 * (float)microtime()) % PHP_INT_MAX);
$hash = md5(uniqid(microtime() . mt_rand(0, mt_getrandmax()), true));
$this->emailNotificationMock->expects($this->once())
@@ -1168,7 +1168,7 @@ class AccountManagementTest extends \PHPUnit_Framework_TestCase
$templateIdentifier = 'Template Identifier';
$sender = 'Sender';
- mt_srand(mt_rand() + (100000000 * microtime()) % PHP_INT_MAX);
+ mt_srand(mt_rand() + (100000000 * (float)microtime()) % PHP_INT_MAX);
$hash = md5(uniqid(microtime() . mt_rand(0, mt_getrandmax()), true));
$this->emailNotificationMock->expects($this->once())
@@ -1194,7 +1194,7 @@ class AccountManagementTest extends \PHPUnit_Framework_TestCase
$templateIdentifier = 'Template Identifier';
$sender = 'Sender';
- mt_srand(mt_rand() + (100000000 * microtime()) % PHP_INT_MAX);
+ mt_srand(mt_rand() + (100000000 * (float)microtime()) % PHP_INT_MAX);
$hash = md5(uniqid(microtime() . mt_rand(0, mt_getrandmax()), true));
$this->prepareInitiatePasswordReset($email, $templateIdentifier, $sender, $storeId, $customerId, $hash);
diff --git a/app/code/Magento/Eav/Model/AttributeManagement.php b/app/code/Magento/Eav/Model/AttributeManagement.php
index 8d8674bcca0e7886d4a174840a7d55dea5bef8a4..102aafbd39fb1ba473dc1a346a857ccf695a5dab 100644
--- a/app/code/Magento/Eav/Model/AttributeManagement.php
+++ b/app/code/Magento/Eav/Model/AttributeManagement.php
@@ -6,10 +6,14 @@
*/
namespace Magento\Eav\Model;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\Exception\InputException;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\Exception\StateException;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class AttributeManagement implements \Magento\Eav\Api\AttributeManagementInterface
{
/**
@@ -19,6 +23,7 @@ class AttributeManagement implements \Magento\Eav\Api\AttributeManagementInterfa
/**
* @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
+ * @deprecated please use instead \Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory
*/
protected $attributeCollection;
@@ -47,6 +52,11 @@ class AttributeManagement implements \Magento\Eav\Api\AttributeManagementInterfa
*/
protected $attributeResource;
+ /**
+ * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory
+ */
+ private $attributeCollectionFactory;
+
/**
* @param \Magento\Eav\Api\AttributeSetRepositoryInterface $setRepository
* @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection $attributeCollection
@@ -154,11 +164,26 @@ class AttributeManagement implements \Magento\Eav\Api\AttributeManagementInterfa
if (!$attributeSet->getAttributeSetId() || $attributeSet->getEntityTypeId() != $requiredEntityTypeId) {
throw NoSuchEntityException::singleField('attributeSetId', $attributeSetId);
}
-
- $attributeCollection = $this->attributeCollection
- ->setAttributeSetFilter($attributeSet->getAttributeSetId())
- ->load();
+ /** @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection $attributeCollection */
+ $attributeCollection = $this->getCollectionFactory()->create();
+ $attributeCollection->setAttributeSetFilter($attributeSet->getAttributeSetId())->load();
return $attributeCollection->getItems();
}
+
+ /**
+ * Retrieve collection factory
+ *
+ * @deprecated
+ * @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory
+ */
+ private function getCollectionFactory()
+ {
+ if ($this->attributeCollectionFactory === null) {
+ $this->attributeCollectionFactory = ObjectManager::getInstance()->create(
+ \Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory::class
+ );
+ }
+ return $this->attributeCollectionFactory;
+ }
}
diff --git a/app/code/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php b/app/code/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php
index 88118e0b0f70fc54241d76b3895c644c5bd4a616..c45c575dffc2fa9fd87cf9e226ef06ceaa0ce2e2 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php
@@ -371,6 +371,24 @@ class AttributeManagementTest extends \PHPUnit_Framework_TestCase
$entityType = 'type';
$attributeSetId = 148;
+ $attributeCollectionFactoryMock = $this->getMock(
+ \Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory::class,
+ ['create'],
+ [],
+ '',
+ false
+ );
+ $attributeCollectionFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($this->attributeCollectionMock);
+
+ $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $objectManager->setBackwardCompatibleProperty(
+ $this->model,
+ 'attributeCollectionFactory',
+ $attributeCollectionFactoryMock
+ );
+
$attributeSetMock = $this->getMock(\Magento\Eav\Api\Data\AttributeSetInterface::class, [], [], '', false);
$this->setRepositoryMock->expects($this->once())
->method('get')
diff --git a/app/code/Magento/Integration/Model/Config.php b/app/code/Magento/Integration/Model/Config.php
index 70795cae0035034a7801c6a21cc3bb90ab566e1f..3cea4d33743198988c44d8c8aae9bf6e9f247efa 100644
--- a/app/code/Magento/Integration/Model/Config.php
+++ b/app/code/Magento/Integration/Model/Config.php
@@ -5,6 +5,8 @@
*/
namespace Magento\Integration\Model;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\SerializerInterface;
use Magento\Integration\Model\Cache\Type;
/**
@@ -34,14 +36,24 @@ class Config
*/
protected $_integrations;
+ /**
+ * @var SerializerInterface
+ */
+ private $serializer;
+
/**
* @param Cache\Type $configCacheType
* @param Config\Reader $configReader
+ * @param SerializerInterface $serializer
*/
- public function __construct(Cache\Type $configCacheType, Config\Reader $configReader)
- {
+ public function __construct(
+ Cache\Type $configCacheType,
+ Config\Reader $configReader,
+ SerializerInterface $serializer = null
+ ) {
$this->_configCacheType = $configCacheType;
$this->_configReader = $configReader;
+ $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
}
/**
@@ -55,10 +67,14 @@ class Config
if (null === $this->_integrations) {
$integrations = $this->_configCacheType->load(self::CACHE_ID);
if ($integrations && is_string($integrations)) {
- $this->_integrations = unserialize($integrations);
+ $this->_integrations = $this->serializer->unserialize($integrations);
} else {
$this->_integrations = $this->_configReader->read();
- $this->_configCacheType->save(serialize($this->_integrations), self::CACHE_ID, [Type::CACHE_TAG]);
+ $this->_configCacheType->save(
+ $this->serializer->serialize($this->_integrations),
+ self::CACHE_ID,
+ [Type::CACHE_TAG]
+ );
}
}
return $this->_integrations;
diff --git a/app/code/Magento/Integration/Model/ConsolidatedConfig.php b/app/code/Magento/Integration/Model/ConsolidatedConfig.php
index 9027bf774bc30a9a5b7cb6a427057efc45971742..9208d19e7028f8f753d6e20c2d43765163cb9bec 100644
--- a/app/code/Magento/Integration/Model/ConsolidatedConfig.php
+++ b/app/code/Magento/Integration/Model/ConsolidatedConfig.php
@@ -5,6 +5,8 @@
*/
namespace Magento\Integration\Model;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\SerializerInterface;
use Magento\Integration\Model\Cache\TypeConsolidated;
/**
@@ -31,14 +33,24 @@ class ConsolidatedConfig
*/
protected $integrations;
+ /**
+ * @var SerializerInterface
+ */
+ private $serializer;
+
/**
* @param Cache\TypeConsolidated $configCacheType
* @param Config\Consolidated\Reader $configReader
+ * @param SerializerInterface $serializer
*/
- public function __construct(Cache\TypeConsolidated $configCacheType, Config\Consolidated\Reader $configReader)
- {
+ public function __construct(
+ Cache\TypeConsolidated $configCacheType,
+ Config\Consolidated\Reader $configReader,
+ SerializerInterface $serializer = null
+ ) {
$this->configCacheType = $configCacheType;
$this->configReader = $configReader;
+ $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
}
/**
@@ -51,11 +63,11 @@ class ConsolidatedConfig
if (null === $this->integrations) {
$integrations = $this->configCacheType->load(self::CACHE_ID);
if ($integrations && is_string($integrations)) {
- $this->integrations = unserialize($integrations);
+ $this->integrations = $this->serializer->unserialize($integrations);
} else {
$this->integrations = $this->configReader->read();
$this->configCacheType->save(
- serialize($this->integrations),
+ $this->serializer->serialize($this->integrations),
self::CACHE_ID,
[TypeConsolidated::CACHE_TAG]
);
diff --git a/app/code/Magento/Integration/Model/IntegrationConfig.php b/app/code/Magento/Integration/Model/IntegrationConfig.php
index 647bff70efe4afdffd35e5294251e0fe9e98aa98..cde4fc20d22351ff4b9dedd9d93254f8d838438a 100644
--- a/app/code/Magento/Integration/Model/IntegrationConfig.php
+++ b/app/code/Magento/Integration/Model/IntegrationConfig.php
@@ -6,6 +6,8 @@
namespace Magento\Integration\Model;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\SerializerInterface;
use Magento\Integration\Model\Cache\TypeIntegration;
use Magento\Integration\Model\Config\Integration\Reader;
@@ -36,14 +38,24 @@ class IntegrationConfig
*/
protected $_integrations;
+ /**
+ * @var SerializerInterface
+ */
+ private $serializer;
+
/**
* @param TypeIntegration $configCacheType
* @param Reader $configReader
+ * @param SerializerInterface $serializer
*/
- public function __construct(TypeIntegration $configCacheType, Reader $configReader)
- {
+ public function __construct(
+ TypeIntegration $configCacheType,
+ Reader $configReader,
+ SerializerInterface $serializer = null
+ ) {
$this->_configCacheType = $configCacheType;
$this->_configReader = $configReader;
+ $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
}
/**
@@ -57,11 +69,11 @@ class IntegrationConfig
if (null === $this->_integrations) {
$integrations = $this->_configCacheType->load(self::CACHE_ID);
if ($integrations && is_string($integrations)) {
- $this->_integrations = unserialize($integrations);
+ $this->_integrations = $this->serializer->unserialize($integrations);
} else {
$this->_integrations = $this->_configReader->read();
$this->_configCacheType->save(
- serialize($this->_integrations),
+ $this->serializer->serialize($this->_integrations),
self::CACHE_ID,
[TypeIntegration::CACHE_TAG]
);
diff --git a/app/code/Magento/Integration/Test/Unit/Model/ConsolidatedConfigTest.php b/app/code/Magento/Integration/Test/Unit/Model/ConsolidatedConfigTest.php
index 0b75592782773d504061e4e6f9a56c67ebe5982e..22b50a8aef8d070c479ca2a28b499308a6a95c80 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/ConsolidatedConfigTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/ConsolidatedConfigTest.php
@@ -5,6 +5,7 @@
*/
namespace Magento\Integration\Test\Unit\Model;
+use Magento\Framework\Serialize\SerializerInterface;
use Magento\Integration\Model\ConsolidatedConfig as Config;
use Magento\Integration\Model\Cache\TypeConsolidated as Type;
@@ -18,17 +19,22 @@ class ConsolidatedConfigTest extends \PHPUnit_Framework_TestCase
*
* @var Config
*/
- protected $configModel;
+ private $configModel;
/**
* @var Type|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $configCacheTypeMock;
+ private $configCacheTypeMock;
/**
* @var \Magento\Integration\Model\Config\Consolidated\Reader|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $configReaderMock;
+ private $configReaderMock;
+
+ /**
+ * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $serializer;
protected function setUp()
{
@@ -38,12 +44,16 @@ class ConsolidatedConfigTest extends \PHPUnit_Framework_TestCase
$this->configReaderMock = $this->getMockBuilder(\Magento\Integration\Model\Config\Consolidated\Reader::class)
->disableOriginalConstructor()
->getMock();
+ $this->serializer = $this->getMockBuilder(SerializerInterface::class)
+ ->disableOriginalConstructor()
+ ->getMock();
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
$this->configModel = $objectManagerHelper->getObject(
\Magento\Integration\Model\ConsolidatedConfig::class,
[
'configCacheType' => $this->configCacheTypeMock,
- 'configReader' => $this->configReaderMock
+ 'configReader' => $this->configReaderMock,
+ 'serializer' => $this->serializer,
]
);
}
@@ -51,10 +61,15 @@ class ConsolidatedConfigTest extends \PHPUnit_Framework_TestCase
public function testGetIntegrationsFromConfigCacheType()
{
$integrations = ['foo', 'bar', 'baz'];
+ $serializedIntegrations = '["foo","bar","baz"]';
$this->configCacheTypeMock->expects($this->once())
->method('load')
->with(Config::CACHE_ID)
- ->will($this->returnValue(serialize($integrations)));
+ ->will($this->returnValue($serializedIntegrations));
+ $this->serializer->expects($this->once())
+ ->method('unserialize')
+ ->with($serializedIntegrations)
+ ->willReturn($integrations);
$this->assertEquals($integrations, $this->configModel->getIntegrations());
}
@@ -62,17 +77,21 @@ class ConsolidatedConfigTest extends \PHPUnit_Framework_TestCase
public function testGetIntegrationsFromConfigReader()
{
$integrations = ['foo', 'bar', 'baz'];
+ $serializedIntegrations = '["foo","bar","baz"]';
$this->configCacheTypeMock->expects($this->once())
->method('load')
->with(Config::CACHE_ID)
->will($this->returnValue(null));
- $this->configCacheTypeMock->expects($this->once())
- ->method('save')
- ->with(serialize($integrations), Config::CACHE_ID, [Type::CACHE_TAG])
- ->will($this->returnValue(null));
$this->configReaderMock->expects($this->once())
->method('read')
->will($this->returnValue($integrations));
+ $this->serializer->expects($this->once())
+ ->method('serialize')
+ ->with($integrations)
+ ->willReturn($serializedIntegrations);
+ $this->configCacheTypeMock->expects($this->once())
+ ->method('save')
+ ->with($serializedIntegrations, Config::CACHE_ID, [Type::CACHE_TAG]);
$this->assertEquals($integrations, $this->configModel->getIntegrations());
}
diff --git a/app/code/Magento/Integration/Test/Unit/Model/IntegrationConfigTest.php b/app/code/Magento/Integration/Test/Unit/Model/IntegrationConfigTest.php
index aed4e02453dc435fa5ff87f30931560bace8721e..14871420a621aceec2d5dcb79f209c60fac1f9f6 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/IntegrationConfigTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/IntegrationConfigTest.php
@@ -5,6 +5,7 @@
*/
namespace Magento\Integration\Test\Unit\Model;
+use Magento\Framework\Serialize\SerializerInterface;
use Magento\Integration\Model\IntegrationConfig;
use Magento\Integration\Model\Cache\TypeIntegration;
@@ -16,17 +17,22 @@ class IntegrationConfigTest extends \PHPUnit_Framework_TestCase
/**
* @var IntegrationConfig
*/
- protected $integrationConfigModel;
+ private $integrationConfigModel;
/**
* @var TypeIntegration|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $configCacheTypeMock;
+ private $configCacheTypeMock;
/**
* @var \Magento\Integration\Model\Config\Integration\Reader|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $configReaderMock;
+ private $configReaderMock;
+
+ /**
+ * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $serializer;
protected function setUp()
{
@@ -36,19 +42,28 @@ class IntegrationConfigTest extends \PHPUnit_Framework_TestCase
$this->configReaderMock = $this->getMockBuilder(\Magento\Integration\Model\Config\Integration\Reader::class)
->disableOriginalConstructor()
->getMock();
+ $this->serializer = $this->getMockBuilder(SerializerInterface::class)
+ ->disableOriginalConstructor()
+ ->getMock();
$this->integrationConfigModel = new IntegrationConfig(
$this->configCacheTypeMock,
- $this->configReaderMock
+ $this->configReaderMock,
+ $this->serializer
);
}
public function testGetIntegrationsFromConfigCacheType()
{
$integrations = ['foo', 'bar', 'baz'];
+ $serializedIntegrations = '["foo","bar","baz"]';
$this->configCacheTypeMock->expects($this->once())
->method('load')
->with(IntegrationConfig::CACHE_ID)
- ->will($this->returnValue(serialize($integrations)));
+ ->will($this->returnValue($serializedIntegrations));
+ $this->serializer->expects($this->once())
+ ->method('unserialize')
+ ->with($serializedIntegrations)
+ ->willReturn($integrations);
$this->assertEquals($integrations, $this->integrationConfigModel->getIntegrations());
}
@@ -56,17 +71,22 @@ class IntegrationConfigTest extends \PHPUnit_Framework_TestCase
public function testGetIntegrationsFromConfigReader()
{
$integrations = ['foo', 'bar', 'baz'];
+ $serializedIntegrations = '["foo","bar","baz"]';
$this->configCacheTypeMock->expects($this->once())
->method('load')
->with(IntegrationConfig::CACHE_ID)
->will($this->returnValue(null));
- $this->configCacheTypeMock->expects($this->once())
- ->method('save')
- ->with(serialize($integrations), IntegrationConfig::CACHE_ID, [TypeIntegration::CACHE_TAG])
- ->will($this->returnValue(null));
$this->configReaderMock->expects($this->once())
->method('read')
->will($this->returnValue($integrations));
+ $this->serializer->expects($this->once())
+ ->method('serialize')
+ ->with($integrations)
+ ->willReturn($serializedIntegrations);
+ $this->configCacheTypeMock->expects($this->once())
+ ->method('save')
+ ->with($serializedIntegrations, IntegrationConfig::CACHE_ID, [TypeIntegration::CACHE_TAG])
+ ->will($this->returnValue(null));
$this->assertEquals($integrations, $this->integrationConfigModel->getIntegrations());
}
diff --git a/app/code/Magento/Marketplace/Helper/Cache.php b/app/code/Magento/Marketplace/Helper/Cache.php
index 1cb5fb9c710e67885f0e7266d57873ca29cb3e21..a0a4ce73e0373ac7d057777160c7ac5028321e8c 100644
--- a/app/code/Magento/Marketplace/Helper/Cache.php
+++ b/app/code/Magento/Marketplace/Helper/Cache.php
@@ -6,7 +6,8 @@
namespace Magento\Marketplace\Helper;
-use Magento\Framework\Filesystem;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\SerializerInterface;
/**
* Cache helper
@@ -25,15 +26,23 @@ class Cache extends \Magento\Framework\App\Helper\AbstractHelper
*/
protected $cache;
+ /**
+ * @var SerializerInterface
+ */
+ private $serializer;
+
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\Config\CacheInterface $cache
+ * @param SerializerInterface $serializer
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Framework\Config\CacheInterface $cache
+ \Magento\Framework\Config\CacheInterface $cache,
+ SerializerInterface $serializer = null
) {
$this->cache = $cache;
+ $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
parent::__construct($context);
}
@@ -46,7 +55,7 @@ class Cache extends \Magento\Framework\App\Helper\AbstractHelper
{
$data = $this->getCache()->load($this->pathToCacheFile);
if (false !== $data) {
- $data = unserialize($data);
+ $data = $this->serializer->unserialize($data);
}
return $data;
}
@@ -59,7 +68,7 @@ class Cache extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function savePartnersToCache($partners)
{
- return $this->getCache()->save(serialize($partners), $this->pathToCacheFile);
+ return $this->getCache()->save($this->serializer->serialize($partners), $this->pathToCacheFile);
}
/**
diff --git a/app/code/Magento/Marketplace/Test/Unit/Helper/CacheTest.php b/app/code/Magento/Marketplace/Test/Unit/Helper/CacheTest.php
index 75c6e6110389c5a920c3053aa451a6d0deab3775..00b78a47eb4b0be4c5b89cf3383dac80028dc899 100644
--- a/app/code/Magento/Marketplace/Test/Unit/Helper/CacheTest.php
+++ b/app/code/Magento/Marketplace/Test/Unit/Helper/CacheTest.php
@@ -6,70 +6,79 @@
namespace Magento\Marketplace\Test\Unit\Helper;
+use Magento\Framework\Serialize\SerializerInterface;
+
class CacheTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Marketplace\Helper\Cache
+ * @var \Magento\Framework\Config\CacheInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $cache;
+
+ /**
+ * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
- private $cacheHelperMock;
+ private $serializer;
+
+ /**
+ * @var \Magento\Marketplace\Helper\Cache
+ */
+ private $cacheHelper;
protected function setUp()
{
- $this->cacheHelperMock = $this->getCacheHelperMock(['getCache']);
+ $this->cache = $this->getMockForAbstractClass(\Magento\Framework\Config\CacheInterface::class);
+ $this->serializer = $this->getMockForAbstractClass(SerializerInterface::class);
+ $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $this->cacheHelper = $objectManagerHelper->getObject(
+ \Magento\Marketplace\Helper\Cache::class,
+ [
+ 'cache' => $this->cache,
+ 'serializer' => $this->serializer,
+ ]
+ );
}
- /**
- * @covers \Magento\Marketplace\Helper\Cache::loadPartnersFromCache
- */
public function testLoadPartnersFromCache()
{
- $cache = $this->getCacheMock();
- $this->cacheHelperMock
- ->expects($this->once())
- ->method('getCache')
- ->will($this->returnValue($cache));
- $cache->expects($this->once())
+ $partners = ['partner1', 'partner2'];
+ $serializedPartners = '["partner1", "partner2"]';
+ $this->cache->expects($this->once())
->method('load')
- ->will($this->returnValue(''));
+ ->with('partners')
+ ->willReturn($serializedPartners);
+ $this->serializer->expects($this->once())
+ ->method('unserialize')
+ ->with($serializedPartners)
+ ->willReturn($partners);
- $this->cacheHelperMock->loadPartnersFromCache();
+ $this->assertSame($partners, $this->cacheHelper->loadPartnersFromCache());
}
- /**
- * @covers \Magento\Marketplace\Helper\Cache::savePartnersToCache
- */
- public function testSavePartnersToCache()
+ public function testLoadPartnersFromCacheNoCachedData()
{
- $cache = $this->getCacheMock();
- $this->cacheHelperMock
- ->expects($this->once())
- ->method('getCache')
- ->will($this->returnValue($cache));
- $cache->expects($this->once())
- ->method('save')
- ->will($this->returnValue(true));
+ $this->cache->expects($this->once())
+ ->method('load')
+ ->with('partners')
+ ->willReturn(false);
+ $this->serializer->expects($this->never())
+ ->method('unserialize');
- $this->cacheHelperMock->savePartnersToCache([]);
+ $this->assertSame(false, $this->cacheHelper->loadPartnersFromCache());
}
- /**
- * Gets cache helper mock
- *
- * @param null $methods
- * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Marketplace\Helper\Cache
- */
- public function getCacheHelperMock($methods = null)
+ public function testSavePartnersToCache()
{
- return $this->getMock(\Magento\Marketplace\Helper\Cache::class, $methods, [], '', false);
- }
+ $partners = ['partner1', 'partner2'];
+ $serializedPartners = '["partner1", "partner2"]';
+ $this->serializer->expects($this->once())
+ ->method('serialize')
+ ->with($partners)
+ ->willReturn($serializedPartners);
+ $this->cache->expects($this->once())
+ ->method('save')
+ ->with($serializedPartners);
- /**
- * Gets Filesystem mock
- *
- * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Config\CacheInterface
- */
- public function getCacheMock()
- {
- return $this->getMockForAbstractClass(\Magento\Framework\Config\CacheInterface::class);
+ $this->cacheHelper->savePartnersToCache($partners);
}
}
diff --git a/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml b/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
index fb6989716cd2dfc64d1e97c487e77f3b47afeb35..0ee371c32817649669fe2bc20d88b08e132a9a11 100644
--- a/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
+++ b/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
@@ -10,7 +10,7 @@
?>
<div class="block newsletter">
- <div class="title"><strong>Newsletter</strong></div>
+ <div class="title"><strong><?php /* @escapeNotVerified */ echo __('Newsletter') ?></strong></div>
<div class="content">
<form class="form subscribe"
novalidate
diff --git a/app/code/Magento/PageCache/Model/Config.php b/app/code/Magento/PageCache/Model/Config.php
index 222d9d57e467a31988fd6b6ac221f7ce640c06c5..786165728406f0162be0da04f869a10020d9d3bb 100644
--- a/app/code/Magento/PageCache/Model/Config.php
+++ b/app/code/Magento/PageCache/Model/Config.php
@@ -148,12 +148,17 @@ class Config
),
'/* {{ ips }} */' => $this->_getAccessList(),
'/* {{ design_exceptions_code }} */' => $this->_getDesignExceptions(),
- // http headers get transformed by php `X-Forwarded-Proto: https` becomes $SERVER['HTTP_X_FORWARDED_PROTO'] = 'https'
+ // http headers get transformed by php `X-Forwarded-Proto: https`
+ // becomes $SERVER['HTTP_X_FORWARDED_PROTO'] = 'https'
// Apache and Nginx drop all headers with underlines by default.
- '/* {{ ssl_offloaded_header }} */' => str_replace('_', '-', $this->_scopeConfig->getValue(
- \Magento\Framework\HTTP\PhpEnvironment\Request::XML_PATH_OFFLOADER_HEADER,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE))
-
+ '/* {{ ssl_offloaded_header }} */' => str_replace(
+ '_',
+ '-',
+ $this->_scopeConfig->getValue(
+ \Magento\Framework\HTTP\PhpEnvironment\Request::XML_PATH_OFFLOADER_HEADER,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ )
+ )
];
}
@@ -176,6 +181,7 @@ class Config
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if (!empty($accessList)) {
+ $result = [];
$ips = explode(',', $accessList);
foreach ($ips as $ip) {
$result[] = sprintf($tpl, trim($ip));
diff --git a/app/code/Magento/Quote/Model/QueryResolver.php b/app/code/Magento/Quote/Model/QueryResolver.php
index cfc1480feb66386a122b21a6484107a205cad566..04d83bab85b2bf4b31c5d57e8c2b742614a4694b 100644
--- a/app/code/Magento/Quote/Model/QueryResolver.php
+++ b/app/code/Magento/Quote/Model/QueryResolver.php
@@ -5,8 +5,10 @@
*/
namespace Magento\Quote\Model;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\Config\CacheInterface;
use Magento\Framework\App\ResourceConnection\ConfigInterface;
+use Magento\Framework\Serialize\SerializerInterface;
class QueryResolver
{
@@ -37,19 +39,27 @@ class QueryResolver
*/
private $cacheTags = [];
+ /**
+ * @var SerializerInterface
+ */
+ private $serializer;
+
/**
* @param ConfigInterface $config
* @param CacheInterface $cache
* @param string $cacheId
+ * @param SerializerInterface $serializer
*/
public function __construct(
ConfigInterface $config,
CacheInterface $cache,
- $cacheId = 'connection_config_cache'
+ $cacheId = 'connection_config_cache',
+ SerializerInterface $serializer = null
) {
$this->config = $config;
$this->cache = $cache;
$this->cacheId = $cacheId;
+ $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
}
/**
@@ -75,9 +85,9 @@ class QueryResolver
if (false === $data) {
$singleQuery = $this->config->getConnectionName('checkout_setup') == 'default' ? true : false;
$data['checkout'] = $singleQuery;
- $this->cache->save(serialize($data), $this->cacheId, $this->cacheTags);
+ $this->cache->save($this->serializer->serialize($data), $this->cacheId, $this->cacheTags);
} else {
- $data = unserialize($data);
+ $data = $this->serializer->unserialize($data);
}
$this->merge($data);
}
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php
index 8e62d1b942f1e2a5808e76ac293c94abd9830cad..d430bf3acc6cd08d22b0f352efde6b9dc7774fed 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php
@@ -5,6 +5,8 @@
*/
namespace Magento\Quote\Model\Quote\Address\Total;
+use Magento\Framework\Serialize\SerializerInterface;
+
/**
* Address Total Collector model
*/
@@ -69,6 +71,7 @@ class Collector extends \Magento\Sales\Model\Config\Ordered
* @param \Magento\Quote\Model\Quote\Address\TotalFactory $totalFactory
* @param mixed $sourceData
* @param mixed $store
+ * @param SerializerInterface $serializer
*/
public function __construct(
\Magento\Framework\App\Cache\Type\Config $configCacheType,
@@ -78,11 +81,12 @@ class Collector extends \Magento\Sales\Model\Config\Ordered
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Quote\Model\Quote\Address\TotalFactory $totalFactory,
$sourceData = null,
- $store = null
+ $store = null,
+ SerializerInterface $serializer = null
) {
$this->_scopeConfig = $scopeConfig;
$this->_totalFactory = $totalFactory;
- parent::__construct($configCacheType, $logger, $salesConfig, $sourceData);
+ parent::__construct($configCacheType, $logger, $salesConfig, $sourceData, $serializer);
$this->_store = $store ?: $storeManager->getStore();
$this->_initModels()->_initCollectors()->_initRetrievers();
}
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QueryResolverTest.php b/app/code/Magento/Quote/Test/Unit/Model/QueryResolverTest.php
index a2075b1161fc2a9cde83ba9af7bd2729244aa9a3..eb6828afff4edc79f0fb32bea383515ebacdcf86 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QueryResolverTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QueryResolverTest.php
@@ -6,83 +6,100 @@
namespace Magento\Quote\Test\Unit\Model;
+use Magento\Framework\Serialize\SerializerInterface;
+
class QueryResolverTest extends \PHPUnit_Framework_TestCase
{
/**
* @var \Magento\Quote\Model\QueryResolver
*/
- protected $quoteResolver;
+ private $quoteResolver;
/**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
- protected $configMock;
+ private $configMock;
/**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
- protected $cacheMock;
+ private $cacheMock;
+
+ /**
+ * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $serializer;
protected function setUp()
{
$this->configMock = $this->getMock(\Magento\Framework\App\ResourceConnection\ConfigInterface::class);
$this->cacheMock = $this->getMock(\Magento\Framework\Config\CacheInterface::class);
+ $this->serializer = $this->getMockForAbstractClass(SerializerInterface::class);
$this->quoteResolver = new \Magento\Quote\Model\QueryResolver(
$this->configMock,
$this->cacheMock,
- 'connection_config_cache'
+ 'connection_config_cache',
+ $this->serializer
);
-
}
public function testIsSingleQueryWhenDataWereCached()
{
- $queryData['checkout'] = true;
+ $serializedData = '{"checkout":true}';
+ $data = ['checkout' => true];
$this->cacheMock
->expects($this->once())
->method('load')
->with('connection_config_cache')
- ->willReturn(serialize($queryData));
+ ->willReturn($serializedData);
+ $this->serializer->expects($this->once())
+ ->method('unserialize')
+ ->with($serializedData)
+ ->willReturn($data);
$this->assertTrue($this->quoteResolver->isSingleQuery());
}
- public function testIsSingleQueryWhenDataNotCached()
+ /**
+ * @param string $connectionName
+ * @param bool $isSingleQuery
+ *
+ * @dataProvider isSingleQueryWhenDataNotCachedDataProvider
+ */
+ public function testIsSingleQueryWhenDataNotCached($connectionName, $isSingleQuery)
{
- $queryData['checkout'] = true;
+ $data = ['checkout' => $isSingleQuery];
+ $serializedData = '{"checkout":true}';
$this->cacheMock
->expects($this->once())
->method('load')
->with('connection_config_cache')
->willReturn(false);
+ $this->serializer->expects($this->never())
+ ->method('unserialize');
$this->configMock
->expects($this->once())
->method('getConnectionName')
->with('checkout_setup')
- ->willReturn('default');
+ ->willReturn($connectionName);
+ $this->serializer->expects($this->once())
+ ->method('serialize')
+ ->with($data)
+ ->willReturn($serializedData);
$this->cacheMock
->expects($this->once())
->method('save')
- ->with(serialize($queryData), 'connection_config_cache', []);
- $this->assertTrue($this->quoteResolver->isSingleQuery());
+ ->with($serializedData, 'connection_config_cache', []);
+ $this->assertEquals($isSingleQuery, $this->quoteResolver->isSingleQuery());
}
- public function testIsSingleQueryWhenSeveralConnectionsExist()
+ /**
+ * @return array
+ */
+ public function isSingleQueryWhenDataNotCachedDataProvider()
{
- $queryData['checkout'] = false;
- $this->cacheMock
- ->expects($this->once())
- ->method('load')
- ->with('connection_config_cache')
- ->willReturn(false);
- $this->configMock
- ->expects($this->once())
- ->method('getConnectionName')
- ->with('checkout_setup')
- ->willReturn('checkout');
- $this->cacheMock
- ->expects($this->once())
- ->method('save')
- ->with(serialize($queryData), 'connection_config_cache', []);
- $this->assertFalse($this->quoteResolver->isSingleQuery());
+ return [
+ ['default', true],
+ ['checkout', false],
+ ];
}
}
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php
index 36f1310079ed534d928fa03be511a64265f71dc5..ac3ffdc3d622c956074b3fc174df6c24e4cabff3 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php
@@ -217,9 +217,9 @@ class CreditmemoLoader extends DataObject
foreach ($creditmemo->getAllItems() as $creditmemoItem) {
$orderItem = $creditmemoItem->getOrderItem();
$parentId = $orderItem->getParentItemId();
- if (isset($backToStock[$orderItem->getId()])) {
+ if ($parentId && isset($backToStock[$parentId]) && $backToStock[$parentId]) {
$creditmemoItem->setBackToStock(true);
- } elseif ($orderItem->getParentItem() && isset($backToStock[$parentId]) && $backToStock[$parentId]) {
+ } elseif (isset($backToStock[$orderItem->getId()])) {
$creditmemoItem->setBackToStock(true);
} elseif (empty($savedData)) {
$creditmemoItem->setBackToStock(
diff --git a/app/code/Magento/Sales/Model/Config/Ordered.php b/app/code/Magento/Sales/Model/Config/Ordered.php
index 7ea7d1f8cc5fae05277754e033c9a4cb9fac37f6..806a7b522c189f495e080307981bf8fd95f3d420 100644
--- a/app/code/Magento/Sales/Model/Config/Ordered.php
+++ b/app/code/Magento/Sales/Model/Config/Ordered.php
@@ -5,6 +5,9 @@
*/
namespace Magento\Sales\Model\Config;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\SerializerInterface;
+
/**
* Configuration class for ordered items
*
@@ -69,22 +72,30 @@ abstract class Ordered extends \Magento\Framework\App\Config\Base
*/
protected $_salesConfig;
+ /**
+ * @var SerializerInterface
+ */
+ private $serializer;
+
/**
* @param \Magento\Framework\App\Cache\Type\Config $configCacheType
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Sales\Model\Config $salesConfig
* @param \Magento\Framework\Simplexml\Element $sourceData
+ * @param SerializerInterface $serializer
*/
public function __construct(
\Magento\Framework\App\Cache\Type\Config $configCacheType,
\Psr\Log\LoggerInterface $logger,
\Magento\Sales\Model\Config $salesConfig,
- $sourceData = null
+ $sourceData = null,
+ SerializerInterface $serializer = null
) {
parent::__construct($sourceData);
$this->_configCacheType = $configCacheType;
$this->_logger = $logger;
$this->_salesConfig = $salesConfig;
+ $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
}
/**
@@ -179,11 +190,11 @@ abstract class Ordered extends \Magento\Framework\App\Config\Base
$sortedCodes = [];
$cachedData = $this->_configCacheType->load($this->_collectorsCacheKey);
if ($cachedData) {
- $sortedCodes = unserialize($cachedData);
+ $sortedCodes = $this->serializer->unserialize($cachedData);
}
if (!$sortedCodes) {
$sortedCodes = $this->_getSortedCollectorCodes($this->_modelsConfig);
- $this->_configCacheType->save(serialize($sortedCodes), $this->_collectorsCacheKey);
+ $this->_configCacheType->save($this->serializer->serialize($sortedCodes), $this->_collectorsCacheKey);
}
foreach ($sortedCodes as $code) {
$this->_collectors[$code] = $this->_models[$code];
diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
index 21104933a51d6d8fda5d225ff4b879a07def3d20..ff687074e4a66cc50c457c685fc1757d1529dcb6 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
@@ -3,7 +3,6 @@
* Copyright © 2016 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-
namespace Magento\Sales\Model\Order;
/**
@@ -23,6 +22,11 @@ class CreditmemoFactory
*/
protected $taxConfig;
+ /**
+ * @var \Magento\Framework\Unserialize\Unserialize
+ */
+ protected $unserialize;
+
/**
* Factory constructor
*
@@ -57,7 +61,12 @@ class CreditmemoFactory
$item = $this->convertor->itemToCreditmemoItem($orderItem);
if ($orderItem->isDummy()) {
- $qty = 1;
+ if (isset($data['qtys'][$orderItem->getParentItemId()])) {
+ $parentQty = $data['qtys'][$orderItem->getParentItemId()];
+ } else {
+ $parentQty = $orderItem->getParentItem() ? $orderItem->getParentItem()->getQtyToRefund() : 1;
+ }
+ $qty = $this->calculateProductOptions($orderItem, $parentQty);
$orderItem->setLockedDoShip(true);
} else {
if (isset($qtys[$orderItem->getId()])) {
@@ -132,7 +141,12 @@ class CreditmemoFactory
$item = $this->convertor->itemToCreditmemoItem($orderItem);
if ($orderItem->isDummy()) {
- $qty = 1;
+ if (isset($data['qtys'][$orderItem->getParentItemId()])) {
+ $parentQty = $data['qtys'][$orderItem->getParentItemId()];
+ } else {
+ $parentQty = $orderItem->getParentItem() ? $orderItem->getParentItem()->getQtyToRefund() : 1;
+ }
+ $qty = $this->calculateProductOptions($orderItem, $parentQty);
} else {
if (isset($qtys[$orderItem->getId()])) {
$qty = (double)$qtys[$orderItem->getId()];
@@ -245,4 +259,38 @@ class CreditmemoFactory
$creditmemo->setAdjustmentNegative($data['adjustment_negative']);
}
}
+
+ /**
+ * @param \Magento\Sales\Api\Data\OrderItemInterface $orderItem
+ * @param array $qtys
+ * @return int
+ */
+ private function calculateProductOptions(\Magento\Sales\Api\Data\OrderItemInterface $orderItem, $parentQty)
+ {
+ $qty = $parentQty;
+ $productOptions = $orderItem->getProductOptions();
+ if (isset($productOptions['bundle_selection_attributes'])) {
+ $bundleSelectionAttributes = $this->getUnserialize()
+ ->unserialize($productOptions['bundle_selection_attributes']);
+ if ($bundleSelectionAttributes) {
+ $qty = $bundleSelectionAttributes['qty'] * $parentQty;
+ }
+ }
+ return $qty;
+ }
+
+ /**
+ * Get Unserialize
+ *
+ * @return \Magento\Framework\Unserialize\Unserialize
+ * @deprecated
+ */
+ private function getUnserialize()
+ {
+ if (!$this->unserialize) {
+ $this->unserialize = \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(\Magento\Framework\Unserialize\Unserialize::class);
+ }
+ return $this->unserialize;
+ }
}
diff --git a/app/code/Magento/Sales/Model/Order/Payment.php b/app/code/Magento/Sales/Model/Order/Payment.php
index a0f56d6ea9a73ea02d4c852ef6ac4831be29b574..3cd5ecde21366c87d4ee746a0ddc1b453ec0bf95 100644
--- a/app/code/Magento/Sales/Model/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/Order/Payment.php
@@ -1289,7 +1289,7 @@ class Payment extends Info implements OrderPaymentInterface
*/
public function isCaptureFinal($amountToCapture)
{
- $total = $this->getOrder()->getTotalDue();
+ $total = $this->getOrder()->getBaseTotalDue();
return $this->formatAmount($total, true) == $this->formatAmount($amountToCapture, true);
}
diff --git a/app/code/Magento/Sales/Model/Order/Total/Config/Base.php b/app/code/Magento/Sales/Model/Order/Total/Config/Base.php
index 22c71f48b6f35189bf532362a8647e53069a39a5..d96591118b82296a937445256e01e75ee942a569 100644
--- a/app/code/Magento/Sales/Model/Order/Total/Config/Base.php
+++ b/app/code/Magento/Sales/Model/Order/Total/Config/Base.php
@@ -5,6 +5,8 @@
*/
namespace Magento\Sales\Model\Order\Total\Config;
+use Magento\Framework\Serialize\SerializerInterface;
+
/**
* Configuration class for totals
*/
@@ -42,15 +44,17 @@ class Base extends \Magento\Sales\Model\Config\Ordered
* @param \Magento\Sales\Model\Config $salesConfig
* @param \Magento\Sales\Model\Order\TotalFactory $orderTotalFactory
* @param mixed $sourceData
+ * @param SerializerInterface $serializer
*/
public function __construct(
\Magento\Framework\App\Cache\Type\Config $configCacheType,
\Psr\Log\LoggerInterface $logger,
\Magento\Sales\Model\Config $salesConfig,
\Magento\Sales\Model\Order\TotalFactory $orderTotalFactory,
- $sourceData = null
+ $sourceData = null,
+ SerializerInterface $serializer = null
) {
- parent::__construct($configCacheType, $logger, $salesConfig, $sourceData);
+ parent::__construct($configCacheType, $logger, $salesConfig, $sourceData, $serializer);
$this->_orderTotalFactory = $orderTotalFactory;
}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php
index f97e3be1dcb6dcb9ea6383efec081517751325b5..7f058b7c05053646af0272e5b4f206105b8b45aa 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php
@@ -1548,7 +1548,7 @@ class PaymentTest extends \PHPUnit_Framework_TestCase
$partialAmount = 12.00;
$this->orderMock->expects(static::exactly(2))
- ->method('getTotalDue')
+ ->method('getBaseTotalDue')
->willReturn($amount);
static::assertFalse($this->payment->isCaptureFinal($partialAmount));
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Total/Config/BaseTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Total/Config/BaseTest.php
index ed44331f577d06ebdbe4df00401f85f34c59284d..bd519e76585ba452bb066ccac2cfbd27c5d58d7f 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Total/Config/BaseTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Total/Config/BaseTest.php
@@ -5,24 +5,28 @@
*/
namespace Magento\Sales\Test\Unit\Model\Order\Total\Config;
+use Magento\Framework\Serialize\SerializerInterface;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
class BaseTest extends \PHPUnit_Framework_TestCase
{
/** @var \Magento\Sales\Model\Order\Total\Config\Base */
- protected $object;
+ private $object;
+
+ /** @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ private $serializer;
/** @var \Magento\Framework\App\Cache\Type\Config|\PHPUnit_Framework_MockObject_MockObject */
- protected $configCacheType;
+ private $configCacheType;
/** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */
- protected $logger;
+ private $logger;
/** @var \Magento\Sales\Model\Config|\PHPUnit_Framework_MockObject_MockObject */
- protected $salesConfig;
+ private $salesConfig;
/** @var \Magento\Sales\Model\Order\TotalFactory|\PHPUnit_Framework_MockObject_MockObject */
- protected $orderTotalFactory;
+ private $orderTotalFactory;
protected function setUp()
{
@@ -30,6 +34,7 @@ class BaseTest extends \PHPUnit_Framework_TestCase
$this->logger = $this->getMock(\Psr\Log\LoggerInterface::class);
$this->salesConfig = $this->getMock(\Magento\Sales\Model\Config::class, [], [], '', false);
$this->orderTotalFactory = $this->getMock(\Magento\Sales\Model\Order\TotalFactory::class, [], [], '', false);
+ $this->serializer = $this->getMockForAbstractClass(SerializerInterface::class);
$objectManager = new ObjectManager($this);
$this->object = $objectManager->getObject(
@@ -39,6 +44,7 @@ class BaseTest extends \PHPUnit_Framework_TestCase
'logger' => $this->logger,
'salesConfig' => $this->salesConfig,
'orderTotalFactory' => $this->orderTotalFactory,
+ 'serializer' => $this->serializer,
]
);
}
@@ -59,8 +65,14 @@ class BaseTest extends \PHPUnit_Framework_TestCase
->with(\Magento\Sales\Model\Order\Total\AbstractTotal::class)
->will($this->returnValue($total));
+ $sortedCodes = ['other_code', 'some_code'];
+ $serializedCodes = '["other_code", "some_code"]';
+ $this->serializer->expects($this->once())
+ ->method('serialize')
+ ->with($sortedCodes)
+ ->willReturn($serializedCodes);
$this->configCacheType->expects($this->once())->method('save')
- ->with('a:2:{i:0;s:10:"other_code";i:1;s:9:"some_code";}', 'sorted_collectors');
+ ->with($serializedCodes, 'sorted_collectors');
$this->assertSame(
['other_code' => $total, 'some_code' => $total],
@@ -106,8 +118,14 @@ class BaseTest extends \PHPUnit_Framework_TestCase
->with(\Magento\Sales\Model\Order\Total\AbstractTotal::class)
->will($this->returnValue($total));
+ $sortedCodes = ['other_code', 'some_code'];
+ $serializedCodes = '["other_code", "some_code"]';
$this->configCacheType->expects($this->once())->method('load')->with('sorted_collectors')
- ->will($this->returnValue('a:2:{i:0;s:10:"other_code";i:1;s:9:"some_code";}'));
+ ->will($this->returnValue($serializedCodes));
+ $this->serializer->expects($this->once())
+ ->method('unserialize')
+ ->with($serializedCodes)
+ ->willReturn($sortedCodes);
$this->configCacheType->expects($this->never())->method('save');
$this->assertSame(
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
index b2e779e330fe0582f855f17ee57e6f648f61a001..6acb23ab0910ea3e8dc1e8bd5e87c28900e19da5 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
@@ -16,7 +16,7 @@
<referenceBlock name="page.title">
<action method="setTitleId">
- <argument translate="true" name="id" xsi:type="string">order-header</argument>
+ <argument translate="false" name="id" xsi:type="string">order-header</argument>
</action>
</referenceBlock>
<referenceContainer name="after.body.start">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
index 59bb31a94fa0cadadf177f695271c1efeaa69aa6..a8ccf82c5fe06030055381d9c13228661308e04e 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
@@ -66,7 +66,13 @@
<?php endif; ?>
<?php if ($block->canDisplayPrice()): ?>
- <td class="col-price"><?php /* @noEscape */ echo $block->getItemPrice($_item) ?></td>
+ <td class="col-price">
+ <?php if ($block->getDataId() == 'cart'): ?>
+ <?php /* @noEscape */ echo $block->getItemPrice($_item->getProduct()) ?>
+ <?php else: ?>
+ <?php /* @noEscape */ echo $block->getItemPrice($_item) ?>
+ <?php endif; ?>
+ </td>
<?php endif; ?>
<?php if ($block->canRemoveItems()): ?>
diff --git a/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php b/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php
index 7752d7131031cf0daa63f4c8b8bf49609e3090ed..3680bbb3a1eaefa3ee822eefd99b7b21b320a3f8 100644
--- a/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php
+++ b/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php
@@ -6,7 +6,6 @@
namespace Magento\SalesInventory\Model\Order;
use Magento\Sales\Api\Data\CreditmemoInterface;
-use Magento\Sales\Api\Data\CreditmemoItemInterface;
use Magento\Sales\Api\Data\OrderInterface;
/**
@@ -29,52 +28,35 @@ class ReturnProcessor
*/
private $priceIndexer;
- /**
- * @var \Magento\Sales\Api\CreditmemoRepositoryInterface
- */
- private $creditmemoRepository;
-
/**
* @var \Magento\Store\Model\StoreManagerInterface
*/
private $storeManager;
- /**
- * @var \Magento\Sales\Api\OrderRepositoryInterface
- */
- private $orderRepository;
-
/**
* @var \Magento\Sales\Api\OrderItemRepositoryInterface
*/
private $orderItemRepository;
/**
- * ReturnToStockPlugin constructor.
- * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
+ * ReturnProcessor constructor.
* @param \Magento\CatalogInventory\Api\StockManagementInterface $stockManagement
* @param \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexer
* @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
- * @param \Magento\Sales\Api\CreditmemoRepositoryInterface $creditmemoRepository
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
- * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
* @param \Magento\Sales\Api\OrderItemRepositoryInterface $orderItemRepository
*/
public function __construct(
\Magento\CatalogInventory\Api\StockManagementInterface $stockManagement,
\Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexer,
\Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer,
- \Magento\Sales\Api\CreditmemoRepositoryInterface $creditmemoRepository,
\Magento\Store\Model\StoreManagerInterface $storeManager,
- \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
\Magento\Sales\Api\OrderItemRepositoryInterface $orderItemRepository
) {
$this->stockManagement = $stockManagement;
$this->stockIndexerProcessor = $stockIndexer;
$this->priceIndexer = $priceIndexer;
- $this->creditmemoRepository = $creditmemoRepository;
$this->storeManager = $storeManager;
- $this->orderRepository = $orderRepository;
$this->orderItemRepository = $orderItemRepository;
}
@@ -82,22 +64,22 @@ class ReturnProcessor
* @param CreditmemoInterface $creditmemo
* @param OrderInterface $order
* @param array $returnToStockItems
+ * @param bool $isAutoReturn
* @return void
*/
public function execute(
CreditmemoInterface $creditmemo,
OrderInterface $order,
- array $returnToStockItems = []
+ array $returnToStockItems = [],
+ $isAutoReturn = false
) {
$itemsToUpdate = [];
foreach ($creditmemo->getItems() as $item) {
- $qty = $item->getQty();
$productId = $item->getProductId();
$orderItem = $this->orderItemRepository->get($item->getOrderItemId());
$parentItemId = $orderItem->getParentItemId();
- if ($this->canReturnItem($item, $qty, $parentItemId, $returnToStockItems)) {
- $parentItem = $parentItemId ? $this->getItemByOrderId($creditmemo, $parentItemId) : false;
- $qty = $parentItem ? $parentItem->getQty() * $qty : $qty;
+ $qty = $item->getQty();
+ if ($isAutoReturn || $this->canReturnItem($item, $qty, $parentItemId, $returnToStockItems)) {
if (isset($itemsToUpdate[$productId])) {
$itemsToUpdate[$productId] += $qty;
} else {
@@ -122,21 +104,6 @@ class ReturnProcessor
}
}
- /**
- * @param \Magento\Sales\Api\Data\CreditmemoInterface $creditmemo
- * @param int $parentItemId
- * @return bool|CreditmemoItemInterface
- */
- private function getItemByOrderId(\Magento\Sales\Api\Data\CreditmemoInterface $creditmemo, $parentItemId)
- {
- foreach ($creditmemo->getItems() as $item) {
- if ($item->getOrderItemId() == $parentItemId) {
- return $item;
- }
- }
- return false;
- }
-
/**
* @param \Magento\Sales\Api\Data\CreditmemoItemInterface $item
* @param int $qty
diff --git a/app/code/Magento/CatalogInventory/Observer/RefundOrderInventoryObserver.php b/app/code/Magento/SalesInventory/Observer/RefundOrderInventoryObserver.php
similarity index 57%
rename from app/code/Magento/CatalogInventory/Observer/RefundOrderInventoryObserver.php
rename to app/code/Magento/SalesInventory/Observer/RefundOrderInventoryObserver.php
index 9702bfc7cfe425b2c8987c1aec4e86430e1d62ac..acdebcf976a2eead77eb6074611968a9831cd524 100644
--- a/app/code/Magento/CatalogInventory/Observer/RefundOrderInventoryObserver.php
+++ b/app/code/Magento/SalesInventory/Observer/RefundOrderInventoryObserver.php
@@ -4,54 +4,74 @@
* See COPYING.txt for license details.
*/
-namespace Magento\CatalogInventory\Observer;
+namespace Magento\SalesInventory\Observer;
use Magento\CatalogInventory\Api\StockConfigurationInterface;
use Magento\CatalogInventory\Api\StockManagementInterface;
use Magento\Framework\Event\Observer as EventObserver;
use Magento\Framework\Event\ObserverInterface;
+use Magento\Sales\Model\OrderRepository;
+use Magento\SalesInventory\Model\Order\ReturnProcessor;
/**
* Catalog inventory module observer
+ * @deprecated
*/
class RefundOrderInventoryObserver implements ObserverInterface
{
/**
* @var StockConfigurationInterface
*/
- protected $stockConfiguration;
+ private $stockConfiguration;
/**
* @var StockManagementInterface
*/
- protected $stockManagement;
+ private $stockManagement;
/**
* @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
*/
- protected $stockIndexerProcessor;
+ private $stockIndexerProcessor;
/**
* @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
*/
- protected $priceIndexer;
+ private $priceIndexer;
/**
+ * @var \Magento\SalesInventory\Model\Order\ReturnProcessor
+ */
+ private $returnProcessor;
+
+ /**
+ * @var \Magento\Sales\Api\OrderRepositoryInterface
+ */
+ private $orderRepository;
+
+ /**
+ * RefundOrderInventoryObserver constructor.
* @param StockConfigurationInterface $stockConfiguration
* @param StockManagementInterface $stockManagement
* @param \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor
* @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
+ * @param ReturnProcessor $returnProcessor
+ * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
*/
public function __construct(
StockConfigurationInterface $stockConfiguration,
StockManagementInterface $stockManagement,
\Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor,
- \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
+ \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer,
+ \Magento\SalesInventory\Model\Order\ReturnProcessor $returnProcessor,
+ \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
) {
$this->stockConfiguration = $stockConfiguration;
$this->stockManagement = $stockManagement;
$this->stockIndexerProcessor = $stockIndexerProcessor;
$this->priceIndexer = $priceIndexer;
+ $this->returnProcessor = $returnProcessor;
+ $this->orderRepository = $orderRepository;
}
/**
@@ -64,31 +84,18 @@ class RefundOrderInventoryObserver implements ObserverInterface
{
/* @var $creditmemo \Magento\Sales\Model\Order\Creditmemo */
$creditmemo = $observer->getEvent()->getCreditmemo();
- $itemsToUpdate = [];
- foreach ($creditmemo->getAllItems() as $item) {
- $qty = $item->getQty();
- if (($item->getBackToStock() && $qty) || $this->stockConfiguration->isAutoReturnEnabled()) {
- $productId = $item->getProductId();
- $parentItemId = $item->getOrderItem()->getParentItemId();
- /* @var $parentItem \Magento\Sales\Model\Order\Creditmemo\Item */
- $parentItem = $parentItemId ? $creditmemo->getItemByOrderId($parentItemId) : false;
- $qty = $parentItem ? $parentItem->getQty() * $qty : $qty;
- if (isset($itemsToUpdate[$productId])) {
- $itemsToUpdate[$productId] += $qty;
- } else {
- $itemsToUpdate[$productId] = $qty;
- }
+ $order = $this->orderRepository->get($creditmemo->getOrderId());
+ $returnToStockItems = [];
+ foreach ($creditmemo->getItems() as $item) {
+ if ($item->getBackToStock()) {
+ $returnToStockItems[] = $item->getOrderItemId();
}
}
- if (!empty($itemsToUpdate)) {
- $this->stockManagement->revertProductsSale(
- $itemsToUpdate,
- $creditmemo->getStore()->getWebsiteId()
- );
-
- $updatedItemIds = array_keys($itemsToUpdate);
- $this->stockIndexerProcessor->reindexList($updatedItemIds);
- $this->priceIndexer->reindexList($updatedItemIds);
- }
+ $this->returnProcessor->execute(
+ $creditmemo,
+ $order,
+ $returnToStockItems,
+ $this->stockConfiguration->isAutoReturnEnabled()
+ );
}
}
diff --git a/app/code/Magento/SalesInventory/Test/Unit/Model/Order/ReturnProcessorTest.php b/app/code/Magento/SalesInventory/Test/Unit/Model/Order/ReturnProcessorTest.php
index 523759d54645a1e2db471db948fa116cf59cd32e..efa3bff32c0fa2b40c3a9a57ec04cb1ec5c9f257 100644
--- a/app/code/Magento/SalesInventory/Test/Unit/Model/Order/ReturnProcessorTest.php
+++ b/app/code/Magento/SalesInventory/Test/Unit/Model/Order/ReturnProcessorTest.php
@@ -5,9 +5,7 @@
*/
namespace Magento\SalesInventory\Test\Unit\Model\Order;
-use Magento\CatalogInventory\Api\StockConfigurationInterface;
use Magento\CatalogInventory\Api\StockManagementInterface;
-use Magento\Sales\Api\CreditmemoRepositoryInterface;
use Magento\Sales\Api\Data\CreditmemoInterface;
use Magento\Sales\Api\Data\CreditmemoItemInterface;
use Magento\Sales\Api\Data\OrderInterface;
@@ -49,21 +47,11 @@ class ReturnProcessorTest extends \PHPUnit_Framework_TestCase
*/
private $priceIndexerMock;
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject|CreditmemoRepositoryInterface
- */
- private $creditmemoRepositoryMock;
-
/**
* @var \PHPUnit_Framework_MockObject_MockObject|StoreManagerInterface
*/
private $storeManagerMock;
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject|OrderRepositoryInterface
- */
- private $orderRepositoryMock;
-
/**
* @var \PHPUnit_Framework_MockObject_MockObject|OrderItemRepositoryInterface
*/
@@ -95,13 +83,10 @@ class ReturnProcessorTest extends \PHPUnit_Framework_TestCase
$this->priceIndexerMock = $this->getMockBuilder(\Magento\Catalog\Model\Indexer\Product\Price\Processor::class)
->disableOriginalConstructor()
->getMock();
- $this->creditmemoRepositoryMock = $this->getMockBuilder(CreditmemoRepositoryInterface::class)
- ->disableOriginalConstructor()
- ->getMock();
$this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
->disableOriginalConstructor()
->getMock();
- $this->orderRepositoryMock = $this->getMockBuilder(OrderRepositoryInterface::class)
+ $this->orderItemRepositoryMock = $this->getMockBuilder(OrderRepositoryInterface::class)
->disableOriginalConstructor()
->getMock();
$this->orderItemRepositoryMock = $this->getMockBuilder(OrderItemRepositoryInterface::class)
@@ -127,9 +112,7 @@ class ReturnProcessorTest extends \PHPUnit_Framework_TestCase
$this->stockManagementMock,
$this->stockIndexerProcessorMock,
$this->priceIndexerMock,
- $this->creditmemoRepositoryMock,
$this->storeManagerMock,
- $this->orderRepositoryMock,
$this->orderItemRepositoryMock
);
}
@@ -139,6 +122,7 @@ class ReturnProcessorTest extends \PHPUnit_Framework_TestCase
$orderItemId = 99;
$productId = 50;
$returnToStockItems = [$orderItemId];
+ $parentItemId = 52;
$qty = 1;
$storeId = 0;
$webSiteId = 10;
@@ -147,10 +131,6 @@ class ReturnProcessorTest extends \PHPUnit_Framework_TestCase
->method('getItems')
->willReturn([$this->creditmemoItemMock]);
- $this->creditmemoItemMock->expects($this->once())
- ->method('getQty')
- ->willReturn($qty);
-
$this->creditmemoItemMock->expects($this->exactly(2))
->method('getOrderItemId')
->willReturn($orderItemId);
@@ -190,6 +170,14 @@ class ReturnProcessorTest extends \PHPUnit_Framework_TestCase
->method('reindexList')
->with([$productId]);
+ $this->orderItemMock->expects($this->once())
+ ->method('getParentItemId')
+ ->willReturn($parentItemId);
+
+ $this->creditmemoItemMock->expects($this->once())
+ ->method('getQty')
+ ->willReturn($qty);
+
$this->returnProcessor->execute($this->creditmemoMock, $this->orderMock, $returnToStockItems);
}
}
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Observer/RefundOrderInventoryObserverTest.php b/app/code/Magento/SalesInventory/Test/Unit/Observer/RefundOrderInventoryObserverTest.php
similarity index 65%
rename from app/code/Magento/CatalogInventory/Test/Unit/Observer/RefundOrderInventoryObserverTest.php
rename to app/code/Magento/SalesInventory/Test/Unit/Observer/RefundOrderInventoryObserverTest.php
index e440ed3380498a0c8d0deb9fb4edbd68a5d2c295..4e553493d07f63ed9f7d0a2d0d0ec7129d7580e7 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Observer/RefundOrderInventoryObserverTest.php
+++ b/app/code/Magento/SalesInventory/Test/Unit/Observer/RefundOrderInventoryObserverTest.php
@@ -3,9 +3,12 @@
* Copyright © 2016 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\CatalogInventory\Test\Unit\Observer;
+namespace Magento\SalesInventory\Test\Unit\Observer;
-use Magento\CatalogInventory\Observer\RefundOrderInventoryObserver;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\OrderRepository;
+use Magento\SalesInventory\Model\Order\ReturnProcessor;
+use Magento\SalesInventory\Observer\RefundOrderInventoryObserver;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -47,6 +50,26 @@ class RefundOrderInventoryObserverTest extends \PHPUnit_Framework_TestCase
*/
protected $eventObserver;
+ /**
+ * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+ */
+ protected $objectManagerHelper;
+
+ /**
+ * @var OrderRepository|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $orderRepositoryMock;
+
+ /**
+ * @var ReturnProcessor|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $returnProcessorMock;
+
+ /**
+ * @var OrderInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $orderMock;
+
protected function setUp()
{
$this->stockIndexerProcessor = $this->getMock(
@@ -93,8 +116,22 @@ class RefundOrderInventoryObserverTest extends \PHPUnit_Framework_TestCase
->method('getEvent')
->will($this->returnValue($this->event));
- $this->observer = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))->getObject(
- \Magento\CatalogInventory\Observer\RefundOrderInventoryObserver::class,
+ $this->orderRepositoryMock = $this->getMockBuilder(OrderRepository::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->returnProcessorMock = $this->getMockBuilder(ReturnProcessor::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->orderMock = $this->getMockBuilder(OrderInterface::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+ $this->observer = $this->objectManagerHelper->getObject(
+ \Magento\SalesInventory\Observer\RefundOrderInventoryObserver::class,
[
'stockConfiguration' => $this->stockConfiguration,
'stockManagement' => $this->stockManagement,
@@ -102,83 +139,67 @@ class RefundOrderInventoryObserverTest extends \PHPUnit_Framework_TestCase
'priceIndexer' => $this->priceIndexer,
]
);
+
+ $this->objectManagerHelper->setBackwardCompatibleProperty(
+ $this->observer,
+ 'orderRepository',
+ $this->orderRepositoryMock
+ );
+ $this->objectManagerHelper->setBackwardCompatibleProperty(
+ $this->observer,
+ 'returnProcessor',
+ $this->returnProcessorMock
+ );
}
public function testRefundOrderInventory()
{
- $websiteId = 0;
$ids = ['1', '14'];
$items = [];
$isAutoReturnEnabled = true;
- $store = $this->getMock(
- \Magento\Store\Model\Store::class,
- ['getWebsiteId'],
- [],
- '',
- false
- );
- $store->expects($this->once())->method('getWebsiteId')->will($this->returnValue($websiteId));
+ $creditMemo = $this->getMock(\Magento\Sales\Model\Order\Creditmemo::class, [], [], '', false);
- $itemsToUpdate = [];
foreach ($ids as $id) {
$item = $this->getCreditMemoItem($id);
$items[] = $item;
- $itemsToUpdate[$item->getProductId()] = $item->getQty();
}
- $creditMemo = $this->getMock(\Magento\Sales\Model\Order\Creditmemo::class, [], [], '', false);
+
$creditMemo->expects($this->once())
- ->method('getAllItems')
+ ->method('getItems')
->will($this->returnValue($items));
- $creditMemo->expects($this->once())->method('getStore')->will($this->returnValue($store));
$this->stockConfiguration->expects($this->any())
->method('isAutoReturnEnabled')
->will($this->returnValue($isAutoReturnEnabled));
- $this->stockManagement->expects($this->once())
- ->method('revertProductsSale')
- ->with($itemsToUpdate, $websiteId);
-
- $this->stockIndexerProcessor->expects($this->once())
- ->method('reindexList')
- ->with($ids);
-
- $this->priceIndexer->expects($this->once())
- ->method('reindexList')
- ->with($ids);
-
$this->event->expects($this->once())
->method('getCreditmemo')
->will($this->returnValue($creditMemo));
+ $this->orderRepositoryMock->expects($this->once())
+ ->method('get')
+ ->willReturn($this->orderMock);
+
+ $this->returnProcessorMock->expects($this->once())
+ ->method('execute')
+ ->with($creditMemo, $this->orderMock, $ids, $isAutoReturnEnabled);
+
$this->observer->execute($this->eventObserver);
}
private function getCreditMemoItem($productId)
{
- $parentItemId = false;
$backToStock = true;
- $qty = 1;
$item = $this->getMock(
\Magento\Sales\Model\Order\Creditmemo\Item::class,
- ['getProductId', 'getOrderItem', 'getBackToStock', 'getQty', '__wakeup'],
- [],
- '',
- false
- );
- $orderItem = $this->getMock(
- \Magento\Sales\Model\Order\Item::class,
- ['getParentItemId', '__wakeup'],
+ ['getOrderItemId', 'getBackToStock', 'getQty', '__wakeup'],
[],
'',
false
);
- $orderItem->expects($this->any())->method('getParentItemId')->willReturn($parentItemId);
- $item->expects($this->any())->method('getOrderItem')->willReturn($orderItem);
- $item->expects($this->any())->method('getProductId')->will($this->returnValue($productId));
$item->expects($this->any())->method('getBackToStock')->willReturn($backToStock);
- $item->expects($this->any())->method('getQty')->willReturn($qty);
+ $item->expects($this->any())->method('getOrderItemId')->willReturn($productId);
return $item;
}
}
diff --git a/app/code/Magento/SalesInventory/etc/events.xml b/app/code/Magento/SalesInventory/etc/events.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a71ed7f8a28a16a4ded03e507876757ec94f436c
--- /dev/null
+++ b/app/code/Magento/SalesInventory/etc/events.xml
@@ -0,0 +1,12 @@
+<?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="urn:magento:framework:Event/etc/events.xsd">
+ <event name="sales_order_creditmemo_save_after">
+ <observer name="inventory" instance="Magento\SalesInventory\Observer\RefundOrderInventoryObserver"/>
+ </event>
+</config>
diff --git a/app/code/Magento/Swatches/Helper/Data.php b/app/code/Magento/Swatches/Helper/Data.php
index 68a18ef8be6a1b2d51403acac0ebaca1ecc83996..a973a822c4101671faa0fe57925a0e9b0c5b2f2a 100644
--- a/app/code/Magento/Swatches/Helper/Data.php
+++ b/app/code/Magento/Swatches/Helper/Data.php
@@ -63,6 +63,13 @@ class Data
*/
protected $imageHelper;
+ /**
+ * Product metadata pool
+ *
+ * @var \Magento\Framework\EntityManager\MetadataPool
+ */
+ private $metadataPool;
+
/**
* Data key which should populated to Attribute entity from "additional_data" field
*
@@ -196,7 +203,13 @@ class Data
}
$productCollection = $this->productCollectionFactory->create();
- $this->addFilterByParent($productCollection, $parentProduct->getId());
+
+ $productLinkedFiled = $this->getMetadataPool()
+ ->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
+ ->getLinkField();
+ $parentId = $parentProduct->getData($productLinkedFiled);
+
+ $this->addFilterByParent($productCollection, $parentId);
$configurableAttributes = $this->getAttributesFromConfigurable($parentProduct);
$allAttributesArray = [];
@@ -491,4 +504,19 @@ class Data
}
return $attribute->getData(Swatch::SWATCH_INPUT_TYPE_KEY) == Swatch::SWATCH_INPUT_TYPE_TEXT;
}
+
+ /**
+ * Get product metadata pool.
+ *
+ * @return \Magento\Framework\EntityManager\MetadataPool
+ * @deprecared
+ */
+ protected function getMetadataPool()
+ {
+ if (!$this->metadataPool) {
+ $this->metadataPool = \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(\Magento\Framework\EntityManager\MetadataPool::class);
+ }
+ return $this->metadataPool;
+ }
}
diff --git a/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php b/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
index 6cf79dae309a583aca3ced31bd1411eb9d53b27b..e5f2f887836eff5ad73ca95602d4d7aec411150e 100644
--- a/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
@@ -46,6 +46,9 @@ class DataTest extends \PHPUnit_Framework_TestCase
/** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Api\ProductRepositoryInterface */
protected $productRepoMock;
+ /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\EntityManager\MetadataPool*/
+ private $metaDataPoolMock;
+
protected function setUp()
{
$this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -108,7 +111,13 @@ class DataTest extends \PHPUnit_Framework_TestCase
'',
false
);
-
+ $this->metaDataPoolMock = $this->getMock(
+ \Magento\Framework\EntityManager\MetadataPool::class,
+ [],
+ [],
+ '',
+ false
+ );
$this->swatchHelperObject = $this->objectManager->getObject(
\Magento\Swatches\Helper\Data::class,
[
@@ -120,6 +129,11 @@ class DataTest extends \PHPUnit_Framework_TestCase
'imageHelper' => $this->imageHelperMock,
]
);
+ $this->objectManager->setBackwardCompatibleProperty(
+ $this->swatchHelperObject,
+ 'metadataPool',
+ $this->metaDataPoolMock
+ );
}
public function dataForAdditionalData()
@@ -246,12 +260,16 @@ class DataTest extends \PHPUnit_Framework_TestCase
*/
public function testLoadVariationByFallback($product)
{
+ $metadataMock = $this->getMock(\Magento\Framework\EntityManager\EntityMetadataInterface::class);
+ $this->metaDataPoolMock->expects($this->once())->method('getMetadata')->willReturn($metadataMock);
+ $metadataMock->expects($this->once())->method('getLinkField')->willReturn('id');
+
$this->getSwatchAttributes($product);
$this->prepareVariationCollection();
$this->productCollectionMock->method('getFirstItem')->willReturn($this->productMock);
- $this->productMock->method('getId')->willReturn(95);
+ $this->productMock->method('getData')->with('id')->willReturn(95);
$this->productModelFactoryMock->method('create')->willReturn($this->productMock);
$this->productMock->method('load')->with(95)->will($this->returnSelf());
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
index 86046fdce4b6ee3d264d86f94f3a7dcfbf4b13b3..9c3274627b984cc093ecf5f39c54190ead2412fa 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
@@ -7,15 +7,17 @@
<?php /** @var $block \Magento\Swatches\Block\Product\Renderer\Configurable */ ?>
<div class="swatch-opt-<?php /* @escapeNotVerified */ echo $block->getProduct()->getId() ?>"></div>
<script>
- require(["jquery", "jquery/ui", "Magento_Swatches/js/swatch-renderer"], function ($) {
- $('.swatch-opt-<?php /* @escapeNotVerified */ echo $block->getProduct()->getId() ?>').SwatchRenderer({
- selectorProduct: '.product-item-details',
- onlySwatches: true,
- enableControlLabel: false,
- numberToShow: <?php /* @escapeNotVerified */ echo $block->getNumberSwatchesPerProduct(); ?>,
- jsonConfig: <?php /* @escapeNotVerified */ echo $block->getJsonConfig(); ?>,
- jsonSwatchConfig: <?php /* @escapeNotVerified */ echo $block->getJsonSwatchConfig(); ?>,
- mediaCallback: '<?php /* @escapeNotVerified */ echo $block->getMediaCallback() ?>'
- });
+ require(
+ ["jquery", "jquery/ui", "Magento_Swatches/js/swatch-renderer", "Magento_Swatches/js/catalog-add-to-cart"],
+ function ($) {
+ $('.swatch-opt-<?php /* @escapeNotVerified */ echo $block->getProduct()->getId() ?>').SwatchRenderer({
+ selectorProduct: '.product-item-details',
+ onlySwatches: true,
+ enableControlLabel: false,
+ numberToShow: <?php /* @escapeNotVerified */ echo $block->getNumberSwatchesPerProduct(); ?>,
+ jsonConfig: <?php /* @escapeNotVerified */ echo $block->getJsonConfig(); ?>,
+ jsonSwatchConfig: <?php /* @escapeNotVerified */ echo $block->getJsonSwatchConfig(); ?>,
+ mediaCallback: '<?php /* @escapeNotVerified */ echo $block->getMediaCallback() ?>'
+ });
});
</script>
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
index 19419d4c0a7eef2db8fe472c80b99f9246828993..478d6da720a79bf38df1bcf0b24ed1cc51061b3c 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
@@ -16,8 +16,8 @@
"jsonSwatchConfig": <?php /* @escapeNotVerified */
echo $swatchOptions = $block->getJsonSwatchConfig(); ?>,
"mediaCallback": "<?php /* @escapeNotVerified */ echo $block->getMediaCallback() ?>",
- "onlyMainImg": <?php /* @escapeNotVerified */ echo $block->getVar('change_only_base_image',
- 'Magento_Swatches') ?: 'false'; ?>
+ "gallerySwitchStrategy": "<?php /* @escapeNotVerified */ echo $block->getVar('gallery_switch_strategy',
+ 'Magento_ConfigurableProduct') ?: 'replace'; ?>"
}
}
}
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/catalog-add-to-cart.js b/app/code/Magento/Swatches/view/frontend/web/js/catalog-add-to-cart.js
new file mode 100644
index 0000000000000000000000000000000000000000..7900ff67b09be952f13bcfd1bd88842327dd0db4
--- /dev/null
+++ b/app/code/Magento/Swatches/view/frontend/web/js/catalog-add-to-cart.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+require([
+ 'jquery'
+], function ($) {
+ 'use strict';
+
+ $('body').on('catalogCategoryAddToCartRedirect', function (event, data) {
+ $(data.form).find('[name*="super"]').each(function (index, item) {
+ var $item = $(item);
+
+ data.redirectParameters.push($item.attr('data-attr-name') + '=' + $item.val());
+ });
+ });
+});
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
index 54e207c335ffb5b6a007a7774df4e2c4a0760628..8af48829df438261aaed469c88245fc50a349853 100644
--- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
+++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
@@ -243,8 +243,15 @@ define([
// Cache for BaseProduct images. Needed when option unset
mediaGalleryInitial: [{}],
- //
- onlyMainImg: false,
+ /**
+ * Defines the mechanism of how images of a gallery should be
+ * updated when user switches between configurations of a product.
+ *
+ * As for now value of this option can be either 'replace' or 'prepend'.
+ *
+ * @type {String}
+ */
+ gallerySwitchStrategy: 'replace',
// whether swatches are rendered in product list or on product page
inProductList: false
@@ -264,6 +271,8 @@ define([
*/
_init: function () {
if (this.options.jsonConfig !== '' && this.options.jsonSwatchConfig !== '') {
+ // store unsorted attributes
+ this.options.jsonConfig.mappedAttributes = _.clone(this.options.jsonConfig.attributes);
this._sortAttributes();
this._RenderControls();
$(this.element).trigger('swatch.initialized');
@@ -293,11 +302,9 @@ define([
this.element.parents('.product-item-info');
if (isProductViewExist) {
- gallery.on('gallery:loaded', function () {
- var galleryObject = gallery.data('gallery');
-
- options.mediaGalleryInitial = galleryObject.returnCurrentImages();
- });
+ gallery.data('gallery') ?
+ this._onGalleryLoaded(gallery) :
+ gallery.on('gallery:loaded', this._onGalleryLoaded.bind(this, gallery));
} else {
options.mediaGalleryInitial = [{
'img': $main.find('.product-image-photo').attr('src')
@@ -617,6 +624,7 @@ define([
$parent.attr('option-selected', $this.attr('option-id')).find('.selected').removeClass('selected');
$label.text($this.attr('option-label'));
$input.val($this.attr('option-id'));
+ $input.attr('data-attr-name', this._getAttributeCodeById(attributeId));
$this.addClass('selected');
$widget._toggleCheckedAttributes($this, $wrapper);
}
@@ -633,6 +641,19 @@ define([
$input.trigger('change');
},
+ /**
+ * Get human readable attribute code (eg. size, color) by it ID from configuration
+ *
+ * @param {Number} attributeId
+ * @returns {*}
+ * @private
+ */
+ _getAttributeCodeById: function (attributeId) {
+ var attribute = this.options.jsonConfig.mappedAttributes[attributeId];
+
+ return attribute ? attribute.code : attributeId;
+ },
+
/**
* Toggle accessibility attributes
*
@@ -1016,26 +1037,27 @@ define([
*/
updateBaseImage: function (images, context, isProductViewExist) {
var justAnImage = images[0],
- updateImg,
- imagesToUpdate,
+ initialImages = this.options.mediaGalleryInitial,
gallery = context.find(this.options.mediaGallerySelector).data('gallery'),
- item;
+ imagesToUpdate,
+ isInitial;
if (isProductViewExist) {
imagesToUpdate = images.length ? this._setImageType($.extend(true, [], images)) : [];
+ isInitial = _.isEqual(imagesToUpdate, initialImages);
- if (this.options.onlyMainImg) {
- updateImg = imagesToUpdate.filter(function (img) {
- return img.isMain;
- });
- item = updateImg.length ? updateImg[0] : imagesToUpdate[0];
- gallery.updateDataByIndex(0, item);
+ if (this.options.gallerySwitchStrategy === 'prepend' && !isInitial) {
+ imagesToUpdate = imagesToUpdate.concat(initialImages);
+ }
- gallery.seek(1);
- } else {
- gallery.updateData(imagesToUpdate);
+ gallery.updateData(imagesToUpdate);
+
+ if (isInitial) {
$(this.options.mediaGallerySelector).AddFotoramaVideoEvents();
}
+
+ gallery.first();
+
} else if (justAnImage && justAnImage.img) {
context.find('.product-image-photo').attr('src', justAnImage.img);
}
@@ -1104,13 +1126,24 @@ define([
params = $.parseQuery(window.location.href.substr(hashIndex + 1));
selectedAttributes = _.invert(_.mapObject(_.invert(params), function (attributeId) {
- var attribute = this.options.jsonConfig.attributes[attributeId];
+ var attribute = this.options.jsonConfig.mappedAttributes[attributeId];
return attribute ? attribute.code : attributeId;
}.bind(this)));
}
return selectedAttributes;
+ },
+
+ /**
+ * Callback which fired after gallery gets initialized.
+ *
+ * @param {HTMLElement} element - DOM element associated with a gallery.
+ */
+ _onGalleryLoaded: function (element) {
+ var galleryObject = element.data('gallery');
+
+ this.options.mediaGalleryInitial = galleryObject.returnCurrentImages();
}
});
diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml
index 7aa02ab019c46b9ad7094764118a9f5d07519293..d0f9678602707ff2950b8b051b8dd50f0b4c7df0 100644
--- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml
@@ -9,7 +9,7 @@
/** @var \Magento\UrlRewrite\Block\Catalog\Category\Tree $block */
?>
<fieldset class="admin__fieldset" data-ui-id="category-selector">
- <legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('Select Category') ?></span></legend>
+ <legend class="admin__legend"><span><?php echo $block->escapeHtml(__('Select Category')) ?></span></legend>
<div class="content content-category-tree">
<input type="hidden" name="categories" id="product_categories" value="" />
<?php if ($block->getRoot()): ?>
diff --git a/app/code/Magento/Webapi/Model/Config.php b/app/code/Magento/Webapi/Model/Config.php
index 45d29bc59cf0d6a1c9c1be78ff84343f50b1029d..fb6dc894e3c0ae87915f12bdf38311a5be541874 100644
--- a/app/code/Magento/Webapi/Model/Config.php
+++ b/app/code/Magento/Webapi/Model/Config.php
@@ -8,6 +8,8 @@ namespace Magento\Webapi\Model;
use Magento\Webapi\Model\Cache\Type\Webapi as WebapiCache;
use Magento\Webapi\Model\Config\Reader;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\SerializerInterface;
/**
* Web API Config Model.
@@ -40,16 +42,26 @@ class Config
*/
protected $services;
+ /**
+ * @var SerializerInterface
+ */
+ private $serializer;
+
/**
* Initialize dependencies.
*
* @param WebapiCache $cache
* @param Reader $configReader
+ * @param SerializerInterface|null $serializer
*/
- public function __construct(WebapiCache $cache, Reader $configReader)
- {
+ public function __construct(
+ WebapiCache $cache,
+ Reader $configReader,
+ SerializerInterface $serializer = null
+ ) {
$this->cache = $cache;
$this->configReader = $configReader;
+ $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
}
/**
@@ -62,10 +74,10 @@ class Config
if (null === $this->services) {
$services = $this->cache->load(self::CACHE_ID);
if ($services && is_string($services)) {
- $this->services = unserialize($services);
+ $this->services = $this->serializer->unserialize($services);
} else {
$this->services = $this->configReader->read();
- $this->cache->save(serialize($this->services), self::CACHE_ID);
+ $this->cache->save($this->serializer->serialize($this->services), self::CACHE_ID);
}
}
return $this->services;
diff --git a/app/code/Magento/Webapi/Model/ServiceMetadata.php b/app/code/Magento/Webapi/Model/ServiceMetadata.php
index b75d10f9a271f7a3f39fff2ac9494f020b5cf660..14e45ccb409db24df2dd2f1c4f8d5693a55d3126 100644
--- a/app/code/Magento/Webapi/Model/ServiceMetadata.php
+++ b/app/code/Magento/Webapi/Model/ServiceMetadata.php
@@ -7,6 +7,8 @@ namespace Magento\Webapi\Model;
use Magento\Webapi\Model\Config\Converter;
use Magento\Webapi\Model\Cache\Type\Webapi as WebApiCache;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\SerializerInterface;
/**
* Service Metadata Model
@@ -74,6 +76,11 @@ class ServiceMetadata
*/
protected $typeProcessor;
+ /**
+ * @var SerializerInterface
+ */
+ private $serializer;
+
/**
* Initialize dependencies.
*
@@ -81,17 +88,20 @@ class ServiceMetadata
* @param WebApiCache $cache
* @param \Magento\Webapi\Model\Config\ClassReflector $classReflector
* @param \Magento\Framework\Reflection\TypeProcessor $typeProcessor
+ * @param SerializerInterface|null $serializer
*/
public function __construct(
\Magento\Webapi\Model\Config $config,
WebApiCache $cache,
\Magento\Webapi\Model\Config\ClassReflector $classReflector,
- \Magento\Framework\Reflection\TypeProcessor $typeProcessor
+ \Magento\Framework\Reflection\TypeProcessor $typeProcessor,
+ SerializerInterface $serializer = null
) {
$this->config = $config;
$this->cache = $cache;
$this->classReflector = $classReflector;
$this->typeProcessor = $typeProcessor;
+ $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
}
/**
@@ -142,12 +152,18 @@ class ServiceMetadata
$servicesConfig = $this->cache->load(self::SERVICES_CONFIG_CACHE_ID);
$typesData = $this->cache->load(self::REFLECTED_TYPES_CACHE_ID);
if ($servicesConfig && is_string($servicesConfig) && $typesData && is_string($typesData)) {
- $this->services = unserialize($servicesConfig);
- $this->typeProcessor->setTypesData(unserialize($typesData));
+ $this->services = $this->serializer->unserialize($servicesConfig);
+ $this->typeProcessor->setTypesData($this->serializer->unserialize($typesData));
} else {
$this->services = $this->initServicesMetadata();
- $this->cache->save(serialize($this->services), self::SERVICES_CONFIG_CACHE_ID);
- $this->cache->save(serialize($this->typeProcessor->getTypesData()), self::REFLECTED_TYPES_CACHE_ID);
+ $this->cache->save(
+ $this->serializer->serialize($this->services),
+ self::SERVICES_CONFIG_CACHE_ID
+ );
+ $this->cache->save(
+ $this->serializer->serialize($this->typeProcessor->getTypesData()),
+ self::REFLECTED_TYPES_CACHE_ID
+ );
}
}
return $this->services;
@@ -256,12 +272,18 @@ class ServiceMetadata
$routesConfig = $this->cache->load(self::ROUTES_CONFIG_CACHE_ID);
$typesData = $this->cache->load(self::REFLECTED_TYPES_CACHE_ID);
if ($routesConfig && is_string($routesConfig) && $typesData && is_string($typesData)) {
- $this->routes = unserialize($routesConfig);
- $this->typeProcessor->setTypesData(unserialize($typesData));
+ $this->routes = $this->serializer->unserialize($routesConfig);
+ $this->typeProcessor->setTypesData($this->serializer->unserialize($typesData));
} else {
$this->routes = $this->initRoutesMetadata();
- $this->cache->save(serialize($this->routes), self::ROUTES_CONFIG_CACHE_ID);
- $this->cache->save(serialize($this->typeProcessor->getTypesData()), self::REFLECTED_TYPES_CACHE_ID);
+ $this->cache->save(
+ $this->serializer->serialize($this->routes),
+ self::ROUTES_CONFIG_CACHE_ID
+ );
+ $this->cache->save(
+ $this->serializer->serialize($this->typeProcessor->getTypesData()),
+ self::REFLECTED_TYPES_CACHE_ID
+ );
}
}
return $this->routes;
diff --git a/app/code/Magento/Webapi/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Webapi/Test/Unit/Model/ConfigTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..74280f61916d7182e90bdf1e9b6125da55a6c31b
--- /dev/null
+++ b/app/code/Magento/Webapi/Test/Unit/Model/ConfigTest.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Webapi\Test\Unit\Model;
+
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Webapi\Model\Config;
+use Magento\Webapi\Model\Config\Reader;
+use Magento\Webapi\Model\Cache\Type\Webapi;
+
+class ConfigTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var Config
+ */
+ private $config;
+
+ /**
+ * @var Webapi|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $webapiCacheMock;
+
+ /**
+ * @var Reader|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $configReaderMock;
+
+ /**
+ * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $serializerMock;
+
+ protected function setUp()
+ {
+ $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+ $this->webapiCacheMock = $this->getMock(\Magento\Webapi\Model\Cache\Type\Webapi::class, [], [], '', false);
+ $this->configReaderMock = $this->getMock(\Magento\Webapi\Model\Config\Reader::class, [], [], '', false);
+ $this->serializerMock = $this->getMock(SerializerInterface::class);
+
+ $this->config = $objectManager->getObject(
+ Config::class,
+ [
+ 'cache' => $this->webapiCacheMock,
+ 'configReader' => $this->configReaderMock,
+ 'serializer' => $this->serializerMock
+ ]
+ );
+ }
+
+ public function testGetServices()
+ {
+ $data = ['foo' => 'bar'];
+ $serializedData = 'serialized data';
+ $this->webapiCacheMock->expects($this->once())
+ ->method('load')
+ ->with(Config::CACHE_ID)
+ ->willReturn($serializedData);
+ $this->serializerMock->expects($this->once())
+ ->method('unserialize')
+ ->with($serializedData)
+ ->willReturn($data);
+ $this->config->getServices();
+ $this->assertEquals($data, $this->config->getServices());
+ }
+
+ public function testGetServicesNoCache()
+ {
+ $data = ['foo' => 'bar'];
+ $serializedData = 'serialized data';
+ $this->webapiCacheMock->expects($this->once())
+ ->method('load')
+ ->with(Config::CACHE_ID)
+ ->willReturn(false);
+ $this->serializerMock->expects($this->never())
+ ->method('unserialize');
+ $this->configReaderMock->expects($this->once())
+ ->method('read')
+ ->willReturn($data);
+ $this->serializerMock->expects($this->once())
+ ->method('serialize')
+ ->with($data)
+ ->willReturn($serializedData);
+ $this->webapiCacheMock->expects($this->once())
+ ->method('save')
+ ->with(
+ $serializedData,
+ Config::CACHE_ID
+ );
+
+ $this->config->getServices();
+ $this->assertEquals($data, $this->config->getServices());
+ }
+}
diff --git a/app/code/Magento/Webapi/Test/Unit/Model/ServiceMetadataTest.php b/app/code/Magento/Webapi/Test/Unit/Model/ServiceMetadataTest.php
index 29c1bf90402ebe36d6ca91c5585cacb03f739cc3..4125f82b7923ffb30a3bfc0d86f3414255498231 100644
--- a/app/code/Magento/Webapi/Test/Unit/Model/ServiceMetadataTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Model/ServiceMetadataTest.php
@@ -1,187 +1,450 @@
<?php
/**
- * ServiceMetadata Unit tests.
- *
* Copyright © 2016 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-
-/**
- * Class implements tests for \Magento\Webapi\Model\ServiceMetadata class.
- */
namespace Magento\Webapi\Test\Unit\Model;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Webapi\Model\Config;
+use Magento\Webapi\Model\Cache\Type\Webapi;
+use Magento\Webapi\Model\Config\ClassReflector;
+use Magento\Framework\Reflection\TypeProcessor;
+use Magento\Webapi\Model\ServiceMetadata;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+
class ServiceMetadataTest extends \PHPUnit_Framework_TestCase
{
- /** @var \Magento\Webapi\Model\ServiceMetadata */
- protected $serviceMetadata;
+ /**
+ * @var ServiceMetadata
+ */
+ private $serviceMetadata;
/**
- * Set up helper.
- * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @var Webapi|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $cacheMock;
+
+ /**
+ * @var Config|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $configMock;
+
+ /**
+ * @var ClassReflector|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $classReflectorMock;
+
+ /**
+ * @var TypeProcessor|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $typeProcessorMock;
+
+ /**
+ * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
+ private $serializerMock;
+
protected function setUp()
{
- $interfaceParameters = [
- 'activateById' => [
+ $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+ $this->configMock = $this->getMock(Config::class, [], [], '', false);
+ $this->cacheMock = $this->getMock(Webapi::class, [], [], '', false);
+ $this->classReflectorMock = $this->getMock(ClassReflector::class, [], [], '', false);
+ $this->typeProcessorMock = $this->getMock(TypeProcessor::class, [], [], '', false);
+ $this->serializerMock = $this->getMock(SerializerInterface::class);
+
+ $this->serviceMetadata = $objectManager->getObject(
+ ServiceMetadata::class,
+ [
+ 'config' => $this->configMock,
+ 'cache' => $this->cacheMock,
+ 'classReflector' => $this->classReflectorMock,
+ 'typeProcessor' => $this->typeProcessorMock,
+ 'serializer' => $this->serializerMock
+ ]
+ );
+ }
+
+ public function testGetServicesConfig()
+ {
+ $servicesConfig = ['foo' => 'bar'];
+ $typeData = ['bar' => 'foo'];
+ $serializedServicesConfig = 'serialized services config';
+ $serializedTypeData = 'serialized type data';
+ $this->cacheMock->expects($this->at(0))
+ ->method('load')
+ ->with(ServiceMetadata::SERVICES_CONFIG_CACHE_ID)
+ ->willReturn($serializedServicesConfig);
+ $this->cacheMock->expects($this->at(1))
+ ->method('load')
+ ->with(ServiceMetadata::REFLECTED_TYPES_CACHE_ID)
+ ->willReturn($serializedTypeData);
+ $this->serializerMock->expects($this->at(0))
+ ->method('unserialize')
+ ->with($serializedServicesConfig)
+ ->willReturn($servicesConfig);
+ $this->serializerMock->expects($this->at(1))
+ ->method('unserialize')
+ ->with($serializedTypeData)
+ ->willReturn($typeData);
+ $this->typeProcessorMock->expects($this->once())
+ ->method('setTypesData')
+ ->with($typeData);
+ $this->serviceMetadata->getServicesConfig();
+ $this->assertEquals($servicesConfig, $this->serviceMetadata->getServicesConfig());
+ }
+
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function testGetServicesConfigNoCache()
+ {
+ $servicesConfig = [
+ 'services' => [
+ CustomerRepositoryInterface::class => [
+ 'V1' => [
+ 'methods' => [
+ 'getById' => [
+ 'resources' => [
+ [
+ 'Magento_Customer::customer',
+ ]
+ ],
+ 'secure' => false
+ ]
+ ]
+ ]
+ ]
+ ]
+ ];
+ $methodsReflectionData = [
+ 'getById' => [
+ 'documentation' => 'Get customer by customer ID.',
'interface' => [
'in' => [
'parameters' => [
'customerId' => [
- 'force' => true,
- 'value' => '%customer_id%',
- ],
- 'requiredInputParameter' => [
+ 'type' => 'int',
'required' => true,
- ],
- ],
+ 'documentation' => null
+ ]
+ ]
],
'out' => [
'parameters' => [
- 'outputParameter' => [
- 'type' => 'string',
+ 'result' => [
+ 'type' => 'CustomerDataCustomerInterface',
+ 'required' => true,
+ 'documentation' => null
+ ]
+ ]
+ ]
+ ]
+ ]
+ ];
+ $servicesMetadata = [
+ 'customerCustomerRepositoryV1' => [
+ 'methods' => array_merge_recursive(
+ [
+ 'getById' => [
+ 'resources' => [
+ [
+ 'Magento_Customer::customer',
+ ],
],
- ],
+ 'method' => 'getById',
+ 'inputRequired' => false,
+ 'isSecure' => false,
+ ]
],
- ],
- ],
+ $methodsReflectionData
+ ),
+ 'class' => CustomerRepositoryInterface::class,
+ 'description' => 'Customer CRUD interface.'
+ ]
];
- $classReflection = $this->getMock(
- \Magento\Webapi\Model\Config\ClassReflector::class,
- ['reflectClassMethods', 'extractClassDescription'],
- [],
- '',
- false
- );
- $classReflection->expects($this->any())
+ $typeData = [
+ 'CustomerDataCustomerInterface' => [
+ 'documentation' => 'Customer interface.',
+ 'parameters' => [
+ 'id' => [
+ 'type' => 'int',
+ 'required' => false,
+ 'documentation' => 'Customer id'
+ ]
+ ]
+ ]
+ ];
+ $serializedServicesConfig = 'serialized services config';
+ $serializedTypeData = 'serialized type data';
+ $this->cacheMock->expects($this->at(0))
+ ->method('load')
+ ->with(ServiceMetadata::SERVICES_CONFIG_CACHE_ID)
+ ->willReturn(false);
+ $this->cacheMock->expects($this->at(1))
+ ->method('load')
+ ->with(ServiceMetadata::REFLECTED_TYPES_CACHE_ID)
+ ->willReturn(false);
+ $this->serializerMock->expects($this->never())
+ ->method('unserialize');
+ $this->configMock->expects($this->once())
+ ->method('getServices')
+ ->willReturn($servicesConfig);
+ $this->classReflectorMock->expects($this->once())
->method('reflectClassMethods')
- ->will($this->returnValue($interfaceParameters));
- $classReflection->expects($this->any())
+ ->willReturn($methodsReflectionData);
+ $this->classReflectorMock->expects($this->once())
->method('extractClassDescription')
- ->will($this->returnValue('classDescription'));
+ ->with(CustomerRepositoryInterface::class)
+ ->willReturn('Customer CRUD interface.');
+ $this->typeProcessorMock->expects($this->once())
+ ->method('getTypesData')
+ ->willReturn($typeData);
+ $this->serializerMock->expects($this->at(0))
+ ->method('serialize')
+ ->with($servicesMetadata)
+ ->willReturn($serializedServicesConfig);
+ $this->serializerMock->expects($this->at(1))
+ ->method('serialize')
+ ->with($typeData)
+ ->willReturn($serializedTypeData);
+ $this->cacheMock->expects($this->at(2))
+ ->method('save')
+ ->with(
+ $serializedServicesConfig,
+ ServiceMetadata::SERVICES_CONFIG_CACHE_ID
+ );
+ $this->cacheMock->expects($this->at(3))
+ ->method('save')
+ ->with(
+ $serializedTypeData,
+ ServiceMetadata::REFLECTED_TYPES_CACHE_ID
+ );
+ $this->serviceMetadata->getServicesConfig();
+ $this->assertEquals($servicesMetadata, $this->serviceMetadata->getServicesConfig());
+ }
+
+ public function testGetRoutesConfig()
+ {
+ $routesConfig = ['foo' => 'bar'];
+ $typeData = ['bar' => 'foo'];
+ $serializedRoutesConfig = 'serialized routes config';
+ $serializedTypeData = 'serialized type data';
+ $this->cacheMock->expects($this->at(0))
+ ->method('load')
+ ->with(ServiceMetadata::ROUTES_CONFIG_CACHE_ID)
+ ->willReturn($serializedRoutesConfig);
+ $this->cacheMock->expects($this->at(1))
+ ->method('load')
+ ->with(ServiceMetadata::REFLECTED_TYPES_CACHE_ID)
+ ->willReturn($serializedTypeData);
+ $this->serializerMock->expects($this->at(0))
+ ->method('unserialize')
+ ->with($serializedRoutesConfig)
+ ->willReturn($routesConfig);
+ $this->serializerMock->expects($this->at(1))
+ ->method('unserialize')
+ ->with($serializedTypeData)
+ ->willReturn($typeData);
+ $this->typeProcessorMock->expects($this->once())
+ ->method('setTypesData')
+ ->with($typeData);
+ $this->serviceMetadata->getRoutesConfig();
+ $this->assertEquals($routesConfig, $this->serviceMetadata->getRoutesConfig());
+ }
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function testGetRoutesConfigNoCache()
+ {
$servicesConfig = [
- 'services' => [\Magento\Customer\Api\AccountManagementInterface::class => [
- 'V1' => [
- 'methods' => [
- 'activateById' => [
- 'resources' => [
- [
- 'Magento_Customer::manage',
- ],
- ],
- 'secure' => false,
- ],
- ],
- ],
- ], \Magento\Customer\Api\CustomerRepositoryInterface::class => [
+ 'services' => [
+ CustomerRepositoryInterface::class => [
'V1' => [
'methods' => [
'getById' => [
'resources' => [
[
'Magento_Customer::customer',
- ],
+ ]
],
- 'secure' => false,
- ],
- ],
- ],
- ],
+ 'secure' => false
+ ]
+ ]
+ ]
+ ]
],
'routes' => [
- '/V1/customers/me/activate' => [
- 'PUT' => [
+ '/V1/customers/:customerId' => [
+ 'GET' => [
'secure' => false,
'service' => [
- 'class' => \Magento\Customer\Api\AccountManagementInterface::class,
- 'method' => 'activateById',
+ 'class' => CustomerRepositoryInterface::class,
+ 'method' => 'getById'
],
'resources' => [
- 'self' => true,
+ 'Magento_Customer::customer' => true
],
+ 'parameters' => []
+ ]
+ ]
+ ],
+ 'class' => CustomerRepositoryInterface::class,
+ 'description' => 'Customer CRUD interface.',
+ ];
+ $methodsReflectionData = [
+ 'getById' => [
+ 'documentation' => 'Get customer by customer ID.',
+ 'interface' => [
+ 'in' => [
'parameters' => [
'customerId' => [
- 'force' => true,
- 'value' => '%customer_id%',
- ],
- ],
+ 'type' => 'int',
+ 'required' => true,
+ 'documentation' => null
+ ]
+ ]
],
- ],
- '/V1/customers/:customerId' => [
- 'GET' => [
- 'secure' => false,
- 'service' => [
- 'class' => \Magento\Customer\Api\CustomerRepositoryInterface::class,
- 'method' => 'getById',
- ],
- 'resources' => [
- 'Magento_Customer::customer' => true,
- ],
+ 'out' => [
'parameters' => [
- ],
+ 'result' => [
+ 'type' => 'CustomerDataCustomerInterface',
+ 'required' => true,
+ 'documentation' => null
+ ]
+ ]
+ ]
+ ]
+ ]
+ ];
+ $routesMetadata = [
+ 'customerCustomerRepositoryV1' => [
+ 'methods' => array_merge_recursive(
+ [
+ 'getById' => [
+ 'resources' => [
+ [
+ 'Magento_Customer::customer',
+ ]
+ ],
+ 'method' => 'getById',
+ 'inputRequired' => false,
+ 'isSecure' => false,
+ ]
],
+ $methodsReflectionData
+ ),
+ 'routes' => [
+ '/V1/customers/:customerId' => [
+ 'GET' => [
+ 'method' => 'getById',
+ 'parameters' => []
+ ]
+ ]
],
+ 'class' => CustomerRepositoryInterface::class,
+ 'description' => 'Customer CRUD interface.'
]
];
-
- /**
- * @var $cacheMock \Magento\Webapi\Model\Cache\Type\Webapi
- */
- $cacheMock = $this->getMockBuilder(\Magento\Webapi\Model\Cache\Type\Webapi::class)
- ->disableOriginalConstructor()
- ->getMock();
-
- /** @var $readerMock \Magento\Webapi\Model\Config\Reader */
- $readerMock = $this->getMockBuilder(\Magento\Webapi\Model\Config\Reader::class)
- ->disableOriginalConstructor()
- ->getMock();
- $readerMock->expects($this->any())->method('read')->will($this->returnValue($servicesConfig));
-
- /** @var $config \Magento\Webapi\Model\Config */
- $config = new \Magento\Webapi\Model\Config($cacheMock, $readerMock);
-
- $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
- $typeProcessor = $objectManager->getObject(\Magento\Framework\Reflection\TypeProcessor::class);
-
- /** @var $config \Magento\Webapi\Model\ServiceMetadata */
- $this->serviceMetadata = new \Magento\Webapi\Model\ServiceMetadata(
- $config,
- $cacheMock,
- $classReflection,
- $typeProcessor
- );
-
- parent::setUp();
+ $typeData = [
+ 'CustomerDataCustomerInterface' => [
+ 'documentation' => 'Customer interface.',
+ 'parameters' => [
+ 'id' => [
+ 'type' => 'int',
+ 'required' => false,
+ 'documentation' => 'Customer id'
+ ]
+ ]
+ ]
+ ];
+ $serializedRoutesConfig = 'serialized routes config';
+ $serializedTypeData = 'serialized type data';
+ $this->cacheMock->expects($this->at(0))
+ ->method('load')
+ ->with(ServiceMetadata::ROUTES_CONFIG_CACHE_ID)
+ ->willReturn(false);
+ $this->cacheMock->expects($this->at(1))
+ ->method('load')
+ ->with(ServiceMetadata::REFLECTED_TYPES_CACHE_ID)
+ ->willReturn(false);
+ $this->serializerMock->expects($this->never())
+ ->method('unserialize');
+ $this->configMock->expects($this->exactly(2))
+ ->method('getServices')
+ ->willReturn($servicesConfig);
+ $this->classReflectorMock->expects($this->once())
+ ->method('reflectClassMethods')
+ ->willReturn($methodsReflectionData);
+ $this->classReflectorMock->expects($this->once())
+ ->method('extractClassDescription')
+ ->with(CustomerRepositoryInterface::class)
+ ->willReturn('Customer CRUD interface.');
+ $this->typeProcessorMock->expects($this->exactly(2))
+ ->method('getTypesData')
+ ->willReturn($typeData);
+ $this->serializerMock->expects($this->at(2))
+ ->method('serialize')
+ ->with($routesMetadata)
+ ->willReturn($serializedRoutesConfig);
+ $this->serializerMock->expects($this->at(3))
+ ->method('serialize')
+ ->with($typeData)
+ ->willReturn($serializedTypeData);
+ $this->cacheMock->expects($this->at(6))
+ ->method('save')
+ ->with(
+ $serializedRoutesConfig,
+ ServiceMetadata::ROUTES_CONFIG_CACHE_ID
+ );
+ $this->cacheMock->expects($this->at(7))
+ ->method('save')
+ ->with(
+ $serializedTypeData,
+ ServiceMetadata::REFLECTED_TYPES_CACHE_ID
+ );
+ $this->serviceMetadata->getRoutesConfig();
+ $this->assertEquals($routesMetadata, $this->serviceMetadata->getRoutesConfig());
}
/**
- * Test identifying service name including subservices using class name.
- *
- * @dataProvider serviceNameDataProvider
+ * @dataProvider getServiceNameDataProvider
*/
public function testGetServiceName($className, $version, $preserveVersion, $expected)
{
- $actual = $this->serviceMetadata->getServiceName($className, $version, $preserveVersion);
- $this->assertEquals($expected, $actual);
+ $this->assertEquals(
+ $expected,
+ $this->serviceMetadata->getServiceName($className, $version, $preserveVersion)
+ );
}
/**
- * Dataprovider for testGetServiceName
- *
* @return string
*/
- public function serviceNameDataProvider()
+ public function getServiceNameDataProvider()
{
return [
- [\Magento\Customer\Api\AccountManagementInterface::class, 'V1', false, 'customerAccountManagement'],
- [\Magento\Customer\Api\AddressRepositoryInterface::class, 'V1', true, 'customerAddressRepositoryV1'],
+ [
+ \Magento\Customer\Api\AccountManagementInterface::class,
+ 'V1',
+ false,
+ 'customerAccountManagement'
+ ],
+ [
+ \Magento\Customer\Api\AddressRepositoryInterface::class,
+ 'V1',
+ true,
+ 'customerAddressRepositoryV1'
+ ],
];
}
/**
* @expectedException \InvalidArgumentException
- * @dataProvider dataProviderForTestGetServiceNameInvalidName
+ * @dataProvider getServiceNameInvalidNameDataProvider
*/
public function testGetServiceNameInvalidName($interfaceClassName, $version)
{
@@ -189,111 +452,18 @@ class ServiceMetadataTest extends \PHPUnit_Framework_TestCase
}
/**
- * Dataprovider for testGetServiceNameInvalidName
- *
* @return string
*/
- public function dataProviderForTestGetServiceNameInvalidName()
+ public function getServiceNameInvalidNameDataProvider()
{
return [
- ['BarV1Interface', 'V1'], // Missed vendor, module, 'Service'
+ ['BarV1Interface', 'V1'], // Missed vendor, module and Service
['Service\\V1Interface', 'V1'], // Missed vendor and module
['Magento\\Foo\\Service\\BarVxInterface', 'V1'], // Version number should be a number
- ['Magento\\Foo\\Service\\BarInterface', 'V1'], // Version missed
- ['Magento\\Foo\\Service\\BarV1', 'V1'], // 'Interface' missed
- ['Foo\\Service\\BarV1Interface', 'V1'], // Module missed
- ['Foo\\BarV1Interface', 'V1'] // Module and 'Service' missed
- ];
- }
-
- public function testGetServiceMetadata()
- {
- $expectedResult = [
- 'methods' => [
- 'activateById' => [
- 'method' => 'activateById',
- 'inputRequired' => '',
- 'isSecure' => '',
- 'resources' => [['Magento_Customer::manage']],
- 'interface' => [
- 'in' => [
- 'parameters' => [
- 'customerId' => [
- 'force' => true,
- 'value' => '%customer_id%',
- ],
- 'requiredInputParameter' => [
- 'required' => true,
- ],
- ],
- ],
- 'out' => [
- 'parameters' => [
- 'outputParameter' => [
- 'type' => 'string',
- ],
- ],
- ],
- ],
- ],
- ],
- 'class' => \Magento\Customer\Api\AccountManagementInterface::class,
- 'description' => 'classDescription',
+ ['Magento\\Foo\\Service\\BarInterface', 'V1'], // Missed version
+ ['Magento\\Foo\\Service\\BarV1', 'V1'], // Missed Interface
+ ['Foo\\Service\\BarV1Interface', 'V1'], // Missed module
+ ['Foo\\BarV1Interface', 'V1'] // Missed module and Service
];
- $result = $this->serviceMetadata->getServiceMetadata('customerAccountManagementV1');
- $this->assertEquals($expectedResult, $result);
- }
-
- public function testGetRouteMetadata()
- {
- $expectedResult = [
- 'methods' => [
- 'activateById' => [
- 'method' => 'activateById',
- 'inputRequired' => '',
- 'isSecure' => '',
- 'resources' => [['Magento_Customer::manage']],
- 'interface' => [
- 'in' => [
- 'parameters' => [
- 'customerId' => [
- 'force' => true,
- 'value' => '%customer_id%',
- ],
- 'requiredInputParameter' => [
- 'required' => true,
- ],
- ],
- ],
- 'out' => [
- 'parameters' => [
- 'outputParameter' => [
- 'type' => 'string',
- ],
- ],
- ],
- ],
- ],
- ],
- 'class' => \Magento\Customer\Api\AccountManagementInterface::class,
- 'description' => 'classDescription',
- 'routes' => [
- '/V1/customers/me/activate' => [
- 'PUT' => [
- 'method' => 'activateById',
- 'parameters' => [
- 'customerId' => [
- 'force' => true,
- 'value' => '%customer_id%'
- ]
- ]
- ]
- ]
- ]
- ];
- $result = $this->serviceMetadata->getRouteMetadata('customerAccountManagementV1');
- $this->assertEquals($expectedResult, $result);
}
}
-
-require_once realpath(__DIR__ . '/../_files/test_interfaces.php');
diff --git a/app/code/Magento/Webapi/Test/Unit/Model/Soap/ConfigTest.php b/app/code/Magento/Webapi/Test/Unit/Model/Soap/ConfigTest.php
deleted file mode 100644
index aa5d1a7bfab7e5a1858ae9b321d41a1accba3955..0000000000000000000000000000000000000000
--- a/app/code/Magento/Webapi/Test/Unit/Model/Soap/ConfigTest.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-/**
- * Config helper Unit tests.
- *
- * Copyright © 2016 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-// @codingStandardsIgnoreFile
-
-/**
- * Class implements tests for \Magento\Webapi\Model\Soap\Config class.
- */
-namespace Magento\Webapi\Test\Unit\Model\Soap;
-
-class ConfigTest extends \PHPUnit_Framework_TestCase
-{
- /** @var \Magento\Webapi\Model\Soap\Config */
- protected $_soapConfig;
-
- /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
- protected $objectManager;
-
- /**
- * Set up helper.
- */
- protected function setUp()
- {
- $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
- $typeProcessor = $this->objectManager->getObject(\Magento\Framework\Reflection\TypeProcessor::class);
-
- $objectManagerMock = $this->getMockBuilder(
- \Magento\Framework\App\ObjectManager::class
- )->disableOriginalConstructor()->getMock();
-
- $classReflection = $this->getMock(
- \Magento\Webapi\Model\Config\ClassReflector::class,
- ['reflectClassMethods'],
- ['_typeProcessor' => $typeProcessor],
- ''
- );
- $classReflection->expects($this->any())->method('reflectClassMethods')->will($this->returnValue([]));
-
- $servicesConfig = [
- 'services' => [\Magento\Customer\Api\AccountManagementInterface::class => [
- 'V1' => [
- 'methods' => [
- 'activate' => [
- 'resources' => [
- [
- 'Magento_Customer::manage',
- ],
- ],
- 'secure' => false,
- ],
- ],
- ],
- ], \Magento\Customer\Api\CustomerRepositoryInterface::class => [
- 'V1' => [
- 'methods' => [
- 'getById' => [
- 'resources' => [
- [
- 'Magento_Customer::customer',
- ],
- ],
- 'secure' => false,
- ],
- ],
- ],
- ],
- ],
- ];
-
- /**
- * @var $registryMock \Magento\Framework\Registry
- */
- $registryMock = $this->getMockBuilder(\Magento\Framework\Registry::class)
- ->disableOriginalConstructor()
- ->getMock();
-
- /**
- * @var $cacheMock \Magento\Webapi\Model\Cache\Type\Webapi
- */
- $cacheMock = $this->getMockBuilder(\Magento\Webapi\Model\Cache\Type\Webapi::class)
- ->disableOriginalConstructor()
- ->getMock();
-
- /** @var $readerMock \Magento\Webapi\Model\Config\Reader */
- $readerMock = $this->getMockBuilder(\Magento\Webapi\Model\Config\Reader::class)
- ->disableOriginalConstructor()
- ->getMock();
- $readerMock->expects($this->any())->method('read')->will($this->returnValue($servicesConfig));
-
- /** @var $config \Magento\Webapi\Model\Config */
- $config = new \Magento\Webapi\Model\Config($cacheMock, $readerMock);
-
- /** @var $config \Magento\Webapi\Model\ServiceMetadata */
- $serviceMetadata = new \Magento\Webapi\Model\ServiceMetadata(
- $config,
- $cacheMock,
- $classReflection,
- $typeProcessor);
-
- $this->_soapConfig = $this->objectManager->getObject(
- \Magento\Webapi\Model\Soap\Config::class,
- [
- 'objectManager' => $objectManagerMock,
- 'registry' => $registryMock,
- 'serviceMetadata' => $serviceMetadata,
- ]
- );
- parent::setUp();
- }
-
- public function testGetRequestedSoapServices()
- {
- $expectedResult = [
- 'customerAccountManagementV1' =>
- [
- 'methods' => [
- 'activate' => [
- 'method' => 'activate',
- 'inputRequired' => '',
- 'isSecure' => '',
- 'resources' => [['Magento_Customer::manage']],
- ],
- ],
- 'class' => \Magento\Customer\Api\AccountManagementInterface::class,
- 'description' => 'Interface for managing customers accounts.',
- ],
- ];
-
- $result = $this->_soapConfig->getRequestedSoapServices(
- ['customerAccountManagementV1', 'moduleBarV2', 'moduleBazV1']
- );
-
- $this->assertEquals($expectedResult, $result);
- }
-
- public function testGetServiceMethodInfo()
- {
- $expectedResult = [
- 'class' => \Magento\Customer\Api\CustomerRepositoryInterface::class,
- 'method' => 'getById',
- 'isSecure' => false,
- 'resources' => [['Magento_Customer::customer']],
- ];
- $methodInfo = $this->_soapConfig->getServiceMethodInfo(
- 'customerCustomerRepositoryV1GetById',
- ['customerCustomerRepositoryV1', 'moduleBazV1']
- );
- $this->assertEquals($expectedResult, $methodInfo);
- }
-
- public function testGetSoapOperation()
- {
- $expectedResult = 'customerAccountManagementV1Activate';
- $soapOperation = $this->_soapConfig
- ->getSoapOperation(\Magento\Customer\Api\AccountManagementInterface::class, 'activate', 'V1');
- $this->assertEquals($expectedResult, $soapOperation);
- }
-}
-
-require_once realpath(__DIR__ . '/../../_files/test_interfaces.php');
diff --git a/app/code/Magento/Webapi/Test/Unit/_files/test_interfaces.php b/app/code/Magento/Webapi/Test/Unit/_files/test_interfaces.php
deleted file mode 100644
index 288a747cefd89cec4182de66890127eebd552806..0000000000000000000000000000000000000000
--- a/app/code/Magento/Webapi/Test/Unit/_files/test_interfaces.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Copyright © 2016 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-// @codingStandardsIgnoreFile
-
-namespace Magento\Framework\Module\Service;
-
-/**
- * The list of test interfaces.
- */
-interface FooV1Interface
-{
- public function someMethod();
-}
-interface BarV1Interface
-{
- public function someMethod();
-}
-interface FooBarV1Interface
-{
- public function someMethod();
-}
-namespace Magento\Framework\Module\Service\Foo;
-
-interface BarV1Interface
-{
- public function someMethod();
-}
diff --git a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php
index f5197dd7d0435d672023a0027d7bbb7674036abb..dc048d41612b800c9d291b5067b0106bb1fbf079 100644
--- a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php
+++ b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php
@@ -10,6 +10,10 @@
*/
namespace Magento\Widget\Model\ResourceModel\Widget\Instance\Options;
+/**
+ * @deprecated created new class that correctly loads theme options and whose name follows naming convention
+ * @see \Magento\Widget\Model\ResourceModel\Widget\Instance\Options\Themes
+ */
class ThemeId implements \Magento\Framework\Option\ArrayInterface
{
/**
diff --git a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/Themes.php b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/Themes.php
new file mode 100644
index 0000000000000000000000000000000000000000..403dfeb40ff2ea3330440c0a22db4247e9a5e377
--- /dev/null
+++ b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/Themes.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Widget\Model\ResourceModel\Widget\Instance\Options;
+
+use Magento\Framework\Data\OptionSourceInterface;
+use Magento\Theme\Model\ResourceModel\Theme\CollectionFactory as ThemeCollectionFactory;
+
+/**
+ * Option source of the widget theme property.
+ *
+ * Can be used as a data provider for UI components that shows possible themes as a list.
+ */
+class Themes implements OptionSourceInterface
+{
+ /**
+ * @var ThemeCollectionFactory
+ */
+ private $themeCollectionFactory;
+
+ /**
+ * @param ThemeCollectionFactory $themeCollectionFactory
+ */
+ public function __construct(ThemeCollectionFactory $themeCollectionFactory)
+ {
+ $this->themeCollectionFactory = $themeCollectionFactory;
+ }
+
+ /**
+ * Return array of options as value-label pairs
+ *
+ * @return array Format: array('<theme ID>' => '<theme label>', ...)
+ */
+ public function toOptionArray()
+ {
+ // Load only visible themes that are used in frontend area
+ return $this->themeCollectionFactory->create()->loadRegisteredThemes()->toOptionHash();
+ }
+}
diff --git a/app/code/Magento/Widget/Test/Unit/Model/ResourceModel/Widget/Instance/Options/ThemesTest.php b/app/code/Magento/Widget/Test/Unit/Model/ResourceModel/Widget/Instance/Options/ThemesTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..e3854a599013298e0b3bbd6439183611d14b95d3
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Unit/Model/ResourceModel/Widget/Instance/Options/ThemesTest.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Widget\Test\Unit\Model\ResourceModel\Widget\Instance\Options;
+
+use Magento\Widget\Model\ResourceModel\Widget\Instance\Options\Themes;
+use Magento\Theme\Model\ResourceModel\Theme\Collection as ThemeCollection;
+use Magento\Theme\Model\ResourceModel\Theme\CollectionFactory as ThemeCollectionFactory;
+
+/**
+ * Test class for \Magento\Widget\Model\ResourceModel\Widget\Instance\Options\Themes
+ */
+class ThemesTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var Themes
+ */
+ private $model;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $themeCollectionFactoryMock;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $themeCollectionMock;
+
+ protected function setUp()
+ {
+ $this->themeCollectionMock = $this->getMock(ThemeCollection::class, [], [], '', false);
+ $this->themeCollectionFactoryMock = $this->getMock(ThemeCollectionFactory::class, ['create'], [], '', false);
+ $this->model = new Themes(
+ $this->themeCollectionFactoryMock
+ );
+ }
+
+ public function testToOptionArray()
+ {
+ $expectedResult = [
+ 1 => 'Theme Label',
+ ];
+ $this->themeCollectionFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($this->themeCollectionMock);
+
+ $this->themeCollectionMock->expects($this->once())->method('loadRegisteredThemes')->willReturnSelf();
+ $this->themeCollectionMock->expects($this->once())->method('toOptionHash')->willReturn($expectedResult);
+
+ $this->assertEquals($expectedResult, $this->model->toOptionArray());
+ }
+}
diff --git a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_block.xml b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_block.xml
index 2d9cf935afa0d4281e46f997e22465285f69e53d..db73e302f4a7629e380292308cce534693560d99 100644
--- a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_block.xml
+++ b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_block.xml
@@ -52,7 +52,7 @@
<argument name="header" xsi:type="string" translate="true">Design Theme</argument>
<argument name="index" xsi:type="string">theme_id</argument>
<argument name="type" xsi:type="string">options</argument>
- <argument name="options" xsi:type="options" model="Magento\Widget\Model\ResourceModel\Widget\Instance\Options\ThemeId"/>
+ <argument name="options" xsi:type="options" model="Magento\Widget\Model\ResourceModel\Widget\Instance\Options\Themes"/>
<argument name="with_empty" xsi:type="string">1</argument>
</arguments>
</block>
diff --git a/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml b/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml
index 4e240770b04622e4ec6c68bfa796a6a83da006e1..94ee88698111f72c81cbd86eb16adef0e9b94317 100644
--- a/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml
+++ b/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml
@@ -79,7 +79,7 @@ jQuery(function()
// Add empty node to reset category filter
if(!emptyNodeAdded) {
var empty = Object.clone(_node);
- empty.text = '<?php /* @escapeNotVerified */ echo __('None') ?>';
+ empty.text = '<?php echo $block->escapeJs($block->escapeHtml(__('None'))); ?>';
empty.children = [];
empty.id = 'none';
empty.path = '1/none';
diff --git a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
index 62d92ac38aecdbc22f13de959eba3f419b47c431..5d55ba4035873d028f27e5662814cc838b7e18a8 100644
--- a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
+++ b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
@@ -10,7 +10,7 @@
?>
<fieldset class="fieldset">
- <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Layout Updates') ?></span></legend>
+ <legend class="legend"><span><?php echo $block->escapeHtml(__('Layout Updates')); ?></span></legend>
<br />
<div class="widget-layout-updates">
<div id="page_group_container"></div>
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_checkout.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_checkout.less
index 3804721026db50a77ebaf752c75f5dc35a23cf09..d861d4dcae256222cb30cc81ee21359a40e12582 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_checkout.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_checkout.less
@@ -23,8 +23,7 @@
& when (@media-common = true) {
- .checkout-index-index,
- .checkout-onepage-success {
+ .checkout-index-index {
.page-title-wrapper {
&:extend(.abs-visually-hidden all);
}
@@ -61,6 +60,14 @@
margin-left: 0;
}
}
+
+ .checkout-onepage-success {
+ &:extend(.abs-add-clearfix all);
+
+ .print {
+ display: none;
+ }
+ }
}
//
@@ -87,4 +94,12 @@
.lib-layout-column(2, 1, @checkout-wrapper__columns);
padding-right: @indent__l;
}
+
+ .checkout-onepage-success {
+ .print {
+ display: block;
+ float: right;
+ margin: 22px 0 0;
+ }
+ }
}
diff --git a/app/design/frontend/Magento/blank/Magento_Rma/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Rma/web/css/source/_module.less
index a8d0bf8b584822f7e0084d690f9feb5ad04246a2..6596fe2fd79762908b1a87d2fbeac90fd8be7824 100644
--- a/app/design/frontend/Magento/blank/Magento_Rma/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Rma/web/css/source/_module.less
@@ -158,11 +158,12 @@
.block-returns-tracking {
.block-title {
.action {
- margin: 12px 0 0 30px;
+ margin: 0 0 0 30px;
+ }
- &.track {
- float: right;
- }
+ .actions-track {
+ float: right;
+ margin-top: 12px;
}
}
}
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less
index f037c1c5777cbf8f761fddf779f7c8e9942278f8..a1109523d26b5ea6b85e794a66ebad3100a551c0 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less
@@ -27,8 +27,7 @@
& when (@media-common = true) {
- .checkout-index-index,
- .checkout-onepage-success {
+ .checkout-index-index {
.page-title-wrapper {
&:extend(.abs-visually-hidden all);
}
@@ -66,6 +65,14 @@
margin-left: 0;
}
}
+
+ .checkout-onepage-success {
+ &:extend(.abs-add-clearfix all);
+
+ .print {
+ display: none;
+ }
+ }
}
//
@@ -96,4 +103,12 @@
.lib-layout-column(2, 1, @checkout-wrapper__columns);
padding-right: @indent__l;
}
+
+ .checkout-onepage-success {
+ .print {
+ display: block;
+ float: right;
+ margin: 23px 0 0;
+ }
+ }
}
diff --git a/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less
index cfec28464244e59e48aeb16e674d8afcc33407b4..c7e955e69c3a66864e073365d2863968f014ed66 100644
--- a/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less
@@ -176,11 +176,12 @@
.block-returns-tracking {
.block-title {
.action {
- margin: 12px 0 0 30px;
+ margin: 0 0 0 30px;
+ }
- &.track {
- float: right;
- }
+ .actions-track {
+ float: right;
+ margin-top: 12px;
}
}
}
diff --git a/app/design/frontend/Magento/luma/etc/view.xml b/app/design/frontend/Magento/luma/etc/view.xml
index e0fc864e000840ebe770a85f6a78506f0d962a2f..12a51ee065edba43c9afde39ce31c2aace3d00a8 100644
--- a/app/design/frontend/Magento/luma/etc/view.xml
+++ b/app/design/frontend/Magento/luma/etc/view.xml
@@ -253,10 +253,7 @@
</vars>
<vars module="Magento_ConfigurableProduct">
- <var name="change_only_base_image">true</var>
- </vars>
- <vars module="Magento_Swatches">
- <var name="change_only_base_image">true</var>
+ <var name="gallery_switch_strategy">prepend</var>
</vars>
<vars module="Js_Bundle">
diff --git a/app/etc/di.xml b/app/etc/di.xml
index 61abf896fa035dee239f9c77f4d60d28d4c300fb..e9767eccb28114ffa66bc8bc84829d92b1620e99 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -154,6 +154,7 @@
<preference for="Magento\Framework\EntityManager\MapperInterface" type="Magento\Framework\EntityManager\CompositeMapper"/>
<preference for="Magento\Framework\Console\CommandListInterface" type="Magento\Framework\Console\CommandList"/>
<preference for="Magento\Framework\DataObject\IdentityGeneratorInterface" type="Magento\Framework\DataObject\IdentityService" />
+ <preference for="Magento\Framework\Serialize\SerializerInterface" type="Magento\Framework\Serialize\Serializer\Json" />
<type name="Magento\Framework\Model\ResourceModel\Db\TransactionManager" shared="false" />
<type name="Magento\Framework\Logger\Handler\Base">
<arguments>
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.xml
index 269bff796c7bc618e4c257046426e35ab7a25eaa..accacc60fc5c07c386d02fdd4b038c15f6dcc166 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.xml
@@ -8,26 +8,31 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Backend\Test\TestCase\GlobalSearchEntityTest" summary="Global Search Backend " ticketId="MAGETWO-28457">
<variation name="GlobalSearchEntityTestVariation1">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">search shows admin preview</data>
<data name="search/data/query" xsi:type="string">Some search term</data>
<constraint name="Magento\Backend\Test\Constraint\AssertGlobalSearchPreview" />
</variation>
<variation name="GlobalSearchEntityTestVariation2">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">search with 2 sign return no results</data>
<data name="search/data/query" xsi:type="string">:)</data>
<constraint name="Magento\Backend\Test\Constraint\AssertGlobalSearchNoRecordsFound" />
</variation>
<variation name="GlobalSearchEntityTestVariation3">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">search product by sku</data>
<data name="search/data/query" xsi:type="string">orderInjectable::default::product::sku</data>
<constraint name="Magento\Backend\Test\Constraint\AssertGlobalSearchProductName" />
</variation>
<variation name="GlobalSearchEntityTestVariation4">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">search existed customer</data>
<data name="search/data/query" xsi:type="string">customer::johndoe_unique::lastname</data>
<constraint name="Magento\Backend\Test\Constraint\AssertGlobalSearchCustomerName" />
</variation>
<variation name="GlobalSearchEntityTestVariation5">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">search order (by order id)</data>
<data name="search/data/query" xsi:type="string">orderInjectable::default::id</data>
<constraint name="Magento\Backend\Test\Constraint\AssertGlobalSearchOrderId" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderWithPayPalBraintreeVaultBackendTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderWithPayPalBraintreeVaultBackendTest.xml
index 03e0ba330fa3b74e2a33c2983655ced95cf3dbfe..86b5ff79d648c0807a2bc346e3431fc2a7c975a2 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderWithPayPalBraintreeVaultBackendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderWithPayPalBraintreeVaultBackendTest.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\Braintree\Test\TestCase\CreateOrderWithPayPalBraintreeVaultBackendTest" summary="Checkout with PayPal Braintree Vault token from Admin">
<variation name="CreateOrderWithPayPalBraintreeVaultBackendTestVariation1" summary="Checkout with PayPal Braintree Vault token from Admin" ticketId="MAGETWO-59259">
- <data name="tag" xsi:type="string">est_type:3rd_party_test, severity:S0</data>
+ <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="customer/dataset" xsi:type="string">default</data>
<data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Bundle/Option/Selection.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Bundle/Option/Selection.xml
index 3a124f0cc38b5a76620fce7265890775a047d79f..e8485df0733de8385e31f55f2c95db9b0061848c 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Bundle/Option/Selection.xml
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Bundle/Option/Selection.xml
@@ -21,6 +21,10 @@
<selection_qty>
<selector>[name$='[selection_qty]']</selector>
</selection_qty>
+ <user_defined>
+ <selector>[name$='[selection_can_change_qty]']</selector>
+ <input>checkbox</input>
+ </user_defined>
<getProductName>
<selector>span[data-index="name"]</selector>
</getProductName>
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 db349d16a86c673f7fcd89d57e94b42461f51012..ec96c5b27f50a39ffcfc6f88bfc5d1299a17af83 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
@@ -6,11 +6,10 @@
namespace Magento\Bundle\Test\Block\Catalog\Product;
+use Magento\Bundle\Test\Block\Catalog\Product\View\Summary;
use Magento\Bundle\Test\Block\Catalog\Product\View\Type\Bundle;
-use Magento\Bundle\Test\Fixture\BundleProduct;
use Magento\Mtf\Client\Locator;
use Magento\Mtf\Fixture\FixtureInterface;
-use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class View
@@ -46,6 +45,13 @@ class View extends \Magento\Catalog\Test\Block\Product\View
*/
protected $newsletterFormSelector = '#newsletter-validate-detail[novalidate="novalidate"]';
+ /**
+ * Summary Block selector.
+ *
+ * @var string
+ */
+ private $summaryBlockSelector = '#bundleSummary';
+
/**
* Get bundle options block.
*
@@ -59,6 +65,19 @@ class View extends \Magento\Catalog\Test\Block\Product\View
);
}
+ /**
+ * Get bundle Summary block.
+ *
+ * @return Summary
+ */
+ public function getBundleSummaryBlock()
+ {
+ return $this->blockFactory->create(
+ Summary::class,
+ ['element' => $this->_rootElement->find($this->summaryBlockSelector)]
+ );
+ }
+
/**
* Click "Customize and add to cart button".
*
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
new file mode 100644
index 0000000000000000000000000000000000000000..76a46bfe3088a47f79dafa7f8c71d649e324b130
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Summary.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Test\Block\Catalog\Product\View;
+
+use Magento\Bundle\Test\Block\Catalog\Product\View\Summary\ConfiguredPrice;
+
+/**
+ * Bundle Summary block.
+ */
+class Summary extends \Magento\Catalog\Test\Block\Product\View
+{
+ /**
+ * Configured Price block selector.
+ *
+ * @var string
+ */
+ private $configuredPriceBlockSelector = '.price-configured_price';
+
+ /**
+ * Get configured price block.
+ *
+ * @return ConfiguredPrice
+ */
+ public function getConfiguredPriceBlock()
+ {
+ return $this->blockFactory->create(
+ ConfiguredPrice::class,
+ ['element' => $this->_rootElement->find($this->configuredPriceBlockSelector)]
+ );
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Summary/ConfiguredPrice.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Summary/ConfiguredPrice.php
new file mode 100644
index 0000000000000000000000000000000000000000..30effcdeef060af5a81f92ed1a463e3f69bc57a0
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Summary/ConfiguredPrice.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Test\Block\Catalog\Product\View\Summary;
+
+/**
+ * This class is used to access the price related information from the storefront.
+ */
+class ConfiguredPrice extends \Magento\Catalog\Test\Block\AbstractPriceBlock
+{
+ /**
+ * Mapping for different type of price.
+ *
+ * @var array
+ */
+ protected $mapTypePrices = [
+ 'configured_price' => [
+ 'selector' => '.price',
+ ]
+ ];
+
+ /**
+ * This method returns the price represented by the block.
+ *
+ * @param string $currency
+ * @return string|null
+ */
+ public function getPrice($currency = '$')
+ {
+ return $this->getTypePrice('configured_price', $currency);
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
index 23ac2d25ee017dab9e869e35b1dea7cac4abb94c..ccf47420b11521f9f5bf1a6c4b0f347d86c1baa0 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
@@ -107,11 +107,11 @@ class Bundle extends Block
/** @var SimpleElement $optionElement */
$optionElement = $listFormOptions[$title];
- $getTypeData = 'get' . $this->optionNameConvert($option['type']) . 'Data';
+ $getTypeData = 'get' . $this->optionNameConvert($option['frontend_type']) . 'Data';
$optionData = $this->$getTypeData($optionElement);
$optionData['title'] = $title;
- $optionData['type'] = $option['type'];
+ $optionData['type'] = $option['frontend_type'];
$optionData['is_require'] = $optionElement->find($this->required, Locator::SELECTOR_XPATH)->isVisible()
? 'Yes'
: 'No';
@@ -266,7 +266,7 @@ class Bundle extends Block
/** @var Option $optionBlock */
$optionBlock = $this->blockFactory->create(
'Magento\Bundle\Test\Block\Catalog\Product\View\Type\Option\\'
- . $this->optionNameConvert($option['type']),
+ . $this->optionNameConvert($option['frontend_type']),
['element' => $this->_rootElement->find($selector, Locator::SELECTOR_XPATH)]
);
$optionBlock->fillOption($option['value']);
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option/Element/Qty.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option/Element/Qty.php
new file mode 100644
index 0000000000000000000000000000000000000000..7506b81f8471c7ad8130aa45e31a1680cc26cd34
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option/Element/Qty.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Test\Block\Catalog\Product\View\Type\Option\Element;
+
+use Magento\Mtf\Client\Element\SimpleElement;
+
+/**
+ * Typified element class for qty element.
+ */
+class Qty extends SimpleElement
+{
+ /**
+ * "Backspace" key code.
+ */
+ const BACKSPACE = "\xEE\x80\x83";
+
+ /**
+ * "RIGHT" key code.
+ */
+ const RIGHT = "\xEE\x80\x94";
+
+ /**
+ * Set the value.
+ *
+ * @param string|array $value
+ * @return void
+ */
+ public function setValue($value)
+ {
+ $this->keys([self::RIGHT, self::BACKSPACE, $value]);
+ $this->context->click();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option/Hidden.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option/Hidden.php
new file mode 100644
index 0000000000000000000000000000000000000000..9fa54759b8e579728cdf2ea053d94481eb520503
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option/Hidden.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Test\Block\Catalog\Product\View\Type\Option;
+
+use Magento\Bundle\Test\Block\Catalog\Product\View\Type\Option;
+
+/**
+ * Bundle option hidden type.
+ */
+class Hidden extends Option
+{
+ //
+}
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option/Hidden.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option/Hidden.xml
new file mode 100644
index 0000000000000000000000000000000000000000..356f6a52d6b0c296abc0eb857fe2d8b3dccc4b84
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option/Hidden.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<mapping strict="1">
+ <fields>
+ <qty>
+ <selector>//input[contains(@class,"qty")]</selector>
+ <strategy>xpath</strategy>
+ <class>Magento\Bundle\Test\Block\Catalog\Product\View\Type\Option\Element\Qty</class>
+ </qty>
+ </fields>
+</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php
index ddd8e35a301d6907cf75c3790cefaf6d79b394da..411c53d982fcb8a2445e8a5d214383670ec7bf4a 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php
@@ -61,7 +61,7 @@ class AssertBundleItemsOnProductPage extends AbstractAssertForm
foreach ($bundleOptions as $optionKey => $bundleOption) {
$optionData = [
'title' => $bundleOption['title'],
- 'type' => $bundleOption['type'],
+ 'type' => $bundleOption['frontend_type'],
'is_require' => $bundleOption['required'],
];
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceCalculatedOnProductPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceCalculatedOnProductPage.php
new file mode 100644
index 0000000000000000000000000000000000000000..756fe75eea7db1f943f3a8c490b8eb2427e63095
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceCalculatedOnProductPage.php
@@ -0,0 +1,64 @@
+<?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\Catalog\Test\TestStep\ConfigureProductOnProductPageStep;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\TestStep\TestStepFactory;
+
+/**
+ * Assert calculated price after configure bundle product on product page.
+ */
+class AssertBundlePriceCalculatedOnProductPage extends AbstractConstraint
+{
+ /**
+ * Assert calculated price after configure bundle product on product page.
+ *
+ * @param TestStepFactory $stepFactory
+ * @param BundleProduct $product
+ * @param CatalogProductView $catalogProductView
+ */
+ public function processAssert(
+ TestStepFactory $stepFactory,
+ BundleProduct $product,
+ CatalogProductView $catalogProductView
+ ) {
+ $stepFactory->create(ConfigureProductOnProductPageStep::class, ['product' => $product])->run();
+
+ //Process assertions
+ $this->assertPrice($product, $catalogProductView);
+ }
+
+ /**
+ * Assert prices on the product view Page.
+ *
+ * @param BundleProduct $product
+ * @param CatalogProductView $productView
+ * @return void
+ */
+ protected function assertPrice(BundleProduct $product, CatalogProductView $productView)
+ {
+ $checkoutData = $product->getCheckoutData();
+ \PHPUnit_Framework_Assert::assertEquals(
+ $checkoutData['cartItem']['configuredPrice'],
+ $productView->getBundleViewBlock()->getBundleSummaryBlock()->getConfiguredPriceBlock()->getPrice(),
+ 'Bundle price calculated is not correct.'
+ );
+ }
+
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Bundle price calculates right on product view page.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Curl.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Curl.php
index 4a4aea603cf8619d0d12335f496b1e6a9e50fd33..6a3572ab15a7af1e9a84ee06841cedf772bc9283 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Curl.php
@@ -68,6 +68,10 @@ class Curl extends ProductCurl implements BundleProductInterface
'gift_message_available' => [
'Yes' => 1,
'No' => 0
+ ],
+ 'user_defined' => [
+ 'Yes' => 1,
+ 'No' => 0
]
];
}
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Webapi.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Webapi.php
index 634f6c00a6cc87aac749b187fafd2452e3fd98fb..2fbdaffefc7a33192c73309d0dde80729311b5d8 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Webapi.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Webapi.php
@@ -64,25 +64,8 @@ class Webapi extends SimpleProductWebapi implements BundleProductInterface
'title' => $bundleOption['title'],
'type' => $bundleOption['type'],
'required' => $bundleOption['required'],
- 'product_links' => [],
+ 'product_links' => $this->prepareLinksInfo($bundleSelections, $key)
];
-
- $productLinksInfo = $bundleOption['assigned_products'];
- $products = $bundleSelections['products'][$key];
- foreach ($productLinksInfo as $linkKey => $productLink) {
- $product = $products[$linkKey];
- $bundleProductOptions[$key]['product_links'][] = [
- 'sku' => $product->getSku(),
- 'qty' => $productLink['data']['selection_qty'],
- 'is_default' => false,
- 'price' => isset($productLink['data']['selection_price_value'])
- ? $productLink['data']['selection_price_value']
- : null,
- 'price_type' => isset($productLink['data']['selection_price_type'])
- ? $productLink['data']['selection_price_type']
- : null,
- ];
- }
}
}
@@ -92,6 +75,39 @@ class Webapi extends SimpleProductWebapi implements BundleProductInterface
unset($this->fields['product']['bundle_selections']);
}
+ /**
+ * Prepare links info field.
+ *
+ * @param array $bundleSelections
+ * @param int $key
+ * @return array
+ */
+ private function prepareLinksInfo(array $bundleSelections, $key)
+ {
+ $result = [];
+ $productLinksInfo = $bundleSelections['bundle_options'][$key]['assigned_products'];
+ $products = $bundleSelections['products'][$key];
+ foreach ($productLinksInfo as $linkKey => $productLink) {
+ $product = $products[$linkKey];
+ $result[] = [
+ 'sku' => $product->getSku(),
+ 'qty' => $productLink['data']['selection_qty'],
+ 'is_default' => false,
+ 'price' => isset($productLink['data']['selection_price_value'])
+ ? $productLink['data']['selection_price_value']
+ : null,
+ 'price_type' => isset($productLink['data']['selection_price_type'])
+ ? $productLink['data']['selection_price_type']
+ : null,
+ 'can_change_quantity' => isset($productLink['data']['user_defined'])
+ ? $productLink['data']['user_defined']
+ : 0,
+ ];
+ }
+
+ return $result;
+ }
+
/**
* Parse response.
*
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 7131aab3cffcbb69ca84f1078540a2dbada2ae28..c19a78f64894e17b256a1ec13828b0612bdada08 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
@@ -12,6 +12,7 @@
<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">
@@ -46,6 +47,7 @@
<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">
@@ -84,6 +86,7 @@
<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">
@@ -122,6 +125,7 @@
<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">
@@ -160,6 +164,7 @@
<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">
@@ -187,6 +192,7 @@
<item name="1" xsi:type="array">
<item name="title" xsi:type="string">Radio Button Option</item>
<item name="type" xsi:type="string">Radio Buttons</item>
+ <item name="frontend_type" xsi:type="string">Radio Buttons</item>
<item name="required" xsi:type="string">Yes</item>
<item name="assigned_products" xsi:type="array">
<item name="0" xsi:type="array">
@@ -214,6 +220,7 @@
<item name="2" xsi:type="array">
<item name="title" xsi:type="string">Checkbox Option</item>
<item name="type" xsi:type="string">Checkbox</item>
+ <item name="frontend_type" xsi:type="string">Checkbox</item>
<item name="required" xsi:type="string">Yes</item>
<item name="assigned_products" xsi:type="array">
<item name="0" xsi:type="array">
@@ -241,6 +248,7 @@
<item name="3" xsi:type="array">
<item name="title" xsi:type="string">Multiple Select Option</item>
<item name="type" xsi:type="string">Multiple Select</item>
+ <item name="frontend_type" xsi:type="string">Multiple Select</item>
<item name="required" xsi:type="string">Yes</item>
<item name="assigned_products" xsi:type="array">
<item name="0" xsi:type="array">
@@ -291,6 +299,7 @@
<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">
@@ -314,6 +323,7 @@
<item name="1" xsi:type="array">
<item name="title" xsi:type="string">Radio Button Option</item>
<item name="type" xsi:type="string">Radio Buttons</item>
+ <item name="frontend_type" xsi:type="string">Radio Buttons</item>
<item name="required" xsi:type="string">Yes</item>
<item name="assigned_products" xsi:type="array">
<item name="0" xsi:type="array">
@@ -337,6 +347,7 @@
<item name="2" xsi:type="array">
<item name="title" xsi:type="string">Checkbox Option</item>
<item name="type" xsi:type="string">Checkbox</item>
+ <item name="frontend_type" xsi:type="string">Checkbox</item>
<item name="required" xsi:type="string">Yes</item>
<item name="assigned_products" xsi:type="array">
<item name="0" xsi:type="array">
@@ -360,6 +371,7 @@
<item name="3" xsi:type="array">
<item name="title" xsi:type="string">Multiple Select Option</item>
<item name="type" xsi:type="string">Multiple Select</item>
+ <item name="frontend_type" xsi:type="string">Multiple Select</item>
<item name="required" xsi:type="string">Yes</item>
<item name="assigned_products" xsi:type="array">
<item name="0" xsi:type="array">
@@ -406,6 +418,7 @@
<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">No</item>
<item name="assigned_products" xsi:type="array">
<item name="0" xsi:type="array">
@@ -433,6 +446,7 @@
<item name="1" xsi:type="array">
<item name="title" xsi:type="string">Radio Button Option</item>
<item name="type" xsi:type="string">Radio Buttons</item>
+ <item name="frontend_type" xsi:type="string">Radio Buttons</item>
<item name="required" xsi:type="string">No</item>
<item name="assigned_products" xsi:type="array">
<item name="0" xsi:type="array">
@@ -475,6 +489,7 @@
<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">
@@ -513,6 +528,7 @@
<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">
@@ -547,6 +563,7 @@
<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">
@@ -572,6 +589,7 @@
<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">
@@ -610,6 +628,7 @@
<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">
@@ -633,6 +652,7 @@
<item name="1" 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">
@@ -830,5 +850,32 @@
</item>
</field>
</dataset>
+
+ <dataset name="one_required_option_with_one_item">
+ <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">Hidden</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_qty" xsi:type="string">1</item>
+ <item name="user_defined" xsi:type="string">Yes</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::default</item>
+ </item>
+ </field>
+ </dataset>
</repository>
</config>
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 3e7550b9d784e3858bd9800e66b88b8c60326b1b..d68fb0d0b83f8ff3520508a1c72bc51dcf8ff1c1 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
@@ -13,6 +13,7 @@
<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">product_100_dollar</item>
</item>
@@ -27,6 +28,7 @@
<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">product_100_dollar</item>
</item>
@@ -47,6 +49,7 @@
<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">product_100_dollar</item>
</item>
@@ -67,6 +70,7 @@
<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">product_10_dollar</item>
</item>
@@ -87,6 +91,7 @@
<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">Simple Product</item>
</item>
@@ -107,6 +112,7 @@
<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">product_100_dollar</item>
</item>
@@ -114,6 +120,7 @@
<item name="1" xsi:type="array">
<item name="title" xsi:type="string">Radio Button Option</item>
<item name="type" xsi:type="string">Radio Buttons</item>
+ <item name="frontend_type" xsi:type="string">Radio Buttons</item>
<item name="value" xsi:type="array">
<item name="name" xsi:type="string">product_100_dollar</item>
</item>
@@ -128,6 +135,7 @@
<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">product_100_dollar</item>
</item>
@@ -192,6 +200,7 @@
<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">product_100_dollar</item>
</item>
@@ -212,6 +221,7 @@
<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">product_10_dollar</item>
</item>
@@ -242,6 +252,7 @@
<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">product_100_dollar</item>
</item>
@@ -249,6 +260,7 @@
<item name="1" xsi:type="array">
<item name="title" xsi:type="string">Radio Button Option</item>
<item name="type" xsi:type="string">Radio Buttons</item>
+ <item name="frontend_type" xsi:type="string">Radio Buttons</item>
<item name="value" xsi:type="array">
<item name="name" xsi:type="string">product_100_dollar</item>
</item>
@@ -256,6 +268,7 @@
<item name="2" xsi:type="array">
<item name="title" xsi:type="string">Checkbox Option</item>
<item name="type" xsi:type="string">Checkbox</item>
+ <item name="frontend_type" xsi:type="string">Checkbox</item>
<item name="value" xsi:type="array">
<item name="name" xsi:type="string">product_100_dollar</item>
</item>
@@ -263,6 +276,7 @@
<item name="3" xsi:type="array">
<item name="title" xsi:type="string">Multiple Select Option</item>
<item name="type" xsi:type="string">Multiple</item>
+ <item name="frontend_type" xsi:type="string">Multiple</item>
<item name="value" xsi:type="array">
<item name="name" xsi:type="string">product_100_dollar</item>
</item>
@@ -315,6 +329,7 @@
<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">product_100_dollar</item>
</item>
@@ -322,6 +337,7 @@
<item name="1" xsi:type="array">
<item name="title" xsi:type="string">Radio Button Option</item>
<item name="type" xsi:type="string">Radio Buttons</item>
+ <item name="frontend_type" xsi:type="string">Radio Buttons</item>
<item name="value" xsi:type="array">
<item name="name" xsi:type="string">product_100_dollar</item>
</item>
@@ -329,6 +345,7 @@
<item name="2" xsi:type="array">
<item name="title" xsi:type="string">Checkbox Option</item>
<item name="type" xsi:type="string">Checkbox</item>
+ <item name="frontend_type" xsi:type="string">Checkbox</item>
<item name="value" xsi:type="array">
<item name="name" xsi:type="string">product_100_dollar</item>
</item>
@@ -357,5 +374,24 @@
</item>
</field>
</dataset>
+
+ <dataset name="one_required_option_with_one_item">
+ <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">Hidden</item>
+ <item name="value" xsi:type="array">
+ <item name="name" xsi:type="string">Simple Product</item>
+ <item name="qty" xsi:type="string">3</item>
+ </item>
+ </item>
+ </item>
+ </field>
+ <field name="cartItem" xsi:type="array">
+ <item name="configuredPrice" xsi:type="string">1680</item>
+ </field>
+ </dataset>
</repository>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml
index 211e09861995f27e22a446b93e465a7197936965..56b2ceb917fe6d46296e408954bdfc88380af5a3 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.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\Bundle\Test\TestCase\CreateBundleProductEntityTest" summary="Create Bundle Product" ticketId="MAGETWO-24118">
<variation name="CreateBundleProductEntityTestVariation1">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">Create default bundle with dynamic options</data>
<data name="product/data/url_key" xsi:type="string">bundle-product-%isolation%</data>
<data name="product/data/name" xsi:type="string">BundleProduct %isolation%</data>
@@ -44,7 +45,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductNotSearchableBySku" />
</variation>
<variation name="CreateBundleProductEntityTestVariation3">
- <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
+ <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes</data>
<data name="description" xsi:type="string">Create dynamic bundle with price randle and all types options</data>
<data name="product/data/url_key" xsi:type="string">bundle-product-%isolation%</data>
<data name="product/data/name" xsi:type="string">BundleProduct %isolation%</data>
@@ -74,6 +75,7 @@
<constraint name="Magento\Bundle\Test\Constraint\AssertBundlePriceType" />
</variation>
<variation name="CreateBundleProductEntityTestVariation4">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">Create fixed bundle</data>
<data name="product/data/url_key" xsi:type="string">bundle-product-%isolation%</data>
<data name="product/data/name" xsi:type="string">BundleProduct %isolation%</data>
@@ -97,6 +99,7 @@
<constraint name="Magento\Bundle\Test\Constraint\AssertBundleItemsOnProductPage" />
</variation>
<variation name="CreateBundleProductEntityTestVariation5">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">Create fixed bundle with all types options</data>
<data name="product/data/url_key" xsi:type="string">bundle-product-%isolation%</data>
<data name="product/data/name" xsi:type="string">BundleProduct %isolation%</data>
@@ -161,6 +164,7 @@
<constraint name="Magento\Bundle\Test\Constraint\AssertBundlePriceView" />
</variation>
<variation name="CreateBundleProductEntityTestVariation7" summary="Check bundle dynamic product with tier price">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="product/data/url_key" xsi:type="string">bundle-product-%isolation%</data>
<data name="product/data/name" xsi:type="string">BundleProduct %isolation%</data>
<data name="product/data/sku_type" xsi:type="string">Yes</data>
@@ -187,6 +191,7 @@
<constraint name="Magento\Bundle\Test\Constraint\AssertTierPriceOnBundleProductPage" />
</variation>
<variation name="CreateBundleProductEntityTestVariation8">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="description" xsi:type="string">Create dynamic bundle with special price</data>
<data name="product/data/url_key" xsi:type="string">bundle-product-%isolation%</data>
<data name="product/data/name" xsi:type="string">Bundle Dynamic %isolation%</data>
@@ -236,6 +241,7 @@
<constraint name="Magento\Bundle\Test\Constraint\AssertBundlePriceType" />
</variation>
<variation name="CreateBundleProductEntityTestVariation11">
+ <data name="issue" xsi:type="string">MAGETWO-52788: Dynamic Rows: support status being changed</data>
<data name="description" xsi:type="string">Create fixed product with checkout first option</data>
<data name="product/data/url_key" xsi:type="string">bundle-product-%isolation%</data>
<data name="product/data/name" xsi:type="string">Bundle Fixed %isolation%</data>
@@ -334,6 +340,7 @@
<constraint name="Magento\Bundle\Test\Constraint\AssertBundleProductPage" />
</variation>
<variation name="CreateBundleProductEntityTestVariation17" summary="Create fixed bundle product with tier price and custom options with fixed and percent price">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="product/data/url_key" xsi:type="string">bundle-product-%isolation%</data>
<data name="product/data/name" xsi:type="string">Bundle Fixed %isolation%</data>
<data name="product/data/sku_type" xsi:type="string">No</data>
@@ -359,6 +366,7 @@
<constraint name="Magento\Bundle\Test\Constraint\AssertBundleProductInCart" />
</variation>
<variation name="CreateBundleProductEntityTestVariation18" summary="Create dynamic bundle product with tier price for sub-item">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="product/data/url_key" xsi:type="string">bundle-product-%isolation%</data>
<data name="product/data/name" xsi:type="string">BundleProduct %isolation%</data>
<data name="product/data/sku_type" xsi:type="string">Yes</data>
@@ -394,6 +402,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock" />
</variation>
<variation name="CreateBundleProductEntityTestVariation21" summary="Create default fixed bundle with custom Website">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="product/data/url_key" xsi:type="string">bundle-product-%isolation%</data>
<data name="product/data/name" xsi:type="string">Bundle Fixed %isolation%</data>
<data name="product/data/sku_type" xsi:type="string">No</data>
@@ -446,5 +455,17 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Bundle\Test\Constraint\AssertBundleProductPage" />
</variation>
+ <variation name="CreateBundleProductEntityTestVariation25" summary="Create Bundle (dynamic) Product with one require option with one item" ticketId="MAGETWO-59841">
+ <data name="product/data/url_key" xsi:type="string">bundle-product-%isolation%</data>
+ <data name="product/data/name" xsi:type="string">Bundle Dynamic %isolation%</data>
+ <data name="product/data/sku" xsi:type="string">sku_bundle_dynamic_%isolation%</data>
+ <data name="product/data/price_type" xsi:type="string">Yes</data>
+ <data name="product/data/category" xsi:type="string">category_%isolation%</data>
+ <data name="product/data/shipment_type" xsi:type="string">Together</data>
+ <data name="product/data/bundle_selections/dataset" xsi:type="string">one_required_option_with_one_item</data>
+ <data name="product/data/checkout_data/dataset" xsi:type="string">one_required_option_with_one_item</data>
+ <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
+ <constraint name="Magento\Bundle\Test\Constraint\AssertBundlePriceCalculatedOnProductPage" />
+ </variation>
</testCase>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php
index bf17d216bcf9b479e6279f449e782bc94438600e..8326b1ba4d9ae9b0589b1d55bd973f9db6efe970 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php
@@ -73,6 +73,7 @@ class UpdateBundleProductEntityTest extends Injectable
*/
public function test(BundleProduct $product, BundleProduct $originalProduct)
{
+ $this->markTestIncomplete('MAGETWO-56584: [FT] Custom options are not created for product in test');
// Preconditions
$originalProduct->persist();
$originalCategory = $originalProduct->hasData('category_ids')
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/BlockGallery.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/BlockGallery.php
new file mode 100644
index 0000000000000000000000000000000000000000..bc0d0b87f24bba19d2e249fa37be7e59e16cca92
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/BlockGallery.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Section;
+
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Ui\Test\Block\Adminhtml\Section;
+
+/**
+ * Class for product gallery block.
+ */
+class BlockGallery extends Section
+{
+ /**
+ * Selector for image loader container.
+ *
+ * @var string
+ */
+ private $imageLoader = '.image.image-placeholder .file-row';
+
+ /**
+ * Selector for image upload input.
+ *
+ * @var string
+ */
+ private $imageUploadInput = '[name="image"]';
+
+ /**
+ * Upload product images.
+ *
+ * @param array $data
+ * @param SimpleElement|null $element
+ * @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function setFieldsData(array $data, SimpleElement $element = null)
+ {
+ foreach ($data['image']['value'] as $imageData) {
+ $uploadElement = $element->find($this->imageUploadInput, Locator::SELECTOR_CSS, 'upload');
+ $uploadElement->setValue($imageData['file']);
+ $this->waitForElementNotVisible($this->imageLoader);
+ }
+ return $this;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml
index 407b5c9cb20a3b2097ea87e9d1f5a8240e5566b2..3b66164ebe658097e05fdba2e8b53c6cb3d643d2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml
@@ -143,7 +143,7 @@
</fields>
</attributes>
<gallery>
- <class>\Magento\Ui\Test\Block\Adminhtml\Section</class>
+ <class>\Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Section\BlockGallery</class>
<selector>[data-index='block_gallery']</selector>
<strategy>css selector</strategy>
</gallery>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
index 3134fda0d2b2b3f98b3e9d0ef5c835e8cb1aad53..de6adb0efd8b21df23cf0531624fa0b90983225d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Block\AbstractConfigureBlock;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Mtf\Client\Locator;
use Magento\Mtf\Fixture\FixtureInterface;
-use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Checkout\Test\Block\Cart\Sidebar;
/**
* Product view block on the product page.
@@ -145,7 +145,14 @@ class View extends AbstractConfigureBlock
*
* @var string
*/
- protected $miniCartBlock = '[data-block="minicart"]';
+ protected $miniCartBlockSelector = '[data-block="minicart"]';
+
+ /**
+ * Minicart block element.
+ *
+ * @var Sidebar
+ */
+ private $miniCartBlock;
/**
* Success message selector.
@@ -222,21 +229,44 @@ class View extends AbstractConfigureBlock
*/
public function addToCart(FixtureInterface $product)
{
- /** @var \Magento\Checkout\Test\Block\Cart\Sidebar $miniCart */
- $miniCart = $this->blockFactory->create(
- \Magento\Checkout\Test\Block\Cart\Sidebar::class,
- ['element' => $this->browser->find($this->miniCartBlock)]
- );
+ $this->configure($product);
+ $this->clickAddToCart();
+ $this->getMiniCartBlock()->waitLoader();
+ }
+
+ /**
+ * Configure Product.
+ *
+ * @param FixtureInterface $product
+ * @return void
+ */
+ public function configure(FixtureInterface $product)
+ {
/** @var CatalogProductSimple $product */
$checkoutData = $product->getCheckoutData();
- $miniCart->waitInit();
+ $this->getMiniCartBlock()->waitInit();
$this->fillOptions($product);
if (isset($checkoutData['qty'])) {
$this->setQty($checkoutData['qty']);
}
- $this->clickAddToCart();
- $miniCart->waitLoader();
+ }
+
+ /**
+ * Get MiniCart block.
+ *
+ * @return Sidebar
+ */
+ private function getMiniCartBlock()
+ {
+ if ($this->miniCartBlock === null) {
+ $this->miniCartBlock = $this->blockFactory->create(
+ Sidebar::class,
+ ['element' => $this->browser->find($this->miniCartBlockSelector)]
+ );
+ }
+
+ return $this->miniCartBlock;
}
/**
@@ -313,14 +343,8 @@ class View extends AbstractConfigureBlock
public function braintreePaypalCheckout()
{
$currentWindow = $this->browser->getCurrentWindow();
- /** @var \Magento\Checkout\Test\Block\Cart\Sidebar $miniCart */
- $miniCart = $this->blockFactory->create(
- \Magento\Checkout\Test\Block\Cart\Sidebar::class,
- ['element' => $this->browser->find($this->miniCartBlock)]
- );
-
- $miniCart->openMiniCart();
- $miniCart->clickBraintreePaypalButton();
+ $this->getMiniCartBlock()->openMiniCart();
+ $this->getMiniCartBlock()->clickBraintreePaypalButton();
return $currentWindow;
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
index 54bf06f70b5f1c0f192b79bda3ade75a85cd37f7..da1ec8f71a1121bceba80b6a3138f77b07663310 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
@@ -13,9 +13,11 @@ use Magento\Mtf\Constraint\AbstractConstraint;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
+use Magento\Mtf\Client\BrowserInterface;
/**
* Check attribute on product form.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class AssertAddedProductAttributeOnProductForm extends AbstractConstraint
{
@@ -45,6 +47,13 @@ class AssertAddedProductAttributeOnProductForm extends AbstractConstraint
*/
protected $catalogProductEdit;
+ /**
+ * Locator for attributes section.
+ *
+ * @var string
+ */
+ protected $attributes = '[data-index="attributes"]';
+
/**
* Add this attribute to Default attribute Template. Create product and Assert that created attribute
* is displayed on product form (Products > Inventory > Catalog).
@@ -66,6 +75,7 @@ class AssertAddedProductAttributeOnProductForm extends AbstractConstraint
CatalogProductEdit $catalogProductEdit,
CatalogProductAttribute $attribute,
CatalogAttributeSet $attributeSet,
+ BrowserInterface $browser,
CatalogProductAttribute $productAttributeOriginal = null
) {
$this->fixtureFactory = $fixtureFactory;
@@ -92,7 +102,9 @@ class AssertAddedProductAttributeOnProductForm extends AbstractConstraint
$catalogProductAttribute = ($productAttributeOriginal !== null)
? array_merge($productAttributeOriginal->getData(), $attribute->getData())
: $attribute->getData();
- $catalogProductEdit->getProductForm()->openSection(self::ATTRIBUTES);
+ if ($browser->find($this->attributes)->isVisible()) {
+ $catalogProductEdit->getProductForm()->openSection(self::ATTRIBUTES);
+ }
\PHPUnit_Framework_Assert::assertTrue(
$catalogProductEdit->getProductForm()->checkAttributeLabel($catalogProductAttribute),
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCanSaveProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCanSaveProduct.php
new file mode 100644
index 0000000000000000000000000000000000000000..04e1c034b3db77a49a583ee819f9b8d97cb440ba
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCanSaveProduct.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+/**
+ * Assert that can save already exist product.
+ */
+class AssertCanSaveProduct extends \Magento\Mtf\Constraint\AbstractConstraint
+{
+ /**
+ * Assert that can save already existing product.
+ *
+ * @param \Magento\Mtf\Fixture\FixtureInterface $product
+ * @param \Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit $catalogProductEdit
+ * @param \Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex $catalogProductIndex
+ * @return void
+ */
+ public function processAssert(
+ \Magento\Mtf\Fixture\FixtureInterface $product,
+ \Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit $catalogProductEdit,
+ \Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex $catalogProductIndex
+ ) {
+ $filter = ['sku' => $product->getSku()];
+ $catalogProductIndex->open()->getProductGrid()->searchAndOpen($filter);
+ $catalogProductEdit->getFormPageActions()->save();
+
+ \PHPUnit_Framework_Assert::assertNotEmpty(
+ $catalogProductEdit->getMessagesBlock()->getSuccessMessage(),
+ 'Can\'t save existing product.'
+ );
+ }
+
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Product was saved without errors.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductHasImageInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductHasImageInGrid.php
new file mode 100644
index 0000000000000000000000000000000000000000..fed3b36c08d661bbc0297b6f87d08aa692d3c04e
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductHasImageInGrid.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
+
+class AssertProductHasImageInGrid extends AbstractConstraint
+{
+ /**
+ * Assert that product image is present in grid.
+ *
+ * @param CatalogProductIndex $productGrid
+ * @param InjectableFixture $product
+ * @return void
+ */
+ public function processAssert(
+ CatalogProductIndex $productGrid,
+ InjectableFixture $product
+ ) {
+ $filter = ['sku' => $product->getSku()];
+ $productGrid->open();
+ $productGrid->getProductGrid()->search($filter);
+ $src = $productGrid->getProductGrid()->getBaseImageSource();
+ \PHPUnit_Framework_Assert::assertTrue(
+ strpos($src, '/placeholder/') === false,
+ 'Product image is not present in product grid when it should be'
+ );
+ }
+
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Product image is displayed in product grid.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml
index b4514208a509358a6828a7b77d33ca0c2678072a..e8ceb1d0889247805746a401f6c60bb5a0556010 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml
@@ -36,8 +36,8 @@
<field name="gallery" is_required="0" />
<field name="gift_message_available" is_required="0" />
<field name="has_options" is_required="0" />
- <field name="image" is_required="0" />
- <field name="image_label" is_required="0" />
+ <field name="image" is_required="0" group="gallery" source="Magento\Catalog\Test\Fixture\Product\Image" />
+ <field name="image_label" group="gallery" is_required="0" />
<field name="manufacturer" is_required="0" />
<field name="media_gallery" is_required="0" />
<field name="meta_description" is_required="0" group="search-engine-optimization" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/Image.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/Image.php
new file mode 100644
index 0000000000000000000000000000000000000000..ad72a6db4f4cef615f4abb7edddc497886a73981
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/Image.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Fixture\Product;
+
+use Magento\Mtf\Fixture\DataSource;
+use Magento\Mtf\Fixture\FixtureFactory;
+
+/**
+ * Image entity data source.
+ */
+class Image extends DataSource
+{
+ /**
+ * Fixture Factory instance.
+ *
+ * @var FixtureFactory
+ */
+ private $fixtureFactory;
+
+ /**
+ * Fixture data.
+ *
+ * @var array
+ */
+ private $fixtureData;
+
+ /**
+ * @param FixtureFactory $fixtureFactory
+ * @param array $params
+ * @param array $data
+ */
+ public function __construct(FixtureFactory $fixtureFactory, array $params, $data = [])
+ {
+ $this->fixtureFactory = $fixtureFactory;
+ $this->params = $params;
+ $this->fixtureData = $data;
+ }
+
+ /**
+ * {@inheritdoc}
+ * @throws \Exception
+ */
+ public function getData($key = null)
+ {
+ foreach ($this->fixtureData as &$imageData) {
+ if (isset($imageData['file']) && file_exists(MTF_TESTS_PATH . $imageData['file'])) {
+ $imageData['file'] = MTF_TESTS_PATH . $imageData['file'];
+ } else {
+ throw new \Exception("Image '{$imageData['file']}'' not found on the server.");
+ }
+ }
+ $this->data = $this->fixtureData;
+
+ return parent::getData($key);
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
index a4a773ae7c7ecd02e11b6e824d6ec3d50925523b..db43cc535ca01c4bbac96e425a435bd71ef3fcef 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
@@ -47,6 +47,14 @@ class Curl extends AbstractCurl implements CatalogProductAttributeInterface
'No' => 0,
'Yes' => 1,
],
+ 'is_global' => [
+ 'Store View' => '0',
+ 'Global' => '1',
+ ],
+ 'used_in_product_listing' => [
+ 'No' => '0',
+ 'Yes' => '1',
+ ],
];
/**
@@ -76,6 +84,7 @@ class Curl extends AbstractCurl implements CatalogProductAttributeInterface
unset($data['options']);
}
+ $data = $this->changeStructureOfTheData($data);
$url = $_ENV['app_backend_url'] . 'catalog/product_attribute/save/back/edit';
$curl = new BackendDecorator(new CurlTransport(), $this->_configuration);
$curl->write($url, $data);
@@ -104,4 +113,13 @@ class Curl extends AbstractCurl implements CatalogProductAttributeInterface
return $resultData;
}
+
+ /**
+ * @param array $data
+ * @return array
+ */
+ protected function changeStructureOfTheData(array $data)
+ {
+ return $data;
+ }
}
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 22cdab45ac875c6a6987892898e3c8dda3382944..fa81264dd2d4b061ef769f882408b104ba92793f 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,6 +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="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>
@@ -56,6 +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="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>
@@ -90,6 +92,7 @@
<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>
@@ -150,7 +153,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryForAssignedProducts" />
</variation>
<variation name="CreateCategoryEntityTestVariation9_ThreeNesting">
- <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
+ <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes</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/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml
index 2c8528595f44b99bc70133cdc473841a0cbb0e22..1b61b92beef1310aa78e49acf49d2501410961b3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml
@@ -14,7 +14,7 @@
</variation>
<variation name="NavigateMenuTest10">
<data name="menuItem" xsi:type="string">Products > Categories</data>
- <data name="pageTitle" xsi:type="string">Default Category</data>
+ <data name="pageTitle" xsi:type="string">Default Category (ID: 2)</data>
<constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
</variation>
<variation name="NavigateMenuTest11">
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.php
index 131163311bcd2af4d34031883d103b3c2341cdb8..eddb620feabb3a7b211d0a8d63e4b2bd6a9ec79d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.php
@@ -29,6 +29,7 @@ class AddCompareProductsTest extends AbstractCompareProductsTest
{
/* tags */
const MVP = 'yes';
+ const TO_MAINTAIN = 'yes';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.xml
index 64d2a1de8a28454df0498d0b8fed68f5064d38ba..c29c99193b75dc99ab725996b617ef1ff794353c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.xml
@@ -10,6 +10,7 @@
<variation name="AddCompareProductsTestVariation1">
<data name="products" xsi:type="string">catalogProductSimple::simple_for_composite_products</data>
<data name="isCustomerLoggedIn" xsi:type="string">No</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductCompareItemsLink" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductComparePage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductCompareBlockOnCmsPage" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest.xml
index 16ebdf323e5920fb90074845b53ab61b8b91c68a..19fc527e71ab7672a96a6b0226e43ede2d356b25 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest.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\Catalog\Test\TestCase\Product\ClearAllCompareProductsTest" summary="Clear All Compare Products" ticketId="MAGETWO-25961">
<variation name="ClearAllCompareProductsTestVariation1">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="config/dataset" xsi:type="string">compare_products</data>
<data name="products" xsi:type="string">catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,downloadableProduct::default,groupedProduct::grouped_product_with_price,configurableProduct::default,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductCompareSuccessRemoveAllProductsMessage" />
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 9e410c525deef720573e7c93e0de4d463b9b2ac7..9f4a5e4bb71fea9293612125157757f7e3d965da 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
@@ -137,6 +137,7 @@
<data name="product/data/checkout_data/dataset" xsi:type="string">simple_drop_down_with_one_option_percent_price</data>
<data name="product/data/price/dataset" xsi:type="string">MAGETWO-23030</data>
<data name="product/data/tier_price/dataset" xsi:type="string">MAGETWO-23002</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" />
@@ -157,6 +158,7 @@
<data name="product/data/checkout_data/dataset" xsi:type="string">simple_drop_down_with_one_option_fixed_price</data>
<data name="product/data/price/dataset" xsi:type="string">MAGETWO-23029</data>
<data name="product/data/tier_price/dataset" xsi:type="string">MAGETWO-23002</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" />
@@ -238,6 +240,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
</variation>
<variation name="CreateSimpleProductEntityTestVariation14">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">Create simple product and check visibility in category</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>
@@ -255,6 +258,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
</variation>
<variation name="CreateSimpleProductEntityTestVariation15">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">Create product with tax class and group price</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>
@@ -303,6 +307,7 @@
<data name="product/data/weight" xsi:type="string">66</data>
<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">143</data>
<data name="product/data/tier_price/dataset" xsi:type="string">default</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -324,6 +329,7 @@
<data name="product/data/custom_options/dataset" xsi:type="string">options_suite</data>
<data name="product/data/checkout_data/dataset" xsi:type="string">simple_options_suite</data>
<data name="product/data/custom_options/import_products" xsi:type="string">catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option</data>
+ <data name="issue" xsi:type="string">MAGETWO-58181: All kind of Custom Options have dynamic view on Bamboo</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -333,6 +339,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsOnProductPage" />
</variation>
<variation name="CreateSimpleProductEntityTestVariation19" summary="Create product with cross-sell products" ticketId="MAGETWO-29081">
+ <data name="tag" xsi:type="string">stable:no</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>
<data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
@@ -349,6 +356,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductCrossSells" />
</variation>
<variation name="CreateSimpleProductEntityTestVariation20" summary="Create product with up-sell products" ticketId="MAGETWO-29105">
+ <data name="tag" xsi:type="string">stable:no</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>
<data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
@@ -401,6 +409,7 @@
<data name="product/data/sku" xsi:type="string">simple%isolation%</data>
<data name="product/data/price/value" xsi:type="string">10</data>
<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">345</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
@@ -500,5 +509,19 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInCart" />
</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>
+ <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">10</data>
+ <data name="product/data/weight" xsi:type="string">50</data>
+ <data name="tag" xsi:type="string">severity:S1</data>
+ <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">100</data>
+ <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
+ <constraint name="Magento\Catalog\Test\Constraint\AssertProductHasImageInGrid" />
+ <constraint name="Magento\Catalog\Test\Constraint\AssertCanSaveProduct" />
+ </variation>
</testCase>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml
index bf158ce4d66b772daaa03f7795cf74d1826bbe59..ed124d152d29b280e2131d1a077a0ed41f5f79af 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.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\Catalog\Test\TestCase\Product\CreateVirtualProductEntityTest" summary="Create Virtual Product" ticketId="MAGETWO-23417">
<variation name="CreateVirtualProductEntityTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="description" xsi:type="string">Create product with required fields</data>
<data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
<data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
@@ -17,7 +18,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
</variation>
<variation name="CreateVirtualProductEntityTestVariation2" summary="Create product with tier price">
- <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
+ <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes</data>
<data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
<data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
<data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
@@ -65,12 +66,14 @@
<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">In Stock</data>
<data name="product/data/visibility" xsi:type="string">Catalog, Search</data>
<data name="customer/dataset" xsi:type="string">default</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPageWithCustomer" />
</variation>
<variation name="CreateVirtualProductEntityTestVariation5">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="description" xsi:type="string">Create product with custom options suite and import options</data>
<data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
<data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
@@ -110,6 +113,7 @@
<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">999</data>
<data name="product/data/tier_price/dataset" xsi:type="string">default</data>
<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">Out of Stock</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest.php
index 7026b757bb7de03a00f18b525076a057749d2383..81cf672344d612224ff6cab99fec93bfa97b8253 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest.php
@@ -28,6 +28,7 @@ class DeleteCompareProductsTest extends AbstractCompareProductsTest
{
/* tags */
const MVP = 'yes';
+ const STABLE = 'no';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest.xml
index 883e7cdf6032c5813759db3d613378c34f04c277..9d983f52c08b6bde5c9edc5e59f30899e8da5f21 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest.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\Catalog\Test\TestCase\Product\DeleteCompareProductsTest" summary="Delete Compare Products" ticketId="MAGETWO-26161">
<variation name="DeleteCompareProductsTestVariation1_NotLoggedIn">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="products" xsi:type="string">catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,downloadableProduct::default,groupedProduct::grouped_product_with_price,configurableProduct::default,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product</data>
<data name="removeProductIndex" xsi:type="string">1</data>
<data name="isCustomerLoggedIn" xsi:type="string">No</data>
@@ -15,6 +16,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductIsNotVisibleInComparePage" />
</variation>
<variation name="DeleteCompareProductsTestVariation2_LoggedIn">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="products" xsi:type="string">catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,downloadableProduct::default,groupedProduct::grouped_product_with_price,configurableProduct::default,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product</data>
<data name="removeProductIndex" xsi:type="string">6</data>
<data name="isCustomerLoggedIn" xsi:type="string">Yes</data>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteProductEntityTest.xml
index 3bef2716d35728fff7c3a2cd730688862acae1e4..32d534941e2b91ad5ba1a96d9ba6b0e47d523e70 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteProductEntityTest.xml
@@ -10,6 +10,7 @@
<variation name="DeleteProductEntityTestVariation1">
<data name="products" xsi:type="string">catalogProductSimple::default</data>
<data name="isRequired" xsi:type="string">Yes</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductNotInGrid" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductIsNotDisplayingOnFrontend" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.xml
index 5b81bebbc6d04e9551fa6399c308a365895b9bd7..0dad886f05ed55c7b951e32dfec8a74b433d6067 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.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\Catalog\Test\TestCase\Product\DuplicateProductEntityTest" summary="Duplicate Product" ticketId="MAGETWO-23294">
<variation name="DuplicateProductEntityTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="productType" xsi:type="string">catalogProductSimple::default</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductDuplicateMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml
index 6cb89d424fee3a0e3ddc084dc304e3fe2f25751c..4ab490478958a81f7312dd1d7a9fc6fb9835a05a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.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\Catalog\Test\TestCase\Product\ProductTypeSwitchingOnCreationTest" summary="Product Type Switching on Creation" ticketId="MAGETWO-29398">
<variation name="ProductTypeSwitchingOnCreationTestVariation1">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="createProduct" xsi:type="string">simple</data>
<data name="product" xsi:type="string">configurableProduct::default</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
@@ -44,6 +45,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
</variation>
<variation name="ProductTypeSwitchingOnCreationTestVariation6">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="createProduct" xsi:type="string">virtual</data>
<data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
@@ -56,6 +58,7 @@
<constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductIsNotDisplayedSeparately" />
</variation>
<variation name="ProductTypeSwitchingOnCreationTestVariation7">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="createProduct" xsi:type="string">virtual</data>
<data name="product" xsi:type="string">downloadableProduct::default</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
@@ -73,6 +76,7 @@
<variation name="ProductTypeSwitchingOnCreationTestVariation9">
<data name="createProduct" xsi:type="string">downloadable</data>
<data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
<constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml
index a2580cee9b91a342c30d21fb4356c682e68a8383..874cac5d4bc5828769a88badc87a41643799d4fc 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml
@@ -11,6 +11,7 @@
<data name="productOrigin" xsi:type="string">catalogProductSimple::default</data>
<data name="product" xsi:type="string">configurableProduct::default</data>
<data name="actionName" xsi:type="string">-</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
<constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />
@@ -20,6 +21,7 @@
<constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductIsNotDisplayedSeparately" />
</variation>
<variation name="ProductTypeSwitchingOnUpdateTestVariation2">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="productOrigin" xsi:type="string">catalogProductSimple::default</data>
<data name="product" xsi:type="string">catalogProductVirtual::default</data>
<data name="actionName" xsi:type="string">-</data>
@@ -27,6 +29,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
</variation>
<variation name="ProductTypeSwitchingOnUpdateTestVariation3">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="productOrigin" xsi:type="string">configurableProduct::default</data>
<data name="product" xsi:type="string">catalogProductSimple::product_without_category</data>
<data name="actionName" xsi:type="string">deleteVariations</data>
@@ -37,10 +40,12 @@
<data name="productOrigin" xsi:type="string">configurableProduct::default</data>
<data name="product" xsi:type="string">catalogProductVirtual::required_fields</data>
<data name="actionName" xsi:type="string">deleteVariations</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
</variation>
<variation name="ProductTypeSwitchingOnUpdateTestVariation5">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="productOrigin" xsi:type="string">catalogProductVirtual::default</data>
<data name="product" xsi:type="string">catalogProductSimple::default</data>
<data name="actionName" xsi:type="string">-</data>
@@ -51,6 +56,7 @@
<data name="productOrigin" xsi:type="string">catalogProductVirtual::default</data>
<data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
<data name="actionName" xsi:type="string">-</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
<constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />
@@ -63,6 +69,7 @@
<data name="productOrigin" xsi:type="string">catalogProductVirtual::default</data>
<data name="product" xsi:type="string">downloadableProduct::default</data>
<data name="actionName" xsi:type="string">-</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
<constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
@@ -74,6 +81,7 @@
<data name="productOrigin" xsi:type="string">downloadableProduct::default</data>
<data name="product" xsi:type="string">catalogProductSimple::default</data>
<data name="actionName" xsi:type="string">-</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
</variation>
@@ -81,6 +89,7 @@
<data name="productOrigin" xsi:type="string">downloadableProduct::default</data>
<data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
<data name="actionName" xsi:type="string">-</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
<constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />
@@ -90,6 +99,7 @@
<constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductIsNotDisplayedSeparately" />
</variation>
<variation name="ProductTypeSwitchingOnUpdateTestVariation10">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="productOrigin" xsi:type="string">downloadableProduct::default</data>
<data name="product" xsi:type="string">catalogProductVirtual::default</data>
<data name="actionName" xsi:type="string">clearDownloadableData</data>
@@ -100,6 +110,7 @@
<data name="productOrigin" xsi:type="string">catalogProductSimple::default</data>
<data name="product" xsi:type="string">downloadableProduct::default</data>
<data name="actionName" xsi:type="string">-</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
<constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml
index 0395f9f5ed8cf83c0aa570252cc5ed7df32da3c8..31aaad654f92a914c14276ab770fa7fe9790f5de 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.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\Catalog\Test\TestCase\Product\UpdateSimpleProductEntityTest" summary="Update Simple Product" ticketId="MAGETWO-23544">
<variation name="UpdateSimpleProductEntityTestVariation1">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">Update visibility to Catalog, Search</data>
<data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
<data name="product/data/name" xsi:type="string">Test simple product %isolation%</data>
@@ -24,6 +25,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
</variation>
<variation name="UpdateSimpleProductEntityTestVariation2">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">Update visibility to Not Visible Individually</data>
<data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
<data name="product/data/name" xsi:type="string">Test simple product %isolation%</data>
@@ -47,6 +49,7 @@
<data name="product/data/url_key" xsi:type="string">test-simple-product-%isolation%</data>
<data name="product/data/weight" xsi:type="string">25.0000</data>
<data name="product/data/visibility" xsi:type="string">Catalog</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInStock" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -64,6 +67,7 @@
<data name="product/data/url_key" xsi:type="string">test-simple-product-%isolation%</data>
<data name="product/data/weight" xsi:type="string">89.0000</data>
<data name="product/data/visibility" xsi:type="string">Search</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInStock" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -81,6 +85,7 @@
<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">Out of Stock</data>
<data name="product/data/url_key" xsi:type="string">test-simple-product-%isolation%</data>
<data name="product/data/weight" xsi:type="string">125.0000</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock" />
@@ -89,6 +94,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
</variation>
<variation name="UpdateSimpleProductEntityTestVariation6">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">Update product status to offline</data>
<data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
<data name="product/data/name" xsi:type="string">Test simple product %isolation%</data>
@@ -112,6 +118,7 @@
<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">87</data>
<data name="product/data/url_key" xsi:type="string">test-simple-product-%isolation%</data>
<data name="product/data/weight" xsi:type="string">333.0000</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
<constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteUpdatedProductInGrid" />
@@ -124,6 +131,7 @@
<data name="product/data/sku" xsi:type="string">test_simple_product_%isolation%</data>
<data name="product/data/price/value" xsi:type="string">133.00</data>
<data name="product/data/url_key" xsi:type="string">test-simple-product-%isolation%</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
</variation>
@@ -142,10 +150,12 @@
<data name="product/data/sku" xsi:type="string">sku_simple_product_%isolation%</data>
<data name="product/data/price/value" xsi:type="string">1.99</data>
<data name="product/data/attribute_set_id/dataset" xsi:type="string">default</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" />
</variation>
<variation name="EditSimpleProductTestVariation11" summary="Update simple product with custom option">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
<data name="product/data/name" xsi:type="string">Test simple product %isolation%</data>
<data name="product/data/sku" xsi:type="string">test_simple_product_%isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.php
index ddd788d7ee1c91dde5164b06ea2d908056031c25..2a18f9e37f953b91e06332ffc1e4090c1a4acd73 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.php
@@ -37,6 +37,7 @@ class UpdateVirtualProductEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
+ const TO_MAINTAIN = 'yes';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.xml
index 3bc4b3c780d627c6ec6e049574381f1ff726867c..a263a70e8bfc007cbcc0a224e8bc1255e86dfe2a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.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\Catalog\Test\TestCase\ProductAttribute\CreateAttributeSetEntityTest" summary="Create Attribute Set (Attribute Set)" ticketId="MAGETWO-25104">
<variation name="CreateAttributeSetEntityTestVariation1">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="attributeSet/data/attribute_set_name" xsi:type="string">AttributeSet%isolation%</data>
<data name="attributeSet/data/skeleton_set/dataset" xsi:type="string">default</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertAttributeSetSuccessSaveMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml
index 2a94a12c0dbdf0d37082a16c19cff02c152ed7f3..543bece9331f4d0968e38b7d8f887f563b9b8ec3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.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\Catalog\Test\TestCase\ProductAttribute\CreateProductAttributeEntityTest" summary="Create Product Attribute" ticketId="MAGETWO-24767">
<variation name="CreateProductAttributeEntityTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
<data name="productAttribute/data/frontend_label" xsi:type="string">Text_Field_Admin_%isolation%</data>
<data name="productAttribute/data/frontend_input" xsi:type="string">Text Field</data>
@@ -19,6 +20,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />
</variation>
<variation name="CreateProductAttributeEntityTestVariation2">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
<data name="productAttribute/data/frontend_label" xsi:type="string">Text_Field_Admin_%isolation%</data>
<data name="productAttribute/data/frontend_input" xsi:type="string">Text Area</data>
@@ -57,6 +59,7 @@
<data name="productAttribute/data/used_in_product_listing" xsi:type="string">Yes</data>
<data name="productAttribute/data/is_used_for_promo_rules" xsi:type="string">Yes</data>
<data name="productAttribute/data/used_for_sort_by" xsi:type="string">Yes</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeInGrid" />
<constraint name="Magento\Catalog\Test\Constraint\AssertAttributeForm" />
<constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductByAttribute" />
@@ -65,6 +68,7 @@
<constraint name="Magento\CatalogRule\Test\Constraint\AssertProductAttributeIsUsedPromoRules" />
</variation>
<variation name="CreateProductAttributeEntityTestVariation4">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
<data name="productAttribute/data/frontend_label" xsi:type="string">Yes/No_Admin_%isolation%</data>
<data name="productAttribute/data/frontend_input" xsi:type="string">Yes/No</data>
@@ -97,6 +101,7 @@
<data name="productAttribute/data/is_html_allowed_on_front" xsi:type="string">Yes</data>
<data name="productAttribute/data/is_visible_on_front" xsi:type="string">Yes</data>
<data name="productAttribute/data/used_in_product_listing" xsi:type="string">Yes</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeInGrid" />
<constraint name="Magento\Catalog\Test\Constraint\AssertAttributeForm" />
<constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />
@@ -110,7 +115,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertAttributeOptionsOnProductForm" />
</variation>
<variation name="CreateProductAttributeEntityTestVariation6">
- <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
+ <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes</data>
<data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
<data name="productAttribute/data/frontend_label" xsi:type="string">Dropdown_Admin_%isolation%</data>
<data name="productAttribute/data/frontend_input" xsi:type="string">Dropdown</data>
@@ -148,6 +153,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertAttributeOptionsOnProductForm" />
</variation>
<variation name="CreateProductAttributeEntityTestVariation7">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
<data name="productAttribute/data/frontend_label" xsi:type="string">Price_Admin_%isolation%</data>
<data name="productAttribute/data/frontend_input" xsi:type="string">Price</data>
@@ -169,6 +175,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeIsFilterableInSearch" />
</variation>
<variation name="CreateProductAttributeEntityTestVariation8">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
<data name="productAttribute/data/frontend_label" xsi:type="string">Fixed_Product_Tax_Admin_%isolation%</data>
<data name="productAttribute/data/frontend_input" xsi:type="string">Fixed Product Tax</data>
@@ -185,6 +192,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />
</variation>
<variation name="CreateProductAttributeEntityTestVariation9">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
<data name="productAttribute/data/frontend_label" xsi:type="string">Text_Field_Admin_%isolation%</data>
<data name="productAttribute/data/frontend_input" xsi:type="string">Text Field</data>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.xml
index 3f547daa68eb58cfc8480f76ede8c1be5ea31ace..83b5be744f0251374798b2a151c9c1dabf737b53 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.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\Catalog\Test\TestCase\ProductAttribute\DeleteAttributeSetTest" summary="Delete Attribute Set (Attribute Set)" ticketId="MAGETWO-25473">
<variation name="DeleteAttributeSetTestVariation1">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
<data name="attributeSet/data/assigned_attributes/dataset" xsi:type="string">default</data>
<data name="product/dataset" xsi:type="string">default</data>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.xml
index a11e2679b27e0860ba298008eaa48b9f2812fe01..83d819b7db1c4d6e0fc09d6209b0255c18f8f6c0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.xml
@@ -15,6 +15,7 @@
<constraint name="Magento\ImportExport\Test\Constraint\AssertProductAttributeAbsenceForExport" />
</variation>
<variation name="DeleteProductAttributeEntityTestVariation2">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="attribute/dataset" xsi:type="string">attribute_type_dropdown</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeSuccessDeleteMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeAbsenceInGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.xml
index a7b233a7aae4b9d97f83638c80572d7f8888a9f1..ff80366fea097217450ad1d95eb4d0b5f4191944 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.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\Catalog\Test\TestCase\ProductAttribute\UpdateAttributeSetTest" summary="Update Attribute Set" ticketId="MAGETWO-26251">
<variation name="UpdateAttributeSetTestVariation1">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="attributeSet/data/attribute_set_name" xsi:type="string">AttributeSetEdit1%isolation%</data>
<data name="attributeSet/data/group" xsi:type="string">Custom-group%isolation%</data>
<data name="attributeSetOriginal/dataset" xsi:type="string">custom_attribute_set</data>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.xml
index b7e27854a82441e35328c31d0c81f2088cf50408..7077b8e852b5e06f7fa240be8a8e106f36686068 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.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\Catalog\Test\TestCase\ProductAttribute\UpdateProductAttributeEntityTest" summary="Update Product Attribute" ticketId="MAGETWO-23459">
<variation name="UpdateProductAttributeEntityTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
<data name="productAttributeOriginal/dataset" xsi:type="string">attribute_type_text_field</data>
<data name="attribute/data/frontend_label" xsi:type="string">Text_Field_%isolation%</data>
@@ -28,6 +29,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />
</variation>
<variation name="UpdateProductAttributeEntityTestVariation2">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
<data name="productAttributeOriginal/dataset" xsi:type="string">attribute_type_dropdown</data>
<data name="attribute/data/frontend_label" xsi:type="string">Dropdown_%isolation%</data>
@@ -60,6 +62,7 @@
<data name="cacheTags" xsi:type="array">
<item name="0" xsi:type="string">FPC</item>
</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\PageCache\Test\Constraint\AssertCacheIsRefreshableAndInvalidated" />
<constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductByAttribute" />
</variation>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/ConfigureProductOnProductPageStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/ConfigureProductOnProductPageStep.php
new file mode 100644
index 0000000000000000000000000000000000000000..f2f08513d7297ad1a3fe3345c8bdca1b848e4819
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/ConfigureProductOnProductPageStep.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\TestStep;
+
+use Magento\Catalog\Test\Page\Product\CatalogProductView;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\TestStep\TestStepInterface;
+
+/**
+ * Configure Product on Product Page step.
+ */
+class ConfigureProductOnProductPageStep implements TestStepInterface
+{
+ /**
+ * Product fixture.
+ *
+ * @var InjectableFixture
+ */
+ private $product;
+
+ /**
+ * Frontend product view page.
+ *
+ * @var CatalogProductView
+ */
+ private $catalogProductView;
+
+ /**
+ * Interface Browser.
+ *
+ * @var BrowserInterface
+ */
+ private $browser;
+
+ /**
+ * @constructor
+ * @param CatalogProductView $catalogProductView
+ * @param BrowserInterface $browser
+ * @param InjectableFixture $product
+ */
+ public function __construct(
+ CatalogProductView $catalogProductView,
+ BrowserInterface $browser,
+ InjectableFixture $product
+ ) {
+ $this->product = $product;
+ $this->catalogProductView = $catalogProductView;
+ $this->browser = $browser;
+ }
+
+ /**
+ * Configure product.
+ *
+ * @return void
+ */
+ public function run()
+ {
+ $this->browser->open($_ENV['app_frontend_url'] . $this->product->getUrlKey() . '.html');
+ $this->catalogProductView->getViewBlock()->configure($this->product);
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/_files/test1.png b/dev/tests/functional/tests/app/Magento/Catalog/Test/_files/test1.png
new file mode 100644
index 0000000000000000000000000000000000000000..3077df38da2ffab3378a630914803dfad59e7961
Binary files /dev/null and b/dev/tests/functional/tests/app/Magento/Catalog/Test/_files/test1.png differ
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/_files/test2.png b/dev/tests/functional/tests/app/Magento/Catalog/Test/_files/test2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d219e6ee734b983a39e041a2386117a10d762be
Binary files /dev/null and b/dev/tests/functional/tests/app/Magento/Catalog/Test/_files/test2.png differ
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.xml
index 9359b0c402b953ba1b8fcd2343b5ca84af3a764f..3a2f2f8aa7816a53d674c6c665b058afb1a4b720 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.xml
@@ -8,11 +8,13 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\CatalogSearch\Test\TestCase\SuggestSearchingResultEntityTest" summary="Suggest Searching Results" ticketId="MAGETWO-24671">
<variation name="SuggestSearchingResultEntityTestVariation1">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::name</data>
<data name="catalogSearch/data/num_results" xsi:type="string">-</data>
<constraint name="Magento\CatalogSearch\Test\Constraint\AssertSuggestSearchingResult" />
</variation>
<variation name="SuggestSearchingResultEntityTestVariation2">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::sku</data>
<data name="catalogSearch/data/num_results" xsi:type="string">1</data>
<constraint name="Magento\CatalogSearch\Test\Constraint\AssertSuggestSearchingResult" />
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php
index cad6dda90459845718bc3ab1e3ac2952cca16640..ce8f5a4cbfd99b41e990a11fc89527f28b0fec5f 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php
@@ -8,7 +8,6 @@ namespace Magento\Checkout\Test\Block\Onepage;
use Magento\Mtf\Block\Block;
use Magento\Mtf\Fixture\InjectableFixture;
-use Magento\Payment\Test\Fixture\CreditCard;
/**
* Checkout payment block.
@@ -90,7 +89,12 @@ class Payment extends Block
} catch (\Exception $exception) {
throw new \Exception('Such payment method is absent.');
}
-
+ $browser = $this->browser;
+ $browser->waitUntil(
+ function () use ($browser, $paymentSelector) {
+ return $browser->find($paymentSelector);
+ }
+ );
$paymentRadioButton = $this->_rootElement->find($paymentSelector);
if ($paymentRadioButton->isVisible()) {
$paymentRadioButton->click();
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml
index 30688723ae8edb8c83b761e89f2805f5dcdcd588..9a539d856e7082ae5131e903d7d86eec5f37d6c5 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.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\Checkout\Test\TestCase\AddProductsToShoppingCartEntityTest" summary="Add Products to Shopping Cart" ticketId="MAGETWO-25382">
<variation name="AddProductsToShoppingCartEntityTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="productsData/0" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
<data name="cart/data/grand_total" xsi:type="string">210</data>
<data name="cart/data/subtotal" xsi:type="string">200</data>
@@ -20,6 +21,7 @@
<constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
</variation>
<variation name="AddProductsToShoppingCartEntityTestVariation2">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="productsData/0" xsi:type="string">bundleProduct::bundle_fixed_product</data>
<data name="cart/data/grand_total" xsi:type="string">761</data>
<data name="cart/data/subtotal" xsi:type="string">756</data>
@@ -32,6 +34,7 @@
<constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
</variation>
<variation name="AddProductsToShoppingCartEntityTestVariation3">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="productsData/0" xsi:type="string">catalogProductSimple::with_two_custom_option</data>
<data name="cart/data/grand_total" xsi:type="string">345</data>
<data name="cart/data/subtotal" xsi:type="string">340</data>
@@ -44,6 +47,7 @@
<constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
</variation>
<variation name="AddProductsToShoppingCartEntityTestVariation4">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="productsData/0" xsi:type="string">catalogProductVirtual::product_50_dollar</data>
<data name="cart/data/grand_total" xsi:type="string">50</data>
<data name="cart/data/subtotal" xsi:type="string">50</data>
@@ -56,6 +60,7 @@
<constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
</variation>
<variation name="AddProductsToShoppingCartEntityTestVariation5">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="productsData/0" xsi:type="string">configurableProduct::default</data>
<data name="cart/data/grand_total" xsi:type="string">135</data>
<data name="cart/data/subtotal" xsi:type="string">120</data>
@@ -80,6 +85,7 @@
<constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
</variation>
<variation name="AddProductsToShoppingCartEntityTestVariation7">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="productsData/0" xsi:type="string">groupedProduct::three_simple_products</data>
<data name="cart/data/grand_total" xsi:type="string">1950</data>
<data name="cart/data/subtotal" xsi:type="string">1920</data>
@@ -92,6 +98,7 @@
<constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
</variation>
<variation name="AddProductsToShoppingCartEntityTestVariation8">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="productsData/0" xsi:type="string">catalogProductSimple::with_two_custom_option</data>
<data name="productsData/1" xsi:type="string">catalogProductVirtual::product_50_dollar</data>
<data name="productsData/2" xsi:type="string">downloadableProduct::with_two_separately_links</data>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml
index 2f2177c6cc7efcdf9c7e1df8f71b8b4ca7752188..033ea76a2a5ff17c5233d7f1b543f6b72f013c61 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml
@@ -16,6 +16,7 @@
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
</variation>
<variation name="DeleteProductsFromShoppingCartTestVariation3">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="productsData/0" xsi:type="string">catalogProductSimple::with_two_custom_option</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
</variation>
@@ -36,6 +37,7 @@
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
</variation>
<variation name="DeleteProductsFromShoppingCartTestVariation8">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="productsData/0" xsi:type="string">catalogProductSimple::with_two_custom_option</data>
<data name="productsData/1" xsi:type="string">catalogProductVirtual::product_50_dollar</data>
<data name="productsData/2" xsi:type="string">downloadableProduct::with_two_separately_links</data>
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 6a1f225bc9429e47b68ffb85bd06fc0443ebdbf9..797255d4e374acf001132647eee1121168ec0b50 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
@@ -27,6 +27,7 @@
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
</variation>
<variation name="OnePageCheckoutTestVariation2" summary="US customer during checkout using coupon for all customer groups">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="products/0" xsi:type="string">catalogProductSimple::default</data>
<data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups</data>
<data name="customer/dataset" xsi:type="string">default</data>
@@ -48,6 +49,7 @@
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
</variation>
<variation name="OnePageCheckoutTestVariation3" summary="Checkout as UK guest with simple product" ticketId="MAGETWO-42603">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="products/0" xsi:type="string">catalogProductSimple::default</data>
<data name="customer/dataset" xsi:type="string">default</data>
<data name="checkoutMethod" xsi:type="string">guest</data>
@@ -167,6 +169,7 @@
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
</variation>
<variation name="OnePageCheckoutTestVariation9" summary="One Page Checkout Products with Tier Prices">
+ <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>
@@ -183,6 +186,7 @@
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
</variation>
<variation name="OnePageCheckoutTestVariation10" summary="One Page Checkout with all product types">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="products/0" xsi:type="string">catalogProductVirtual::default</data>
<data name="products/1" xsi:type="string">downloadableProduct::with_two_separately_links</data>
<data name="products/2" xsi:type="string">configurableProduct::with_one_option</data>
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 1c60b0f156bae087433d03ac12e84c733bb9258f..5f9b069ab85ca92d37ac8773ac3d1694e5d6ee81 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
@@ -8,14 +8,14 @@
<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</data>
+ <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>
<constraint name="Magento\Checkout\Test\Constraint\AssertProductDataInMiniShoppingCart" />
<constraint name="Magento\Checkout\Test\Constraint\AssertProductQtyInShoppingCart" />
</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</data>
+ <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes</data>
<data name="originalProduct/0" xsi:type="string">configurableProduct::default</data>
<data name="checkoutData/dataset" xsi:type="string">configurable_update_mini_shopping_cart</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertCartItemsOptions" />
@@ -24,7 +24,7 @@
<constraint name="Magento\Checkout\Test\Constraint\AssertProductOptionsAbsentInShoppingCart" />
</variation>
<variation name="UpdateProductFromMiniShoppingCartEntityTestVariation3" summary="Update Bundle 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</data>
+ <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes</data>
<data name="originalProduct/0" xsi:type="string">bundleProduct::bundle_fixed_product</data>
<data name="checkoutData/dataset" xsi:type="string">bundle_update_mini_shopping_cart</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertCartItemsOptions" />
@@ -33,7 +33,7 @@
<constraint name="Magento\Checkout\Test\Constraint\AssertProductOptionsAbsentInShoppingCart" />
</variation>
<variation name="UpdateProductFromMiniShoppingCartEntityTestVariation4" summary="Update Downloadable and check previous link was updated to new one in shopping cart and mini shopping cart">
- <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
+ <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes</data>
<data name="originalProduct/0" xsi:type="string">downloadableProduct::with_two_separately_links</data>
<data name="checkoutData/dataset" xsi:type="string">downloadable_update_mini_shopping_cart</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertCartItemsOptions" />
@@ -42,7 +42,7 @@
<constraint name="Magento\Checkout\Test\Constraint\AssertProductOptionsAbsentInShoppingCart" />
</variation>
<variation name="UpdateProductFromMiniShoppingCartEntityTestVariation5" summary="Update Virtual product in mini shopping cart">
- <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
+ <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes</data>
<data name="originalProduct/0" xsi:type="string">catalogProductVirtual::default</data>
<data name="checkoutData/dataset" xsi:type="string">virtual_update_mini_shopping_cart</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertProductDataInMiniShoppingCart" />
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php
index 809688cd8286a0afdc68ef3d236a6b1673b1c66b..3dba57e26e003726e856577f5e4b48a427428a24 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php
@@ -33,6 +33,7 @@ class UpdateShoppingCartTest extends Injectable
{
/* tags */
const MVP = 'yes';
+ const STABLE = 'no';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsBlockEntityTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsBlockEntityTest.xml
index fc043effe5a77682ef1a30307350ad72aab8401b..34c70c9e2a33bea3418e394a241a1d87d48ee27a 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsBlockEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsBlockEntityTest.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\Cms\Test\TestCase\DeleteCmsBlockEntityTest" summary="Delete CMS Block" ticketId="MAGETWO-25698">
<variation name="DeleteCmsBlockEntityTestVariation1">
- <data name="tag" xsi:type="string">severity:S1</data>
+ <data name="tag" xsi:type="string">severity:S1, stable:no</data>
<constraint name="Magento\Cms\Test\Constraint\AssertCmsBlockDeleteMessage" />
<constraint name="Magento\Cms\Test\Constraint\AssertCmsBlockNotInGrid" />
<constraint name="Magento\Cms\Test\Constraint\AssertCmsBlockNotOnCategoryPage" />
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageEntityTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageEntityTest.xml
index 2a85425890e8e455a4ba6e32960f6d329bfcdf5b..745d60dad9f8ac8c67d891e84e33e502db1b6659 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageEntityTest.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\Cms\Test\TestCase\DeleteCmsPageEntityTest" summary="Delete CMS Page" ticketId="MAGETWO-23291">
<variation name="DeleteCmsPageEntityTestVariation1">
- <data name="tag" xsi:type="string">severity:S1</data>
+ <data name="tag" xsi:type="string">severity:S1, stable:no</data>
<data name="cmsPage/dataset" xsi:type="string">default</data>
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageDeleteMessage" />
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageNotInGrid" />
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 893cfc2f0dacc75f92b31b3a14fcc54a41aaf6b5..fc279aad59d3d7e21590be2c256f83831e7295cf 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</data>
+ <data name="tag" xsi:type="string">severity:S2, 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>
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 d6467a53e15659a1e5859002c04be6ad3e91b3e3..1be7e61f6bd0ea27a99733a63828f438ab481215 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</data>
+ <data name="tag" xsi:type="string">severity:S2, 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</data>
+ <data name="tag" xsi:type="string">severity:S2, 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/Cms/Test/TestCase/UpdateCmsPageEntityTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageEntityTest.xml
index 75f8cf63f645e333e001ba26ef940f62ae95581c..93d38321ab7db4c2fa8fcda830022a8c52970e14 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageEntityTest.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\Cms\Test\TestCase\UpdateCmsPageEntityTest" summary="Update Cms Page" ticketId="MAGETWO-25186">
<variation name="UpdateCmsPageEntityTestVariation1">
- <data name="tag" xsi:type="string">severity:S3</data>
+ <data name="tag" xsi:type="string">severity:S3, to_maintain:yes</data>
<data name="cms/data/title" xsi:type="string">CmsPageEdited%isolation%</data>
<data name="cms/data/is_active" xsi:type="string">No</data>
<data name="cms/data/content/content" xsi:type="string">cms_page_text_content_after_edit</data>
@@ -16,7 +16,7 @@
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageDisabledOnFrontend" />
</variation>
<variation name="UpdateCmsPageEntityTestVariation2">
- <data name="tag" xsi:type="string">severity:S1</data>
+ <data name="tag" xsi:type="string">severity:S1, to_maintain:yes</data>
<data name="cms/data/title" xsi:type="string">CmsPageEdited%isolation%</data>
<data name="cms/data/identifier" xsi:type="string">cms_page_url_edited_%isolation%</data>
<data name="cms/data/content_heading" xsi:type="string">Content Heading TextEdited</data>
diff --git a/dev/tests/functional/tests/app/Magento/Config/Test/TestCase/VerifyAdminAccountSharingEntityTest.php b/dev/tests/functional/tests/app/Magento/Config/Test/TestCase/VerifyAdminAccountSharingEntityTest.php
index 30928810490d770c5ea8309748b07aeabf45314a..5df648a565dc7040c24e43d8b35bad5859a3b200 100644
--- a/dev/tests/functional/tests/app/Magento/Config/Test/TestCase/VerifyAdminAccountSharingEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Config/Test/TestCase/VerifyAdminAccountSharingEntityTest.php
@@ -23,13 +23,14 @@ class VerifyAdminAccountSharingEntityTest extends Injectable
/* tags */
const MVP = 'yes';
const DOMAIN = 'PS';
+ const TO_MAINTAIN = 'yes';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
/**
* Admin account settings page.
*
- * @var adminAccountSharing
+ * @var AdminAccountSharing
*/
private $adminAccountSharing;
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductQtyDecreasedAfterCreditmemo.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductQtyDecreasedAfterCreditmemo.php
new file mode 100644
index 0000000000000000000000000000000000000000..e5c3ab4dad9ee121c1332649dabd8715c3544449
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductQtyDecreasedAfterCreditmemo.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ConfigurableProduct\Test\Constraint;
+
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\System\Event\EventManagerInterface;
+use Magento\Sales\Test\Fixture\OrderInjectable;
+
+/**
+ * Class AssertProductQtyDecreasedAfterCreditmemo
+ */
+class AssertProductQtyDecreasedAfterCreditmemo extends AbstractConstraint
+{
+ /**
+ * @var FixtureFactory
+ */
+ protected $fixtureFactory;
+
+ /**
+ * Skip fields for create product fixture.
+ *
+ * @var array
+ */
+ protected $skipFields = [
+ 'attribute_set_id',
+ 'website_ids',
+ 'checkout_data',
+ 'type_id',
+ 'price',
+ ];
+
+ /**
+ * AssertFirstProductForm constructor.
+ * @param ObjectManager $objectManager
+ */
+ public function __construct(
+ ObjectManager $objectManager,
+ EventManagerInterface $eventManager,
+ FixtureFactory $fixtureFactory
+ ) {
+ $this->fixtureFactory = $fixtureFactory;
+ parent::__construct($objectManager, $eventManager);
+ }
+
+ /**
+ * Assert form data equals fixture data
+ *
+ * @param OrderInjectable $order
+ * @param array $data
+ * @param CatalogProductIndex $productGrid
+ * @param CatalogProductEdit $productPage
+ * @return void
+ */
+ public function processAssert(
+ OrderInjectable $order,
+ array $data,
+ CatalogProductIndex $productGrid,
+ CatalogProductEdit $productPage
+ ) {
+ $product = $this->getProduct($order, $data);
+ $this->objectManager->get(\Magento\Catalog\Test\Constraint\AssertProductForm::class)->processAssert(
+ $product,
+ $productGrid,
+ $productPage
+ );
+ }
+
+ /**
+ * Get product's fixture.
+ *
+ * @param OrderInjectable $order
+ * @param array $data
+ * @param int $index [optional]
+ * @return FixtureInterface
+ */
+ protected function getProduct(OrderInjectable $order, array $data, $index = 0)
+ {
+ if (!isset($data['items_data'][$index]['back_to_stock'])
+ || $data['items_data'][$index]['back_to_stock'] != 'Yes'
+ ) {
+ return $order->getEntityId()['products'][$index];
+ }
+ $product = $order->getEntityId()['products'][$index];
+ $productData = $product->getData();
+ $checkoutDataQty = $productData['checkout_data']['qty'];
+
+ $productKey = '';
+ foreach ($productData['checkout_data']['options']['configurable_options'] as $option) {
+ $productKey .= ' ' . $option['title'] . ':' . $option['value'];
+ }
+ $productKey = trim($productKey);
+ $optionProduct = $productData['configurable_attributes_data']['matrix'][$productKey];
+ $optionProduct['qty'] -= ($checkoutDataQty - $data['items_data'][$index]['qty']);
+ $productData = $optionProduct;
+
+ $productData = array_diff_key($productData, array_flip($this->skipFields));
+
+ return $this->fixtureFactory->create(get_class($product), ['data' => $productData]);
+ }
+
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Product qty was decreased after creditmemo creation.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProduct/Curl.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProduct/Curl.php
index bf5d5944aa3da0a7093d5bbe33ea00897f3b5397..626be7dee3652ee88407d47f1bac313a96dde225 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProduct/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProduct/Curl.php
@@ -172,7 +172,7 @@ class Curl extends ProductCurl implements ConfigurableProductInterface
$keyIds[] = $attribute['options'][$optionKey]['id'];
$configurableAttribute[] = sprintf(
'"%s":"%s"',
- $attribute['attribute_code'],
+ isset($attribute['attribute_code']) ? $attribute['attribute_code'] : $attribute['frontend_label'],
$attribute['options'][$optionKey]['id']
);
}
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml
index 4a69a7604bca3d74119b07bdcea3b2115a1f6648..32f1957d4173f87b10069b60c8c428b921e260fb 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml
@@ -71,7 +71,40 @@
</dataset>
<dataset name="configurable_with_qty_1">
- <field name="name" xsi:type="string">Test configurable product %isolation%</field>
+ <field name="name" xsi:type="string">sku_test_configurable_product_%isolation%</field>
+ <field name="sku" xsi:type="string">sku_test_configurable_product_%isolation%</field>
+ <field name="price" xsi:type="array">
+ <item name="dataset" xsi:type="string">price_40</item>
+ </field>
+ <field name="product_has_weight" xsi:type="string">This item has weight</field>
+ <field name="weight" xsi:type="string">30</field>
+ <field name="status" xsi:type="string">Yes</field>
+ <field name="visibility" xsi:type="string">Catalog, Search</field>
+ <field name="tax_class_id" xsi:type="array">
+ <item name="dataset" xsi:type="string">taxable_goods</item>
+ </field>
+ <field name="url_key" xsi:type="string">configurable-product-%isolation%</field>
+ <field name="configurable_attributes_data" xsi:type="array">
+ <item name="dataset" xsi:type="string">default</item>
+ </field>
+ <field name="quantity_and_stock_status" xsi:type="array">
+ <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="attribute_set_id" xsi:type="array">
+ <item name="dataset" xsi:type="string">default</item>
+ </field>
+ <field name="checkout_data" xsi:type="array">
+ <item name="dataset" xsi:type="string">configurable_options_with_qty_1</item>
+ </field>
+ </dataset>
+
+ <dataset name="configurable_with_qty_2">
+ <field name="name" xsi:type="string">sku_test_configurable_product_%isolation%</field>
<field name="sku" xsi:type="string">sku_test_configurable_product_%isolation%</field>
<field name="price" xsi:type="array">
<item name="dataset" xsi:type="string">price_40</item>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml
index 187283da4602fd56c6fb6f2441d11dc5c1ad05bd..14ff24f18908da187a0631662cf74bfdaad5db6f 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.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\ConfigurableProduct\Test\TestCase\CreateConfigurableProductEntityTest" summary="Create Configurable Product" ticketId="MAGETWO-26041">
<variation name="CreateConfigurableProductEntityTestVariation1" summary="Create product with category and two new options">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
<data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_new_options</data>
<data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_options</data>
@@ -32,6 +33,7 @@
<constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductIsNotDisplayedSeparately"/>
</variation>
<variation name="CreateConfigurableProductEntityTestVariation2" summary="Create product with two options">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
<data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_options</data>
<data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_options</data>
@@ -53,6 +55,7 @@
<constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductInCart" />
</variation>
<variation name="CreateConfigurableProductEntityTestVariation3" summary="Create product with special price">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
<data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_options_with_assigned_product_special_price</data>
<data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_new_options_with_special_price</data>
@@ -75,6 +78,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSpecialPriceOnProductPage" />
</variation>
<variation name="CreateConfigurableProductEntityTestVariation4" summary="Create product with assigned products to options">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
<data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_options_with_assigned_product</data>
<data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_options_with_assigned_product</data>
@@ -95,6 +99,7 @@
<constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductInCart" />
</variation>
<variation name="CreateConfigurableProductEntityTestVariation5" summary="Create Configurable Product and Assign it to Category" ticketId="MAGETWO-12620">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
<data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_options_with_fixed_price</data>
<data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
@@ -143,6 +148,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductAutoincrementedSkuNoticeMessage" />
</variation>
<variation name="CreateConfigurableProductEntityTestVariation9" summary="Create configurable product and assign it to custom website">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
<data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_options_with_assigned_product_special_price</data>
<data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_new_options_with_special_price</data>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateCreditMemoEntityTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateCreditMemoEntityTest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dd92edc82b3310ad9610c70138578a220e4358cd
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateCreditMemoEntityTest.xml
@@ -0,0 +1,21 @@
+<?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\Sales\Test\TestCase\CreateCreditMemoEntityTest" summary="Create Credit Memo for Offline Payment Methods" ticketId="MAGETWO-59074">
+ <variation name="CreateCreditMemoEntityWithConfigurableTestVariation1" ticketId="MAGETWO-12447">
+ <data name="description" xsi:type="string">Assert items return to stock (partial refund)</data>
+ <data name="data/items_data/0/back_to_stock" xsi:type="string">Yes</data>
+ <data name="data/items_data/0/qty" xsi:type="string">1</data>
+ <data name="order/dataset" xsi:type="string">default</data>
+ <data name="order/data/entity_id/products" xsi:type="string">configurableProduct::configurable_with_qty_1</data>
+ <data name="order/data/price/dataset" xsi:type="string">full_refund</data>
+ <constraint name="Magento\Sales\Test\Constraint\AssertRefundSuccessCreateMessage" />
+ <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertProductQtyDecreasedAfterCreditmemo" />
+ </variation>
+ </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DuplicateProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DuplicateProductEntityTest.xml
index 62279a9fa579c99b8fce18ca6c39279834ce22c6..b069371fe5bec2aa39ea7c5ce6c7a3e6eb1d8977 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DuplicateProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DuplicateProductEntityTest.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\Catalog\Test\TestCase\Product\DuplicateProductEntityTest">
<variation name="DuplicateProductEntityTestVariation2" firstConstraint="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" method="test">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="productType" xsi:type="string">configurableProduct::default</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" next="Magento\Catalog\Test\Constraint\AssertProductDuplicateMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductDuplicateMessage" next="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductDuplicateForm" />
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/MassProductUpdateTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/MassProductUpdateTest.xml
index 3d58645d618ffe4f34beb84cd3a1d58212649148..d1066de26d66c608bc96198585bb8a92112b3fbf 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/MassProductUpdateTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/MassProductUpdateTest.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\Catalog\Test\TestCase\Product\MassProductUpdateTest" summary="Edit Products Using Mass Actions" ticketId="MAGETWO-21128">
<variation name="MassProductUpdateTestVariation2" summary="Update stock data for simple and configurable">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="configData" xsi:type="string">product_flat</data>
<data name="initialProducts/1" xsi:type="string">configurableProduct::out_of_stock</data>
<data name="initialProducts/0" xsi:type="string">catalogProductSimple::out_of_stock</data>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php
index 7ff2be303d677a944e5c2391a509882ecb7d3e96..d3ab2ffa6b026e0ec0fe8d0d93655a49193e6127 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php
@@ -32,6 +32,7 @@ class UpdateConfigurableProductEntityTest extends Scenario
{
/* tags */
const MVP = 'yes';
+ const TO_MAINTAIN = 'yes';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php
index 4919d364dc6fa07592556bc66674588ec84589c0..ac6b26e85fbeb23e9a04c8a8b709e57da3b696ee 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php
@@ -97,7 +97,7 @@ abstract class AbstractCurrencySymbolEntityTest extends Injectable
$this->currencyIndex->getCurrencyRateForm()->clickImportButton();
$this->currencyIndex->getCurrencyRateForm()->fillCurrencyUSDUAHRate();
if ($this->currencyIndex->getMessagesBlock()->isVisibleMessage('warning')) {
- throw new \Exception($this->currencyIndex->getMessagesBlock()->getWarningMessages());
+ throw new \Exception($this->currencyIndex->getMessagesBlock()->getWarningMessage());
}
$this->currencyIndex->getFormPageActions()->save();
}
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.php
index 14a9d6f283b278228f178f4f3a14ffbe7786aceb..302f23104d959119f125fb6ab3b82b78078efa3d 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.php
@@ -27,6 +27,7 @@ class EditCurrencySymbolEntityTest extends AbstractCurrencySymbolEntityTest
{
/* tags */
const MVP = 'no';
+ const TO_MAINTAIN = 'yes';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.php
index 8740b0000ff58324787941a92213528b6c24d11d..e49f25bc4fa181ffce4e442e1dbda485b8c5a76b 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.php
@@ -28,6 +28,7 @@ class ResetCurrencySymbolEntityTest extends AbstractCurrencySymbolEntityTest
{
/* tags */
const MVP = 'no';
+ const TO_MAINTAIN = 'yes';
/* end tags */
/**
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 9802ef998048a8f9cfb8914b7288c4f119a667d1..70191dc828af7aecada34068c5d0e93cce4736ee 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
@@ -61,8 +61,8 @@
<field name="postcode" xsi:type="string">90230</field>
<field name="country_id" xsi:type="string">United States</field>
<field name="telephone" xsi:type="string">555-55-555-55</field>
- <field name="default_billing" xsi:type="string">Yes</field>
- <field name="default_shipping" xsi:type="string">No</field>
+ <field name="default_billing" xsi:type="string">No</field>
+ <field name="default_shipping" xsi:type="string">Yes</field>
</dataset>
<dataset name="US_address_1">
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml
index 14e3a9642d1a5d649536d0b84070c8ae3e9210a6..766cf96b3d6447029384715ea57e06bf21dda1e8 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml
@@ -19,6 +19,7 @@
<constraint name="Magento\Customer\Test\Constraint\AssertCustomerForm" />
</variation>
<variation name="CreateCustomerBackendEntityTestVariation2" summary="Customer with prefix">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="customerAction" xsi:type="string">save</data>
<data name="customer/data/group_id/dataset" xsi:type="string">Wholesale</data>
<data name="customer/data/prefix" xsi:type="string">M</data>
@@ -92,6 +93,7 @@
<constraint name="Magento\Customer\Test\Constraint\AssertCustomerBackendFormTitle" />
</variation>
<variation name="CreateCustomerBackendEntityTestVariation7" summary="Create customer with custom customer group">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="customerAction" xsi:type="string">saveAndContinue</data>
<data name="customer/data/website_id" xsi:type="string">Main Website</data>
<data name="customer/data/group_id/dataset" xsi:type="string">customer_group_retail_customer</data>
@@ -131,6 +133,7 @@
<constraint name="Magento\Customer\Test\Constraint\AssertCustomerBackendRequiredFields" />
</variation>
<variation name="CreateCustomerBackendEntityTestVariation10" summary="Create customer with 2 websites and with different allowed countries.">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="customerAction" xsi:type="string">save</data>
<data name="customer/data/website_id" xsi:type="string">Main Website</data>
<data name="customer/data/group_id/dataset" xsi:type="string">General</data>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php
index 64051195daa32a808536adb8afaa6a5100c51ce6..c354e733a6913263d3b2ea1cb72d63bb7434c9a2 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php
@@ -29,6 +29,7 @@ class CreateCustomerGroupEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
+ const STABLE = 'no';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.php
index 61771665c059ed1783c3e3820a8005601d91e631..1f00df69dfb578e552429ccdeb43a02254951d95 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.php
@@ -30,6 +30,7 @@ class DeleteCustomerAddressTest extends Injectable
{
/* tags */
const MVP = 'yes';
+ const STABLE = 'no';
/* end tags */
/**
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 18791441b1d20754360d80d7757bffe922d6c40e..b967fbd184526fd1d71fcf2055799842d0d018f1 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">stable:no</data>
<data name="description" xsi:type="string">Verify customer page grid sorting</data>
<data name="columnsForSorting" xsi:type="array">
<item name="id" xsi:type="string">ID</item>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.xml
index e86104e992deebf2b925e8a67b3346be7a6e2907..af57affcd7f07bf42182f444b16fc85ffe274ade 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.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\Customer\Test\TestCase\MassAssignCustomerGroupTest" summary="Mass Assign Customer's Group to Customers" ticketId="MAGETWO-27892">
<variation name="MassAssignCustomerGroupTestVariation1">
- <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
+ <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes</data>
<data name="customerGroup/dataset" xsi:type="string">default</data>
<constraint name="Magento\Customer\Test\Constraint\AssertMassActionSuccessUpdateMessage" />
<constraint name="Magento\Customer\Test\Constraint\AssertCustomerGroupInGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.xml
index 2985252d82ffae55c5a932927623ecf7cf470aa3..cdbfd91ddbd49dddc040569252bb1a988c262a5c 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.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\Customer\Test\TestCase\MassDeleteCustomerBackendEntityTest" summary="Customer Mass Delete" ticketId="MAGETWO-26848">
<variation name="MassDeleteCustomerBackendEntityTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="customer/dataset" xsi:type="string">default</data>
<data name="customersQty" xsi:type="string">3</data>
<data name="customersQtyToDelete" xsi:type="string">2</data>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.xml
index 31a947ad1ab02771464cdf9f8cd93f01f2451718..96e78f58d78c8402a133184b633614e4e4fd20c7 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.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\Customer\Test\TestCase\RegisterCustomerFrontendEntityTest" summary="Register New Customer" ticketId="MAGETWO-23546">
<variation name="RegisterCustomerFrontendEntityTestVariation1" summary="Register new customer">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="customer/data/firstname" xsi:type="string">john</data>
<data name="customer/data/lastname" xsi:type="string">doe</data>
<data name="customer/data/email" xsi:type="string">johndoe%isolation%@example.com</data>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml
index c2132672d900a65fe81b3f011266d036cd390e91..7855fb0f17dd2d709a383722475ec1e95fbfa737 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.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\Customer\Test\TestCase\UpdateCustomerBackendEntityTest" summary="Update Backend Customer" ticketId="MAGETWO-23881">
<variation name="UpdateCustomerBackendEntityTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="initialCustomer/dataset" xsi:type="string">default</data>
<data name="customer/data/group_id/dataset" xsi:type="string">Wholesale</data>
<data name="customer/data/prefix" xsi:type="string">%isolation%Prefix_</data>
@@ -44,6 +45,7 @@
<constraint name="Magento\Customer\Test\Constraint\AssertCustomerInGrid" />
</variation>
<variation name="UpdateCustomerBackendEntityTestVariation3" summary="Address with alphanumeric zip">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="initialCustomer/dataset" xsi:type="string">default</data>
<data name="customer/data/group_id/dataset" xsi:type="string">Retailer</data>
<data name="customer/data/prefix" xsi:type="string">%isolation%Prefix_</data>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php
index 7fda95c0be7d2e48e58cb2a01317704cc54a0b57..bd21e9aca690525910b5500e69e6b5913449d2e5 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php
@@ -32,6 +32,7 @@ class UpdateCustomerGroupEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
+ const TO_MAINTAIN = 'yes';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml
index e2f49d40cac7395734acc42783f5fce6b0c74083..9d12218ccf0dddf72b15a21db85e6c211848f0b8 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml
@@ -24,6 +24,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInCart" />
</variation>
<variation name="CreateDownloadableProductEntityTestVariation2">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">Create product with default set links</data>
<data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
<data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
@@ -53,6 +54,7 @@
<data name="product/data/downloadable_sample/dataset" xsi:type="string">with_two_samples</data>
<data name="product/data/downloadable_links/dataset" xsi:type="string">with_two_separately_links</data>
<data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
<constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
@@ -91,6 +93,7 @@
<data name="product/data/downloadable_links/dataset" xsi:type="string">with_three_links</data>
<data name="product/data/custom_options/dataset" xsi:type="string">two_options</data>
<data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsOnProductPage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
@@ -118,6 +121,7 @@
<constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
</variation>
<variation name="CreateDownloadableProductEntityTestVariation7">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">Create product with manage stock</data>
<data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
<data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
@@ -135,6 +139,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock" />
</variation>
<variation name="CreateDownloadableProductEntityTestVariation8">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">Create product without tax class id</data>
<data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
<data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
@@ -166,6 +171,7 @@
<data name="product/data/custom_options/dataset" xsi:type="string">default</data>
<data name="product/data/custom_options/import_products" xsi:type="string">catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option</data>
<data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
<constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
@@ -189,6 +195,7 @@
<data name="product/data/downloadable_links/dataset" xsi:type="string">with_three_links</data>
<data name="product/data/custom_options/dataset" xsi:type="string">default</data>
<data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
@@ -210,6 +217,7 @@
<data name="product/data/downloadable_links/dataset" xsi:type="string">with_three_links</data>
<data name="product/data/custom_options/dataset" xsi:type="string">default</data>
<data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
<constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
@@ -278,6 +286,7 @@
<data name="product/data/downloadable_links/dataset" xsi:type="string">with_two_separately_links</data>
<data name="product/data/tier_price/dataset" xsi:type="string">default</data>
<data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
<constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
@@ -285,6 +294,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage" />
</variation>
<variation name="CreateDownloadableProductEntityTestVariation16" summary="Create downloadable product and assign it to custom website">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
<data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
<data name="product/data/price/value" xsi:type="string">350</data>
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DuplicateProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DuplicateProductEntityTest.xml
index be38a73902cd71a2a893b0f2aaf94ac70ebb4273..8e844fa90ddf94a48ed09bc1b7ed9285b51ef555 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DuplicateProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DuplicateProductEntityTest.xml
@@ -9,6 +9,7 @@
<testCase name="Magento\Catalog\Test\TestCase\Product\DuplicateProductEntityTest">
<variation name="DuplicateProductEntityTestVariation3" firstConstraint="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" method="test">
<data name="productType" xsi:type="string">downloadableProduct::default</data>
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" next="Magento\Catalog\Test\Constraint\AssertProductDuplicateMessage" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductDuplicateMessage" next="Magento\Downloadable\Test\Constraint\AssertDownloadableDuplicateForm" />
<constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableDuplicateForm" next="Magento\Catalog\Test\Constraint\AssertProductDuplicatedInGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/TaxCalculationTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/TaxCalculationTest.xml
index 87a124814fc222b7ae21df4b47b6b75284fdcdf0..e2afcbeb7cce01be9b5200b8a06c1af4392490f4 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/TaxCalculationTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/TaxCalculationTest.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\Tax\Test\TestCase\TaxCalculationTest">
<variation name="DownloadableTaxCalculationTestVariation1" summary="Downloadable product with sales rule, customer tax equals store tax and catalog price excluding tax" ticketId="MAGETWO-32076">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="configData" xsi:type="string">total_cat_excl_ship_incl_after_disc_on_incl, display_excluding_including_tax</data>
<data name="product" xsi:type="string">downloadableProduct::with_two_separately_links_special_price_and_category</data>
<data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
@@ -34,6 +35,7 @@
<constraint name="Magento\Tax\Test\Constraint\AssertOrderTaxOnBackendExcludingIncludingTax" />
</variation>
<variation name="DownloadableTaxCalculationTestVariation2" summary="Downloadable product with catalog rule, customer tax greater than store tax and catalog price excluding tax" ticketId="MAGETWO-32076">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="configData" xsi:type="string">total_cat_excl_ship_incl_after_disc_on_incl, display_including_tax</data>
<data name="product" xsi:type="string">downloadableProduct::with_two_separately_links_special_price_and_category</data>
<data name="catalogRule" xsi:type="string">catalog_price_rule_all_groups</data>
@@ -53,6 +55,7 @@
<constraint name="Magento\Tax\Test\Constraint\AssertOrderTaxOnBackendIncludingTax" />
</variation>
<variation name="DownloadableTaxCalculationTestVariation4" summary="Downloadable product with catalog rule, customer tax greater than store tax and catalog price including tax" ticketId="MAGETWO-32076">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="configData" xsi:type="string">total_cat_incl_ship_excl_before_disc_on_excl, display_excluding_including_tax</data>
<data name="product" xsi:type="string">downloadableProduct::with_two_separately_links_custom_options_and_category</data>
<data name="catalogRule" xsi:type="string">catalog_price_rule_all_groups</data>
@@ -77,6 +80,7 @@
<constraint name="Magento\Tax\Test\Constraint\AssertOrderTaxOnBackendExcludingIncludingTax" />
</variation>
<variation name="DownloadableTaxCalculationTestVariation6" summary="Downloadable product with catalog rule, customer tax equals store tax and catalog price including tax" ticketId="MAGETWO-32076">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="configData" xsi:type="string">total_cat_incl_ship_excl_before_disc_on_excl</data>
<data name="product" xsi:type="string">downloadableProduct::with_two_separately_links_custom_options_and_category</data>
<data name="catalogRule" xsi:type="string">catalog_price_rule_all_groups</data>
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php
index 276cc08e8efb74f05c70868cdf67a77f452bb44a..91281de3cdbdaf1308d0aca1473aaf7aab808688 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php
@@ -37,6 +37,7 @@ class UpdateDownloadableProductEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
+ const TO_MAINTAIN = 'yes';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Email/Test/TestCase/CreateEmailTemplateEntityTest.php b/dev/tests/functional/tests/app/Magento/Email/Test/TestCase/CreateEmailTemplateEntityTest.php
index dc86b6479757e00564877fa3f52c7e5c6c3ef4f5..69bae8412db119983edf5f99e73da7399af5f9a7 100644
--- a/dev/tests/functional/tests/app/Magento/Email/Test/TestCase/CreateEmailTemplateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Email/Test/TestCase/CreateEmailTemplateEntityTest.php
@@ -30,6 +30,7 @@ class CreateEmailTemplateEntityTest extends Injectable
/* tags */
const MVP = 'yes';
const DOMAIN = 'PS';
+ const TO_MAINTAIN = 'yes';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.xml
index 3913817d8f3205105356b39d39e48bc212e6ca66..6226713f316c5f0a90f06291a3a8160a65ac912f 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.xml
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.xml
@@ -27,6 +27,7 @@
<constraint name="Magento\GiftMessage\Test\Constraint\AssertGiftMessageInFrontendOrder" />
</variation>
<variation name="CheckoutWithGiftMessagesTestVariation2">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="products/0" xsi:type="string">catalogProductSimple::default</data>
<data name="products/1" xsi:type="string">catalogProductVirtual::default</data>
<data name="customer/dataset" xsi:type="string">default</data>
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml
index 47592328f39c10d7a257b014de640e82f969c639..a8a2aebbf2f259875cf55fecd3ac5d59f7b2b52c 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml
@@ -57,6 +57,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock" />
</variation>
<variation name="CreateGroupedProductEntityTestVariation5" summary="Create with no required products">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="product/data/url_key" xsi:type="string">test-grouped-product-%isolation%</data>
<data name="product/data/name" xsi:type="string">GroupedProduct %isolation%</data>
<data name="product/data/sku" xsi:type="string">GroupedProduct_sku%isolation%</data>
@@ -109,6 +110,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
</variation>
<variation name="CreateGroupedProductEntityTestVariation10" summary="Create Grouped Product and Assign it on Custom Website">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="product/data/url_key" xsi:type="string">test-grouped-product-%isolation%</data>
<data name="product/data/name" xsi:type="string">GroupedProduct %isolation%</data>
<data name="product/data/sku" xsi:type="string">GroupedProduct_sku%isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
index 91c26ddb6acbc1adf214828b7cbde9b041b81eb0..92a842ee5a71e4ea2bc8a2eeba6fd3bdc6bbbeb8 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductFromMiniShoppingCartTest.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\Checkout\Test\TestCase\DeleteProductFromMiniShoppingCartTest" summary="Delete Grouped Product from Mini Shopping Cart" ticketId="MAGETWO-29104">
<variation name="DeleteGroupedProductFromMiniShoppingCartTestVariation">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="products/0" xsi:type="string">groupedProduct::default</data>
<data name="deletedProductIndex" xsi:type="string">0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.xml
index d2ae0836e5e7654ddc37288c582ebe9dece27e65..11f854749d3fdcde8d149fcc6e1519e359dee3d1 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.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\GroupedProduct\Test\TestCase\UpdateGroupedProductEntityTest" summary="Update Grouped Product" ticketId="MAGETWO-26462">
<variation name="UpdateGroupedProductEntityTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="originalProduct/dataset" xsi:type="string">grouped_product_out_of_stock</data>
<data name="product/data/name" xsi:type="string">GroupedProduct_edited %isolation%</data>
<data name="product/data/sku" xsi:type="string">GroupedProduct_sku_edited %isolation%</data>
@@ -21,6 +22,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
</variation>
<variation name="UpdateGroupedProductEntityTestVariation2">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="originalProduct/dataset" xsi:type="string">default</data>
<data name="product/data/name" xsi:type="string">GroupedProduct_edited %isolation%</data>
<data name="product/data/sku" xsi:type="string">GroupedProduct_sku_edited %isolation%</data>
@@ -31,6 +33,7 @@
<constraint name="Magento\GroupedProduct\Test\Constraint\AssertGroupedProductForm" />
</variation>
<variation name="UpdateGroupedProductEntityTestVariation3">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="originalProduct/dataset" xsi:type="string">default</data>
<data name="product/data/name" xsi:type="string">GroupedProduct_edited %isolation%</data>
<data name="product/data/sku" xsi:type="string">GroupedProduct_sku_edited %isolation%</data>
@@ -42,6 +45,7 @@
<constraint name="Magento\GroupedProduct\Test\Constraint\AssertGroupedProductForm" />
</variation>
<variation name="UpdateGroupedProductEntityTestVariation4">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="originalProduct/dataset" xsi:type="string">default</data>
<data name="product/data/name" xsi:type="string">GroupedProduct_edited %isolation%</data>
<data name="product/data/sku" xsi:type="string">GroupedProduct_sku_edited %isolation%</data>
@@ -52,6 +56,7 @@
<constraint name="Magento\GroupedProduct\Test\Constraint\AssertSpecialPriceOnGroupedProductPage" />
</variation>
<variation name="UpdateGroupedProductEntityTestVariation5">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="originalProduct/dataset" xsi:type="string">default</data>
<data name="product/data/name" xsi:type="string">GroupedProduct_edited %isolation%</data>
<data name="product/data/sku" xsi:type="string">GroupedProduct_sku_edited %isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.xml
index e09d2a23559b97a904e59899177177ae38f9b93f..5965aa7ce3c581264c73106afd52197be71af583 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.xml
@@ -20,6 +20,7 @@
<constraint name="Magento\Integration\Test\Constraint\AssertIntegrationInGrid" />
</variation>
<variation name="UpdateIntegrationEntityTestVariation2">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="integration/data/name" xsi:type="string">Integration_%isolation%</data>
<data name="integration/data/email" xsi:type="string">-</data>
<data name="integration/data/endpoint" xsi:type="string">-</data>
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.php
index a79ea3995eeff08464befe26a71e61171af3bc2e..0203cf89fe7d2d5b4745a65625df5cb14602be8d 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.php
@@ -31,6 +31,7 @@ class ActionNewsletterTemplateEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
+ const STABLE = 'no';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/PreviewNewsletterTemplateEntityTest.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/PreviewNewsletterTemplateEntityTest.xml
index 13b499fca5e3c40754fd78f54b158361514bbb8a..206e2d01468e7e03300fd328e798bd6b70069b73 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/PreviewNewsletterTemplateEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/PreviewNewsletterTemplateEntityTest.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\Newsletter\Test\TestCase\PreviewNewsletterTemplateEntityTest" summary="Newsletter Template Preview" ticketId="MAGETWO-51979">
<variation name="PreviewNewsletterTemplateEntityTestVariation1">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="newsletter/dataset" xsi:type="string">default</data>
<constraint name="Magento\Newsletter\Test\Constraint\AssertNewsletterPreview" />
</variation>
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/AddProductVideoTest.xml b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/AddProductVideoTest.xml
index 9dfcc4d8bac35141a99400cb88df7e4206dfce44..0bcf0db70b2fba7a98b02e326f7d986d5f3c95f9 100644
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/AddProductVideoTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/AddProductVideoTest.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\ProductVideo\Test\TestCase\AddProductVideoTest" summary="Add Video to PCF" ticketId="MAGETWO-43672">
<variation name="AddProductVideoEntityTestVariation1" summary="Add youtube video with all available fields filled in">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="product/dataset" xsi:type="string">product_with_video_youtube</data>
<data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
@@ -15,6 +16,7 @@
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
</variation>
<variation name="AddProductVideoEntityTestVariation2" summary="Add vimeo video with all available fields filled in">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="product/dataset" xsi:type="string">product_with_video_vimeo</data>
<data name="configData" xsi:type="string">play_if_base</data>
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/DeleteProductVideoTest.xml b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/DeleteProductVideoTest.xml
index 78a7fe00ab9f43227ffe4828769dd3b627e8cfce..26df238f11b286f47d4a923084cc56dd7d6985dd 100644
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/DeleteProductVideoTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/DeleteProductVideoTest.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\ProductVideo\Test\TestCase\DeleteProductVideoTest" summary="Delete Video from PCF - Delete video" ticketId="MAGETWO-43660">
<variation name="DeleteVideoEntityTestVariation1" summary="Delete video youtube" ticketId="MAGETWO-43660">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="product/dataset" xsi:type="string">product_with_video_youtube</data>
<data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductNoImageInGrid" />
@@ -15,6 +16,7 @@
<constraint name="Magento\ProductVideo\Test\Constraint\AssertNoVideoProductView" />
</variation>
<variation name="DeleteVideoEntityTestVariation2" summary="Delete video vimeo" ticketId="MAGETWO-43660">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="product/dataset" xsi:type="string">product_with_video_vimeo</data>
<data name="configData" xsi:type="string">play_if_base</data>
<constraint name="Magento\Catalog\Test\Constraint\AssertProductNoImageInGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateProductVideoTest.php b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateProductVideoTest.php
index 30df076817dff80416933e9bccf11d598fb28a87..a02ba30f716ecea19e2ec06a30e0627afcd997a6 100644
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateProductVideoTest.php
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateProductVideoTest.php
@@ -33,8 +33,9 @@ use Magento\Mtf\TestCase\Injectable;
class UpdateProductVideoTest extends Injectable
{
/* tags */
- const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
+ const TEST_TYPE = 'extended_acceptance_test';
const MVP = 'yes';
+ const STABLE = 'no';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
index 5930e63b9d3bd367a4c93fb241cc64613fa9aea6..95c9d518a391ddb679c3d5a4118ef79391d2cdca 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
@@ -34,6 +34,7 @@ class AbandonedCartsReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
+ const STABLE = 'no';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomersOrderCountReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomersOrderCountReportEntityTest.php
index cacb6e5a329bff99eb28fd62118f440c569ade46..7dc9b6106b7bb20d8507af83840abb030e9b24e7 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomersOrderCountReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomersOrderCountReportEntityTest.php
@@ -31,6 +31,7 @@ class CustomersOrderCountReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
+ const STABLE = 'no';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/DownloadProductsReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/DownloadProductsReportEntityTest.xml
index 6e37965603c787083bfa0a9b337d1b770df3bfec..3a25f81d37fb6316e27a891a573503778443d57b 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/DownloadProductsReportEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/DownloadProductsReportEntityTest.xml
@@ -8,16 +8,19 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Reports\Test\TestCase\DownloadProductsReportEntityTest" summary="Download Products Report" ticketId="MAGETWO-28823">
<variation name="DownloadProductsReportEntityTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="order/dataset" xsi:type="string">downloadable_product</data>
<data name="downloads" xsi:type="string">1</data>
<constraint name="Magento\Reports\Test\Constraint\AssertDownloadsReportResult" />
</variation>
<variation name="DownloadProductsReportEntityTestVariation2">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="order/dataset" xsi:type="string">two_downloadable_product</data>
<data name="downloads" xsi:type="string">2</data>
<constraint name="Magento\Reports\Test\Constraint\AssertDownloadsReportResult" />
</variation>
<variation name="DownloadProductsReportEntityTestVariation3">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="order/dataset" xsi:type="string">downloadable_product</data>
<data name="downloads" xsi:type="string">0</data>
<constraint name="Magento\Reports\Test\Constraint\AssertDownloadsReportResult" />
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.xml
index c484c94a976f6340706e0b6f5ab045b16c83caf7..582d41a9d3bb2957abdb136a0032c051f3b5d949 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.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\Reports\Test\TestCase\NewAccountsReportEntityTest" summary="New Accounts Report" ticketId="MAGETWO-27742">
<variation name="NewAccountsReportEntityTestVariation1">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="customer/dataset" xsi:type="string">default</data>
<data name="total" xsi:type="string">1</data>
<data name="customersReport/report_from" xsi:type="string">m/d/Y</data>
@@ -16,6 +17,7 @@
<constraint name="Magento\Reports\Test\Constraint\AssertNewAccountsReportTotalResult" />
</variation>
<variation name="NewAccountsReportEntityTestVariation2">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="customer/dataset" xsi:type="string">default</data>
<data name="total" xsi:type="string">1</data>
<data name="customersReport/report_from" xsi:type="string">m/d/Y</data>
@@ -24,6 +26,7 @@
<constraint name="Magento\Reports\Test\Constraint\AssertNewAccountsReportTotalResult" />
</variation>
<variation name="NewAccountsReportEntityTestVariation3">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="customer/dataset" xsi:type="string">default</data>
<data name="total" xsi:type="string">1</data>
<data name="customersReport/report_from" xsi:type="string">m/d/Y</data>
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/OrderedProductsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/OrderedProductsReportEntityTest.php
index 7d0d13862e7720b0b63516639d8b4968909c66cc..dc09819ab98790fd7b6b8acf6b69aad614ef7ccd 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/OrderedProductsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/OrderedProductsReportEntityTest.php
@@ -28,6 +28,7 @@ class OrderedProductsReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
+ const STABLE = 'no';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesCouponReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesCouponReportEntityTest.php
index 0d59b989fc25fc162e450ce719c96413229c45fe..8d686421a524bfc610ab22e16cc6780e559d32c9 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesCouponReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesCouponReportEntityTest.php
@@ -34,6 +34,7 @@ class SalesCouponReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
+ const STABLE = 'no';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest.php
index 3ebfd4746a858f92381e9c58e8b20cc84356c0be..b8e5a5276d616061eb1e2e0c30fe74801fb96479 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest.php
@@ -37,6 +37,7 @@ class SalesInvoiceReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
+ const STABLE = 'no';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.xml
index b1957b6315765538644619f27390d06ae0dd7aa0..1d8adebd6befdc04d23a4b6653eafeb3ce26d410 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.xml
@@ -21,6 +21,7 @@
<constraint name="Magento\Reports\Test\Constraint\AssertSalesReportTotalResult" />
</variation>
<variation name="SalesOrderReportEntityTestVariation2">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="order/dataset" xsi:type="string">default</data>
<data name="order/data/price/dataset" xsi:type="string">full_invoice</data>
<data name="salesReport/report_type" xsi:type="string">Order Created</data>
@@ -34,6 +35,7 @@
<constraint name="Magento\Reports\Test\Constraint\AssertSalesReportTotalResult" />
</variation>
<variation name="SalesOrderReportEntityTestVariation3">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="order/dataset" xsi:type="string">default</data>
<data name="order/data/price/dataset" xsi:type="string">full_invoice</data>
<data name="salesReport/report_type" xsi:type="string">Order Updated</data>
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.xml
index a3b971ec5a8caf5332c9be61a1397a28c4e4ead0..927e461fc2181d818ecaca45a57d9876f44f2965 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.xml
@@ -20,6 +20,7 @@
<constraint name="Magento\Reports\Test\Constraint\AssertRefundReportIntervalResult" />
</variation>
<variation name="SalesRefundsReportEntityTestVariation2">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">assert refunds month report</data>
<data name="order/dataset" xsi:type="string">default</data>
<data name="order/data/price/dataset" xsi:type="string">full_invoice</data>
@@ -32,6 +33,7 @@
<constraint name="Magento\Reports\Test\Constraint\AssertRefundReportIntervalResult" />
</variation>
<variation name="SalesRefundsReportEntityTestVariation3">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">assert refund Daily report</data>
<data name="order/dataset" xsi:type="string">default</data>
<data name="order/data/price/dataset" xsi:type="string">full_invoice</data>
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.xml
index df6eb7759fd5558110925b224de31d72090702c6..69440d5f15e3fe9508ae7d8a1efd3d31c8940417 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.xml
@@ -22,6 +22,7 @@
<constraint name="Magento\Reports\Test\Constraint\AssertTaxReportNotInGrid" />
</variation>
<variation name="SalesTaxReportEntityTestVariation2">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="orderSteps" xsi:type="string">invoice</data>
<data name="taxRule/dataset" xsi:type="string">custom_rule</data>
<data name="order/dataset" xsi:type="string">default</data>
@@ -37,6 +38,7 @@
<constraint name="Magento\Reports\Test\Constraint\AssertTaxReportInGrid" />
</variation>
<variation name="SalesTaxReportEntityTestVariation3">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="orderSteps" xsi:type="string">invoice,shipment</data>
<data name="taxRule/dataset" xsi:type="string">custom_rule</data>
<data name="order/dataset" xsi:type="string">default</data>
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php
index 905fa8fb70f0cebff985cf4a99d193359969e5e1..6c22348179897ffa0d533dba563a5fce06657632 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php
@@ -33,6 +33,7 @@ class ViewedProductsReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
+ const STABLE = 'no';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.php
index 9130c5285848e2d04f5978403c23ae0b2278ff16..251cbd75a793f8a0382180041b20529784526e57 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.php
@@ -34,6 +34,7 @@ class CreateProductReviewBackendEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
+ const TO_MAINTAIN = 'yes';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.xml
index 786203e93f24d8e29ba779c8ed0ad3b4b66f0626..8cd4e44b7622a2de828b9f2d9a96738a41ae2911 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.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\Review\Test\TestCase\CreateProductReviewFrontendEntityTest" summary="Create Frontend Product Review" ticketId="MAGETWO-25519">
<variation name="CreateProductReviewFrontendEntityTestVariation1" summary="Create product review with rating">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="review/data/type" xsi:type="string">Guest</data>
<data name="review/data/nickname" xsi:type="string">name_%isolation%</data>
<data name="review/data/title" xsi:type="string">title_%isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php
index fc58266356223d48457d54a14d508a01712acc4c..3f1adc16694ccee1b7ba8aec945e71d8d2b30d52 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php
@@ -43,6 +43,7 @@ class ManageProductReviewFromCustomerPageTest extends Injectable
{
/* tags */
const MVP = 'no';
+ const TO_MAINTAIN = 'yes';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.xml
index 5d731c736fd69245c110161823374f3ca2843ccc..86dca577d0094e3d3fd20e15b1a9b22eabd75a1e 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.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\Review\Test\TestCase\UpdateProductReviewEntityOnProductPageTest" summary="Update Product Review from Product Page" ticketId="MAGETWO-27743">
<variation name="UpdateProductReviewEntityOnProductPageTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="rating" xsi:type="string">3</data>
<data name="review/data/status_id" xsi:type="string">Approved</data>
<data name="productRating/data/select_stores" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.xml
index 549c3c3ddc3a8d91292e1169c8fe3084f628b2e9..71c40ca27fac05b1b1c3b4e4c6609d98e788ea0b 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.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\Review\Test\TestCase\UpdateProductReviewEntityTest" summary="Update Product Review" ticketId="MAGETWO-25604">
<variation name="UpdateProductReviewEntityTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="reviewInitial/dataset" xsi:type="string">review_for_simple_product_with_rating</data>
<data name="review/data/nickname" xsi:type="string">name_upd_%isolation%</data>
<data name="review/data/title" xsi:type="string">title_upd_%isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
index c25b96a624bfda79865d81f73f3208f0bc38d74a..9e0c1517d3d7eae9c8945b6c822928eaef0ac64f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
@@ -339,6 +339,7 @@ class Create extends Block
$this->getTemplateBlock()->waitLoader();
$this->_rootElement->find($this->orderMethodsSelector)->click();
$this->getBillingMethodBlock()->selectPaymentMethod($paymentCode, $creditCard);
+ $this->_rootElement->click();
$this->getTemplateBlock()->waitLoader();
}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductQtyDecreasedAfterCreditmemo.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductQtyDecreasedAfterCreditmemo.php
new file mode 100644
index 0000000000000000000000000000000000000000..f48e9e198210c02a66870674cbc35178b7d91df4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductQtyDecreasedAfterCreditmemo.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Constraint;
+
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\System\Event\EventManagerInterface;
+use Magento\Sales\Test\Fixture\OrderInjectable;
+
+/**
+ * Class AssertProductQtyDecreasedAfterCreditmemo
+ */
+class AssertProductQtyDecreasedAfterCreditmemo extends AbstractConstraint
+{
+ /**
+ * @var FixtureFactory
+ */
+ protected $fixtureFactory;
+
+ /**
+ * Skip fields for create product fixture.
+ *
+ * @var array
+ */
+ protected $skipFields = [
+ 'attribute_set_id',
+ 'website_ids',
+ 'checkout_data',
+ 'type_id',
+ 'price',
+ ];
+
+ /**
+ * AssertFirstProductForm constructor.
+ * @param ObjectManager $objectManager
+ */
+ public function __construct(
+ ObjectManager $objectManager,
+ EventManagerInterface $eventManager,
+ FixtureFactory $fixtureFactory
+ ) {
+ $this->fixtureFactory = $fixtureFactory;
+ parent::__construct($objectManager, $eventManager);
+ }
+
+ /**
+ * Assert form data equals fixture data
+ *
+ * @param OrderInjectable $order
+ * @param array $data
+ * @param CatalogProductIndex $productGrid
+ * @param CatalogProductEdit $productPage
+ * @return void
+ */
+ public function processAssert(
+ OrderInjectable $order,
+ array $data,
+ CatalogProductIndex $productGrid,
+ CatalogProductEdit $productPage
+ ) {
+ $product = $this->getProduct($order, $data);
+ $this->objectManager->get(\Magento\Catalog\Test\Constraint\AssertProductForm::class)->processAssert(
+ $product,
+ $productGrid,
+ $productPage
+ );
+ }
+
+ /**
+ * Get product's fixture.
+ *
+ * @param OrderInjectable $order
+ * @param array $data
+ * @param int $index [optional]
+ * @return FixtureInterface
+ */
+ protected function getProduct(OrderInjectable $order, array $data, $index = 0)
+ {
+ if (!isset($data['items_data'][$index]['back_to_stock'])
+ || $data['items_data'][$index]['back_to_stock'] != 'Yes'
+ ) {
+ return $order->getEntityId()['products'][$index];
+ }
+ $product = $order->getEntityId()['products'][$index];
+ $productData = $product->getData();
+ $checkoutDataQty = $productData['checkout_data']['qty'];
+ $productData['quantity_and_stock_status']['qty'] -= ($checkoutDataQty - $data['items_data'][$index]['qty']);
+
+ $productData = array_diff_key($productData, array_flip($this->skipFields));
+
+ return $this->fixtureFactory->create(get_class($product), ['data' => $productData]);
+ }
+
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Product qty was decreased after creditmemo creation.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable/Price.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable/Price.xml
index 3e2dfdd7125074ac64fdc6c7a39cdc762348585a..3da1f91925e0a1274cbe317d36f2bc40271cbeb6 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable/Price.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable/Price.xml
@@ -43,5 +43,12 @@
<item name="grand_creditmemo_total" xsi:type="string">110</item>
</field>
</dataset>
+
+ <dataset name="free_invoice">
+ <field name="0" xsi:type="array">
+ <item name="grand_order_total" xsi:type="string">0</item>
+ <item name="grand_invoice_total" xsi:type="string">0</item>
+ </field>
+ </dataset>
</repository>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.xml
index b65b9a31f72f3d7ff7290afb4393edeaf73679bc..e839681907c6d291b0855f138fa7d52c9b1dd4fa 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.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\Sales\Test\TestCase\CancelCreatedOrderTest" summary="Cancel Created Order for Offline Payment Methods" ticketId="MAGETWO-28191">
<variation name="CancelCreatedOrderTestVariationWithCheckMoneyOrderPaymentMethod" summary="Cancel order with check/money order payment method and check status on storefront">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="order/dataset" xsi:type="string">default</data>
<data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::default,catalogProductSimple::default</data>
<data name="status" xsi:type="string">Canceled</data>
@@ -17,6 +18,7 @@
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
</variation>
<variation name="CancelCreatedOrderTestVariationWithZeroSubtotalCheckout" summary="Cancel order with zero subtotal checkout payment method and check status on storefront">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="order/dataset" xsi:type="string">default</data>
<data name="order/data/payment_auth_expiration/method" xsi:type="string">free</data>
<data name="order/data/shipping_method" xsi:type="string">freeshipping_freeshipping</data>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.php
index 9d19d10f4d40c6c3e317a97e7e83cd3c79e6f8ae..92b341bef2675fe635f804da2d9a17c5eea54c49 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.php
@@ -90,32 +90,7 @@ class CreateCreditMemoEntityTest extends Injectable
return [
'ids' => ['creditMemoIds' => $result['creditMemoIds']],
- 'product' => $this->getProduct($order, $data),
'customer' => $order->getDataFieldConfig('customer_id')['source']->getCustomer()
];
}
-
- /**
- * Get product's fixture.
- *
- * @param OrderInjectable $order
- * @param array $data
- * @param int $index [optional]
- * @return FixtureInterface
- */
- protected function getProduct(OrderInjectable $order, array $data, $index = 0)
- {
- if (!isset($data['items_data'][$index]['back_to_stock'])
- || $data['items_data'][$index]['back_to_stock'] != 'Yes'
- ) {
- return $order->getEntityId()['products'][$index];
- }
- $product = $order->getEntityId()['products'][$index];
- $productData = $product->getData();
- $checkoutDataQty = $productData['checkout_data']['qty'];
- $productData['quantity_and_stock_status']['qty'] -= ($checkoutDataQty - $data['items_data'][$index]['qty']);
- $productData = array_diff_key($productData, array_flip($this->skipFields));
-
- return $this->fixtureFactory->create(get_class($product), ['data' => $productData]);
- }
}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.xml
index 02b9640acbea4159c0560e8a4727a13cc36e1199..b2cf9843598f48af778edda5a4240409fd9d0365 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.xml
@@ -22,7 +22,7 @@
<constraint name="Magento\Sales\Test\Constraint\AssertRefundOrderStatusInCommentsHistory" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderCommentsHistoryNotifyStatus" />
<constraint name="Magento\Sales\Test\Constraint\AssertRefundedGrandTotalOnFrontend" />
- <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
+ <constraint name="Magento\Sales\Test\Constraint\AssertProductQtyDecreasedAfterCreditmemo" />
<constraint name="Magento\Sales\Test\Constraint\AssertCreditMemoItems" />
</variation>
<variation name="CreateCreditMemoEntityTestVariation2" summary="Assert 0 shipping refund">
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.php
index f7cdaf74ab0f57e0544a392f6a936498bcb8efee..fc866fab6dc17fbf35d1176594ae2e8836ecf87e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.php
@@ -31,6 +31,7 @@ class CreateInvoiceEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
+ const STABLE = 'no';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.xml
index 8753de91d1f4301710f15a968b7a7ea24e04d663..116d3cb5d4a5e36dcf30b04a953c0f94cdc3e7f0 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.xml
@@ -68,7 +68,7 @@
</variation>
<variation name="CreateInvoiceEntityTestVariationWithZeroSubtotalCheckout">
<data name="order/dataset" xsi:type="string">default</data>
- <data name="order/data/price/dataset" xsi:type="string">partial_invoice</data>
+ <data name="order/data/price/dataset" xsi:type="string">free_invoice</data>
<data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
<data name="order/data/total_qty_ordered/0" xsi:type="string">-</data>
<data name="order/data/payment_auth_expiration/method" xsi:type="string">free</data>
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 ad4cc670e43cdd6087ede4ffdb2ebffff5343f0a..bd592e9d71aaa1e9d74279af53c80ac3b319e376 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
@@ -69,6 +69,7 @@
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
</variation>
<variation name="CreateOrderBackendTestVariation4">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="description" xsi:type="string">Create order with virtual product for registered UK customer using Bank Transfer payment method</data>
<data name="products/0" xsi:type="string">catalogProductVirtual::default</data>
<data name="customer/dataset" xsi:type="string">default</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 4e61abb7c5d50b783f407a926d56b6e60473a5ae..b4c3a7568a2a1dd4fb62fe0d013b6425d372d27d 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">stable:no</data>
<data name="description" xsi:type="string">Verify sales order grid filtering</data>
<data name="steps" xsi:type="array">
<item name="0" xsi:type="string">-</item>
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 abd9432fe098e836ce34f0107f89e099620a33de..0979d0dcbff250a7f0bdb2d5151f60004f72efd0 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,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="SalesOrderGridFullTextSearch">
+ <data name="tag" xsi:type="string">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>
@@ -23,6 +24,7 @@
<constraint name="Magento\Ui\Test\Constraint\AssertGridFullTextSearch"/>
</variation>
<variation name="SalesInvoiceGridFullTextSearch">
+ <data name="tag" xsi:type="string">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>
@@ -55,6 +57,7 @@
<constraint name="Magento\Ui\Test\Constraint\AssertGridFullTextSearch"/>
</variation>
<variation name="SalesCreditMemoGridFullTextSearch">
+ <data name="tag" xsi:type="string">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 056fa5136d433ba1700b462ad12a1c0747b9dcc1..f82f232625841ddfdd77e66812970a4de31efea6 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">to_maintain:yes</data>
<data name="description" xsi:type="string">Verify sales order grid storting</data>
<data name="steps" xsi:type="array">
<item name="0" xsi:type="string">-</item>
@@ -26,6 +27,7 @@
<constraint name="\Magento\Ui\Test\Constraint\AssertGridSorting"/>
</variation>
<variation name="SalesInvoiceGridSorting">
+ <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">
<item name="0" xsi:type="string">Magento\Sales\Test\TestStep\CreateInvoiceStep</item>
@@ -43,6 +45,7 @@
<constraint name="\Magento\Ui\Test\Constraint\AssertGridSorting"/>
</variation>
<variation name="SalesShipmentGridSorting">
+ <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">
<item name="0" xsi:type="string">Magento\Sales\Test\TestStep\CreateShipmentStep</item>
@@ -60,6 +63,7 @@
<constraint name="\Magento\Ui\Test\Constraint\AssertGridSorting"/>
</variation>
<variation name="SalesCreditMemoGridSorting">
+ <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">
<item name="0" xsi:type="array">
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml
index 02dbf74225ba9d69ffe88e7c933e5ac0cc82da9e..4d54654a04bbbf7f1d3ea0cc2f53199538d7910c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.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\Sales\Test\TestCase\MassOrdersUpdateTest" summary="Mass Update Orders" ticketId="MAGETWO-27897">
<variation name="MassOrdersUpdateTestVariation1">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">cancel orders in status Pending and Processing</data>
<data name="steps" xsi:type="string">-</data>
<data name="action" xsi:type="string">Cancel</data>
@@ -44,6 +45,7 @@
<constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
</variation>
<variation name="MassOrdersUpdateTestVariation5">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">Try to put order in status Complete on Hold</data>
<data name="steps" xsi:type="string">invoice, shipment</data>
<data name="action" xsi:type="string">Hold</data>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml
index 8f6466b4edc4f538918c274564888758da706b62..5f4066c1d8027a7e95b2aeab2eb8f4a8aca12330 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml
@@ -8,11 +8,13 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Sales\Test\TestCase\MoveLastOrderedProductsOnOrderPageTest" summary="Add Products to Order from Last Ordered Products Section" ticketId="MAGETWO-27640">
<variation name="MoveLastOrderedProductsOnOrderPageTestVariation1">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="order/dataset" xsi:type="string">default</data>
<data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::default</data>
<constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
</variation>
<variation name="MoveLastOrderedProductsOnOrderPageTestVariation2">
+ <data name="issue" xsi:type="string">MAGETWO-58762: Customer grid does not open in MoveLastOrderedProductsOnOrderPageTestVariation2 on Jenkins</data>
<data name="order/dataset" xsi:type="string">default</data>
<data name="order/data/entity_id/products" xsi:type="string">configurableProduct::configurable_with_qty_1</data>
<constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveProductsInComparedOnOrderPageTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveProductsInComparedOnOrderPageTest.xml
index 4fbfbe531e8fee71987f1881c70a889d7c3deba8..695948b8b10c9caa421ebe674cbe9fe078ec6c04 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveProductsInComparedOnOrderPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveProductsInComparedOnOrderPageTest.xml
@@ -8,11 +8,13 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Sales\Test\TestCase\MoveProductsInComparedOnOrderPageTest" summary="Add Products to Order from Products in Comparison List Section" ticketId="MAGETWO-28050">
<variation name="MoveProductsInComparedOnOrderPageTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="products/0" xsi:type="string">catalogProductSimple::default</data>
<data name="products/1" xsi:type="string">catalogProductSimple::default</data>
<constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
</variation>
<variation name="MoveProductsInComparedOnOrderPageTestVariation2">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="products/0" xsi:type="string">configurableProduct::configurable_with_qty_1</data>
<data name="products/1" xsi:type="string">configurableProduct::configurable_with_qty_1</data>
<constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.xml
index e6f96da0367cae153191a4bf3c535bc33ed97b5a..601f550e4588bfd3c613ef8a50e8615174b298ae 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.xml
@@ -8,11 +8,13 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Sales\Test\TestCase\MoveRecentlyComparedProductsOnOrderPageTest" summary="Add Products to Order from Recently Compared Products Section" ticketId="MAGETWO-28109">
<variation name="MoveRecentlyComparedProductsOnOrderPageTestVariation1">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="products/0" xsi:type="string">catalogProductSimple::default</data>
<data name="products/1" xsi:type="string">catalogProductSimple::default</data>
<constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
</variation>
<variation name="MoveRecentlyComparedProductsOnOrderPageTestVariation2">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="products/0" xsi:type="string">configurableProduct::configurable_with_qty_1</data>
<data name="products/1" xsi:type="string">configurableProduct::configurable_with_qty_1</data>
<constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyViewedProductsOnOrderPageTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyViewedProductsOnOrderPageTest.xml
index 2e1c3eeea7b8942febf1b8f3505f6c1c9e407106..ae955b301d95687cb1aad697fb79a591c4e5c2d2 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyViewedProductsOnOrderPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyViewedProductsOnOrderPageTest.xml
@@ -8,10 +8,12 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Sales\Test\TestCase\MoveRecentlyViewedProductsOnOrderPageTest" summary="Add Products to Order from Recently Viewed Products Section" ticketId="MAGETWO-29723">
<variation name="MoveRecentlyViewedProductsOnOrderPageTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="products/0" xsi:type="string">configurableProduct::default</data>
<constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
</variation>
<variation name="MoveRecentlyViewedProductsOnOrderPageTestVariation2">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="products/0" xsi:type="string">bundleProduct::bundle_fixed_product</data>
<constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
</variation>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.xml
index e29a63165ad03aa8eddb4186546632e0c97c7687..53f321366de5ecc53d2d87ade453478371572274 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.xml
@@ -8,10 +8,12 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Sales\Test\TestCase\MoveShoppingCartProductsOnOrderPageTest" summary="Add Products to Order from Shopping Cart " ticketId="MAGETWO-28540">
<variation name="MoveShoppingCartProductsOnOrderPageTestVariation1">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="product" xsi:type="string">catalogProductSimple::default</data>
<constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
</variation>
<variation name="MoveShoppingCartProductsOnOrderPageTestVariation2" firstConstraint="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductInItemsOrderedGrid" method="test">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="product" xsi:type="string">configurableProduct::configurable_with_qty_1</data>
<constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
</variation>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.xml
index 4dc6ae8d2fcd1d55062da03c74b7dce41c70c08c..46349665259d03f2626dbbb2723e3a8d18e864f6 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.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\Sales\Test\TestCase\PrintOrderFrontendGuestTest" summary="Print Order from Guest on Frontend" ticketId="MAGETWO-30253">
<variation name="PrintOrderFrontendGuestTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="customer" xsi:type="array">
<item name="dataset" xsi:type="string">johndoe_with_addresses</item>
</data>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/ReorderOrderEntityTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/ReorderOrderEntityTest.xml
index 7608ec4f68ca0d01fd8c7f736d0429ad45972503..8124a32c66eb1149c2c3e30fd79ee41381b0ee15 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/ReorderOrderEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/ReorderOrderEntityTest.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\Sales\Test\TestCase\ReorderOrderEntityTest" summary="Reorder Order from Admin for Offline Payment Methods" ticketId="MAGETWO-29007">
<variation name="ReorderOrderEntityTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="description" xsi:type="string">Reorder placed order (update products, billing address).</data>
<data name="order/dataset" xsi:type="string">two_simple_product</data>
<data name="salesRule" xsi:type="string">active_sales_rule_with_fixed_price_discount_coupon</data>
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
index 4b837e442a4abc83219daf45301fe5a20570f1e0..b1893651726f8a562fe4ba3b9299c17e2ca082d3 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.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\SalesRule\Test\TestCase\ApplySeveralSalesRuleEntityTest" summary="Apply Several Sales Rules" ticketId="MAGETWO-45883">
<variation name="ApplySeveralSalesRuleEntityTestVariation1" summary="Rules with same priority, both are applied">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="salesRules/rule1" xsi:type="string">active_sales_rule_product_subselection</data>
<data name="salesRules/rule2" xsi:type="string">active_sales_rule_product_attribute</data>
<data name="cartPrice/sub_total" xsi:type="string">200.00</data>
@@ -31,6 +32,7 @@
<constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
</variation>
<variation name="ApplySeveralSalesRuleEntityTestVariation3" summary="Rules with different priority, both are applied">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="salesRules/rule1" xsi:type="string">active_sales_rule_product_attribute</data>
<data name="salesRules/rule2" xsi:type="string">active_sales_total_items</data>
<data name="cartPrice/sub_total" xsi:type="string">250.00</data>
@@ -43,6 +45,7 @@
<constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
</variation>
<variation name="ApplySeveralSalesRuleEntityTestVariation4" summary="Rules with different priority, none are applied">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="salesRules/rule1" xsi:type="string">active_sales_rule_row_total</data>
<data name="salesRules/rule2" xsi:type="string">active_sales_total_items</data>
<data name="productForSalesRule1/dataset" xsi:type="string">simple_for_salesrule_1</data>
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 bfa18c65bdcf8362a49c2c2f25ddb6d439c4d99d..d0ad41011004a3fef531865ca1c6265f9406684e 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
@@ -145,6 +145,7 @@
<constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
</variation>
<variation name="CreateSalesRuleEntityTestVariation6">
+ <data name="tag" xsi:type="string">stable:no</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>
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/etc/testcase.xml
index 37f8366674e0573e6d7837a004b3d98fef1dadc0..b894aada2e2ba54ec7c0658b85492b66071dd1c1 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/etc/testcase.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/etc/testcase.xml
@@ -32,8 +32,8 @@
<step name="applySalesRuleOnBackend" module="Magento_SalesRule" next="fillBillingAddress" />
</scenario>
<scenario name="CreateOrderBackendTest">
- <step name="createSalesRule" module="Magento_SalesRule" next="applySalesRuleOnBackend" />
- <step name="applySalesRuleOnBackend" module="Magento_SalesRule" next="fillBillingAddress" />
+ <step name="createSalesRule" module="Magento_SalesRule" prev="fillShippingAddress" next="applySalesRuleOnBackend" />
+ <step name="applySalesRuleOnBackend" module="Magento_SalesRule" />
</scenario>
<scenario name="CreateOrderFromCustomerPageTest">
<step name="createSalesRule" module="Magento_SalesRule" next="applySalesRuleOnBackend" />
diff --git a/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/CreateSynonymGroupEntityTest.xml b/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/CreateSynonymGroupEntityTest.xml
index 21279437ea834b921f2a910714f25daf5735ca84..79a170819c50600ba0f2f15811a8b3cdfe94cb7a 100644
--- a/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/CreateSynonymGroupEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/CreateSynonymGroupEntityTest.xml
@@ -25,7 +25,7 @@
</testCase>
<testCase name="Magento\Search\Test\TestCase\CreateSynonymGroupEntityTest" summary="Create Synonym Group with custom Website and Store View" ticketId="MAGETWO-47681">
<variation name="CreateSynonymGroupEntityTestVariation3">
- <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
+ <data name="tag" xsi:type="string">test_type:extended_acceptance_test, stable:no</data>
<data name="synonymGroup/data/synonyms" xsi:type="string">synonym_%isolation%</data>
<data name="synonymGroup/data/scope_id/dataset" xsi:type="string">custom_store</data>
<constraint name="Magento\Search\Test\Constraint\AssertSynonymGroupSuccessSaveMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/UpdateSynonymGroupEntityTest.xml b/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/UpdateSynonymGroupEntityTest.xml
index 2e6e6cb2e4812b13e0354bf9ec9794f1c845a4db..636cf66fd2c86da20cd331b9a0b1c9b3f549f45d 100644
--- a/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/UpdateSynonymGroupEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/UpdateSynonymGroupEntityTest.xml
@@ -8,9 +8,9 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Search\Test\TestCase\UpdateSynonymGroupEntityTest" summary="Update Synonym Groups" ticketId="MAGETWO-49412">
<variation name="UpdateSynonymGroupEntityTestVariation1">
+ <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes</data>
<data name="initialSynonymGroup/dataset" xsi:type="string">prepareMerge</data>
<data name="description" xsi:type="string">Update Synonym Groups Successfully</data>
- <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
<data name="synonymGroup/data/synonyms" xsi:type="string">new_synonym_%isolation%</data>
<data name="synonymGroup/data/scope_id/dataset" xsi:type="string">all_store_views</data>
<constraint name="Magento\Search\Test\Constraint\AssertSynonymGroupSuccessSaveMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnEditPageTest.xml b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnEditPageTest.xml
index eeb0dd7ab12e9e33eec107f17d3678d4ec1827ad..1a5443ec9e61558b5b7cad2a9ada57825c451581 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnEditPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnEditPageTest.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\Security\Test\TestCase\LockCustomerOnEditPageTest" summary="Lock customer from edit page">
<variation name="LockCustomerOnEditPageTest1">
- <data name="tag" xsi:type="string">severity:S1</data>
+ <data name="tag" xsi:type="string">severity:S1, to_maintain:yes</data>
<data name="configData" xsi:type="string">customer_max_login_failures_number</data>
<data name="initialCustomer/dataset" xsi:type="string">default</data>
<data name="customer/data/current_password" xsi:type="string">incorrect password</data>
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.xml b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.xml
index a5376d73685bad9e54d4ff094348b7100c2a2a8d..df5c5bce59fe0400b308530085e99c541da60323 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.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\Security\Test\TestCase\LockCustomerOnLoginPageTest" summary="Lock customer on login page">
<variation name="LockCustomerOnLoginPageTestVariation1">
- <data name="tag" xsi:type="string">severity:S1</data>
+ <data name="tag" xsi:type="string">severity:S1, to_maintain:yes</data>
<data name="configData" xsi:type="string">customer_max_login_failures_number</data>
<data name="initialCustomer/dataset" xsi:type="string">default</data>
<data name="incorrectPassword" xsi:type="string">incorrect password</data>
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml
index b888ba1f778370d11e19ded0f8c40cfd543541ea..2c3809e27f2eff076ffd538d7aebcfa4fed04e7f 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml
@@ -17,7 +17,7 @@
<constraint name="Magento\Store\Test\Constraint\AssertStoreNotOnFrontend" />
</variation>
<variation name="DeleteStoreEntityTestVariation2">
- <data name="tag" xsi:type="string">severity:S2</data>
+ <data name="tag" xsi:type="string">severity:S2, stable:no</data>
<data name="store/dataset" xsi:type="string">custom</data>
<data name="createBackup" xsi:type="string">No</data>
<constraint name="Magento\Store\Test\Constraint\AssertStoreSuccessDeleteMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml
index 16c0aeb358bb0fe5e7f0e18216300161c6dfbbf1..cfda1263ac19f8355370ad5cb507b44a8aa43f29 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.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\Store\Test\TestCase\DeleteStoreGroupEntityTest" summary="Delete Store Group" ticketId="MAGETWO-27596">
<variation name="DeleteStoreGroupEntityTestVariation1">
- <data name="tag" xsi:type="string">severity:S3</data>
+ <data name="tag" xsi:type="string">severity:S3, stable:no</data>
<data name="storeGroup/dataset" xsi:type="string">custom</data>
<data name="createBackup" xsi:type="string">Yes</data>
<constraint name="Magento\Store\Test\Constraint\AssertStoreGroupSuccessDeleteAndBackupMessages" />
@@ -16,7 +16,7 @@
<constraint name="Magento\Backup\Test\Constraint\AssertBackupInGrid" />
</variation>
<variation name="DeleteStoreGroupEntityTestVariation2">
- <data name="tag" xsi:type="string">severity:S3</data>
+ <data name="tag" xsi:type="string">severity:S3, stable:no</data>
<data name="storeGroup/dataset" xsi:type="string">custom</data>
<data name="createBackup" xsi:type="string">No</data>
<constraint name="Magento\Store\Test\Constraint\AssertStoreGroupSuccessDeleteMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
index 94e14b4a42317edaa2b1f151a3858c770a74fc68..f349131fe5848a5a6b1f44c696bf96969053b19e 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
@@ -39,6 +39,7 @@ class DeleteWebsiteEntityTest extends Injectable
/* tags */
const MVP = 'yes';
const SEVERITY = 'S3';
+ const STABLE = 'no';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ListProduct.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ListProduct.php
new file mode 100644
index 0000000000000000000000000000000000000000..39c630a0aa2060f23e6ef87c2682e73169ffa777
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ListProduct.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Swatches\Test\Block\Product;
+
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Catalog\Test\Block\Product\ListProduct as CatalogListProduct;
+
+/**
+ * Product list block.
+ */
+class ListProduct extends CatalogListProduct
+{
+ /**
+ * @inheritdoc
+ */
+ public function getProductItem(FixtureInterface $product)
+ {
+ $locator = sprintf($this->productItem, $product->getName());
+
+ return $this->blockFactory->create(
+ \Magento\Swatches\Test\Block\Product\ProductList\ProductItem::class,
+ ['element' => $this->_rootElement->find($locator, Locator::SELECTOR_XPATH)]
+ );
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ProductList/ProductItem.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ProductList/ProductItem.php
new file mode 100755
index 0000000000000000000000000000000000000000..414d03bc687871490b551fcfb807f2958fd4e25e
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ProductList/ProductItem.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Swatches\Test\Block\Product\ProductList;
+
+use Magento\Mtf\Client\Locator;
+use Magento\Catalog\Test\Block\Product\ProductList\ProductItem as CatalogProductItem;
+
+/**
+ * Product item block on frontend category view.
+ */
+class ProductItem extends CatalogProductItem
+{
+ /**
+ * Selector for the swatches of the product.
+ *
+ * @var string
+ */
+ protected $swatchSelector = 'div[option-id="%s"]';
+
+ /**
+ * Fill product options on category page.
+ *
+ * @param \Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct $product
+ * @return void
+ */
+ public function fillData(\Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct $product)
+ {
+ $checkoutData = $product->getCheckoutData();
+ $options = $checkoutData['options']['configurable_options'];
+ $confAttrData = $product->getDataFieldConfig('configurable_attributes_data');
+ $confAttrSource = $confAttrData['source'];
+ $attributes = $confAttrSource->getAttributes();
+
+ foreach ($options as $option) {
+ if (!isset($attributes[$option['title']])) {
+ continue;
+ }
+ $availableOptions = $attributes[$option['title']]->getOptions();
+ $optionKey = str_replace('option_key_', '', $option['value']);
+ if (!isset($availableOptions[$optionKey])) {
+ continue;
+ }
+ $optionForSelect = $availableOptions[$optionKey];
+ $this->clickOnSwatch($optionForSelect['id']);
+ }
+ }
+
+ /**
+ * Click on swatch.
+ *
+ * @param $optionId
+ */
+ private function clickOnSwatch($optionId)
+ {
+ $selector = sprintf($this->swatchSelector, $optionId);
+ $this->_rootElement->find($selector, Locator::SELECTOR_CSS)->click();
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function clickAddToCart()
+ {
+ $this->_rootElement->hover();
+ parent::clickAddToCart();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ViewWithSwatches.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ViewWithSwatches.php
new file mode 100644
index 0000000000000000000000000000000000000000..c1405b4a807718edbb511569ac23d03fc2b52d43
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ViewWithSwatches.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Swatches\Test\Block\Product;
+
+use Magento\Catalog\Test\Block\Product\View;
+use Magento\Mtf\Fixture\InjectableFixture;
+
+/**
+ * Configurable product view block with swatch attributes on frontend product page
+ */
+class ViewWithSwatches extends View
+{
+ /**
+ * Selector for swatch attribute value
+ *
+ * @var string
+ */
+ private $swatchAttributeSelector = '.swatch-attribute.%s .swatch-attribute-selected-option';
+
+ /**
+ * Get chosen options from the product view page.
+ *
+ * @param InjectableFixture $product
+ * @return array
+ */
+ public function getSelectedSwatchOptions(InjectableFixture $product)
+ {
+ $checkoutData = $product->getCheckoutData();
+ $availableAttributes = $product->getConfigurableAttributesData();
+ $attributesData = $availableAttributes['attributes_data'];
+ $formData = [];
+ foreach ($checkoutData['options']['configurable_options'] as $item) {
+ $selector = sprintf($this->swatchAttributeSelector, $attributesData[$item['title']]['attribute_code']);
+ $this->waitForElementVisible($selector);
+ $selected = $this->_rootElement->find($selector)->getText();
+ $formData[$item['title']] = $selected;
+ }
+
+ return $formData;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSwatchConfigurableProductPage.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSwatchConfigurableProductPage.php
new file mode 100644
index 0000000000000000000000000000000000000000..460a13ce49d704f30f513af5c8f3189c45f3ffc4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSwatchConfigurableProductPage.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Swatches\Test\Constraint;
+
+use Magento\Catalog\Test\Constraint\AssertProductPage;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Catalog\Test\Page\Product\CatalogProductView;
+use Magento\Mtf\Client\BrowserInterface;
+
+/**
+ * Assert that product with swatches and regular dropdown redirect can't be add to cart from catalog catergory page.
+ */
+class AssertSwatchConfigurableProductPage extends AssertProductPage
+{
+ /**
+ * {@inheritdoc}
+ */
+ public function processAssert(
+ BrowserInterface $browser,
+ CatalogProductView $catalogProductView,
+ FixtureInterface $product
+ ) {
+ $this->product = $product;
+ $this->productView = $catalogProductView->getProductViewWithSwatchesBlock();
+ $this->objectManager->create(
+ \Magento\Swatches\Test\TestStep\AddProductToCartFromCatalogCategoryPageStep::class,
+ [
+ 'product' => $product
+ ]
+ )->run();
+ // we need this line for waiti until page will be fully loaded
+ $this->productView->getSelectedSwatchOptions($this->product);
+ $errors = $this->verify();
+ \PHPUnit_Framework_Assert::assertEmpty(
+ $errors,
+ "\nFound the following errors:\n" . implode(" \n", $errors)
+ );
+ }
+
+ /**
+ * Verify product on product view page.
+ *
+ * @return array
+ */
+ protected function verify()
+ {
+ $errors = parent::verify();
+ $errors[] = $this->verifySwatches();
+
+ return array_filter($errors);
+ }
+
+ /**
+ * Verify selected swatches on product view page.
+ *
+ * @return array
+ */
+ protected function verifySwatches()
+ {
+ $actualData = $this->productView->getSelectedSwatchOptions($this->product);
+ $expectedData = $this->convertCheckoutData($this->product);
+ $this->verifyData($expectedData, $actualData);
+ }
+
+ /**
+ * Get swatch attributes formatter to attributes comparison.
+ *
+ * @param FixtureInterface $product
+ * @return array
+ */
+ public function convertCheckoutData(FixtureInterface $product)
+ {
+ $out = [];
+ $checkoutData = $product->getCheckoutData();
+ $availableAttributes = $product->getConfigurableAttributesData();
+ $attributesData = $availableAttributes['attributes_data'];
+ foreach ($checkoutData['options']['configurable_options'] as $item) {
+ $out[$item['title']] = $attributesData[$item['title']]['options'][$item['value']]['label'];
+ }
+
+ return $out;
+ }
+
+ /**
+ * Return string representation of the object.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Swatch attributes displayed as expected on product page';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Fixture/Cart/Item.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Fixture/Cart/Item.php
new file mode 100644
index 0000000000000000000000000000000000000000..46c9b383ae8420c5210a3d4f71ac49b3513b1724
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Fixture/Cart/Item.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Swatches\Test\Fixture\Cart;
+
+use Magento\ConfigurableProduct\Test\Fixture\Cart\Item as ConfigurableCart;
+
+/**
+ * @inheritdoc
+ */
+class Item extends ConfigurableCart
+{
+ //
+}
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Fixture/ConfigurableProduct.xml b/dev/tests/functional/tests/app/Magento/Swatches/Test/Fixture/ConfigurableProduct.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dbc57a321a68238adff45355fd87a4e97028cde2
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Fixture/ConfigurableProduct.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
+ <fixture
+ name="configurableProductSwatch"
+ module="Magento_Swatches"
+ class="Magento\Swatches\Test\Fixture\ConfigurableProduct"
+ extends="\Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct"
+ >
+ </fixture>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Fixture/SwatchProductAttribute.xml b/dev/tests/functional/tests/app/Magento/Swatches/Test/Fixture/SwatchProductAttribute.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d96331b8159d50a60f6aa215d523d492aa5de7a4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Fixture/SwatchProductAttribute.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
+ <fixture name="swatchesProductAttribute"
+ module="Magento_Swatches"
+ handler_interface="Magento\Swatches\Test\Handler\SwatchProductAttribute\SwatchProductAttributeInterface"
+ repository_class="Magento\Swatches\Test\Repository\SwatchProductAttribute"
+ class="Magento\Swatches\Test\Fixture\SwatchesProductAttribute"
+ extends="\Magento\Catalog\Test\Fixture\CatalogProductAttribute">
+ </fixture>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php
new file mode 100644
index 0000000000000000000000000000000000000000..86de2d651da1ecf3d48fdb165de0b223a665f126
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Swatches\Test\Handler\SwatchProductAttribute;
+
+use Magento\Catalog\Test\Handler\CatalogProductAttribute\Curl as CatalogProductAttributeCurl;
+use Magento\Mtf\Config\DataInterface;
+use Magento\Mtf\System\Event\EventManagerInterface;
+
+/**
+ * Curl handler for creating Swatch Attribute.
+ */
+class Curl extends CatalogProductAttributeCurl implements SwatchProductAttributeInterface
+{
+ /**
+ * Add mapping data related to swatches.
+ *
+ * @param DataInterface $configuration
+ * @param EventManagerInterface $eventManager
+ */
+ public function __construct(DataInterface $configuration, EventManagerInterface $eventManager)
+ {
+ parent::__construct($configuration, $eventManager);
+ $this->mappingData['frontend_input'] = [
+ 'Text Swatch' => 'swatch_text',
+ ];
+ }
+
+ /**
+ * Re-map options from default options structure to swatches structure,
+ * as swatches was initially created with name convention differ from other attributes.
+ *
+ * @param array $data
+ * @return array
+ */
+ protected function changeStructureOfTheData(array $data)
+ {
+ $data = parent::changeStructureOfTheData($data);
+ $data['optiontext'] = $data['option'];
+ $data['swatchtext'] = [
+ 'value' => $data['option']['value']
+ ];
+ unset($data['option']);
+ return $data;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/SwatchProductAttributeInterface.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/SwatchProductAttributeInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..41fdebdd5ce8b084eca0a40c58aeba580a7b3518
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/SwatchProductAttributeInterface.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Swatches\Test\Handler\SwatchProductAttribute;
+
+use Magento\Mtf\Handler\HandlerInterface;
+
+/**
+ * Interface for swatch specific Curl calls
+ */
+interface SwatchProductAttributeInterface extends HandlerInterface
+{
+ //
+}
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Page/Category/CatalogCategoryView.xml b/dev/tests/functional/tests/app/Magento/Swatches/Test/Page/Category/CatalogCategoryView.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9cb5e4fbdf69756a5289555e15d568f577bbf21d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Page/Category/CatalogCategoryView.xml
@@ -0,0 +1,12 @@
+<?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/pages.xsd">
+ <page name="CatalogCategoryView" area="Category" mca="catalog/category/view" module="Magento_Catalog">
+ <block name="listSwatchesProductBlock" class="Magento\Swatches\Test\Block\Product\ListProduct" locator=".products.wrapper.grid" strategy="css selector"/>
+ </page>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Page/Product/CatalogProductView.xml b/dev/tests/functional/tests/app/Magento/Swatches/Test/Page/Product/CatalogProductView.xml
new file mode 100644
index 0000000000000000000000000000000000000000..315c6a02ee968e6bc93ec52bd5555d65be3f87d7
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Page/Product/CatalogProductView.xml
@@ -0,0 +1,12 @@
+<?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/pages.xsd">
+ <page name="CatalogProductView" area="Product" mca="catalog/product/view">
+ <block name="productViewWithSwatchesBlock" class="Magento\Swatches\Test\Block\Product\ViewWithSwatches" locator="#maincontent" strategy="css selector" />
+ </page>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Repository/ConfigurableProduct.xml b/dev/tests/functional/tests/app/Magento/Swatches/Test/Repository/ConfigurableProduct.xml
new file mode 100644
index 0000000000000000000000000000000000000000..22e73572ead0d9081b3bdf15c78f75df12409a3c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Repository/ConfigurableProduct.xml
@@ -0,0 +1,83 @@
+<?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\ConfigurableProduct\Test\Repository\ConfigurableProduct">
+ <dataset name="product_with_text_swatch">
+ <field name="name" xsi:type="string">Test configurable product with color and size %isolation%</field>
+ <field name="sku" xsi:type="string">sku_test_configurable_product_%isolation%</field>
+ <field name="product_has_weight" xsi:type="string">This item has weight</field>
+ <field name="weight" xsi:type="string">30</field>
+ <field name="status" xsi:type="string">Yes</field>
+ <field name="visibility" xsi:type="string">Catalog, Search</field>
+ <field name="tax_class_id" xsi:type="array">
+ <item name="dataset" xsi:type="string">taxable_goods</item>
+ </field>
+ <field name="url_key" xsi:type="string">configurable-product-%isolation%</field>
+ <field name="configurable_attributes_data" xsi:type="array">
+ <item name="dataset" xsi:type="string">text_swatch</item>
+ </field>
+ <field name="quantity_and_stock_status" xsi:type="array">
+ <item name="is_in_stock" xsi:type="string">In Stock</item>
+ </field>
+ <field name="category_ids" xsi:type="array">
+ <item name="dataset" xsi:type="string">default_subcategory</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="attribute_set_id" xsi:type="array">
+ <item name="dataset" xsi:type="string">custom_attribute_set</item>
+ </field>
+ <field name="price" xsi:type="array">
+ <item name="value" xsi:type="string">40</item>
+ <item name="dataset" xsi:type="string">price_40</item>
+ </field>
+ <field name="checkout_data" xsi:type="array">
+ <item name="dataset" xsi:type="string">two_text_swatches</item>
+ </field>
+ </dataset>
+ <dataset name="product_with_text_swatch_and_size">
+ <field name="name" xsi:type="string">Test configurable product with color and size %isolation%</field>
+ <field name="sku" xsi:type="string">sku_test_configurable_product_%isolation%</field>
+ <field name="product_has_weight" xsi:type="string">This item has weight</field>
+ <field name="weight" xsi:type="string">30</field>
+ <field name="status" xsi:type="string">Yes</field>
+ <field name="visibility" xsi:type="string">Catalog, Search</field>
+ <field name="tax_class_id" xsi:type="array">
+ <item name="dataset" xsi:type="string">taxable_goods</item>
+ </field>
+ <field name="url_key" xsi:type="string">configurable-product-%isolation%</field>
+ <field name="configurable_attributes_data" xsi:type="array">
+ <item name="dataset" xsi:type="string">text_swatch_with_dropdown</item>
+ </field>
+ <field name="quantity_and_stock_status" xsi:type="array">
+ <item name="is_in_stock" xsi:type="string">In Stock</item>
+ </field>
+ <field name="category_ids" xsi:type="array">
+ <item name="dataset" xsi:type="string">default_subcategory</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="attribute_set_id" xsi:type="array">
+ <item name="dataset" xsi:type="string">custom_attribute_set</item>
+ </field>
+ <field name="price" xsi:type="array">
+ <item name="value" xsi:type="string">40</item>
+ <item name="dataset" xsi:type="string">price_40</item>
+ </field>
+ <field name="checkout_data" xsi:type="array">
+ <item name="dataset" xsi:type="string">swatches_with_dropdown</item>
+ </field>
+ </dataset>
+ </repository>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Repository/ConfigurableProduct/CheckoutData.xml b/dev/tests/functional/tests/app/Magento/Swatches/Test/Repository/ConfigurableProduct/CheckoutData.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9b369d5a536f0de9e41bb302910526dd8f5023fb
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Repository/ConfigurableProduct/CheckoutData.xml
@@ -0,0 +1,47 @@
+<?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\ConfigurableProduct\Test\Repository\ConfigurableProduct\CheckoutData">
+ <dataset name="two_text_swatches">
+ <field name="options" xsi:type="array">
+ <item name="configurable_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 name="1" xsi:type="array">
+ <item name="title" xsi:type="string">attribute_key_1</item>
+ <item name="value" xsi:type="string">option_key_2</item>
+ </item>
+ </item>
+ </field>
+ <field name="qty" xsi:type="string">1</field>
+ <field name="cartItem" xsi:type="array">
+ <item name="price" xsi:type="string">42</item>
+ <item name="qty" xsi:type="string">1</item>
+ <item name="subtotal" xsi:type="string">47</item>
+ </field>
+ </dataset>
+ <dataset name="swatches_with_dropdown">
+ <field name="options" xsi:type="array">
+ <item name="configurable_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">42</item>
+ <item name="qty" xsi:type="string">1</item>
+ <item name="subtotal" xsi:type="string">47</item>
+ </field>
+ </dataset>
+ </repository>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Repository/ConfigurableProduct/ConfigurableAttributesData.xml b/dev/tests/functional/tests/app/Magento/Swatches/Test/Repository/ConfigurableProduct/ConfigurableAttributesData.xml
new file mode 100644
index 0000000000000000000000000000000000000000..492fda6b751c664bdfde231d813a866e24073f7b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Repository/ConfigurableProduct/ConfigurableAttributesData.xml
@@ -0,0 +1,151 @@
+<?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\ConfigurableProduct\Test\Repository\ConfigurableProduct\ConfigurableAttributesData">
+ <dataset name="text_swatch">
+ <field name="attributes_data" xsi:type="array">
+ <item name="attribute_key_0" xsi:type="array">
+ <item name="options" xsi:type="array">
+ <item name="option_key_0" xsi:type="array">
+ <item name="pricing_value" xsi:type="string">12.00</item>
+ <item name="include" xsi:type="string">Yes</item>
+ </item>
+ <item name="option_key_1" xsi:type="array">
+ <item name="pricing_value" xsi:type="string">20.00</item>
+ <item name="include" xsi:type="string">Yes</item>
+ </item>
+ <item name="option_key_2" xsi:type="array">
+ <item name="pricing_value" xsi:type="string">18.00</item>
+ <item name="include" xsi:type="string">Yes</item>
+ </item>
+ </item>
+ </item>
+ <item name="attribute_key_1" xsi:type="array">
+ <item name="options" xsi:type="array">
+ <item name="option_key_0" xsi:type="array">
+ <item name="pricing_value" xsi:type="string">42.00</item>
+ <item name="include" xsi:type="string">Yes</item>
+ </item>
+ <item name="option_key_1" xsi:type="array">
+ <item name="pricing_value" xsi:type="string">40.00</item>
+ <item name="include" xsi:type="string">Yes</item>
+ </item>
+ <item name="option_key_2" xsi:type="array">
+ <item name="pricing_value" xsi:type="string">48.00</item>
+ <item name="include" xsi:type="string">Yes</item>
+ </item>
+ </item>
+ </item>
+ </field>
+ <field name="attributes" xsi:type="array">
+ <item name="attribute_key_0" xsi:type="string">swatchesProductAttribute::attribute_type_text_swatch</item>
+ <item name="attribute_key_1" xsi:type="string">swatchesProductAttribute::attribute_type_text_swatch</item>
+ </field>
+ <field name="matrix" xsi:type="array">
+ <item name="attribute_key_0:option_key_0 attribute_key_1:option_key_0" xsi:type="array">
+ <item name="qty" xsi:type="string">10</item>
+ <item name="weight" xsi:type="string">1</item>
+ </item>
+ <item name="attribute_key_0:option_key_0 attribute_key_1:option_key_1" xsi:type="array">
+ <item name="qty" xsi:type="string">10</item>
+ <item name="weight" xsi:type="string">1</item>
+ </item>
+ <item name="attribute_key_0:option_key_0 attribute_key_1:option_key_2" xsi:type="array">
+ <item name="qty" xsi:type="string">10</item>
+ <item name="weight" xsi:type="string">1</item>
+ </item>
+ <item name="attribute_key_0:option_key_1 attribute_key_1:option_key_0" xsi:type="array">
+ <item name="qty" xsi:type="string">10</item>
+ <item name="weight" xsi:type="string">1</item>
+ </item>
+ <item name="attribute_key_0:option_key_1 attribute_key_1:option_key_1" xsi:type="array">
+ <item name="qty" xsi:type="string">10</item>
+ <item name="weight" xsi:type="string">1</item>
+ </item>
+ <item name="attribute_key_0:option_key_1 attribute_key_1:option_key_2" xsi:type="array">
+ <item name="qty" xsi:type="string">10</item>
+ <item name="weight" xsi:type="string">1</item>
+ </item>
+ <item name="attribute_key_0:option_key_2 attribute_key_1:option_key_0" xsi:type="array">
+ <item name="qty" xsi:type="string">10</item>
+ <item name="weight" xsi:type="string">1</item>
+ </item>
+ <item name="attribute_key_0:option_key_2 attribute_key_1:option_key_1" xsi:type="array">
+ <item name="qty" xsi:type="string">10</item>
+ <item name="weight" xsi:type="string">1</item>
+ </item>
+ <item name="attribute_key_0:option_key_2 attribute_key_1:option_key_2" xsi:type="array">
+ <item name="qty" xsi:type="string">10</item>
+ <item name="weight" xsi:type="string">1</item>
+ </item>
+ </field>
+ </dataset>
+ <dataset name="text_swatch_with_dropdown">
+ <field name="attributes_data" xsi:type="array">
+ <item name="attribute_key_0" xsi:type="array">
+ <item name="options" xsi:type="array">
+ <item name="option_key_0" xsi:type="array">
+ <item name="pricing_value" xsi:type="string">12.00</item>
+ <item name="include" xsi:type="string">Yes</item>
+ </item>
+ <item name="option_key_1" xsi:type="array">
+ <item name="pricing_value" xsi:type="string">20.00</item>
+ <item name="include" xsi:type="string">Yes</item>
+ </item>
+ <item name="option_key_2" xsi:type="array">
+ <item name="pricing_value" xsi:type="string">18.00</item>
+ <item name="include" xsi:type="string">Yes</item>
+ </item>
+ </item>
+ </item>
+ <item name="attribute_key_1" xsi:type="array">
+ <item name="options" xsi:type="array">
+ <item name="option_key_0" xsi:type="array">
+ <item name="pricing_value" xsi:type="string">42.00</item>
+ <item name="include" xsi:type="string">Yes</item>
+ </item>
+ <item name="option_key_1" xsi:type="array">
+ <item name="pricing_value" xsi:type="string">40.00</item>
+ <item name="include" xsi:type="string">Yes</item>
+ </item>
+ </item>
+ </item>
+ </field>
+ <field name="attributes" xsi:type="array">
+ <item name="attribute_key_0" xsi:type="string">swatchesProductAttribute::attribute_type_text_swatch</item>
+ <item name="attribute_key_1" xsi:type="string">catalogProductAttribute::size</item>
+ </field>
+ <field name="matrix" xsi:type="array">
+ <item name="attribute_key_0:option_key_0 attribute_key_1:option_key_0" xsi:type="array">
+ <item name="qty" xsi:type="string">10</item>
+ <item name="weight" xsi:type="string">1</item>
+ </item>
+ <item name="attribute_key_0:option_key_0 attribute_key_1:option_key_1" xsi:type="array">
+ <item name="qty" xsi:type="string">10</item>
+ <item name="weight" xsi:type="string">1</item>
+ </item>
+ <item name="attribute_key_0:option_key_1 attribute_key_1:option_key_0" xsi:type="array">
+ <item name="qty" xsi:type="string">10</item>
+ <item name="weight" xsi:type="string">1</item>
+ </item>
+ <item name="attribute_key_0:option_key_1 attribute_key_1:option_key_1" xsi:type="array">
+ <item name="qty" xsi:type="string">10</item>
+ <item name="weight" xsi:type="string">1</item>
+ </item>
+ <item name="attribute_key_0:option_key_2 attribute_key_1:option_key_0" xsi:type="array">
+ <item name="qty" xsi:type="string">10</item>
+ <item name="weight" xsi:type="string">1</item>
+ </item>
+ <item name="attribute_key_0:option_key_2 attribute_key_1:option_key_1" xsi:type="array">
+ <item name="qty" xsi:type="string">10</item>
+ <item name="weight" xsi:type="string">1</item>
+ </item>
+ </field>
+ </dataset>
+ </repository>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Repository/SwatchProductAttribute.xml b/dev/tests/functional/tests/app/Magento/Swatches/Test/Repository/SwatchProductAttribute.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fc92146861d1e89e5ef32666c67b8c63882d9691
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Repository/SwatchProductAttribute.xml
@@ -0,0 +1,35 @@
+<?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\Swatches\Test\Repository\SwatchProductAttribute">
+ <dataset name="attribute_type_text_swatch">
+ <field name="attribute_code" xsi:type="string">sw_color%isolation%</field>
+ <field name="frontend_input" xsi:type="string" >Text Swatch</field>
+ <field name="frontend_label" xsi:type="string" >Text Swatch</field>
+ <field name="options" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="is_default" xsi:type="string">No</item>
+ <item name="admin" xsi:type="string">R</item>
+ <item name="view" xsi:type="string">R</item>
+ </item>
+ <item name="1" xsi:type="array">
+ <item name="is_default" xsi:type="string">No</item>
+ <item name="admin" xsi:type="string">G</item>
+ <item name="view" xsi:type="string">G</item>
+ </item>
+ <item name="2" xsi:type="array">
+ <item name="is_default" xsi:type="string">No</item>
+ <item name="admin" xsi:type="string">B</item>
+ <item name="view" xsi:type="string">B</item>
+ </item>
+ </field>
+ <field name="is_global" xsi:type="string">Global</field>
+ <field name="used_in_product_listing" xsi:type="string">Yes</field>
+ </dataset>
+ </repository>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/TestCase/AddConfigurableProductWithSwatchToShopingCartTest.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/TestCase/AddConfigurableProductWithSwatchToShopingCartTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..60cc61f7f0f79319336d57d0d81289de6fe31cab
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/TestCase/AddConfigurableProductWithSwatchToShopingCartTest.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Swatches\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ * 1. Configure text swatch attribute.
+ * 2. Create configurable product with this attribute
+ * 3. Open it on catalog page
+ * 4. Click on 'Add to Cart' button
+ *
+ * Steps:
+ * 1. Go to Frontend.
+ * 2. Open category page with created product
+ * 3. Click on 'Add to Cart' button
+ * 4. Perform asserts
+ *
+ * @group Configurable_Product
+ * @ZephyrId MAGETWO-59958
+ */
+class AddConfigurableProductWithSwatchToShopingCartTest extends Scenario
+{
+ /**
+ * Runs add configurable product with swatches attributes test.
+ *
+ * @return void
+ */
+ public function test()
+ {
+ $this->executeScenario();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/TestCase/AddConfigurableProductWithSwatchToShopingCartTest.xml b/dev/tests/functional/tests/app/Magento/Swatches/Test/TestCase/AddConfigurableProductWithSwatchToShopingCartTest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..adf8d71395ccb9c4b714ad58887ec741391871a2
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/TestCase/AddConfigurableProductWithSwatchToShopingCartTest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+ <testCase name="Magento\Swatches\Test\TestCase\AddConfigurableProductWithSwatchToShopingCartTest" summary="Create text swatch attribute" ticketId="MAGETWO-47017">
+ <variation name="AddConfigurableProductWithSwatchToShopingCartTest1">
+ <data name="attributeTypeAction" xsi:type="string">addOptions</data>
+ <data name="product" xsi:type="string">configurableProductSwatch::product_with_text_swatch</data>
+ <constraint name="Magento\Checkout\Test\Constraint\AssertCartItemsOptions" />
+ </variation>
+ </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/TestCase/TryToAddConfigurableProductWithSwatchToShopingCartTest.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/TestCase/TryToAddConfigurableProductWithSwatchToShopingCartTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..ac3016ade3f016b82a856677715db6c93736c1ef
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/TestCase/TryToAddConfigurableProductWithSwatchToShopingCartTest.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Swatches\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ * 1. Configure text swatch attribute.
+ * 2. Create configurable product with this attribute
+ * 3. Open it on catalog page
+ * 4. Click on 'Add to Cart' button
+ *
+ * Steps:
+ * 1. Go to Frontend.
+ * 2. Open category page with created product
+ * 3. Click on 'Add to Cart' button
+ * 4. Perform asserts
+ *
+ * @group Configurable_Product
+ * @ZephyrId TODO: MAGETWO-59979
+ */
+class TryToAddConfigurableProductWithSwatchToShopingCartTest extends Scenario
+{
+ /**
+ * Runs add configurable product with swatches attributes test.
+ *
+ * @return void
+ */
+ public function test()
+ {
+ $this->executeScenario();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/TestCase/TryToAddConfigurableProductWithSwatchToShopingCartTest.xml b/dev/tests/functional/tests/app/Magento/Swatches/Test/TestCase/TryToAddConfigurableProductWithSwatchToShopingCartTest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4cb7a3e01676f09c6c3e6b9ffcd3d85fb9abbe4a
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/TestCase/TryToAddConfigurableProductWithSwatchToShopingCartTest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+ <testCase name="Magento\Swatches\Test\TestCase\TryToAddConfigurableProductWithSwatchToShopingCartTest" summary="Create text swatch attribute" ticketId="MAGETWO-47017">
+ <variation name="TryToAddConfigurableProductWithSwatchToShopingCartTest1">
+ <data name="attributeTypeAction" xsi:type="string">addOptions</data>
+ <data name="product" xsi:type="string">configurableProductSwatch::product_with_text_swatch_and_size</data>
+ <constraint name="Magento\Swatches\Test\Constraint\AssertSwatchConfigurableProductPage" />
+ </variation>
+ </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/TestStep/AddProductToCartFromCatalogCategoryPageStep.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/TestStep/AddProductToCartFromCatalogCategoryPageStep.php
new file mode 100644
index 0000000000000000000000000000000000000000..e19f9d7b3c362ca61d5869ea409c20359b4b4ffb
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/TestStep/AddProductToCartFromCatalogCategoryPageStep.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Swatches\Test\TestStep;
+
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Swatches\Test\Block\Product\ProductList\ProductItem;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
+use Magento\Cms\Test\Page\CmsIndex;
+
+/**
+ * Add configurable product to cart.
+ */
+class AddProductToCartFromCatalogCategoryPageStep implements TestStepInterface
+{
+ /**
+ * Fixture of configurable product with swatches configuration.
+ *
+ * @var \Magento\Swatches\Test\Fixture\ConfigurableProduct
+ */
+ private $product;
+
+ /**
+ * Fixture factory for create/get fixtures.
+ *
+ * @var FixtureFactory
+ */
+ private $fixtureFactory;
+
+ /**
+ * Page of catalog category view.
+ *
+ * @var CatalogCategoryView
+ */
+ private $categoryView;
+
+ /**
+ * CMS index page.
+ *
+ * @var CmsIndex
+ */
+ private $cmsIndex;
+
+ /**
+ * @constructor
+ * @param FixtureFactory $fixtureFactory
+ * @param CmsIndex $cmsIndex
+ * @param InjectableFixture $product
+ * @param CatalogCategoryView $categoryView
+ */
+ public function __construct(
+ FixtureFactory $fixtureFactory,
+ CmsIndex $cmsIndex,
+ CatalogCategoryView $categoryView,
+ InjectableFixture $product
+ ) {
+ $this->fixtureFactory = $fixtureFactory;
+ $this->cmsIndex = $cmsIndex;
+ $this->categoryView = $categoryView;
+ $this->product = $product;
+ }
+
+ /**
+ * Update configurable product.
+ *
+ * @return array
+ */
+ public function run()
+ {
+ $categoryName = $this->product->getCategoryIds()[0];
+ $this->cmsIndex->open();
+ $this->cmsIndex->getTopmenu()->selectCategoryByName($categoryName);
+ /** @var \Magento\Swatches\Test\Block\Product\ListProduct $productsList */
+ $productsList = $this->categoryView->getListSwatchesProductBlock();
+ /** @var ProductItem $productItemBlock */
+ $productItemBlock = $productsList->getProductItem($this->product);
+ $productItemBlock->fillData($this->product);
+ $productItemBlock->clickAddToCart();
+ $cart = [
+ 'data' => [
+ 'items' => [
+ 'products' => [$this->product]
+ ]
+ ]
+ ];
+
+ return [
+ 'cart' => $this->fixtureFactory->createByCode('cart', $cart)
+ ];
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/etc/curl/di.xml b/dev/tests/functional/tests/app/Magento/Swatches/Test/etc/curl/di.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ac3ad40f804e1abac634c135228d89fca3a90876
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/etc/curl/di.xml
@@ -0,0 +1,10 @@
+<?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="urn:magento:framework:ObjectManager/etc/config.xsd">
+ <preference for="Magento\Swatches\Test\Handler\SwatchProductAttribute\SwatchProductAttributeInterface" type="\Magento\Swatches\Test\Handler\SwatchProductAttribute\Curl" />
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Swatches/Test/etc/testcase.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f2e30c42a7a859e52ad129eda213aa8b1e597aad
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/etc/testcase.xml
@@ -0,0 +1,16 @@
+<?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="AddConfigurableProductWithSwatchToShopingCartTest" firstStep="createProduct">
+ <step name="createProduct" module="Magento_Catalog" next="addProductToCartFromCatalogCategoryPage" />
+ <step name="addProductToCartFromCatalogCategoryPage" module="Magento_Swatches" />
+ </scenario>
+ <scenario name="TryToAddConfigurableProductWithSwatchToShopingCartTest" firstStep="createProduct">
+ <step name="createProduct" module="Magento_Catalog" />
+ </scenario>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/Curl/RemoveTaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/Curl/RemoveTaxRule.php
index 31ca2396f07827735fa3f686facb412807bdf59e..3e69145b42b3416efb88b6557c780d83eae59a1c 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/Curl/RemoveTaxRule.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/Curl/RemoveTaxRule.php
@@ -39,9 +39,9 @@ class RemoveTaxRule extends Curl
public function persist(FixtureInterface $fixture = null)
{
$this->taxRuleGridUrl = $_ENV['app_backend_url'] . 'tax/rule/index/';
- $curl = $this->_getCurl($this->taxRuleGridUrl);
+ $curl = $this->getCurl($this->taxRuleGridUrl);
$response = $curl->read();
- $this->_removeTaxRules($response);
+ $this->removeTaxRules($response);
$curl->close();
return $response;
}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.php
index 9cfa401510bc17bd1e0651f7cb3a71370c46a2fe..55a6694571ac14f4bdb805f57d847db5db87fc62 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.php
@@ -28,6 +28,7 @@ class CreateTaxRuleEntityTest extends Injectable
/* tags */
const MVP = 'yes';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
+ const TO_MAINTAIN = 'yes';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml
index 5d338af60555fbb68836d8abb8a53cf9c2d7ceae..7bbf6d29e7b9fb13c7df662f885c2a089f73f843 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml
@@ -19,6 +19,7 @@
<constraint name="Magento\Tax\Test\Constraint\AssertTaxRuleForm" />
</variation>
<variation name="CreateTaxRuleEntityTestVariation2">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="taxRule/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
<data name="taxRule/data/tax_rate/dataset/rate_0" xsi:type="string">US-CA-Rate_1</data>
<data name="taxRule/data/tax_rate/dataset/rate_1" xsi:type="string">US-NY-Rate_1</data>
@@ -47,6 +48,7 @@
<constraint name="Magento\Tax\Test\Constraint\AssertTaxRuleForm" />
</variation>
<variation name="CreateTaxRuleEntityTestVariation4">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="taxRule/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
<data name="taxRule/data/tax_rate/dataset/rate_0" xsi:type="string">withZipRange</data>
<data name="taxRule/data/tax_rate/dataset/rate_1" xsi:type="string">US-CA-Rate_1</data>
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.xml
index 9414b9a0172f173d18604ed5929c5617adce4341..cda7bf0665b01b8ace1ef863d84932ab44388c47 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.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\Tax\Test\TestCase\TaxCalculationTest" summary="Apply Taxes for products" ticketId="MAGETWO-27809">
<variation name="TaxCalculationTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="description" xsi:type="string">Simple product tier price with sales rule, customer tax equals store tax and catalog price including tax</data>
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, row_cat_incl_ship_excl_after_disc_on_excl, display_excluding_including_tax</data>
<data name="product" xsi:type="string">catalogProductSimple::simple_with_tier_price_and_category</data>
@@ -37,6 +38,7 @@
<constraint name="Magento\Tax\Test\Constraint\AssertOrderTaxOnBackendExcludingIncludingTax" />
</variation>
<variation name="TaxCalculationTestVariation4">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="description" xsi:type="string">Simple product special price with sales rule, customer tax less than store tax and catalog price including tax</data>
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, row_cat_incl_ship_excl_before_disc_on_incl, display_excluding_including_tax</data>
<data name="product" xsi:type="string">catalogProductSimple::product_with_special_price_and_category</data>
@@ -66,6 +68,7 @@
<constraint name="Magento\Tax\Test\Constraint\AssertOrderTaxOnBackendExcludingIncludingTax" />
</variation>
<variation name="TaxCalculationTestVariation5">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="description" xsi:type="string">Simple product tier price with sales rule, customer tax less than store tax and catalog price including tax</data>
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, unit_cat_incl_ship_incl_before_disc_on_incl, display_excluding_including_tax</data>
<data name="product" xsi:type="string">catalogProductSimple::simple_with_tier_price_and_category</data>
@@ -95,6 +98,7 @@
<constraint name="Magento\Tax\Test\Constraint\AssertOrderTaxOnBackendExcludingIncludingTax" />
</variation>
<variation name="TaxCalculationTestVariation6">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="description" xsi:type="string">Simple product special price with sales rule, customer tax equals store tax and catalog price excluding tax</data>
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, total_cat_excl_ship_incl_before_disc_on_incl, display_excluding_including_tax</data>
<data name="product" xsi:type="string">catalogProductSimple::product_with_special_price_and_category</data>
@@ -124,6 +128,7 @@
<constraint name="Magento\Tax\Test\Constraint\AssertOrderTaxOnBackendExcludingIncludingTax" />
</variation>
<variation name="TaxCalculationTestVariation9">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="description" xsi:type="string">Simple product tier price with sales rule, customer tax greater than store tax and catalog price excluding tax</data>
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, total_cat_excl_ship_incl_after_disc_on_incl, display_excluding_including_tax</data>
<data name="product" xsi:type="string">catalogProductSimple::simple_with_tier_price_and_category</data>
@@ -153,6 +158,7 @@
<constraint name="Magento\Tax\Test\Constraint\AssertOrderTaxOnBackendExcludingIncludingTax" />
</variation>
<variation name="TaxCalculationTestVariation10">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="description" xsi:type="string">Simple product special price with sales rule, customer tax greater than store tax and catalog price excluding tax</data>
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, unit_cat_excl_ship_incl_after_disc_on_excl, display_excluding_including_tax</data>
<data name="product" xsi:type="string">catalogProductSimple::product_with_special_price_and_category</data>
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxWithCrossBorderTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxWithCrossBorderTest.php
index 9517ee063ce67cbf33e50ed44412d8e7253526e2..09debcf5f75eb3441b6b18bcab438ecda3f757a3 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxWithCrossBorderTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxWithCrossBorderTest.php
@@ -37,6 +37,7 @@ class TaxWithCrossBorderTest extends Injectable
{
/* tags */
const MVP = 'yes';
+ const STABLE = 'no';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.xml
index a485579634ed95e4027f2147088257ad6b256a52..58e7b2b038cc20cfb4ab079254f18edd6413bf9f 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.xml
@@ -48,6 +48,7 @@
<constraint name="Magento\Tax\Test\Constraint\AssertTaxRuleIsApplied" />
</variation>
<variation name="UpdateTaxRuleEntityTestVariation4">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="initialTaxRule/dataset" xsi:type="string">tax_rule_with_custom_tax_classes</data>
<data name="address/data/country_id" xsi:type="string">United States</data>
<data name="address/data/region_id" xsi:type="string">Idaho</data>
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
index 95240b5dba0644d7f10d80447399d516a4742ac2..c5968c8e936f8a5bead20016d9c70d699b8c1a0c 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
@@ -71,7 +71,7 @@ class DataGrid extends Grid
*
* @var string
*/
- protected $massActionToggleList = '//span[contains(@class, "action-menu-item") and .= "%s"]';
+ protected $massActionToggleList = './/span[contains(@class, "action-menu-item") and .= "%s"]';
/**
* Action button (located above the Grid).
@@ -85,7 +85,7 @@ class DataGrid extends Grid
*
* @var string
*/
- protected $actionList = '//span[contains(@class, "action-menu-item") and .= "%s"]';
+ protected $actionList = './/span[contains(@class, "action-menu-item") and .= "%s"]';
/**
* Column header locator.
@@ -104,6 +104,13 @@ class DataGrid extends Grid
* @var string
*/
private $cellByHeader = "//td[count(//th[span[.='%s']][not(ancestor::*[@class='sticky-header'])]/preceding-sibling::th)+1]";
+
+ /**
+ * Admin data grid header selector.
+ *
+ * @var string
+ */
+ private $gridHeader = './/div[@class="admin__data-grid-header"][(not(ancestor::*[@class="sticky-header"]) and not(contains(@style,"visibility: hidden"))) or (ancestor::*[@class="sticky-header" and not(contains(@style,"display: none"))])]';
// @codingStandardsIgnoreEnd
/**
@@ -322,12 +329,12 @@ class DataGrid extends Grid
public function selectAction($action)
{
$actionType = is_array($action) ? key($action) : $action;
- $this->_rootElement->find($this->actionButton)->click();
- $this->_rootElement
+ $this->getGridHeaderElement()->find($this->actionButton)->click();
+ $this->getGridHeaderElement()
->find(sprintf($this->actionList, $actionType), Locator::SELECTOR_XPATH)
->click();
if (is_array($action)) {
- $this->_rootElement
+ $this->getGridHeaderElement()
->find(sprintf($this->actionList, end($action)), Locator::SELECTOR_XPATH)
->click();
}
@@ -463,4 +470,14 @@ class DataGrid extends Grid
return $data;
}
+
+ /**
+ * Returns admin data grid header element.
+ *
+ * @return \Magento\Mtf\Client\ElementInterface
+ */
+ private function getGridHeaderElement()
+ {
+ return $this->_rootElement->find($this->gridHeader, Locator::SELECTOR_XPATH);
+ }
}
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 39a80b783a0a1cf2dcb36a91e8d140bf3e236b8c..4b923dd4344a93be0e2bf3491c30eecf823f76ba 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 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 c0049f0cc2fb39d22758a1ce3cae3fcc22bf9552..510d2d61c0acd2100b295ee1422015b1833d9c36 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 STABLE = 'no';
const MVP = 'no';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.php
index 2003bb4b27770239a2b9c2b8d75dc1a9a178f02b..fdf10565117764fa85727d38a4d10c44e4047261 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.php
@@ -31,6 +31,7 @@ class CreateAdminUserEntityTest extends Injectable
/* tags */
const MVP = 'no';
const TEST_TYPE = 'extended_acceptance_test';
+ const STABLE = 'no';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/CreateCustomVariableEntityTest.xml b/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/CreateCustomVariableEntityTest.xml
index 381728cb375aef1595153431fa704812689be7cd..4860c6c93696c038b9de309a9ee068e09d65b284 100644
--- a/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/CreateCustomVariableEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/CreateCustomVariableEntityTest.xml
@@ -19,6 +19,7 @@
<constraint name="Magento\Variable\Test\Constraint\AssertCustomVariableInPage" />
</variation>
<variation name="CreateCustomVariableEntityTestVariation2">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="customVariable/data/code" xsi:type="string">variableCode%isolation%</data>
<data name="customVariable/data/name" xsi:type="string">variableName%isolation%</data>
<data name="customVariable/data/html_value" xsi:type="string"><p>variableName%isolation%</p></data>
diff --git a/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/DeleteCustomVariableEntityTest.xml b/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/DeleteCustomVariableEntityTest.xml
index 7f2306c5154e78095979c1b64c7f171feacd722f..7234c455fcc223a6b373a04cd0f0672a2c40781e 100644
--- a/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/DeleteCustomVariableEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/DeleteCustomVariableEntityTest.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\Variable\Test\TestCase\DeleteCustomVariableEntityTest" summary="Delete Custom Variable" ticketId="MAGETWO-25535">
<variation name="DeleteCustomVariableEntityTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<constraint name="Magento\Variable\Test\Constraint\AssertCustomVariableSuccessDeleteMessage" />
<constraint name="Magento\Variable\Test\Constraint\AssertCustomVariableNotInGrid" />
<constraint name="Magento\Variable\Test\Constraint\AssertCustomVariableNotInCmsPageForm" />
diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.xml b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.xml
index 060d2fbc9a7e6f51113238ebf186930d864eec4c..247b22c86a1b207e686fd584b06b297aa4fa3668 100644
--- a/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.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\Weee\Test\TestCase\CreateTaxWithFptTest" summary="Apply FPT to Different Type Prices" ticketId="MAGETWO-29551">
<variation name="CreateTaxWithFptTestVariation1" firstConstraint="Magento\Weee\Test\Constraint\AssertFptApplied" method="test">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="description" xsi:type="string">Check not taxed FPT display set to Excluding, Description and Including FPT on product with custom option catalog price Excluding Tax</data>
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods,tax_with_fpt_cat_excl_disc_on_excl</data>
<data name="productData" xsi:type="string">with_custom_option_and_fpt</data>
@@ -28,6 +29,7 @@
<constraint name="Magento\Weee\Test\Constraint\AssertFptApplied" />
</variation>
<variation name="CreateTaxWithFptTestVariation2" firstConstraint="Magento\Weee\Test\Constraint\AssertFptApplied" method="test">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="description" xsi:type="string">Check not taxed FPT display set to Including FPT and Description on product with custom option catalog price Excluding Tax</data>
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods,tax_with_fpt_cat_excl_disc_on_incl, display_including_tax</data>
<data name="productData" xsi:type="string">with_custom_option_and_fpt</data>
@@ -50,6 +52,7 @@
<constraint name="Magento\Weee\Test\Constraint\AssertFptApplied" />
</variation>
<variation name="CreateTaxWithFptTestVariation3" firstConstraint="Magento\Weee\Test\Constraint\AssertFptApplied" method="test">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">Check not taxed FPT display set to Excluding, Description and Including FPT on product with special price catalog price Excluding Tax</data>
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods,tax_with_fpt_cat_excl_disc_on_incl, display_including_tax</data>
<data name="productData" xsi:type="string">with_special_price_and_fpt</data>
@@ -72,6 +75,7 @@
<constraint name="Magento\Weee\Test\Constraint\AssertFptApplied" />
</variation>
<variation name="CreateTaxWithFptTestVariation4" firstConstraint="Magento\Weee\Test\Constraint\AssertFptApplied" method="test">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="description" xsi:type="string">Check not taxed FPT display set to Including FPT and Description on product with special price catalog price Excluding Tax</data>
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods,tax_with_fpt_cat_excl_disc_on_excl</data>
<data name="productData" xsi:type="string">with_special_price_and_fpt</data>
@@ -92,6 +96,7 @@
<constraint name="Magento\Weee\Test\Constraint\AssertFptApplied" />
</variation>
<variation name="CreateTaxWithFptTestVariation5" firstConstraint="Magento\Weee\Test\Constraint\AssertFptApplied" method="test">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="description" xsi:type="string">Check taxed FPT display set to Excluding, Description and Including FPT on product with with custom option catalog price Excluding Tax</data>
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_excl_disc_on_excl</data>
<data name="productData" xsi:type="string">with_custom_option_and_fpt</data>
@@ -204,6 +209,7 @@
<constraint name="Magento\Weee\Test\Constraint\AssertFptApplied" />
</variation>
<variation name="CreateTaxWithFptTestVariation11" firstConstraint="Magento\Weee\Test\Constraint\AssertFptApplied" method="test">
+ <data name="issue" xsi:type="string">MAGETWO-44968: FPT Final price includes tax on custom option, when display is set to excluding tax</data>
<data name="description" xsi:type="string">Check taxed FPT display set to Excluding, Description and Including FPT on product with with custom option and catalog price Including Tax</data>
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_incl_disc_on_excl</data>
<data name="productData" xsi:type="string">with_custom_option_and_fpt</data>
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/Widget/WidgetGrid.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/Widget/WidgetGrid.php
index 50a5657a4783088eabef74ea56aed23cd8592835..2a03872f4be6bce82a7764ec0358f83c654a5b0a 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/Widget/WidgetGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/Widget/WidgetGrid.php
@@ -7,12 +7,20 @@
namespace Magento\Widget\Test\Block\Adminhtml\Widget;
use Magento\Backend\Test\Block\Widget\Grid as AbstractGrid;
+use Magento\Mtf\Client\Locator;
/**
* Widget grid on the Widget Instance Index page.
*/
class WidgetGrid extends AbstractGrid
{
+ /**
+ * Selector for not empty options at select element.
+ *
+ * @var string
+ */
+ private $notEmptyOptionsSelector = 'option:not([value=""])';
+
/**
* Locator value for link in action column.
*
@@ -36,5 +44,28 @@ class WidgetGrid extends AbstractGrid
'title' => [
'selector' => 'input[name="title"]',
],
+ 'theme_id' => [
+ 'selector' => 'select[name="theme_id"]',
+ 'input' => 'select',
+ ],
];
+
+ /**
+ * Returns values of theme_id filter.
+ *
+ * @return array
+ */
+ public function getThemeIdValues()
+ {
+ $values = [];
+ $themeFilter = $this->filters['theme_id'];
+ $strategy = empty($themeFilter['strategy']) ? Locator::SELECTOR_CSS : $themeFilter['strategy'];
+ $element = $this->_rootElement->find($themeFilter['selector'], $strategy, $themeFilter['input']);
+ $options = $element->getElements($this->notEmptyOptionsSelector);
+ foreach ($options as $option) {
+ $values[] = $option->getText();
+ }
+
+ return $values;
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertThemeFilterValuesOnWidgetGrid.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertThemeFilterValuesOnWidgetGrid.php
new file mode 100644
index 0000000000000000000000000000000000000000..31ebfd87c252b6e4142263636eb00329ab8d72b7
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertThemeFilterValuesOnWidgetGrid.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Widget\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Widget\Test\Fixture\Widget;
+use Magento\Widget\Test\Page\Adminhtml\WidgetInstanceIndex;
+
+/**
+ * Assert theme filter contains all possible values from created widgets.
+ */
+class AssertThemeFilterValuesOnWidgetGrid extends AbstractConstraint
+{
+ /**
+ * Assert theme filter contains all possible values from created widgets.
+ *
+ * @param Widget[] $widgets
+ * @param WidgetInstanceIndex $widgetInstanceIndex
+ * @return void
+ */
+ public function processAssert(array $widgets, WidgetInstanceIndex $widgetInstanceIndex)
+ {
+ $expectedValues = [];
+ foreach ($widgets as $widget) {
+ $expectedValues[] = $widget->getThemeId();
+ }
+ $widgetInstanceIndex->open();
+ $actualValues = $widgetInstanceIndex->getWidgetGrid()->getThemeIdValues();
+ \PHPUnit_Framework_Assert::assertEmpty(
+ array_diff($expectedValues, $actualValues),
+ 'Widget grid theme filter doesn\'t contain all possible values from created widgets.'
+ );
+ }
+
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Widget grid theme filter contains all possible values from created widgets.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetInGrid.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetInGrid.php
index 5382d544a94b9f590a3475c915025c205e1453cd..2cc675f79fbd38a0f7654b40acc5d215be2a5191 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetInGrid.php
@@ -11,7 +11,7 @@ use Magento\Widget\Test\Page\Adminhtml\WidgetInstanceIndex;
use Magento\Mtf\Constraint\AbstractConstraint;
/**
- * Class AssertWidgetInGrid
+ * Assert widget is present in widget grid.
*/
class AssertWidgetInGrid extends AbstractConstraint
{
@@ -20,7 +20,10 @@ class AssertWidgetInGrid extends AbstractConstraint
/* end tags */
/**
- * Assert widget availability in widget grid
+ * Assert widget availability in widget grid.
+ * Verifying such fields as:
+ * - title
+ * - theme_id
*
* @param Widget $widget
* @param WidgetInstanceIndex $widgetInstanceIndex
@@ -28,7 +31,7 @@ class AssertWidgetInGrid extends AbstractConstraint
*/
public function processAssert(Widget $widget, WidgetInstanceIndex $widgetInstanceIndex)
{
- $filter = ['title' => $widget->getTitle()];
+ $filter = ['title' => $widget->getTitle(), 'theme_id' => $widget->getThemeId()];
$widgetInstanceIndex->open();
\PHPUnit_Framework_Assert::assertTrue(
$widgetInstanceIndex->getWidgetGrid()->isRowVisible($filter),
@@ -37,7 +40,7 @@ class AssertWidgetInGrid extends AbstractConstraint
}
/**
- * Returns a string representation of the object
+ * Returns a string representation of the object.
*
* @return string
*/
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetsInGrid.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetsInGrid.php
new file mode 100644
index 0000000000000000000000000000000000000000..bc61b3ef66f51585b0e21fc7dc1a64b7f04e57f7
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetsInGrid.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Widget\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Widget\Test\Fixture\Widget;
+use Magento\Widget\Test\Page\Adminhtml\WidgetInstanceIndex;
+
+/**
+ * Assert widgets are present in widget grid.
+ */
+class AssertWidgetsInGrid extends AbstractConstraint
+{
+ /**
+ * Assert widgets are present in widget grid.
+ * Verifying such fields as:
+ * - title
+ * - theme_id
+ *
+ * @param Widget[] $widgets
+ * @param WidgetInstanceIndex $widgetInstanceIndex
+ * @param AssertWidgetInGrid $assertWidgetInGrid
+ * @return void
+ */
+ public function processAssert(
+ array $widgets,
+ WidgetInstanceIndex $widgetInstanceIndex,
+ AssertWidgetInGrid $assertWidgetInGrid
+ ) {
+ foreach ($widgets as $widget) {
+ $assertWidgetInGrid->processAssert($widget, $widgetInstanceIndex);
+ }
+ }
+
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Widgets are present in widget grid.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Handler/Widget/Curl.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Handler/Widget/Curl.php
index 4c9e61cdb873db0b32d3b77d9c16be3601537364..54520d0786a52732123a7fc0634d363f74d4b43d 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Handler/Widget/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Handler/Widget/Curl.php
@@ -27,6 +27,7 @@ class Curl extends AbstractCurl
protected $mappingData = [
'code' => [
'CMS Page Link' => 'cms_page_link',
+ 'Recently Viewed Products' => 'recently_viewed',
],
'block' => [
'Main Content Area' => 'content',
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Repository/Widget.xml b/dev/tests/functional/tests/app/Magento/Widget/Test/Repository/Widget.xml
index dc39ed7fa1259a02da5eadbc84c38e22f64c71aa..4a8972bfd8dbb3f5a80b7f6fc8a7e20c2f80e0fc 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Repository/Widget.xml
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Repository/Widget.xml
@@ -25,5 +25,20 @@
<item name="dataset" xsi:type="string">cmsPageLink</item>
</field>
</dataset>
+
+ <dataset name="recently_viewed_products_on_blank_theme">
+ <field name="code" xsi:type="string">Recently Viewed Products</field>
+ <field name="title" xsi:type="string">Title_%isolation%</field>
+ <field name="theme_id" xsi:type="string">Magento Blank</field>
+ <field name="store_ids" xsi:type="array">
+ <item name="dataset" xsi:type="string">all_store_views</item>
+ </field>
+ <field name="widget_instance" xsi:type="array">
+ <item name="dataset" xsi:type="string">for_viewed_products</item>
+ </field>
+ <field name="parameters" xsi:type="array">
+ <item name="dataset" xsi:type="string">recentlyViewedProducts</item>
+ </field>
+ </dataset>
</repository>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetEntityTest.php b/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetEntityTest.php
index 6358ac8821f26b621de3e83f7ef8380ffb7c3efc..cc02293ff8fdd98febf581beb87e8a00d7b128fb 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetEntityTest.php
@@ -48,7 +48,7 @@ class CreateWidgetEntityTest extends AbstractCreateWidgetEntityTest
// Preconditions
$this->caches = $caches;
$this->adjustCacheSettings();
-
+
// Steps
$this->widgetInstanceIndex->open();
$this->widgetInstanceIndex->getPageActionsBlock()->addNew();
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 f533e115253ed52100fa5c9a9d51f4aa2303ca6b..225759df91f179dbd911fca662c05476c4830a69 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
@@ -19,7 +19,7 @@
<constraint name="Magento\Widget\Test\Constraint\AssertWidgetOnFrontendInCatalog" />
</variation>
<variation name="CreateWidgetEntityTestVariation2">
- <data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S1</data>
+ <data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S1, stable:no</data>
<data name="widget/data/code" xsi:type="string">CMS Page Link</data>
<data name="widget/data/theme_id" xsi:type="string">Magento Luma</data>
<data name="widget/data/title" xsi:type="string">Title_%isolation%</data>
@@ -42,7 +42,7 @@
<constraint name="Magento\Widget\Test\Constraint\AssertWidgetRecentlyViewedProducts" />
</variation>
<variation name="CreateWidgetEntityTestVariation4">
- <data name="tag" xsi:type="string">severity:S1</data>
+ <data name="tag" xsi:type="string">severity:S1, stable:no</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>
@@ -53,7 +53,7 @@
<constraint name="Magento\Widget\Test\Constraint\AssertWidgetRecentlyComparedProducts" />
</variation>
<variation name="CreateWidgetEntityTestVariation5">
- <data name="tag" xsi:type="string">severity:S1</data>
+ <data name="tag" xsi:type="string">severity:S1, stable:no</data>
<data name="widget/data/code" xsi:type="string">Catalog Category Link</data>
<data name="widget/data/theme_id" xsi:type="string">Magento Luma</data>
<data name="widget/data/title" xsi:type="string">Title_%isolation%</data>
@@ -76,6 +76,7 @@
<constraint name="Magento\Widget\Test\Constraint\AssertWidgetProductLink" />
</variation>
<variation name="CreateWidgetEntityTestVariation7" summary="Assert widget with disabled block_html cache type">
+ <data name="issue" xsi:type="string">MAGETWO-58146: There is no cache invalidate popup after creating widget with disabled block_html cache type</data>
<data name="tag" xsi:type="string">severity:S2</data>
<data name="caches/block_html" xsi:type="string">Disabled</data>
<data name="widget/data/code" xsi:type="string">CMS Static Block</data>
@@ -91,6 +92,7 @@
<constraint name="Magento\Widget\Test\Constraint\AssertWidgetOnFrontendInCatalog" />
</variation>
<variation name="CreateWidgetEntityTestVariation8" summary="Assert widget with invalidated block_html cache type">
+ <data name="issue" xsi:type="string">MAGETWO-58146: There is no cache invalidate popup after creating widget with disabled block_html cache type</data>
<data name="tag" xsi:type="string">severity:S3</data>
<data name="caches/block_html" xsi:type="string">Invalidated</data>
<data name="widget/data/code" xsi:type="string">Catalog Category Link</data>
@@ -106,7 +108,7 @@
<constraint name="Magento\Widget\Test\Constraint\AssertWidgetAbsentOnFrontendHome" />
</variation>
<variation name="CreateWidgetEntityTestVariation9" summary="Create Catalog New Products List type widget">
- <data name="tag" xsi:type="string">severity:S1</data>
+ <data name="tag" xsi:type="string">severity:S1, stable:no</data>
<data name="widget/data/code" xsi:type="string">Catalog New Products List</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/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetsEntityTest.php b/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetsEntityTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..5269c315f78fc23c55e6848ec2482f850cdf2c0e
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetsEntityTest.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Widget\Test\TestCase;
+
+use Magento\Mtf\Fixture\FixtureFactory;
+use \Magento\Mtf\TestCase\Injectable;
+use Magento\Widget\Test\Fixture\Widget;
+
+/**
+ * Steps:
+ * 1. Create widgets.
+ * 2. Perform all assertions.
+ *
+ * @group Widget
+ * @ZephyrId MAGETWO-60672
+ */
+class CreateWidgetsEntityTest extends Injectable
+{
+ /* tags */
+ const SEVERITY = 'S3';
+ /* end tags */
+
+ /**
+ * Create multiple widgets.
+ *
+ * @param array $widgets
+ * @param FixtureFactory $fixtureFactory
+ * @return array
+ */
+ public function test(array $widgets, FixtureFactory $fixtureFactory)
+ {
+ /** @var Widget[] $widgetInstances */
+ $widgetInstances = [];
+ // Preconditions
+ foreach ($widgets as $widget) {
+ $widget = $fixtureFactory->createByCode('widget', ['dataset' => $widget]);
+ $widget->persist();
+ $widgetInstances[] = $widget;
+ }
+
+ return ['widgets' => $widgetInstances];
+ }
+
+ /**
+ * Delete all widgets.
+ *
+ * @return void
+ */
+ public function tearDown()
+ {
+ $this->objectManager->create(\Magento\Widget\Test\TestStep\DeleteAllWidgetsStep::class)->run();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetsEntityTest.xml b/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetsEntityTest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..484ea26cf5253a6524b77e299ccdc2532924d3e9
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetsEntityTest.xml
@@ -0,0 +1,18 @@
+<?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\Widget\Test\TestCase\CreateWidgetsEntityTest" summary="Create Widget" ticketId="MAGETWO-60672">
+ <variation name="CreateWidgetEntityTestWithDifferentThemes" summary="Widgets with different themes is presented in grid/filter">
+ <data name="tag" xsi:type="string">severity:S3</data>
+ <data name="widgets/0" xsi:type="string">default</data>
+ <data name="widgets/1" xsi:type="string">recently_viewed_products_on_blank_theme</data>
+ <constraint name="Magento\Widget\Test\Constraint\AssertThemeFilterValuesOnWidgetGrid" />
+ <constraint name="Magento\Widget\Test\Constraint\AssertWidgetsInGrid" />
+ </variation>
+ </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Widget/Test/etc/di.xml
index 122a9659cf2b6be0706218e1f761870784179ea7..c1595838b4f63d51d1732857c7ccdd6d6ff8bec3 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/etc/di.xml
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/etc/di.xml
@@ -66,4 +66,14 @@
<argument name="severity" xsi:type="string">S1</argument>
</arguments>
</type>
+ <type name="Magento\Widget\Test\Constraint\AssertWidgetsInGrid">
+ <arguments>
+ <argument name="severity" xsi:type="string">S3</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Widget\Test\Constraint\AssertThemeFilterValuesOnWidgetGrid">
+ <arguments>
+ <argument name="severity" xsi:type="string">S3</argument>
+ </arguments>
+ </type>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
index 683ff71e8ff7212e4e9604d581d04b4cf9b0f238..226faf7d9ce507dccfa830cc0f7053cf998eb53e 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
@@ -123,14 +123,12 @@ class Product extends Form
$viewDetails = $this->_rootElement->find($this->viewDetails);
if ($viewDetails->isVisible()) {
$this->_rootElement->find($this->footer, Locator::SELECTOR_XPATH)->click();
- $viewDetails->click();
+ $viewDetails->hover();
$labels = $this->_rootElement->getElements($this->optionLabel);
$values = $this->_rootElement->getElements($this->optionValue);
$data = [];
foreach ($labels as $key => $label) {
- if (!$label->isVisible()) {
- $viewDetails->click();
- }
+ $viewDetails->hover();
$data[] = [
'title' => $label->getText(),
'value' => str_replace('$', '', $values[$key]->getText()),
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml
index 550cffa488130e16f73a9d89b9bc4344a57a2291..1a50facc1d67d756ea9ccfb051db7bb0a643c23b 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.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\Wishlist\Test\TestCase\AddProductToWishlistEntityTest" summary="Add Product to Wishlist" ticketId="MAGETWO-29045">
<variation name="AddProductToWishlistEntityTestVariation1">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="product/0" xsi:type="string">catalogProductSimple::default</data>
<constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" />
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
@@ -38,12 +39,14 @@
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" />
</variation>
<variation name="AddProductToWishlistEntityTestVariation6">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="product/0" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
<constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" />
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" />
</variation>
<variation name="AddProductToWishlistEntityTestVariation7">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="product/0" xsi:type="string">bundleProduct::bundle_fixed_product</data>
<constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" />
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.php
index cf16a045c3487ca9c8520a03ff4b47fc83ed84dd..6fec88a05de2885c57a61383497b06c353b0823a 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.php
@@ -28,6 +28,7 @@ class AddProductsToCartFromCustomerWishlistOnFrontendTest extends AbstractWishli
{
/* tags */
const MVP = 'no';
+ const STABLE = 'no';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.xml
index 7f89b52dff6185330d0058d664fff9ea5c987d70..ab33641cd04420a2eaa7b92df44312278a0ec57e 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.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\Wishlist\Test\TestCase\AddProductsToCartFromCustomerWishlistOnFrontendTest" summary="Add Products from Wishlist to Cart" ticketId="MAGETWO-25268">
<variation name="AddProductsToCartFromCustomerWishlistOnFrontendTestVariation1">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="products/0" xsi:type="string">catalogProductSimple::product_100_dollar</data>
<data name="qty" xsi:type="string">2</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertProductQtyInShoppingCart" />
@@ -20,6 +21,7 @@
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductsIsAbsentInWishlist" />
</variation>
<variation name="AddProductsToCartFromCustomerWishlistOnFrontendTestVariation3">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="products/0" xsi:type="string">catalogProductSimple::default</data>
<data name="products/1" xsi:type="string">catalogProductVirtual::product_50_dollar</data>
<data name="products/2" xsi:type="string">catalogProductSimple::default</data>
@@ -41,18 +43,21 @@
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductsIsAbsentInWishlist" />
</variation>
<variation name="AddProductsToCartFromCustomerWishlistOnFrontendTestVariation6">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="products/0" xsi:type="string">configurableProduct::default</data>
<data name="qty" xsi:type="string">3</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertProductQtyInShoppingCart" />
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductsIsAbsentInWishlist" />
</variation>
<variation name="AddProductsToCartFromCustomerWishlistOnFrontendTestVariation7">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="products/0" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
<data name="qty" xsi:type="string">2</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertProductQtyInShoppingCart" />
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductsIsAbsentInWishlist" />
</variation>
<variation name="AddProductsToCartFromCustomerWishlistOnFrontendTestVariation8">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="products/0" xsi:type="string">bundleProduct::bundle_fixed_product</data>
<data name="qty" xsi:type="string">2</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertProductQtyInShoppingCart" />
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.xml
index ea6e122badf8bdcda1d57dcd4900b13a83d73d3a..62654bff2b7a91c4831a28b8f59068dc1667de14 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.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\Wishlist\Test\TestCase\ConfigureProductInCustomerWishlistOnBackendTest" summary="Configure Products in Customer Wishlist on Backend" ticketId="MAGETWO-29257">
<variation name="ConfigureProductInCustomerWishlistOnBackendTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="product/0" xsi:type="string">catalogProductSimple::with_two_custom_option</data>
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductInCustomerWishlistOnBackendGrid" />
</variation>
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.php
index 3738dd0631e82510715c1ef10f2c12dd5cc7c5d1..037de4cba7bcaa00d884e2f5d926b8bc977f7c14 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.php
@@ -29,6 +29,7 @@ class ConfigureProductInCustomerWishlistOnFrontendTest extends AbstractWishlistT
{
/* tags */
const MVP = 'no';
+ const STABLE = 'no';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml
index c9da4e6ea9b2e4c12b7f8643939f30d8bc97b638..8708ea3c8073f559d2d72c6fbe1129de5fac5017 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml
@@ -8,26 +8,31 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Wishlist\Test\TestCase\ConfigureProductInCustomerWishlistOnFrontendTest" summary="Configure Products in Customer Wishlist on Frontend" ticketId="MAGETWO-29507">
<variation name="ConfigureProductInCustomerWishlistOnFrontendTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="product/0" xsi:type="string">catalogProductSimple::with_two_custom_option</data>
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
</variation>
<variation name="ConfigureProductInCustomerWishlistOnFrontendTestVariation2">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="product/0" xsi:type="string">configurableProduct::default</data>
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
</variation>
<variation name="ConfigureProductInCustomerWishlistOnFrontendTestVariation3">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="product/0" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
</variation>
<variation name="ConfigureProductInCustomerWishlistOnFrontendTestVariation4">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="product/0" xsi:type="string">downloadableProduct::with_two_separately_links</data>
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
</variation>
<variation name="ConfigureProductInCustomerWishlistOnFrontendTestVariation5">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="product/0" xsi:type="string">groupedProduct::three_simple_products</data>
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.xml
index 4d410c03d6fe6df49f6a306108d20bc8a9005e06..f74039110ea4476db0b3b01a17a2968179bc7529 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.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\Wishlist\Test\TestCase\DeleteProductsFromWishlistOnFrontendTest" summary="Delete Products from Wishlist" ticketId="MAGETWO-28874">
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation1">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="products/0" xsi:type="string">catalogProductSimple::product_100_dollar</data>
<data name="products/1" xsi:type="string">catalogProductVirtual::product_50_dollar</data>
<data name="removedProductsIndex" xsi:type="array">
@@ -16,6 +17,7 @@
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductsIsAbsentInWishlist" />
</variation>
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation2">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="products/0" xsi:type="string">catalogProductVirtual::product_50_dollar</data>
<data name="removedProductsIndex" xsi:type="array">
<item name="0" xsi:type="string">1</item>
@@ -23,6 +25,7 @@
<constraint name="Magento\Wishlist\Test\Constraint\AssertWishlistIsEmpty" />
</variation>
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation3">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="products/0" xsi:type="string">catalogProductSimple::default</data>
<data name="products/1" xsi:type="string">catalogProductVirtual::product_50_dollar</data>
<data name="products/2" xsi:type="string">catalogProductSimple::default</data>
@@ -57,6 +60,7 @@
<constraint name="Magento\Wishlist\Test\Constraint\AssertWishlistIsEmpty" />
</variation>
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation7">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="products/0" xsi:type="string">downloadableProduct::with_two_separately_links</data>
<data name="removedProductsIndex" xsi:type="array">
<item name="0" xsi:type="string">1</item>
@@ -64,6 +68,7 @@
<constraint name="Magento\Wishlist\Test\Constraint\AssertWishlistIsEmpty" />
</variation>
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation8">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="products/0" xsi:type="string">groupedProduct::three_simple_products</data>
<data name="removedProductsIndex" xsi:type="array">
<item name="0" xsi:type="string">1</item>
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml
index 3706c8f8b3085bbafc35d4974cbdefb8daacddf9..999591d3344f939db0865c53ce5cbd6013a5e069 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.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\Wishlist\Test\TestCase\MoveProductFromShoppingCartToWishlistTest" summary="Move Products from Shopping Cart to Wishlist" ticketId="MAGETWO-29545">
<variation name="MoveProductFromShoppingCartToWishlistTestVariation1">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="product/0" xsi:type="string">catalogProductSimple::default</data>
<constraint name="Magento\Wishlist\Test\Constraint\AssertMoveProductToWishlistSuccessMessage" />
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
@@ -20,6 +21,7 @@
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
</variation>
<variation name="MoveProductFromShoppingCartToWishlistTestVariation3">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="product/0" xsi:type="string">downloadableProduct::with_two_separately_links</data>
<constraint name="Magento\Wishlist\Test\Constraint\AssertMoveProductToWishlistSuccessMessage" />
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
@@ -35,6 +37,7 @@
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
</variation>
<variation name="MoveProductFromShoppingCartToWishlistTestVariation5">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="product/0" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
<constraint name="Magento\Wishlist\Test\Constraint\AssertMoveProductToWishlistSuccessMessage" />
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
@@ -42,6 +45,7 @@
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
</variation>
<variation name="MoveProductFromShoppingCartToWishlistTestVariation6">
+ <data name="tag" xsi:type="string">stable:no</data>
<data name="product/0" xsi:type="string">bundleProduct::bundle_fixed_product</data>
<constraint name="Magento\Wishlist\Test\Constraint\AssertMoveProductToWishlistSuccessMessage" />
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.xml
index 82d6bf563ae627530781c47c6ad90b5824bfcdc3..5025cb97250d780a56d956e28a5641437494a425 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.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\Wishlist\Test\TestCase\ViewProductInCustomerWishlistOnBackendTest" summary="View Product in Customer Wishlist on Backend" ticketId="MAGETWO-29616">
<variation name="ViewProductInCustomerWishlistOnBackendTestVariation1">
+ <data name="tag" xsi:type="string">to_maintain:yes</data>
<data name="product/0" xsi:type="string">catalogProductSimple::with_two_custom_option</data>
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductInCustomerWishlistOnBackendGrid" />
</variation>
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic_green.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic_green.xml
new file mode 100644
index 0000000000000000000000000000000000000000..df7b03a994df4d322b533162f04dd45c2108d650
--- /dev/null
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic_green.xml
@@ -0,0 +1,29 @@
+<?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/TestRunner/etc/testRunner.xsd">
+ <rule scope="testcase">
+ <deny>
+ <tag group="stable" value="no" />
+ <tag group="to_maintain" value="yes" />
+ </deny>
+ </rule>
+ <rule scope="testsuite">
+ <deny>
+ <module value="Magento_Setup" strict="1" />
+ <module value="Magento_SampleData" strict="1" />
+ </deny>
+ </rule>
+ <rule scope="variation">
+ <deny>
+ <tag group="test_type" value="3rd_party_test" />
+ <tag group="stable" value="no" />
+ <tag group="to_maintain" value="yes" />
+ </deny>
+ </rule>
+</config>
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..a6031429c66023491e2c411748046e76ecbddf41
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Controller\Cart\Index;
+
+/**
+ * @magentoDbIsolation enabled
+ */
+class CouponPostTest extends \Magento\TestFramework\TestCase\AbstractController
+{
+ /**
+ * Test for \Magento\Checkout\Controller\Cart\CouponPost::execute() with simple product
+ *
+ * @magentoDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+ */
+ public function testExecute()
+ {
+ /** @var $session \Magento\Checkout\Model\Session */
+ $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
+ $quote = $session->getQuote();
+ $quote->setData('trigger_recollect', 1)->setTotalsCollectedFlag(true);
+ $inputData = [
+ 'remove' => 0,
+ 'coupon_code' => 'test'
+ ];
+ $this->getRequest()->setPostValue($inputData);
+ $this->dispatch(
+ 'checkout/cart/couponPost/'
+ );
+
+ $this->assertSessionMessages(
+ $this->equalTo(['The coupon code "test" is not valid.']),
+ \Magento\Framework\Message\MessageInterface::TYPE_ERROR
+ );
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Model/AttributeManagementTest.php b/dev/tests/integration/testsuite/Magento/Eav/Model/AttributeManagementTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..82d83938db148ace03cedf19a89cf098517a1d56
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Eav/Model/AttributeManagementTest.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Eav\Model;
+
+class AttributeManagementTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Eav\Api\AttributeManagementInterface
+ */
+ private $model;
+
+ /**
+ * @var \Magento\Framework\ObjectManagerInterface
+ */
+ private $objectManager;
+
+ protected function setUp()
+ {
+ $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+ $this->model = $this->objectManager->create(\Magento\Eav\Api\AttributeManagementInterface::class);
+ }
+
+ /**
+ * Verify that collection in service used correctly
+ */
+ public function testGetList()
+ {
+ $productAttributeSetId = $this->getAttributeSetId(
+ \Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE
+ );
+ $productAttributes = $this->model->getAttributes(
+ \Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE,
+ $productAttributeSetId
+ );
+ // Verify that result contains only product attributes
+ $this->verifyAttributeSetIds($productAttributes, $productAttributeSetId);
+
+ $categoryAttributeSetId = $this->getAttributeSetId(
+ \Magento\Catalog\Api\Data\CategoryAttributeInterface::ENTITY_TYPE_CODE
+ );
+ $categoryAttributes = $this->model->getAttributes(
+ \Magento\Catalog\Api\Data\CategoryAttributeInterface::ENTITY_TYPE_CODE,
+ $categoryAttributeSetId
+ );
+ // Verify that result contains only category attributes
+ $this->verifyAttributeSetIds($categoryAttributes, $categoryAttributeSetId);
+ }
+
+ /**
+ * @param string $entityTypeCode
+ * @return int
+ */
+ private function getAttributeSetId($entityTypeCode)
+ {
+ /** @var \Magento\Eav\Model\Config $eavConfig */
+ $eavConfig = $this->objectManager->create(\Magento\Eav\Model\Config::class);
+ return $eavConfig->getEntityType($entityTypeCode)->getDefaultAttributeSetId();
+ }
+
+ /**
+ * @param array $items
+ * @param string $attributeSetId
+ * @return void
+ */
+ private function verifyAttributeSetIds(array $items, $attributeSetId)
+ {
+ /** @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $item */
+ foreach ($items as $item) {
+ $this->assertEquals($attributeSetId, $item->getAttributeSetId());
+ }
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/View/Deployment/VersionTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/View/Deployment/VersionTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..5a313c318f9e9126ac84848a3b7ddf62e71d6585
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/View/Deployment/VersionTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\App\View\Deployment;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\State;
+use Magento\Framework\App\View\Deployment\Version\Storage\File;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+
+class VersionTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var File
+ */
+ private $fileStorage;
+
+ /**
+ * @var WriteInterface
+ */
+ private $directoryWrite;
+
+ /**
+ * @var string
+ */
+ private $fileName = 'deployed_version.txt';
+
+ public function setUp()
+ {
+ $this->fileStorage = ObjectManager::getInstance()->create(
+ File::class,
+ [
+ 'directoryCode' => DirectoryList::STATIC_VIEW,
+ 'fileName' => $this->fileName
+ ]
+ );
+ /** @var \Magento\TestFramework\App\Filesystem $filesystem */
+ $filesystem = ObjectManager::getInstance()->get(\Magento\TestFramework\App\Filesystem::class);
+ $this->directoryWrite = $filesystem->getDirectoryWrite(DirectoryList::STATIC_VIEW);
+ $this->removeDeployVersionFile();
+ }
+
+ /**
+ * @param string $mode
+ * @return Version
+ */
+ public function getVersionModel($mode)
+ {
+ $appState = ObjectManager::getInstance()->create(
+ State::class,
+ [
+ 'mode' => $mode
+ ]
+ );
+ return ObjectManager::getInstance()->create(
+ Version::class,
+ [
+ 'appState' => $appState
+ ]
+ );
+ }
+
+ protected function tearDown()
+ {
+ $this->removeDeployVersionFile();
+ }
+
+ private function removeDeployVersionFile()
+ {
+ if ($this->directoryWrite->isExist($this->fileName)) {
+ $this->directoryWrite->delete($this->fileName);
+ }
+ }
+
+ /**
+ * @expectedException \UnexpectedValueException
+ */
+ public function testGetValueInProductionModeWithoutVersion()
+ {
+ $this->assertFalse($this->directoryWrite->isExist($this->fileName));
+ $this->getVersionModel(State::MODE_PRODUCTION)->getValue();
+ }
+
+ public function testGetValueInDeveloperMode()
+ {
+ $this->assertFalse($this->directoryWrite->isExist($this->fileName));
+ $this->getVersionModel(State::MODE_DEVELOPER)->getValue();
+ $this->assertTrue($this->directoryWrite->isExist($this->fileName));
+ }
+
+ /**
+ * Assert that version is not regenerated on each request in developer mode
+ */
+ public function testGetValue()
+ {
+ $this->assertFalse($this->directoryWrite->isExist($this->fileName));
+ $versionModel = $this->getVersionModel(State::MODE_DEVELOPER);
+ $version = $versionModel->getValue();
+ $this->assertTrue($this->directoryWrite->isExist($this->fileName));
+ $this->assertEquals($version, $versionModel->getValue());
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Webapi/Model/ServiceMetadataTest.php b/dev/tests/integration/testsuite/Magento/Webapi/Model/ServiceMetadataTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..8fac1c9b0e7031277e59c67d31c8bbff555910c0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Webapi/Model/ServiceMetadataTest.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Webapi\Model;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Framework\Exception\LocalizedException;
+
+class ServiceMetadataTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var ServiceMetadata
+ */
+ private $serviceMetadata;
+
+ protected function setUp()
+ {
+ $objectManager = Bootstrap::getObjectManager();
+ $this->serviceMetadata = $objectManager->create(ServiceMetadata::class);
+ }
+
+ public function testGetServiceMetadata()
+ {
+ $expected = [
+ 'methods' => [
+ 'activate' => [
+ 'method' => 'activate',
+ 'inputRequired' => false,
+ 'isSecure' => false,
+ 'resources' => [
+ 'Magento_Customer::manage'
+ ],
+ 'documentation' => 'Activate a customer account using a key that was sent in a confirmation email.',
+ 'interface' => [
+ 'in' => [
+ 'parameters' => [
+ 'email' => [
+ 'type' => 'string',
+ 'required' => true,
+ 'documentation' => null
+ ],
+ 'confirmationKey' => [
+ 'type' => 'string',
+ 'required' => true,
+ 'documentation' => null
+ ]
+ ]
+ ],
+ 'out' => [
+ 'parameters' => [
+ 'result' => [
+ 'type' => 'CustomerDataCustomerInterface',
+ 'required' => true,
+ 'documentation' => ''
+ ]
+ ],
+ 'throws' => [
+ '\\' . LocalizedException::class
+ ]
+ ]
+ ]
+ ]
+ ],
+ 'class' => AccountManagementInterface::class,
+ 'description' => 'Interface for managing customers accounts.',
+ ];
+ $actual = $this->serviceMetadata->getServiceMetadata('customerAccountManagementV1');
+ $this->assertEquals(array_replace_recursive($actual, $expected), $actual);
+ }
+
+ public function testGetRouteMetadata()
+ {
+ $expected = [
+ 'methods' => [
+ 'activate' => [
+ 'method' => 'activate',
+ 'inputRequired' => false,
+ 'isSecure' => false,
+ 'resources' => [
+ 'Magento_Customer::manage'
+ ],
+ 'documentation' => 'Activate a customer account using a key that was sent in a confirmation email.',
+ 'interface' => [
+ 'in' => [
+ 'parameters' => [
+ 'email' => [
+ 'type' => 'string',
+ 'required' => true,
+ 'documentation' => null
+ ],
+ 'confirmationKey' => [
+ 'type' => 'string',
+ 'required' => true,
+ 'documentation' => null
+ ]
+ ]
+ ],
+ 'out' => [
+ 'parameters' => [
+ 'result' => [
+ 'type' => 'CustomerDataCustomerInterface',
+ 'required' => true,
+ 'documentation' => ''
+ ]
+ ],
+ 'throws' => [
+ '\\' . LocalizedException::class
+ ]
+ ]
+ ]
+ ]
+ ],
+ 'class' => AccountManagementInterface::class,
+ 'description' => 'Interface for managing customers accounts.',
+ 'routes' => [
+ '/V1/customers/me/activate' => [
+ 'PUT' => [
+ 'method' => 'activateById',
+ 'parameters' => [
+ 'customerId' => [
+ 'force' => true,
+ 'value' => '%customer_id%'
+ ]
+ ]
+ ]
+ ]
+ ]
+ ];
+ $actual = $this->serviceMetadata->getRouteMetadata('customerAccountManagementV1');
+ $this->assertEquals(array_replace_recursive($actual, $expected), $actual);
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Webapi/Model/Soap/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Webapi/Model/Soap/ConfigTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..ff1634c60782aee3de08203078f9592716de7803
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Webapi/Model/Soap/ConfigTest.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Webapi\Model\Soap;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Exception\LocalizedException;
+
+class ConfigTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var Config
+ */
+ private $soapConfig;
+
+ protected function setUp()
+ {
+ $objectManager = Bootstrap::getObjectManager();
+ $this->soapConfig = $objectManager->create(Config::class);
+ }
+
+ public function testGetRequestedSoapServices()
+ {
+ $expected = [
+ 'customerAccountManagementV1' => [
+ 'methods' => [
+ 'activate' => [
+ 'method' => 'activate',
+ 'inputRequired' => false,
+ 'isSecure' => false,
+ 'resources' => [
+ 'Magento_Customer::manage'
+ ],
+ 'documentation'
+ => 'Activate a customer account using a key that was sent in a confirmation email.',
+ 'interface' => [
+ 'in' => [
+ 'parameters' => [
+ 'email' => [
+ 'type' => 'string',
+ 'required' => true,
+ 'documentation' => null
+ ],
+ 'confirmationKey' => [
+ 'type' => 'string',
+ 'required' => true,
+ 'documentation' => null
+ ]
+ ]
+ ],
+ 'out' => [
+ 'parameters' => [
+ 'result' => [
+ 'type' => 'CustomerDataCustomerInterface',
+ 'required' => true,
+ 'documentation' => null
+ ]
+ ],
+ 'throws' => [
+ '\\' . LocalizedException::class
+ ]
+ ]
+ ]
+ ]
+ ],
+ 'class' => AccountManagementInterface::class,
+ 'description' => 'Interface for managing customers accounts.',
+ ]
+ ];
+ $actual = $this->soapConfig->getRequestedSoapServices(
+ [
+ 'customerAccountManagementV1',
+ 'NonExistentService'
+ ]
+ );
+ $this->assertEquals(array_replace_recursive($actual, $expected), $actual);
+ }
+
+ public function testGetServiceMethodInfo()
+ {
+ $expected = [
+ 'class' => CustomerRepositoryInterface::class,
+ 'method' => 'getById',
+ 'isSecure' => false,
+ 'resources' => [
+ 'Magento_Customer::customer',
+ 'self'
+ ],
+ ];
+ $actual = $this->soapConfig->getServiceMethodInfo(
+ 'customerCustomerRepositoryV1GetById',
+ [
+ 'customerCustomerRepositoryV1',
+ 'NonExistentService'
+ ]
+ );
+ $this->assertEquals($expected, $actual);
+ }
+
+ public function testGetSoapOperation()
+ {
+ $expected = 'customerAccountManagementV1Activate';
+ $actual = $this->soapConfig
+ ->getSoapOperation(
+ AccountManagementInterface::class,
+ 'activate',
+ 'V1'
+ );
+ $this->assertEquals($expected, $actual);
+ }
+}
diff --git a/dev/tests/js/JsTestDriver/run_js_tests.php b/dev/tests/js/JsTestDriver/run_js_tests.php
index e6578c52b0699ee334c2f0ce9213ec5f78373330..448fd85869cd28dea34d7a00384838674f086c5a 100644
--- a/dev/tests/js/JsTestDriver/run_js_tests.php
+++ b/dev/tests/js/JsTestDriver/run_js_tests.php
@@ -30,6 +30,8 @@ if (isset($config['Browser'])) {
} else {
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
$browser = 'C:\Program Files (x86)\Mozilla Firefox\firefox.exe';
+ } elseif (PHP_OS === 'Darwin') {
+ $browser = '/Applications/Firefox.app/Contents/MacOS/firefox';
} else {
$browser = exec('which firefox');
}
@@ -139,29 +141,35 @@ if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
kill -9 $LSOF
fi
- DISPLAY_NUM=99
- ps -ef | egrep "[X]vfb.*:$DISPLAY_NUM"
- if [ $? -eq 0 ] ; then
- pkill Xvfb
+ # Skip Xvfb setup for OS X since there browsers do not support headless display that way
+ if [ "$(uname)" != "Darwin" ]; then
+ DISPLAY_NUM=99
+ ps -ef | egrep "[X]vfb.*:$DISPLAY_NUM"
+ if [ $? -eq 0 ] ; then
+ pkill Xvfb
+ fi
+
+ XVFB=`which Xvfb`
+ if [ "$?" -eq 1 ];
+ then
+ echo "Xvfb not found."
+ exit 1
+ fi
+
+ $XVFB :$DISPLAY_NUM -nolisten inet6 -ac &
+ PID_XVFB="$!" # take the process ID
+ export DISPLAY=:$DISPLAY_NUM # set display to use that of the Xvfb
fi
-
- XVFB=`which Xvfb`
- if [ "$?" -eq 1 ];
- then
- echo "Xvfb not found."
- exit 1
- fi
-
- $XVFB :$DISPLAY_NUM -nolisten inet6 -ac &
- PID_XVFB="$!" # take the process ID
- export DISPLAY=:$DISPLAY_NUM # set display to use that of the Xvfb
+
USER=`whoami`
SUDO=`which sudo`
# run the tests
$SUDO -u $USER ' . $command . '
- kill -9 $PID_XVFB # shut down Xvfb (firefox will shut down cleanly by JsTestDriver)
+ if [ "$(uname)" != "Darwin" ]; then
+ kill -9 $PID_XVFB # shut down Xvfb (firefox will shut down cleanly by JsTestDriver)
+ fi
echo "Done."';
fwrite($fh, $shellCommand . PHP_EOL);
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CopyPasteDetector.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CopyPasteDetector.php
index b2d9c164fbd1bc57cf9f2497ff02d6fe6f6895e9..b2766ebd90d92e85072bd84c7c7939813d863bc8 100644
--- a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CopyPasteDetector.php
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CopyPasteDetector.php
@@ -56,8 +56,7 @@ class CopyPasteDetector implements ToolInterface, BlacklistInterface
*/
public function canRun()
{
- $vendorDir = require BP . '/app/etc/vendor_path.php';
- exec('php ' . BP . '/' . $vendorDir . '/bin/phpcpd --version', $output, $exitCode);
+ exec($this->getCommand() . ' --version', $output, $exitCode);
return $exitCode === 0;
}
@@ -71,22 +70,37 @@ class CopyPasteDetector implements ToolInterface, BlacklistInterface
*/
public function run(array $whiteList)
{
- $blackListStr = ' ';
+ $blacklistedDirs = [];
+ $blacklistedFileNames = [];
foreach ($this->blacklist as $file) {
$file = escapeshellarg(trim($file));
if (!$file) {
continue;
}
- $blackListStr .= '--exclude ' . $file . ' ';
+ $ext = pathinfo($file, PATHINFO_EXTENSION);
+ if ($ext != '') {
+ $blacklistedFileNames[] = $file;
+ } else {
+ $blacklistedDirs[] = '--exclude ' . $file . ' ';
+ }
}
- $vendorDir = require BP . '/app/etc/vendor_path.php';
- $command = 'php ' . BP . '/' . $vendorDir . '/bin/phpcpd' . ' --log-pmd ' . escapeshellarg(
- $this->reportFile
- ) . ' --names-exclude "*Test.php" --min-lines 13' . $blackListStr . ' ' . implode(' ', $whiteList);
-
+ $command = $this->getCommand() . ' --log-pmd ' . escapeshellarg($this->reportFile)
+ . ' --names-exclude ' . join(',', $blacklistedFileNames) . ' --min-lines 13 ' . join(' ', $blacklistedDirs)
+ . ' ' . implode(' ', $whiteList);
exec($command, $output, $exitCode);
return !(bool)$exitCode;
}
+
+ /**
+ * Get PHPCPD command
+ *
+ * @return string
+ */
+ private function getCommand()
+ {
+ $vendorDir = require BP . '/app/etc/vendor_path.php';
+ return 'php ' . BP . '/' . $vendorDir . '/bin/phpcpd';
+ }
}
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php
index 6b18eb2b71478463e39e815dec078478c4034a07..e5263713d71d7af374ea1f32c2d765d3639e56ce 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php
@@ -64,7 +64,7 @@ class UnsecureFunctionsUsageTest extends \PHPUnit_Framework_TestCase
if ($regexp) {
$matches = preg_grep(
$regexp,
- file($fileName, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
+ file($fileName)
);
if (!empty($matches)) {
foreach (array_keys($matches) as $line) {
@@ -114,7 +114,8 @@ class UnsecureFunctionsUsageTest extends \PHPUnit_Framework_TestCase
if (strpos($path, $directory) === 0) {
if (preg_match($fileExtensions, $path)) {
foreach ($blackListFiles as $blackListFile) {
- if (preg_match($blackListFile, $path)) {
+ $blackListFile = preg_quote($blackListFile, '#');
+ if (preg_match('#' . $blackListFile . '#', $path)) {
return false;
}
}
@@ -158,10 +159,6 @@ class UnsecureFunctionsUsageTest extends \PHPUnit_Framework_TestCase
if (empty($functions)) {
return '';
}
- $regexArray = [];
- foreach ($functions as $function) {
- $regexArray[] = '\b' . $function . '\b\(';
- }
- return '/' . implode('|', $regexArray) . '/i';
+ return '/(?<!function |[^\s])\b(' . join('|', $functions) . ')\s*\(/i';
}
}
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/blacklist.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/blacklist.php
index d120a4543b9ddced597d330ab489de15c80cdb86..42b8e68e784111b96d43049ae27dc5ebc963ad40 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/blacklist.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/blacklist.php
@@ -4,6 +4,7 @@
* See COPYING.txt for license details.
*/
return [
- '/Test\/Unit/',
- '/lib\/internal\/Magento\/Framework\/DB\/Adapter\/Pdo\/Mysql\.php/',
+ 'Test/Unit',
+ 'lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php',
+ 'lib/internal/Magento/Framework/Serialize/Serializer/Serialize.php',
];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/whitelist.txt b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/whitelist.txt
index 2567475de6a035b2a369ac342c076ce1e5cad07d..e464d9713657f6341ccbf1f6d77986ebac08d979 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/whitelist.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/whitelist.txt
@@ -1,4 +1,5 @@
+# "Component Type" "Component Name" "Path Pattern"
module * /
library * /
setup
-pub
\ No newline at end of file
+pub
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
index 56e0d51516c2632a28acd50ca2c3999e984720df..3afe3af79b14ff3177a0dc1c5ea9fe42e93b6331 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -196,4 +196,6 @@ Magento/Framework/Mview/Config/Data
Magento/Framework/View/File/Collector/Override
Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem
Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItem
-Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem
\ No newline at end of file
+Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem
+IntegrationConfig.php
+*Test.php
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php
index c0316a435662ec4f85a42e5f65295e1f232b5c72..8075f9bddc318a81e8640f44c7e2081cd5aff161 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php
@@ -13,10 +13,8 @@ return [
'Magento_CatalogInventory',
'Magento_CatalogRule',
'Magento_CatalogSearch',
- 'Magento_CatalogWidget',
'Magento_Checkout',
'Magento_CheckoutAgreements',
- 'Magento_Cms',
'Magento_Config',
'Magento_ConfigurableProduct',
'Magento_CurrencySymbol',
@@ -47,8 +45,6 @@ return [
'Magento_Theme',
'Magento_Translation',
'Magento_Ui',
- 'Magento_UrlRewrite',
'Magento_User',
'Magento_Weee',
- 'Magento_Widget',
];
diff --git a/dev/tools/grunt/configs/clean.js b/dev/tools/grunt/configs/clean.js
index 53bcd8a1d830ebda056e59c6ba592106abcdde72..e720b6c40c27e45e8ca27579727ee6dec67bd400 100644
--- a/dev/tools/grunt/configs/clean.js
+++ b/dev/tools/grunt/configs/clean.js
@@ -21,7 +21,8 @@ _.each(themes, function(theme, name) {
"<%= path.tmp %>/cache/**/*",
"<%= combo.autopath(\""+name+"\", path.pub ) %>**/*",
"<%= combo.autopath(\""+name+"\", path.tmpLess) %>**/*",
- "<%= combo.autopath(\""+name+"\", path.tmpSource) %>**/*"
+ "<%= combo.autopath(\""+name+"\", path.tmpSource) %>**/*",
+ "<%= path.deployedVersion %>"
]
}
]
@@ -56,7 +57,8 @@ var cleanOptions = {
"dot": true,
"src": [
"<%= path.pub %>frontend/**/*",
- "<%= path.pub %>adminhtml/**/*"
+ "<%= path.pub %>adminhtml/**/*",
+ "<%= path.deployedVersion %>"
]
}
]
@@ -73,7 +75,8 @@ var cleanOptions = {
"<%= path.pub %>frontend/**/*.less",
"<%= path.pub %>frontend/**/*.css",
"<%= path.pub %>adminhtml/**/*.less",
- "<%= path.pub %>adminhtml/**/*.css"
+ "<%= path.pub %>adminhtml/**/*.css",
+ "<%= path.deployedVersion %>"
]
}
]
@@ -102,7 +105,8 @@ var cleanOptions = {
"src": [
"<%= path.pub %>**/*.js",
"<%= path.pub %>**/*.html",
- "<%= path.pub %>_requirejs/**/*"
+ "<%= path.pub %>_requirejs/**/*",
+ "<%= path.deployedVersion %>"
]
}
]
diff --git a/dev/tools/grunt/configs/path.js b/dev/tools/grunt/configs/path.js
index 03621998c14a602c46eec390263aa8450dfc2657..e6a9cf71e81354b8e6b95e6d1623bbf799d831cf 100644
--- a/dev/tools/grunt/configs/path.js
+++ b/dev/tools/grunt/configs/path.js
@@ -13,6 +13,7 @@ module.exports = {
tmpLess: 'var/view_preprocessed/less/',
tmpSource: 'var/view_preprocessed/source/',
tmp: 'var',
+ deployedVersion: 'pub/static/deployed_version.txt',
css: {
setup: 'setup/pub/styles',
updater: '../magento2-updater/pub/css'
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/View/Deployment/Version/Storage/FileTest.php b/lib/internal/Magento/Framework/App/Test/Unit/View/Deployment/Version/Storage/FileTest.php
index 3981511ad47018c8847c8c9cddf889122e059d58..e7206bf5566075f4df04a977185b5f343ed42b8f 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/View/Deployment/Version/Storage/FileTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/View/Deployment/Version/Storage/FileTest.php
@@ -34,48 +34,15 @@ class FileTest extends \PHPUnit_Framework_TestCase
public function testLoad()
{
- $this->directory
- ->expects($this->once())
- ->method('readFile')
+ $this->directory->expects($this->once())
+ ->method('isReadable')
->with('fixture_file.txt')
- ->will($this->returnValue('123'));
- $this->assertEquals('123', $this->object->load());
- }
-
- /**
- * @expectedException \Exception
- * @expectedExceptionMessage Exception to be propagated
- */
- public function testLoadExceptionPropagation()
- {
- $this->directory
- ->expects($this->once())
+ ->willReturn(true);
+ $this->directory->expects($this->once())
->method('readFile')
->with('fixture_file.txt')
- ->will($this->throwException(new \Exception('Exception to be propagated')));
- $this->object->load();
- }
-
- /**
- * @expectedException \UnexpectedValueException
- * @expectedExceptionMessage Unable to retrieve deployment version of static files from the file system
- */
- public function testLoadExceptionWrapping()
- {
- $filesystemException = new \Magento\Framework\Exception\FileSystemException(
- new \Magento\Framework\Phrase('File does not exist')
- );
- $this->directory
- ->expects($this->once())
- ->method('readFile')
- ->with('fixture_file.txt')
- ->will($this->throwException($filesystemException));
- try {
- $this->object->load();
- } catch (\Exception $e) {
- $this->assertSame($filesystemException, $e->getPrevious(), 'Wrapping of original exception is expected');
- throw $e;
- }
+ ->willReturn('123');
+ $this->assertEquals('123', $this->object->load());
}
public function testSave()
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/View/Deployment/VersionTest.php b/lib/internal/Magento/Framework/App/Test/Unit/View/Deployment/VersionTest.php
index 187c043945d059992d6dc59a8713fc413b1a9752..8d804102f7a56038fded4118692931030593caa7 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/View/Deployment/VersionTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/View/Deployment/VersionTest.php
@@ -6,7 +6,6 @@
namespace Magento\Framework\App\Test\Unit\View\Deployment;
use Magento\Framework\App\View\Deployment\Version;
-use Magento\Framework\Exception\FileSystemException;
/**
* Class VersionTest
@@ -45,17 +44,6 @@ class VersionTest extends \PHPUnit_Framework_TestCase
$objectManager->setBackwardCompatibleProperty($this->object, 'logger', $this->loggerMock);
}
- public function testGetValueDeveloperMode()
- {
- $this->appStateMock
- ->expects($this->once())
- ->method('getMode')
- ->will($this->returnValue(\Magento\Framework\App\State::MODE_DEVELOPER));
- $this->versionStorageMock->expects($this->never())->method($this->anything());
- $this->assertInternalType('integer', $this->object->getValue());
- $this->object->getValue(); // Ensure computation occurs only once and result is cached in memory
- }
-
/**
* @param string $appMode
* @dataProvider getValueFromStorageDataProvider
@@ -81,106 +69,46 @@ class VersionTest extends \PHPUnit_Framework_TestCase
];
}
- /**
- * $param bool $isUnexpectedValueExceptionThrown
- * $param bool $isFileSystemExceptionThrown
- * @dataProvider getValueDefaultModeDataProvider
- */
- public function testGetValueDefaultMode(
- $isUnexpectedValueExceptionThrown,
- $isFileSystemExceptionThrown = null
- ) {
- $versionType = 'integer';
- $this->appStateMock
- ->expects($this->once())
- ->method('getMode')
- ->willReturn(\Magento\Framework\App\State::MODE_DEFAULT);
- if ($isUnexpectedValueExceptionThrown) {
- $storageException = new \UnexpectedValueException('Does not exist in the storage');
- $this->versionStorageMock
- ->expects($this->once())
- ->method('load')
- ->will($this->throwException($storageException));
- $this->versionStorageMock->expects($this->once())
- ->method('save')
- ->with($this->isType($versionType));
- if ($isFileSystemExceptionThrown) {
- $fileSystemException = new FileSystemException(
- new \Magento\Framework\Phrase('Can not load static content version')
- );
- $this->versionStorageMock
- ->expects($this->once())
- ->method('save')
- ->will($this->throwException($fileSystemException));
- $this->loggerMock->expects($this->once())
- ->method('critical')
- ->with('Can not save static content version.');
- } else {
- $this->loggerMock->expects($this->never())
- ->method('critical');
- }
- } else {
- $this->versionStorageMock
- ->expects($this->once())
- ->method('load')
- ->willReturn(1475779229);
- $this->loggerMock->expects($this->never())
- ->method('critical');
- }
- $this->assertInternalType($versionType, $this->object->getValue());
+ public function testGetValueInNonProductionMode()
+ {
+ $version = 123123123123;
+ $this->versionStorageMock->expects($this->once())
+ ->method('load')
+ ->willReturn($version);
+
+ $this->assertEquals($version, $this->object->getValue());
$this->object->getValue();
}
/**
- * @return array
+ * @expectedException \UnexpectedValueException
*/
- public function getValueDefaultModeDataProvider()
+ public function testGetValueWithProductionModeAndException()
{
- return [
- [false],
- [true, false],
- [true, true]
- ];
- }
-
- /**
- * @param bool $isUnexpectedValueExceptionThrown
- * @dataProvider getValueProductionModeDataProvider
- */
- public function testGetValueProductionMode(
- $isUnexpectedValueExceptionThrown
- ) {
- $this->appStateMock
- ->expects($this->once())
+ $this->versionStorageMock->expects($this->once())
+ ->method('load')
+ ->willReturn(false);
+ $this->appStateMock->expects($this->once())
->method('getMode')
->willReturn(\Magento\Framework\App\State::MODE_PRODUCTION);
- if ($isUnexpectedValueExceptionThrown) {
- $storageException = new \UnexpectedValueException('Does not exist in the storage');
- $this->versionStorageMock
- ->expects($this->once())
- ->method('load')
- ->will($this->throwException($storageException));
- $this->loggerMock->expects($this->once())
- ->method('critical')
- ->with('Can not load static content version.');
- } else {
- $this->versionStorageMock
- ->expects($this->once())
- ->method('load')
- ->willReturn(1475779229);
- }
- $this->assertInternalType('integer', $this->object->getValue());
+ $this->loggerMock->expects($this->once())
+ ->method('critical')
+ ->with('Can not load static content version.');
+
$this->object->getValue();
}
- /**
- * @return array
- */
- public function getValueProductionModeDataProvider()
+ public function testGetValueWithProductionMode()
{
- return [
- [false],
- [true],
- ];
+ $this->versionStorageMock->expects($this->once())
+ ->method('load')
+ ->willReturn(false);
+ $this->appStateMock->expects($this->once())
+ ->method('getMode')
+ ->willReturn(\Magento\Framework\App\State::MODE_DEFAULT);
+ $this->versionStorageMock->expects($this->once())
+ ->method('save');
+
+ $this->assertNotNull($this->object->getValue());
}
}
diff --git a/lib/internal/Magento/Framework/App/View/Deployment/Version.php b/lib/internal/Magento/Framework/App/View/Deployment/Version.php
index 7f6dc7fa9285ccc3987d84091bc9edb76d09f794..73d4a0c926cea88c5b2cfbd6db34888f3ef651fb 100644
--- a/lib/internal/Magento/Framework/App/View/Deployment/Version.php
+++ b/lib/internal/Magento/Framework/App/View/Deployment/Version.php
@@ -7,7 +7,6 @@
namespace Magento\Framework\App\View\Deployment;
use Psr\Log\LoggerInterface;
-use Magento\Framework\Exception\FileSystemException;
/**
* Deployment version of static files
@@ -67,23 +66,16 @@ class Version
*/
protected function readValue($appMode)
{
- if ($appMode == \Magento\Framework\App\State::MODE_DEVELOPER) {
- $result = $this->generateVersion();
- } else {
- try {
- $result = $this->versionStorage->load();
- } catch (\UnexpectedValueException $e) {
- $result = $this->generateVersion();
- if ($appMode == \Magento\Framework\App\State::MODE_DEFAULT) {
- try {
- $this->versionStorage->save($result);
- } catch (FileSystemException $e) {
- $this->getLogger()->critical('Can not save static content version.');
- }
- } else {
- $this->getLogger()->critical('Can not load static content version.');
- }
+ $result = $this->versionStorage->load();
+ if (!$result) {
+ if ($appMode == \Magento\Framework\App\State::MODE_PRODUCTION) {
+ $this->getLogger()->critical('Can not load static content version.');
+ throw new \UnexpectedValueException(
+ "Unable to retrieve deployment version of static files from the file system."
+ );
}
+ $result = $this->generateVersion();
+ $this->versionStorage->save($result);
}
return $result;
}
diff --git a/lib/internal/Magento/Framework/App/View/Deployment/Version/Storage/File.php b/lib/internal/Magento/Framework/App/View/Deployment/Version/Storage/File.php
index 4f8813df774d7edc9a7490e31f447e6827dd2e38..0967cb634cbd706689bc0d54aa2c9a1b5b7a8b5e 100644
--- a/lib/internal/Magento/Framework/App/View/Deployment/Version/Storage/File.php
+++ b/lib/internal/Magento/Framework/App/View/Deployment/Version/Storage/File.php
@@ -40,15 +40,10 @@ class File implements \Magento\Framework\App\View\Deployment\Version\StorageInte
*/
public function load()
{
- try {
+ if ($this->directory->isReadable($this->fileName)) {
return $this->directory->readFile($this->fileName);
- } catch (\Magento\Framework\Exception\FileSystemException $e) {
- throw new \UnexpectedValueException(
- 'Unable to retrieve deployment version of static files from the file system.',
- 0,
- $e
- );
}
+ return false;
}
/**
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/Import.php b/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/Import.php
index 524ccc8c11fe311837d3390a8f9ec10ee890d375..260f6216b09bd1dd03fdee39f5102c1a717df32e 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/Import.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/Import.php
@@ -4,8 +4,6 @@
* See COPYING.txt for license details.
*/
-// @codingStandardsIgnoreFile
-
namespace Magento\Framework\Css\PreProcessor\Instruction;
use Magento\Framework\View\Asset\LocalInterface;
@@ -22,7 +20,10 @@ class Import implements PreProcessorInterface
* Pattern of @import instruction
*/
const REPLACE_PATTERN =
- '#@import\s+(\((?P<type>\w+)\)\s+)?[\'\"](?P<path>(?![/\\\]|\w:[/\\\])[^\"\']+)[\'\"]\s*?(?P<media>.*?);#';
+ '#@import(?!.*?\surl\(.*?)'
+ . '(?P<start>[\(\),\w\s]*?[\'\"])'
+ . '(?P<path>(?![/\\\]|\w*?:[/\\\])[^\"\']+)'
+ . '(?P<end>[\'\"][\s\w\(\)]*?);#';
/**
* @var \Magento\Framework\View\Asset\NotationResolver\Module
@@ -133,9 +134,9 @@ class Import implements PreProcessorInterface
$matchedFileId = $this->fixFileExtension($matchedContent['path'], $contentType);
$this->recordRelatedFile($matchedFileId, $asset);
$resolvedPath = $this->notationResolver->convertModuleNotationToPath($asset, $matchedFileId);
- $typeString = empty($matchedContent['type']) ? '' : '(' . $matchedContent['type'] . ') ';
- $mediaString = empty($matchedContent['media']) ? '' : ' ' . trim($matchedContent['media']);
- return "@import {$typeString}'{$resolvedPath}'{$mediaString};";
+ $start = $matchedContent['start'];
+ $end = $matchedContent['end'];
+ return "@import{$start}{$resolvedPath}{$end};";
}
/**
diff --git a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/Instruction/ImportTest.php b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/Instruction/ImportTest.php
index 2441422bb182103100c3181bcfae4150423ef0b3..dc45ea75e0eb86f13771c7108a959376caad54f3 100644
--- a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/Instruction/ImportTest.php
+++ b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/Instruction/ImportTest.php
@@ -39,7 +39,7 @@ class ImportTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->notationResolver = $this->getMock(
+ $this->notationResolver = $this->getMock(
\Magento\Framework\View\Asset\NotationResolver\Module::class, [], [], '', false
);
$this->asset = $this->getMock(\Magento\Framework\View\Asset\File::class, [], [], '', false);
@@ -63,7 +63,11 @@ class ImportTest extends \PHPUnit_Framework_TestCase
public function testProcess($originalContent, $foundPath, $resolvedPath, $expectedContent)
{
$chain = new \Magento\Framework\View\Asset\PreProcessor\Chain($this->asset, $originalContent, 'less', 'path');
- $this->notationResolver->expects($this->once())
+ $invoke = $this->once();
+ if (preg_match('/^(http:|https:|\/+)/', $foundPath)) {
+ $invoke = $this->never();
+ }
+ $this->notationResolver->expects($invoke)
->method('convertModuleNotationToPath')
->with($this->asset, $foundPath)
->will($this->returnValue($resolvedPath));
@@ -78,50 +82,70 @@ class ImportTest extends \PHPUnit_Framework_TestCase
public function processDataProvider()
{
return [
- 'non-modular notation' => [
- '@import (type) "some/file.css" media;',
- 'some/file.css',
- 'some/file.css',
- "@import (type) 'some/file.css' media;",
+ 'non-modular notation, no extension' => [
+ '@import (type) \'some/file\' media;',
+ 'some/file.less',
+ 'some/file.less',
+ '@import (type) \'some/file.less\' media;',
],
'modular, with extension' => [
'@import (type) "Magento_Module::something.css" media;',
'Magento_Module::something.css',
'Magento_Module/something.css',
- "@import (type) 'Magento_Module/something.css' media;",
+ '@import (type) "Magento_Module/something.css" media;',
+ ],
+ 'remote file import url()' => [
+ '@import (type) url("http://example.com/css/some.css") media;',
+ 'http://example.com/css/some.css',
+ null,
+ '@import (type) url("http://example.com/css/some.css") media;',
+ ],
+ 'invalid path' => [
+ '@import (type) url("/example.com/css/some.css") media;',
+ '/example.com/css/some.css',
+ null,
+ '@import (type) url("/example.com/css/some.css") media;',
],
'modular, no extension' => [
'@import (type) "Magento_Module::something" media;',
'Magento_Module::something.less',
'Magento_Module/something.less',
- "@import (type) 'Magento_Module/something.less' media;",
+ '@import (type) "Magento_Module/something.less" media;',
],
'no type' => [
'@import "Magento_Module::something.css" media;',
'Magento_Module::something.css',
'Magento_Module/something.css',
- "@import 'Magento_Module/something.css' media;",
+ '@import "Magento_Module/something.css" media;',
],
'no media' => [
'@import (type) "Magento_Module::something.css";',
'Magento_Module::something.css',
'Magento_Module/something.css',
- "@import (type) 'Magento_Module/something.css';",
+ '@import (type) "Magento_Module/something.css";',
+ ],
+ 'with single line comment, replace' => [
+ '@import (type) "some/file" media;' . PHP_EOL
+ . '// @import (type) "unnecessary/file.css" media;',
+ 'some/file.less',
+ 'some/file.less',
+ '@import (type) "some/file.less" media;' . PHP_EOL,
],
- 'with single line comment' => [
- '@import (type) "some/file.css" media;' . PHP_EOL
- . '// @import (type) "unnecessary/file.css" media;',
- 'some/file.css',
- 'some/file.css',
- "@import (type) 'some/file.css' media;" . PHP_EOL,
+ 'with single line comment, no replace' => [
+ '@import (type) "some/file.less" media;' . PHP_EOL
+ . '// @import (type) "unnecessary/file" media;',
+ 'some/file.less',
+ 'some/file.less',
+ '@import (type) "some/file.less" media;' . PHP_EOL
+ . '// @import (type) "unnecessary/file" media;',
],
'with multi line comment' => [
- '@import (type) "some/file.css" media;' . PHP_EOL
+ '@import (type) "some/file" media;' . PHP_EOL
. '/* @import (type) "unnecessary/file.css" media;' . PHP_EOL
. '@import (type) "another/unnecessary/file.css" media; */',
- 'some/file.css',
- 'some/file.css',
- "@import (type) 'some/file.css' media;" . PHP_EOL,
+ 'some/file.less',
+ 'some/file.less',
+ '@import (type) "some/file.less" media;' . PHP_EOL,
],
];
}
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
index a3ed3b941844eec7497eb233d1c43e74045c45e1..779e8cf0a0e5ecf15b0fcb6da1e48b80a5bb3072 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
@@ -1,15 +1,15 @@
<?php
/**
- *
* Copyright © 2016 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\Framework\ObjectManager\Config;
+use Magento\Framework\ObjectManager\ConfigInterface;
use Magento\Framework\ObjectManager\ConfigCacheInterface;
use Magento\Framework\ObjectManager\RelationsInterface;
-class Compiled implements \Magento\Framework\ObjectManager\ConfigInterface
+class Compiled implements ConfigInterface
{
/**
* @var array
@@ -129,9 +129,15 @@ class Compiled implements \Magento\Framework\ObjectManager\ConfigInterface
*/
public function extend(array $configuration)
{
- $this->arguments = $configuration['arguments'];
- $this->virtualTypes = $configuration['instanceTypes'];
- $this->preferences = $configuration['preferences'];
+ $this->arguments = isset($configuration['arguments'])
+ ? array_replace($this->arguments, $configuration['arguments'])
+ : $this->arguments;
+ $this->virtualTypes = isset($configuration['instanceTypes'])
+ ? array_replace($this->virtualTypes, $configuration['instanceTypes'])
+ : $this->virtualTypes;
+ $this->preferences = isset($configuration['preferences'])
+ ? array_replace($this->preferences, $configuration['preferences'])
+ : $this->preferences;
}
/**
diff --git a/lib/internal/Magento/Framework/Serialize/README.md b/lib/internal/Magento/Framework/Serialize/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..5af8fb7f71b6b174855cb39d004ea29cb6d518a3
--- /dev/null
+++ b/lib/internal/Magento/Framework/Serialize/README.md
@@ -0,0 +1,8 @@
+# Serialize
+
+**Serialize** library provides interface *SerializerInterface* and multiple implementations:
+
+ * *Json* - default implementation. Uses PHP native json_encode/json_decode functions;
+ * *Serialize* - less secure than *Json*, but gives higher performance on big arrays. Uses PHP native serialize/unserialize functions, does not unserialize objects on PHP 7.
+
+Using *Serialize* implementation directly is discouraged, always use *SerializerInterface*, using *Serialize* implementation may lead to security vulnerabilities.
\ No newline at end of file
diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
new file mode 100644
index 0000000000000000000000000000000000000000..9c5e55b194165849cddaeebc9d6f772375d7a66e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Serialize\Serializer;
+
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * Class for serializing data to json string and unserializing json string to data
+ */
+class Json implements SerializerInterface
+{
+ /**
+ * {@inheritDoc}
+ */
+ public function serialize($data)
+ {
+ return json_encode($data);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function unserialize($string)
+ {
+ return json_decode($string, true);
+ }
+}
diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/Serialize.php b/lib/internal/Magento/Framework/Serialize/Serializer/Serialize.php
new file mode 100644
index 0000000000000000000000000000000000000000..3d2dc66e502ef478a868d04eac3bdc2e01bf8519
--- /dev/null
+++ b/lib/internal/Magento/Framework/Serialize/Serializer/Serialize.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Serialize\Serializer;
+
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * Less secure than Json implementation, but gives higher performance on big arrays. Does not unserialize objects on
+ * PHP 7. Using this implementation directly is discouraged as it may lead to security vulnerabilities, especially on
+ * older versions of PHP
+ */
+class Serialize implements SerializerInterface
+{
+ /**
+ * {@inheritDoc}
+ */
+ public function serialize($data)
+ {
+ return serialize($data);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function unserialize($string)
+ {
+ if ($this->getPhpVersion() >= 7) {
+ return unserialize($string, ['allowed_classes' => false]);
+ }
+ return unserialize($string);
+ }
+
+ /**
+ * Return major PHP version
+ *
+ * @return int
+ */
+ private function getPhpVersion()
+ {
+ return PHP_MAJOR_VERSION;
+ }
+}
diff --git a/lib/internal/Magento/Framework/Serialize/SerializerInterface.php b/lib/internal/Magento/Framework/Serialize/SerializerInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..f7a15b31a826e004541434a6ec6b4b30863ba9c3
--- /dev/null
+++ b/lib/internal/Magento/Framework/Serialize/SerializerInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Serialize;
+
+/**
+ * Interface for serializing
+ */
+interface SerializerInterface
+{
+ /**
+ * Serialize data into string
+ *
+ * @param string|int|float|bool|array|null $data
+ * @return string|bool
+ */
+ public function serialize($data);
+
+ /**
+ * Unserialize the given string
+ *
+ * @param string $string
+ * @return string|int|float|bool|array|null
+ */
+ public function unserialize($string);
+}
diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..88e06d89e3763d36a1301b595942a513359ce076
--- /dev/null
+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Serialize\Test\Unit\Serializer;
+
+use Magento\Framework\DataObject;
+use Magento\Framework\Serialize\Serializer\Json;
+
+class JsonTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Framework\Serialize\Serializer\Json
+ */
+ private $json;
+
+ protected function setUp()
+ {
+ $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $this->json = $objectManager->getObject(Json::class);
+ }
+
+ /**
+ * @param string|int|float|bool|array|null $value
+ * @param string $expected
+ * @dataProvider serializeDataProvider
+ */
+ public function testSerialize($value, $expected)
+ {
+ $this->assertEquals(
+ $expected,
+ $this->json->serialize($value)
+ );
+ }
+
+ public function serializeDataProvider()
+ {
+ $dataObject = new DataObject(['something']);
+ return [
+ ['', '""'],
+ ['string', '"string"'],
+ [null, 'null'],
+ [false, 'false'],
+ [['a' => 'b', 'd' => 123], '{"a":"b","d":123}'],
+ [123, '123'],
+ [10.56, '10.56'],
+ [$dataObject, '{}'],
+ ];
+ }
+
+ /**
+ * @param string $value
+ * @param string|int|float|bool|array|null $expected
+ * @dataProvider unserializeDataProvider
+ */
+ public function testUnserialize($value, $expected)
+ {
+ $this->assertEquals(
+ $expected,
+ $this->json->unserialize($value)
+ );
+ }
+
+ public function unserializeDataProvider()
+ {
+ return [
+ ['""', ''],
+ ['"string"', 'string'],
+ ['null', null],
+ ['false', false],
+ ['{"a":"b","d":123}', ['a' => 'b', 'd' => 123]],
+ ['123', 123],
+ ['10.56', 10.56],
+ ['{}', []],
+ ];
+ }
+}
diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/SerializeTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/SerializeTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..874647b5d705fc55e6b9328bab8450e1908a8921
--- /dev/null
+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/SerializeTest.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Serialize\Test\Unit\Serializer;
+
+use Magento\Framework\Serialize\Serializer\Serialize;
+use Magento\Framework\Serialize\Signer;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\Serialize\InvalidSignatureException;
+
+class SerializeTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var Serialize
+ */
+ private $serialize;
+
+ protected function setUp()
+ {
+ $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $this->serialize = $objectManager->getObject(Serialize::class);
+ }
+
+ /**
+ * @param string|int|float|bool|array|null $value
+ * @param string $serializedValue
+ * @dataProvider serializeDataProvider
+ */
+ public function testSerialize($value, $serializedValue)
+ {
+ $this->assertEquals($serializedValue, $this->serialize->serialize($value));
+ }
+
+ public function serializeDataProvider()
+ {
+ return [
+ ['string', 's:6:"string";'],
+ ['', 's:0:"";'],
+ [10, 'i:10;'],
+ [10.5, 'd:10.5;'],
+ [null, 'N;'],
+ [false, 'b:0;'],
+ [['foo' => 'bar'], 'a:1:{s:3:"foo";s:3:"bar";}'],
+ ];
+ }
+
+ /**
+ * @param string $serializedValue
+ * @param string|int|float|bool|array|null $value
+ * @dataProvider unserializeDataProvider
+ */
+ public function testUnserialize($serializedValue, $value)
+ {
+ $this->assertEquals($value, $this->serialize->unserialize($serializedValue));
+ }
+
+ public function unserializeDataProvider()
+ {
+ return [
+ ['s:6:"string";', 'string'],
+ ['s:0:"";', ''],
+ ['i:10;', 10],
+ ['d:10.5;', 10.5],
+ ['N;', null],
+ ['b:0;', false],
+ ['a:1:{s:3:"foo";s:3:"bar";}', ['foo' => 'bar']],
+ ];
+ }
+}
diff --git a/lib/internal/Magento/Framework/Test/Unit/ObjectManager/Config/CompiledTest.php b/lib/internal/Magento/Framework/Test/Unit/ObjectManager/Config/CompiledTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..3dd9f5065a1421ec822d4a81377ea81a5c3f8f52
--- /dev/null
+++ b/lib/internal/Magento/Framework/Test/Unit/ObjectManager/Config/CompiledTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Test\Unit\ObjectManager\Config;
+
+use Magento\Framework\ObjectManager\Config\Compiled as CompiledConfig;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class CompiledTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var ObjectManagerHelper
+ */
+ private $objectManagerHelper;
+
+ protected function setUp()
+ {
+ $this->objectManagerHelper = new ObjectManagerHelper($this);
+ }
+
+ /**
+ * @param array $initialData
+ * @param array $configuration
+ * @param array $expectedArguments
+ * @param array $expectedVirtualTypes
+ * @param array $expectedPreferences
+ *
+ * @dataProvider extendDataProvider
+ */
+ public function testExtend(
+ array $initialData,
+ array $configuration,
+ array $expectedArguments,
+ array $expectedVirtualTypes,
+ array $expectedPreferences
+ ) {
+ /** @var CompiledConfig $compiledConfig */
+ $compiledConfig = $this->objectManagerHelper->getObject(CompiledConfig::class, ['data' => $initialData]);
+ $compiledConfig->extend($configuration);
+
+ foreach ($expectedArguments as $type => $arguments) {
+ $this->assertEquals($arguments, $compiledConfig->getArguments($type));
+ }
+
+ $this->assertEquals($expectedVirtualTypes, $compiledConfig->getVirtualTypes());
+ $this->assertEquals($expectedPreferences, $compiledConfig->getPreferences());
+ }
+
+ /**
+ * @return array
+ */
+ public function extendDataProvider()
+ {
+ return [
+ [
+ 'initialData' => [
+ 'arguments' => [
+ 'type1' => serialize(['argument1_1' => 'argumentValue1_1', 'argument1_2' => 'argumentValue1_2'])
+ ],
+ 'instanceTypes' => [
+ 'instanceType1' => 'instanceTypeValue1', 'instanceType2' => 'instanceTypeValue2'
+ ],
+ 'preferences' => ['preference1' => 'preferenceValue1', 'preference2' => 'preferenceValue2']
+ ],
+ 'configuration' => [
+ 'arguments' => [
+ 'type1' => serialize(['argument1_1' => 'newArgumentValue1_1']),
+ 'type2' => serialize(['argument2_1' => 'newArgumentValue2_1'])
+ ],
+ 'instanceTypes' => [
+ 'instanceType2' => 'newInstanceTypeValue2', 'instanceType3' => 'newInstanceTypeValue3'
+ ],
+ 'preferences' => ['preference1' => 'newPreferenceValue1']
+ ],
+ 'expectedArguments' => [
+ 'type1' => ['argument1_1' => 'newArgumentValue1_1'],
+ 'type2' => ['argument2_1' => 'newArgumentValue2_1']
+ ],
+ 'expectedVirtualTypes' => [
+ 'instanceType1' => 'instanceTypeValue1', 'instanceType2' => 'newInstanceTypeValue2',
+ 'instanceType3' => 'newInstanceTypeValue3'
+ ],
+ 'expectedPreferences' => [
+ 'preference1' => 'newPreferenceValue1', 'preference2' => 'preferenceValue2'
+ ]
+ ]
+ ];
+ }
+}
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
index 7b5100215200473f0610afaf27c922e4662cce8f..2c4ab52b896cb8fd8bf01974d7f39cfc8f11e4f4 100755
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
@@ -82,6 +82,7 @@ define([
}
var settings = {
+ entity_encoding: 'raw',
mode: (mode != undefined ? mode : 'none'),
elements: this.id,
theme: 'advanced',