+ - Magento\Framework\App\ScopeResolver
- Magento\Store\Model\Resolver\Store
- Magento\Store\Model\Resolver\Store
- Magento\Store\Model\Resolver\Group
diff --git a/app/code/Magento/Swatches/Controller/Ajax/Media.php b/app/code/Magento/Swatches/Controller/Ajax/Media.php
index d26080635c456..2aaf158064947 100644
--- a/app/code/Magento/Swatches/Controller/Ajax/Media.php
+++ b/app/code/Magento/Swatches/Controller/Ajax/Media.php
@@ -24,18 +24,26 @@ class Media extends \Magento\Framework\App\Action\Action
*/
private $swatchHelper;
+ /**
+ * @var \Magento\PageCache\Model\Config
+ */
+ protected $config;
+
/**
* @param Context $context
* @param \Magento\Catalog\Model\ProductFactory $productModelFactory
* @param \Magento\Swatches\Helper\Data $swatchHelper
+ * @param \Magento\PageCache\Model\Config $config
*/
public function __construct(
Context $context,
\Magento\Catalog\Model\ProductFactory $productModelFactory,
- \Magento\Swatches\Helper\Data $swatchHelper
+ \Magento\Swatches\Helper\Data $swatchHelper,
+ \Magento\PageCache\Model\Config $config
) {
$this->productModelFactory = $productModelFactory;
$this->swatchHelper = $swatchHelper;
+ $this->config = $config;
parent::__construct($context);
}
@@ -49,14 +57,23 @@ public function __construct(
public function execute()
{
$productMedia = [];
+
+ /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+ $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+
+ /** @var \Magento\Framework\App\ResponseInterface $response */
+ $response = $this->getResponse();
+
if ($productId = (int)$this->getRequest()->getParam('product_id')) {
+ $product = $this->productModelFactory->create()->load($productId);
$productMedia = $this->swatchHelper->getProductMediaGallery(
- $this->productModelFactory->create()->load($productId)
+ $product
);
+ $resultJson->setHeader('X-Magento-Tags', implode(',', $product->getIdentities()));
+
+ $response->setPublicHeaders($this->config->getTtl());
}
- /** @var \Magento\Framework\Controller\Result\Json $resultJson */
- $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
$resultJson->setData($productMedia);
return $resultJson;
}
diff --git a/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php b/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
index 8ca694725511d..39245941df948 100644
--- a/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
+++ b/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
@@ -7,8 +7,9 @@
namespace Magento\Swatches\Model\ResourceModel;
/**
- * @codeCoverageIgnore
* Swatch Resource Model
+ *
+ * @codeCoverageIgnore
* @api
* @since 100.0.2
*/
@@ -25,8 +26,10 @@ protected function _construct()
}
/**
- * @param string $defaultValue
+ * Update default swatch option value.
+ *
* @param integer $id
+ * @param string $defaultValue
* @return void
*/
public function saveDefaultSwatchOption($id, $defaultValue)
@@ -49,7 +52,7 @@ public function clearSwatchOptionByOptionIdAndType($optionIDs, $type = null)
{
if (count($optionIDs)) {
foreach ($optionIDs as $optionId) {
- $where = ['option_id' => $optionId];
+ $where = ['option_id = ?' => $optionId];
if ($type !== null) {
$where['type = ?'] = $type;
}
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml
new file mode 100644
index 0000000000000..c64ba0e89de18
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 30
+ getElementWidth
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php b/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php
index 7a110c63da79e..5a11e2787bc69 100644
--- a/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php
@@ -20,6 +20,9 @@ class MediaTest extends \PHPUnit\Framework\TestCase
/** @var \Magento\Catalog\Model\ProductFactory|\PHPUnit_Framework_MockObject_MockObject */
private $productModelFactoryMock;
+ /** @var \Magento\PageCache\Model\Config|\PHPUnit_Framework_MockObject_MockObject */
+ private $config;
+
/** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject */
private $productMock;
@@ -29,6 +32,9 @@ class MediaTest extends \PHPUnit\Framework\TestCase
/** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
private $requestMock;
+ /** @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject */
+ private $responseMock;
+
/** @var \Magento\Framework\Controller\ResultFactory|\PHPUnit_Framework_MockObject_MockObject */
private $resultFactory;
@@ -57,11 +63,20 @@ protected function setUp()
\Magento\Catalog\Model\ProductFactory::class,
['create']
);
+ $this->config = $this->createMock(\Magento\PageCache\Model\Config::class);
+ $this->config->method('getTtl')->willReturn(1);
+
$this->productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
$this->contextMock = $this->createMock(\Magento\Framework\App\Action\Context::class);
$this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
$this->contextMock->method('getRequest')->willReturn($this->requestMock);
+ $this->responseMock = $this->getMockBuilder(\Magento\Framework\App\ResponseInterface::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['setPublicHeaders'])
+ ->getMockForAbstractClass();
+ $this->responseMock->method('setPublicHeaders')->willReturnSelf();
+ $this->contextMock->method('getResponse')->willReturn($this->responseMock);
$this->resultFactory = $this->createPartialMock(\Magento\Framework\Controller\ResultFactory::class, ['create']);
$this->contextMock->method('getResultFactory')->willReturn($this->resultFactory);
@@ -73,7 +88,8 @@ protected function setUp()
[
'context' => $this->contextMock,
'swatchHelper' => $this->swatchHelperMock,
- 'productModelFactory' => $this->productModelFactoryMock
+ 'productModelFactory' => $this->productModelFactoryMock,
+ 'config' => $this->config
]
);
}
@@ -86,6 +102,10 @@ public function testExecute()
->method('load')
->with(59)
->willReturn($this->productMock);
+ $this->productMock
+ ->expects($this->once())
+ ->method('getIdentities')
+ ->willReturn(['tags']);
$this->productModelFactoryMock
->expects($this->once())
diff --git a/app/code/Magento/Swatches/composer.json b/app/code/Magento/Swatches/composer.json
index adce50b564a1d..f46f6720d30d8 100644
--- a/app/code/Magento/Swatches/composer.json
+++ b/app/code/Magento/Swatches/composer.json
@@ -12,6 +12,7 @@
"magento/module-media-storage": "100.2.*",
"magento/module-config": "101.0.*",
"magento/module-theme": "100.2.*",
+ "magento/module-page-cache": "100.2.*",
"magento/framework": "101.0.*"
},
"suggest": {
diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
index 8d4400b3d0477..e00c41d371c9e 100644
--- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
@@ -21,7 +21,7 @@ $stores = $block->getStoresSortedBySortOrder();
|
escapeHtml(__('Is Default')) ?> |
-
getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> _required"
colspan="2">
escapeHtml($_store->getName()) ?>
@@ -75,7 +75,7 @@ $stores = $block->getStoresSortedBySortOrder();
getId(); ?>
- |
+ |
getStoresSortedBySortOrder();
type="text" value="<%- data.swatch %>"
placeholder="escapeHtml(__("Swatch")) ?>"/>
|
-
+ |
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -62,6 +62,7 @@
+
@@ -87,9 +88,13 @@
-
-
-
+
+
+
+
+ {{US_Address_CA.postcode}}
+ grabTextPostCode
+
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml
index fbb44807c8b14..f26b6d2747e09 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -37,6 +37,7 @@
+
@@ -59,9 +60,13 @@
-
-
-
+
+
+
+
+ {{US_Address_NY.postcode}}
+ grabTextPostCode
+
diff --git a/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
index 98fa12ab987b6..13b8aa23073ce 100644
--- a/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
+++ b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
@@ -27,6 +27,11 @@ class Builder implements \Magento\Framework\View\Model\PageLayout\Config\Builder
*/
protected $themeCollection;
+ /**
+ * @var array
+ */
+ private $configFiles = [];
+
/**
* @param \Magento\Framework\View\PageLayout\ConfigFactory $configFactory
* @param \Magento\Framework\View\PageLayout\File\Collector\Aggregated $fileCollector
@@ -44,7 +49,7 @@ public function __construct(
}
/**
- * @return \Magento\Framework\View\PageLayout\Config
+ * @inheritdoc
*/
public function getPageLayoutsConfig()
{
@@ -52,15 +57,20 @@ public function getPageLayoutsConfig()
}
/**
+ * Retrieve configuration files.
+ *
* @return array
*/
protected function getConfigFiles()
{
- $configFiles = [];
- foreach ($this->themeCollection->loadRegisteredThemes() as $theme) {
- $configFiles = array_merge($configFiles, $this->fileCollector->getFilesContent($theme, 'layouts.xml'));
+ if (!$this->configFiles) {
+ $configFiles = [];
+ foreach ($this->themeCollection->loadRegisteredThemes() as $theme) {
+ $configFiles[] = $this->fileCollector->getFilesContent($theme, 'layouts.xml');
+ }
+ $this->configFiles = array_merge(...$configFiles);
}
- return $configFiles;
+ return $this->configFiles;
}
}
diff --git a/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php b/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php
index e5d69cbc820a1..8429be84cae44 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php
@@ -83,7 +83,7 @@ public function testGetPageLayoutsConfig()
->disableOriginalConstructor()
->getMock();
- $this->themeCollection->expects($this->any())
+ $this->themeCollection->expects($this->once())
->method('loadRegisteredThemes')
->willReturn([$theme1, $theme2]);
diff --git a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
index 066b4494e51d0..14283a8899e50 100644
--- a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
+++ b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
@@ -5,6 +5,8 @@
*/
namespace Magento\Ui\TemplateEngine\Xhtml;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\JsonHexTag;
use Magento\Framework\View\Layout\Generator\Structure;
use Magento\Framework\View\Element\UiComponentInterface;
use Magento\Framework\View\TemplateEngine\Xhtml\Template;
@@ -42,25 +44,33 @@ class Result implements ResultInterface
*/
protected $logger;
+ /**
+ * @var JsonHexTag
+ */
+ private $jsonSerializer;
+
/**
* @param Template $template
* @param CompilerInterface $compiler
* @param UiComponentInterface $component
* @param Structure $structure
* @param LoggerInterface $logger
+ * @param JsonHexTag $jsonSerializer
*/
public function __construct(
Template $template,
CompilerInterface $compiler,
UiComponentInterface $component,
Structure $structure,
- LoggerInterface $logger
+ LoggerInterface $logger,
+ JsonHexTag $jsonSerializer = null
) {
$this->template = $template;
$this->compiler = $compiler;
$this->component = $component;
$this->structure = $structure;
$this->logger = $logger;
+ $this->jsonSerializer = $jsonSerializer ?? ObjectManager::getInstance()->get(JsonHexTag::class);
}
/**
@@ -81,7 +91,7 @@ public function getDocumentElement()
public function appendLayoutConfiguration()
{
$layoutConfiguration = $this->wrapContent(
- json_encode($this->structure->generate($this->component), JSON_HEX_TAG)
+ $this->jsonSerializer->serialize($this->structure->generate($this->component))
);
$this->template->append($layoutConfiguration);
}
diff --git a/app/code/Magento/Ui/Test/Unit/TemplateEngine/Xhtml/ResultTest.php b/app/code/Magento/Ui/Test/Unit/TemplateEngine/Xhtml/ResultTest.php
index 30a8e8005bbe8..9babfefd87f76 100644
--- a/app/code/Magento/Ui/Test/Unit/TemplateEngine/Xhtml/ResultTest.php
+++ b/app/code/Magento/Ui/Test/Unit/TemplateEngine/Xhtml/ResultTest.php
@@ -6,6 +6,7 @@
namespace Magento\Ui\Test\Unit\TemplateEngine\Xhtml;
+use Magento\Framework\Serialize\Serializer\JsonHexTag;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
use Magento\Framework\View\Layout\Generator\Structure;
use Magento\Framework\View\Element\UiComponentInterface;
@@ -58,6 +59,11 @@ class ResultTest extends \PHPUnit\Framework\TestCase
*/
private $objectManager;
+ /**
+ * @var JsonHexTag|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $serializer;
+
protected function setUp()
{
$this->template = $this->createPartialMock(Template::class, ['append']);
@@ -65,6 +71,9 @@ protected function setUp()
$this->component = $this->createMock(UiComponentInterface::class);
$this->structure = $this->createPartialMock(Structure::class, ['generate']);
$this->logger = $this->createMock(LoggerInterface::class);
+ $this->serializer = $this->getMockBuilder(JsonHexTag::class)
+ ->disableOriginalConstructor()
+ ->getMock();
$this->objectManager = new ObjectManager($this);
$this->testModel = $this->objectManager->getObject(Result::class, [
@@ -73,6 +82,7 @@ protected function setUp()
'component' => $this->component,
'structure' => $this->structure,
'logger' => $this->logger,
+ 'jsonSerializer' => $this->serializer
]);
}
@@ -82,6 +92,10 @@ protected function setUp()
public function testAppendLayoutConfiguration()
{
$configWithCdata = 'text before ';
+ $this->serializer->expects($this->once())
+ ->method('serialize')
+ ->with([$configWithCdata])
+ ->willReturn('["text before \u003C![CDATA[cdata text]]\u003E"]');
$this->structure->expects($this->once())
->method('generate')
->with($this->component)
diff --git a/app/code/Magento/Ui/i18n/en_US.csv b/app/code/Magento/Ui/i18n/en_US.csv
index 981d444b31d53..040ec32cf0b74 100644
--- a/app/code/Magento/Ui/i18n/en_US.csv
+++ b/app/code/Magento/Ui/i18n/en_US.csv
@@ -202,3 +202,4 @@ CSV,CSV
"Please enter at least {0} characters.","Please enter at least {0} characters."
"Please enter a value between {0} and {1} characters long.","Please enter a value between {0} and {1} characters long."
"Please enter a value between {0} and {1}.","Please enter a value between {0} and {1}."
+"The file upload field is disabled.","The file upload field is disabled."
diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js
index dee9ba7acc172..583e97b7e9449 100644
--- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js
+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js
@@ -15,8 +15,7 @@ define([
], function (ko, $, _, Element) {
'use strict';
- var transformProp,
- isTouchDevice = typeof document.ontouchstart !== 'undefined';
+ var transformProp;
/**
* Get element context
@@ -110,11 +109,7 @@ define([
* @param {Object} data - element data
*/
initListeners: function (elem, data) {
- if (isTouchDevice) {
- $(elem).on('touchstart', this.mousedownHandler.bind(this, data, elem));
- } else {
- $(elem).on('mousedown', this.mousedownHandler.bind(this, data, elem));
- }
+ $(elem).on('mousedown touchstart', this.mousedownHandler.bind(this, data, elem));
},
/**
@@ -131,26 +126,20 @@ define([
$table = $(elem).parents('table').eq(0),
$tableWrapper = $table.parent();
+ this.disableScroll();
$(recordNode).addClass(this.draggableElementClass);
$(originRecord).addClass(this.draggableElementClass);
this.step = this.step === 'auto' ? originRecord.height() / 2 : this.step;
drEl.originRow = originRecord;
drEl.instance = recordNode = this.processingStyles(recordNode, elem);
drEl.instanceCtx = this.getRecord(originRecord[0]);
- drEl.eventMousedownY = isTouchDevice ? event.originalEvent.touches[0].pageY : event.pageY;
+ drEl.eventMousedownY = this.getPageY(event);
drEl.minYpos =
$table.offset().top - originRecord.offset().top + $table.children('thead').outerHeight();
drEl.maxYpos = drEl.minYpos + $table.children('tbody').outerHeight() - originRecord.outerHeight();
$tableWrapper.append(recordNode);
-
- if (isTouchDevice) {
- this.body.bind('touchmove', this.mousemoveHandler);
- this.body.bind('touchend', this.mouseupHandler);
- } else {
- this.body.bind('mousemove', this.mousemoveHandler);
- this.body.bind('mouseup', this.mouseupHandler);
- }
-
+ this.body.bind('mousemove touchmove', this.mousemoveHandler);
+ this.body.bind('mouseup touchend', this.mouseupHandler);
},
/**
@@ -160,16 +149,13 @@ define([
*/
mousemoveHandler: function (event) {
var depEl = this.draggableElement,
- pageY = isTouchDevice ? event.originalEvent.touches[0].pageY : event.pageY,
+ pageY = this.getPageY(event),
positionY = pageY - depEl.eventMousedownY,
processingPositionY = positionY + 'px',
processingMaxYpos = depEl.maxYpos + 'px',
processingMinYpos = depEl.minYpos + 'px',
depElement = this.getDepElement(depEl.instance, positionY, depEl.originRow);
- event.stopPropagation();
- event.preventDefault();
-
if (depElement) {
depEl.depElement ? depEl.depElement.elem.removeClass(depEl.depElement.className) : false;
depEl.depElement = depElement;
@@ -194,9 +180,10 @@ define([
mouseupHandler: function (event) {
var depElementCtx,
drEl = this.draggableElement,
- pageY = isTouchDevice ? event.originalEvent.touches[0].pageY : event.pageY,
+ pageY = this.getPageY(event),
positionY = pageY - drEl.eventMousedownY;
+ this.enableScroll();
drEl.depElement = this.getDepElement(drEl.instance, positionY, this.draggableElement.originRow);
drEl.instance.remove();
@@ -212,13 +199,8 @@ define([
drEl.originRow.removeClass(this.draggableElementClass);
- if (isTouchDevice) {
- this.body.unbind('touchmove', this.mousemoveHandler);
- this.body.unbind('touchend', this.mouseupHandler);
- } else {
- this.body.unbind('mousemove', this.mousemoveHandler);
- this.body.unbind('mouseup', this.mouseupHandler);
- }
+ this.body.unbind('mousemove touchmove', this.mousemoveHandler);
+ this.body.unbind('mouseup touchend', this.mouseupHandler);
this.draggableElement = {};
},
@@ -402,6 +384,55 @@ define([
index = _.isFunction(ctx.$index) ? ctx.$index() : ctx.$index;
return this.recordsCache()[index];
+ },
+
+ /**
+ * Get correct page Y
+ *
+ * @param {Object} event - current event
+ * @returns {integer}
+ */
+ getPageY: function (event) {
+ var pageY;
+
+ if (event.type.indexOf('touch') >= 0) {
+ if (event.originalEvent.touches[0]) {
+ pageY = event.originalEvent.touches[0].pageY;
+ } else {
+ pageY = event.originalEvent.changedTouches[0].pageY;
+ }
+ } else {
+ pageY = event.pageY;
+ }
+
+ return pageY;
+ },
+
+ /**
+ * Disable page scrolling
+ */
+ disableScroll: function () {
+ document.body.addEventListener('touchmove', this.preventDefault, {
+ passive: false
+ });
+ },
+
+ /**
+ * Enable page scrolling
+ */
+ enableScroll: function () {
+ document.body.removeEventListener('touchmove', this.preventDefault, {
+ passive: false
+ });
+ },
+
+ /**
+ * Prevent default function
+ *
+ * @param {Object} event - event object
+ */
+ preventDefault: function (event) {
+ event.preventDefault();
}
});
diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js
index 54309ca068513..3987507ece54f 100644
--- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js
+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js
@@ -25,7 +25,7 @@ define([
},
listens: {
position: 'initPosition',
- elems: 'setColumnVisibileListener'
+ elems: 'setColumnVisibleListener'
},
links: {
position: '${ $.name }.${ $.positionProvider }:value'
@@ -123,7 +123,7 @@ define([
/**
* Set column visibility listener
*/
- setColumnVisibileListener: function () {
+ setColumnVisibleListener: function () {
var elem = _.find(this.elems(), function (curElem) {
return !curElem.hasOwnProperty('visibleListener');
});
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js b/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
index 6d33386fa1f1c..5f2fda830f5ba 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
@@ -162,6 +162,10 @@ define([
}
this.error(hasErrors || message);
+
+ if (hasErrors || message) {
+ this.open();
+ }
},
/**
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
index 013910bbd2e96..5617110590e50 100755
--- a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
@@ -408,6 +408,7 @@ define([
isValid = this.disabled() || !this.visible() || result.passed;
this.error(message);
+ this.error.valueHasMutated();
this.bubble('error', message);
//TODO: Implement proper result propagation for form
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
index b81119f2bd5f3..4b178622c28cf 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
@@ -13,8 +13,9 @@ define([
'Magento_Ui/js/modal/alert',
'Magento_Ui/js/lib/validation/validator',
'Magento_Ui/js/form/element/abstract',
+ 'mage/translate',
'jquery/file-uploader'
-], function ($, _, utils, uiAlert, validator, Element) {
+], function ($, _, utils, uiAlert, validator, Element, $t) {
'use strict';
return Element.extend({
@@ -328,6 +329,12 @@ define([
allowed = this.isFileAllowed(file),
target = $(e.target);
+ if (this.disabled()) {
+ this.notifyError($t('The file upload field is disabled.'));
+
+ return;
+ }
+
if (allowed.passed) {
target.on('fileuploadsend', function (event, postData) {
postData.data.append('param_name', this.paramName);
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js b/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
index 911574a0fb438..1b6dd9f1c57ec 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
@@ -26,7 +26,7 @@ define([
update: function (value) {
var country = registry.get(this.parentName + '.' + 'country_id'),
options = country.indexedOptions,
- option;
+ option = null;
if (!value) {
return;
@@ -34,6 +34,10 @@ define([
option = options[value];
+ if (!option) {
+ return;
+ }
+
if (option['is_zipcode_optional']) {
this.error(false);
this.validation = _.omit(this.validation, 'required-entry');
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index b7a10e6f37944..a9e289d57300b 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -334,6 +334,14 @@ public function setRequest(RateRequest $request)
$destCountry = self::GUAM_COUNTRY_ID;
}
+ // For UPS, Las Palmas and Santa Cruz de Tenerife will be represented by Canary Islands country
+ if (
+ $destCountry == self::SPAIN_COUNTRY_ID &&
+ ($request->getDestRegionCode() == self::LAS_PALMAS_REGION_ID || $request->getDestRegionCode() == self::SANTA_CRUZ_DE_TENERIFE_REGION_ID)
+ ) {
+ $destCountry = self::CANARY_ISLANDS_COUNTRY_ID;
+ }
+
$country = $this->_countryFactory->create()->load($destCountry);
$rowRequest->setDestCountry($country->getData('iso2_code') ?: $destCountry);
diff --git a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
index 499fb9925a54a..60b845f95e5cc 100644
--- a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
+++ b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
@@ -79,7 +79,7 @@ protected function prepareSelect(array $data)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
protected function doFindAllByData(array $data)
{
@@ -87,7 +87,7 @@ protected function doFindAllByData(array $data)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
protected function doFindOneByData(array $data)
{
@@ -152,26 +152,22 @@ private function deleteOldUrls(array $urls)
$oldUrlsSelect->from(
$this->resource->getTableName(self::TABLE_NAME)
);
- /** @var UrlRewrite $url */
- foreach ($urls as $url) {
- $oldUrlsSelect->orWhere(
- $this->connection->quoteIdentifier(
- UrlRewrite::ENTITY_TYPE
- ) . ' = ?',
- $url->getEntityType()
- );
- $oldUrlsSelect->where(
- $this->connection->quoteIdentifier(
- UrlRewrite::ENTITY_ID
- ) . ' = ?',
- $url->getEntityId()
- );
- $oldUrlsSelect->where(
- $this->connection->quoteIdentifier(
- UrlRewrite::STORE_ID
- ) . ' = ?',
- $url->getStoreId()
- );
+
+ $uniqueEntities = $this->prepareUniqueEntities($urls);
+ foreach ($uniqueEntities as $storeId => $entityTypes) {
+ foreach ($entityTypes as $entityType => $entities) {
+ $oldUrlsSelect->orWhere(
+ $this->connection->quoteIdentifier(
+ UrlRewrite::STORE_ID
+ ) . ' = ' . $this->connection->quote($storeId, 'INTEGER') .
+ ' AND ' . $this->connection->quoteIdentifier(
+ UrlRewrite::ENTITY_ID
+ ) . ' IN (' . $this->connection->quote($entities, 'INTEGER') . ')' .
+ ' AND ' . $this->connection->quoteIdentifier(
+ UrlRewrite::ENTITY_TYPE
+ ) . ' = ' . $this->connection->quote($entityType)
+ );
+ }
}
// prevent query locking in a case when nothing to delete
@@ -189,6 +185,28 @@ private function deleteOldUrls(array $urls)
}
}
+ /**
+ * Prepare array with unique entities
+ *
+ * @param UrlRewrite[] $urls
+ * @return array
+ */
+ private function prepareUniqueEntities(array $urls): array
+ {
+ $uniqueEntities = [];
+ /** @var UrlRewrite $url */
+ foreach ($urls as $url) {
+ $entityIds = (!empty($uniqueEntities[$url->getStoreId()][$url->getEntityType()])) ?
+ $uniqueEntities[$url->getStoreId()][$url->getEntityType()] : [];
+
+ if (!\in_array($url->getEntityId(), $entityIds)) {
+ $entityIds[] = $url->getEntityId();
+ }
+ $uniqueEntities[$url->getStoreId()][$url->getEntityType()] = $entityIds;
+ }
+ return $uniqueEntities;
+ }
+
/**
* @inheritDoc
*/
@@ -279,7 +297,7 @@ protected function createFilterDataBasedOnUrls($urls)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function deleteByData(array $data)
{
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
index 455748a0da534..ab847f924b5cf 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
@@ -7,9 +7,10 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml
new file mode 100644
index 0000000000000..cfe96fc1c33f7
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ category-admin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
index 408bcaf7a489e..08fe9a6375b24 100644
--- a/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
+++ b/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
@@ -478,10 +478,6 @@ public function testReplace()
->with(DbStorage::TABLE_NAME)
->will($this->returnValue('table_name'));
- $this->connectionMock->expects($this->any())
- ->method('query')
- ->with('sql delete query');
-
// insert
$urlFirst->expects($this->any())
@@ -496,10 +492,6 @@ public function testReplace()
->with(DbStorage::TABLE_NAME)
->will($this->returnValue('table_name'));
- $this->connectionMock->expects($this->once())
- ->method('insertMultiple')
- ->with('table_name', [['row1'], ['row2']]);
-
$this->storage->replace([$urlFirst, $urlSecond]);
}
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index 1e8faf3cc9614..afe34cac575ac 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -1246,7 +1246,7 @@ protected function _getCountryName($countryId)
'FO' => 'Faroe Islands',
'FR' => 'France',
'GA' => 'Gabon',
- 'GB' => 'Great Britain and Northern Ireland',
+ 'GB' => 'United Kingdom of Great Britain and Northern Ireland',
'GD' => 'Grenada',
'GE' => 'Georgia, Republic of',
'GF' => 'French Guiana',
@@ -1364,7 +1364,7 @@ protected function _getCountryName($countryId)
'ST' => 'Sao Tome and Principe',
'SV' => 'El Salvador',
'SY' => 'Syrian Arab Republic',
- 'SZ' => 'Swaziland',
+ 'SZ' => 'Eswatini',
'TC' => 'Turks and Caicos Islands',
'TD' => 'Chad',
'TG' => 'Togo',
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
index b6dfc00c0ff9e..dfb33b197d74f 100644
--- a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
@@ -7,58 +7,60 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml b/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
index 26864c60b6494..d7db8fe50cb7f 100644
--- a/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
Catalog Products List
Magento Luma
@@ -19,4 +19,17 @@
All Pages
Main Content Area
+
+ Banner Rotator
+ Magento Luma
+ TestBannerWidget
+
+ - All Store Views
+
+ SKU
+ All Pages
+ Main Content Area
+ salesrule
+ header
+
diff --git a/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml b/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml
index 8eb0a5f65318e..d495a36f68d0a 100644
--- a/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml
@@ -7,8 +7,8 @@
-->
-
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+
diff --git a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
index adf234baede72..37ad425114d5c 100644
--- a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
index 4267da896ea96..920b387441ada 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
@@ -95,13 +95,18 @@
+
-
+
-
+
+
+
+
+
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
index a3142b56abd27..42c9b289afdb7 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
@@ -15,9 +15,9 @@
@menu__background-color: @color-very-dark-grayish-orange;
-@menu-logo__padding-bottom: 2.2rem;
+@menu-logo__padding-bottom: 1.7rem;
@menu-logo__outer-size: @menu-logo__padding-top + @menu-logo-img__height + @menu-logo__padding-bottom;
-@menu-logo__padding-top: 1.2rem;
+@menu-logo__padding-top: 1.7rem;
@menu-logo-img__height: 4.1rem;
@menu-logo-img__width: 3.5rem;
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
index 6420738c6fb9b..248c7d2947174 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
@@ -127,8 +127,24 @@
}
}
}
+ td.admin__collapsible-block-wrapper {
+ .admin__collapsible-title {
+ &:before {
+ content: @icon-expand-open__content;
+ }
+ }
+ &._show {
+ .admin__collapsible-title {
+ &:before {
+ content: @icon-expand-close__content;
+ }
+ }
+ }
+ }
}
+
+
&.fieldset-wrapper {
border-bottom: 1px solid @collapsible__border-color;
padding: 0;
@@ -147,6 +163,14 @@
&.collapsible-block-wrapper-last {
border-bottom: 0;
}
+
+ .admin__dynamic-rows.admin__control-collapsible {
+ td {
+ &.admin__collapsible-block-wrapper {
+ border-bottom: none;
+ }
+ }
+ }
}
.admin__collapsible-content {
@@ -322,7 +346,7 @@
}
.value {
- padding-right: 4rem;
+ padding-right: 2rem;
}
}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less
index 80bebb22a9043..0bd6cc62bd509 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less
@@ -10,11 +10,6 @@
// ToDo UI: Consist old styles, should be changed with new design
.store-switcher {
- color: @text__color; // ToDo UI: Delete with admin scope
- float: left;
- font-size: round(@font-size__base - .1rem, 1);
- margin-top: .7rem;
-
.admin__action-dropdown {
background-color: @page-main-actions__background-color;
margin-left: .5em;
@@ -47,8 +42,8 @@
width: 7px;
}
&::-webkit-scrollbar-thumb {
- border-radius: 4px;
background-color: rgba(0, 0, 0, .5);
+ border-radius: 4px;
}
li {
@@ -116,6 +111,12 @@
}
}
}
+
+ color: @text__color; // ToDo UI: Delete with admin scope
+ float: left;
+ font-size: round(@font-size__base - .1rem, 1);
+ margin-top: .59rem;
+
}
.store-switcher-label {
@@ -239,7 +240,6 @@
.store-switcher-label {
display: inline-block;
- margin-top: @indent__s;
}
}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Review/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Review/web/css/source/_module.less
index 17be2ca706076..faa5845405ab2 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Review/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Review/web/css/source/_module.less
@@ -34,7 +34,7 @@
.admin__field-control {
direction: rtl;
display: inline-block;
- margin: -4px 0 0;
+ margin: -2px 0 0;
unicode-bidi: bidi-override;
vertical-align: top;
width: 125px;
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
index 1e76679f594c1..fa1ae25628986 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
@@ -92,6 +92,14 @@
margin: 0;
padding: 0;
}
+ .admin__data-grid-pager-wrap{
+ .selectmenu {
+ margin-bottom: 10px;
+ }
+ }
+ .data-grid-search-control-wrap {
+ margin-bottom: 10px;
+ }
}
//
diff --git a/app/design/adminhtml/Magento/backend/etc/view.xml b/app/design/adminhtml/Magento/backend/etc/view.xml
index f10f7789b0888..18c2d8f1b1722 100644
--- a/app/design/adminhtml/Magento/backend/etc/view.xml
+++ b/app/design/adminhtml/Magento/backend/etc/view.xml
@@ -23,6 +23,8 @@
+ - Lib::mage/captcha.js
+ - Lib::mage/captcha.min.js
- Lib::mage/common.js
- Lib::mage/cookies.js
- Lib::mage/dataPost.js
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less
index 773b70ca5f09d..0fe3a3e8b2ec7 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less
@@ -42,6 +42,7 @@
margin: 0 @indent__xs 15px 0;
overflow: hidden;
padding: 3px;
+ text-overflow: ellipsis;
width: 100px;
&.selected {
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
index de24bf89620d4..15cd295885892 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
@@ -76,7 +76,8 @@
position: absolute;
speak: none;
text-shadow: none;
- top: 1.3rem;
+ top: 50%;
+ margin-top: -1.25rem;
width: auto;
}
}
@@ -110,7 +111,7 @@
content: @alert-icon__error__content;
font-size: @alert-icon__error__font-size;
left: 2.2rem;
- margin-top: 0.5rem;
+ margin-top: -1.1rem;
}
}
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
index 63d97dc52e453..565b127ccad3e 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
@@ -146,13 +146,13 @@
}
.action-close {
- padding: @modal-popup__padding;
+ padding: @modal-popup__padding - 2;
&:active,
&:focus {
background: transparent;
- padding-right: @modal-popup__padding + (@modal-action-close__font-size - @modal-action-close__active__font-size) / 2;
- padding-top: @modal-popup__padding + (@modal-action-close__font-size - @modal-action-close__active__font-size) / 2;
+ padding-right: @modal-popup__padding - 2;
+ padding-top: @modal-popup__padding - 2;
}
}
}
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less
index 7bd10ad491f0c..334e0a4a396bc 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less
@@ -264,7 +264,7 @@
}
}
- #contents-uploader {
+ .contents-uploader {
margin: 0 0 @indent__base;
}
@@ -298,6 +298,7 @@
margin: 0 @indent__xs 15px 0;
overflow: hidden;
padding: 3px;
+ text-overflow: ellipsis;
width: 100px;
&.selected {
@@ -309,7 +310,7 @@
}
}
- #contents-uploader {
+ .contents-uploader {
&:extend(.abs-clearfix all);
}
diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
index 319aad9770d69..116163cc375a8 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -2738,7 +2738,8 @@
// ---------------------------------------------
#widget_instace_tabs_properties_section_content .widget-option-label {
- margin-top: 6px;
+ margin-top: 7px;
+ display: inline-block;
}
//
diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
index 2dd8463308a2c..85ef048ef0fc7 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
@@ -488,6 +488,7 @@
.product-items-names {
.product-item {
+ display: flex;
margin-bottom: @indent__s;
}
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
index 54457353f90ae..5cf1e9f59af39 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
@@ -107,7 +107,7 @@
@_toggle-selector: ~'.action.showcart',
@_options-selector: ~'.block-minicart',
@_dropdown-list-width: 320px,
- @_dropdown-list-position-right: 0px,
+ @_dropdown-list-position-right: 0,
@_dropdown-list-pointer-position: right,
@_dropdown-list-pointer-position-left-right: 26px,
@_dropdown-list-z-index: 101,
@@ -341,7 +341,7 @@
.item-qty {
margin-right: @indent__s;
text-align: center;
- width: 40px;
+ width: 45px;
}
.update-cart-item {
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
index bf264a98f33b8..39b9a051e6592 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
@@ -147,3 +147,32 @@
}
}
}
+
+//
+// Tablet
+// _____________________________________________
+
+@media only screen and (max-width: @screen__m) {
+ .field-tooltip .field-tooltip-content {
+ left: auto;
+ right: -10px;
+ top: 40px;
+ }
+ .field-tooltip .field-tooltip-content::before,
+ .field-tooltip .field-tooltip-content::after {
+ border: 10px solid transparent;
+ height: 0;
+ left: auto;
+ margin-top: -21px;
+ right: 10px;
+ top: 0;
+ width: 0;
+ }
+ .field-tooltip .field-tooltip-content::before {
+ border-bottom-color: @color-gray40;
+ }
+ .field-tooltip .field-tooltip-content::after {
+ border-bottom-color: @color-gray-light01;
+ top: 1px;
+ }
+}
diff --git a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
index 3ffaeb82cdc2a..fea9e8e497e40 100644
--- a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
@@ -367,8 +367,8 @@
}
.account {
- .page.messages {
- margin-bottom: @indent__xl;
+ .messages {
+ margin-bottom: 0;
}
.toolbar {
@@ -421,7 +421,7 @@
> .field {
> .control {
- width: 55%;
+ width: 80%;
}
}
}
diff --git a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less
index 6baa2432ff035..7d86850c4e517 100644
--- a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less
@@ -342,7 +342,7 @@
.product {
&-item {
&-checkbox {
- left: 20px;
+ left: 0;
position: absolute;
top: 20px;
}
@@ -381,16 +381,16 @@
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
.wishlist {
&.window.popup {
+ .field {
+ .lib-form-field-type-revert(@_type: block);
+ }
+
bottom: auto;
.lib-css(top, @desktop-popup-position-top);
.lib-css(left, @desktop-popup-position-left);
.lib-css(margin-left, @desktop-popup-margin-left);
.lib-css(width, @desktop-popup-width);
right: auto;
-
- .field {
- .lib-form-field-type-revert(@_type: block);
- }
}
}
diff --git a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
index 0e8350261e002..2163fe2aee897 100644
--- a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
@@ -177,10 +177,10 @@
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
.products-grid.wishlist {
margin-bottom: @indent__l;
- margin-right: -@indent__s;
+ margin-right: 0;
.product {
&-item {
- padding: @indent__base @indent__s @indent__base @indent__base;
+ padding: @indent__base 0 @indent__base 0;
position: relative;
&-photo {
@@ -194,6 +194,7 @@
&-actions {
display: block;
+ float: left;
.action {
margin-right: 15px;
diff --git a/app/design/frontend/Magento/blank/web/css/source/_forms.less b/app/design/frontend/Magento/blank/web/css/source/_forms.less
index 94b993b53b508..c9f3c3d72ef4c 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_forms.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_forms.less
@@ -18,7 +18,7 @@
.fieldset {
.lib-form-fieldset();
&:last-child {
- margin-bottom: 0;
+ margin-bottom: @indent__base;
}
> .field,
diff --git a/app/design/frontend/Magento/blank/web/css/source/_navigation.less b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
index 4499886ef0f10..21b7315779764 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_navigation.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
@@ -131,12 +131,18 @@
);
}
}
-
.switcher-dropdown {
.lib-list-reset-styles();
+ display: none;
padding: @indent__s 0;
}
-
+ .switcher-options {
+ &.active {
+ .switcher-dropdown {
+ display: block;
+ }
+ }
+ }
.header.links {
.lib-list-reset-styles();
border-bottom: 1px solid @color-gray82;
@@ -207,7 +213,7 @@
}
.nav-toggle {
- &:after{
+ &:after {
background: rgba(0, 0, 0, @overlay__opacity);
content: '';
display: block;
diff --git a/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
index 43ae23bab7895..eeb17653c877b 100644
--- a/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
@@ -253,7 +253,7 @@
.box-tocart {
.action.primary {
margin-right: 1%;
- width: 49%;
+ width: auto;
}
}
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
index 228c6947c938b..6aa0e50f3c393 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -563,6 +563,7 @@
.product-items-names {
.product-item {
+ display: flex;
margin-bottom: @indent__s;
}
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
index 1015bb584ff7b..67057967451d8 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
@@ -698,6 +698,9 @@
position: static;
}
}
+ &.discount {
+ width: auto;
+ }
}
}
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
index 7090da10b46c0..05ce84995afae 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
@@ -352,7 +352,7 @@
.item-qty {
margin-right: @indent__s;
text-align: center;
- width: 40px;
+ width: 45px;
}
.update-cart-item {
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 0df0cace338c0..3ea1f5b7f6842 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
@@ -48,6 +48,7 @@
.step-title {
&:extend(.abs-checkout-title all);
.lib-css(border-bottom, @checkout-step-title__border);
+ margin-bottom: 15px;
}
.step-content {
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
index 9bad9518f5724..5e2c010c13e8f 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
@@ -212,6 +212,12 @@
&:extend(.abs-sidebar-totals-mobile all);
}
}
+
+ .opc-block-shipping-information {
+ .shipping-information-title {
+ font-size: 2.4rem;
+ }
+ }
}
//
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
index 0b27454b206e3..3b584bc26fe34 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
@@ -69,6 +69,13 @@
.payment-option-content {
.lib-css(padding, 0 0 @indent__base @checkout-payment-option-content__padding__xl);
+ .primary {
+ .action {
+ &.action-apply {
+ margin-right: 0;
+ }
+ }
+ }
}
.payment-option-inner {
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
index d7ae6c3b28f4a..5bba92ed20523 100755
--- a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
@@ -371,7 +371,7 @@
.fieldset {
> .field {
> .control {
- width: 55%;
+ width: 80%;
}
}
}
@@ -417,6 +417,12 @@
.column.main {
width: 77.7%;
}
+
+ .sidebar-main {
+ .block {
+ margin-bottom: 0;
+ }
+ }
}
.account {
@@ -528,11 +534,18 @@
.column.main,
.sidebar-additional {
margin: 0;
+ padding: 0;
}
.data.table {
&:extend(.abs-table-striped-mobile all);
}
+
+ .sidebar-main {
+ .account-nav {
+ margin-bottom: 0;
+ }
+ }
}
}
@@ -550,8 +563,8 @@
}
.account {
- .page.messages {
- margin-bottom: @indent__xl;
+ .messages {
+ margin-bottom: 0;
}
.column.main {
diff --git a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
index 0c329f32d3739..621bf40b03093 100644
--- a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
@@ -246,6 +246,10 @@
.gift-messages-order {
margin-bottom: @indent__m;
}
+
+ .gift-message-summary {
+ padding-right: 7rem;
+ }
}
//
@@ -282,10 +286,6 @@
}
}
- .gift-message-summary {
- padding-right: 7rem;
- }
-
//
// In-table block
// ---------------------------------------------
diff --git a/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less
index e10278e3abbec..917e85cdf94b5 100644
--- a/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less
@@ -435,7 +435,7 @@
.product {
&-item {
&-checkbox {
- left: 20px;
+ left: 0;
position: absolute;
top: 20px;
}
diff --git a/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less
index 7662c60734a1b..9761f36b96344 100644
--- a/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less
@@ -374,7 +374,7 @@
text-align: right;
.action {
- margin-left: @indent__s;
+ margin-left: 0;
&.back {
display: block;
@@ -496,4 +496,12 @@
margin-left: @indent__xl;
}
}
+
+ .multicheckout {
+ .actions-toolbar {
+ > .primary {
+ margin-right: 0;
+ }
+ }
+ }
}
diff --git a/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
index da78406f92212..f40762ee6fc6d 100644
--- a/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
@@ -298,6 +298,9 @@
a:not(:last-child) {
margin-right: 30px;
}
+ .action.add {
+ white-space: nowrap;
+ }
}
}
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
index 68938ed206038..f3e0f810481ed 100644
--- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
@@ -151,6 +151,12 @@
}
}
+ .page-print {
+ .nav-toggle {
+ display: none;
+ }
+ }
+
.page-main {
> .page-title-wrapper {
.page-title + .action {
@@ -319,6 +325,23 @@
}
}
}
+ .page-header {
+ .switcher {
+ .options {
+ ul.dropdown {
+ right: 0;
+ &:before {
+ left: auto;
+ right: 10px;
+ }
+ &:after {
+ left: auto;
+ right: 9px;
+ }
+ }
+ }
+ }
+ }
//
// Widgets
diff --git a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
index 584eefb9bc643..48db03d791657 100644
--- a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
@@ -185,11 +185,11 @@
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
.products-grid.wishlist {
margin-bottom: @indent__l;
- margin-right: -@indent__s;
+ margin-right: 0;
.product {
&-item {
- padding: @indent__base @indent__s @indent__base @indent__base;
+ padding: @indent__base 0 @indent__base 0;
position: relative;
&-photo {
@@ -203,6 +203,7 @@
&-actions {
display: block;
+ float: left;
.action {
margin-right: 15px;
diff --git a/app/design/frontend/Magento/luma/web/css/source/_forms.less b/app/design/frontend/Magento/luma/web/css/source/_forms.less
index 7c5027aef113b..6701d5f9e9d21 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_forms.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_forms.less
@@ -20,7 +20,7 @@
.lib-form-fieldset();
&:last-child {
- margin-bottom: 0;
+ margin-bottom: @indent__base;
}
> .field,
diff --git a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
index ed01ef7d027f5..0e34d7b87387d 100644
--- a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
+++ b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
@@ -83,7 +83,8 @@
.modal-slide {
.action-close {
- padding: @modal-slide-action-close__padding;
+ margin: 15px;
+ padding: 0;
}
.page-main-actions {
diff --git a/app/etc/di.xml b/app/etc/di.xml
index ad77ae3adc566..05fd34a178ded 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -1356,4 +1356,11 @@
Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+
+
+
+ - Magento\Framework\App\ScopeResolver
+
+
+
diff --git a/composer.json b/composer.json
index 34341f7c3230a..d04bf269d4485 100644
--- a/composer.json
+++ b/composer.json
@@ -74,7 +74,7 @@
"ramsey/uuid": "~3.7.3"
},
"require-dev": {
- "magento/magento2-functional-testing-framework": "2.3.11",
+ "magento/magento2-functional-testing-framework": "2.3.13",
"phpunit/phpunit": "~6.2.0",
"squizlabs/php_codesniffer": "3.2.2",
"phpmd/phpmd": "@stable",
diff --git a/composer.lock b/composer.lock
index ad8cb4ba740cc..384ff14618a80 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "2fd90a780b9d54a8f73f0554a4b5df98",
+ "content-hash": "d57f148fd874b8685bf73bbf0a0ea75a",
"packages": [
{
"name": "braintree/braintree_php",
@@ -1756,7 +1756,7 @@
},
{
"name": "Gert de Pagter",
- "email": "BackEndTea@gmail.com"
+ "email": "backendtea@gmail.com"
}
],
"description": "Symfony polyfill for ctype functions",
@@ -4058,16 +4058,16 @@
"packages-dev": [
{
"name": "allure-framework/allure-codeception",
- "version": "1.2.7",
+ "version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/allure-framework/allure-codeception.git",
- "reference": "48598f4b4603b50b663bfe977260113a40912131"
+ "reference": "9d31d781b3622b028f1f6210bc76ba88438bd518"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/allure-framework/allure-codeception/zipball/48598f4b4603b50b663bfe977260113a40912131",
- "reference": "48598f4b4603b50b663bfe977260113a40912131",
+ "url": "https://api.github.com/repos/allure-framework/allure-codeception/zipball/9d31d781b3622b028f1f6210bc76ba88438bd518",
+ "reference": "9d31d781b3622b028f1f6210bc76ba88438bd518",
"shasum": ""
},
"require": {
@@ -4105,7 +4105,7 @@
"steps",
"testing"
],
- "time": "2018-03-07T11:18:27+00:00"
+ "time": "2018-12-18T19:47:23+00:00"
},
{
"name": "allure-framework/allure-php-api",
@@ -5972,23 +5972,24 @@
},
{
"name": "magento/magento2-functional-testing-framework",
- "version": "2.3.11",
+ "version": "2.3.13",
"source": {
"type": "git",
"url": "https://github.com/magento/magento2-functional-testing-framework.git",
- "reference": "3ca1bd74228a61bd05520bed1ef88b5a19764d92"
+ "reference": "2c8a4c3557c9a8412eb2ea50ce3f69abc2f47ba1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/3ca1bd74228a61bd05520bed1ef88b5a19764d92",
- "reference": "3ca1bd74228a61bd05520bed1ef88b5a19764d92",
+ "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/2c8a4c3557c9a8412eb2ea50ce3f69abc2f47ba1",
+ "reference": "2c8a4c3557c9a8412eb2ea50ce3f69abc2f47ba1",
"shasum": ""
},
"require": {
- "allure-framework/allure-codeception": "~1.2.6",
- "codeception/codeception": "~2.3.4",
+ "allure-framework/allure-codeception": "~1.3.0",
+ "codeception/codeception": "~2.3.4 || ~2.4.0 ",
"consolidation/robo": "^1.0.0",
"epfremme/swagger-php": "^2.0",
+ "ext-curl": "*",
"flow/jsonpath": ">0.2",
"fzaninotto/faker": "^1.6",
"monolog/monolog": "^1.0",
@@ -6005,6 +6006,7 @@
"goaop/framework": "2.2.0",
"php-coveralls/php-coveralls": "^1.0",
"phpmd/phpmd": "^2.6.0",
+ "phpunit/phpunit": "~6.5.0 || ~7.0.0",
"rregeer/phpunit-coverage-check": "^0.1.4",
"sebastian/phpcpd": "~3.0 || ~4.0",
"squizlabs/php_codesniffer": "~3.2",
@@ -6039,7 +6041,7 @@
"magento",
"testing"
],
- "time": "2018-11-13T18:22:25+00:00"
+ "time": "2019-01-29T15:31:14+00:00"
},
{
"name": "moontoast/math",
diff --git a/dev/tests/acceptance/tests/_data/import_updated.csv b/dev/tests/acceptance/tests/_data/import_updated.csv
new file mode 100644
index 0000000000000..620af02641ecc
--- /dev/null
+++ b/dev/tests/acceptance/tests/_data/import_updated.csv
@@ -0,0 +1,4 @@
+product_websites,store_view_code,attribute_set_code,product_type,categories,sku,price,name,url_key
+base,,Default,simple,Default Category/category-admin,productformagetwo76287,123,productformagetwo76287,productformagetwo76287
+,en,Default,simple,,productformagetwo76287,,productformagetwo76287-english,productformagetwo76287-english
+,nl,Default,simple,,productformagetwo76287,,productformagetwo76287-dutch,productformagetwo76287-dutch
diff --git a/dev/tests/acceptance/tests/_data/magento2.jpg b/dev/tests/acceptance/tests/_data/magento2.jpg
new file mode 100644
index 0000000000000..d0b76b45d46be
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/magento2.jpg differ
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditMemoCreateRefundTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditMemoCreateRefundTest.php
index eae0e600434a6..2b9c539f64e66 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditMemoCreateRefundTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditMemoCreateRefundTest.php
@@ -10,7 +10,7 @@
use Magento\TestFramework\TestCase\WebapiAbstract;
/**
- * Class CreditMemoCreateRefundTest
+ * API tests for CreditMemoCreateRefund.
*/
class CreditMemoCreateRefundTest extends WebapiAbstract
{
@@ -25,12 +25,17 @@ class CreditMemoCreateRefundTest extends WebapiAbstract
*/
protected $objectManager;
+ /**
+ * @inheritdoc
+ */
protected function setUp()
{
$this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
}
/**
+ * Test for Invoke method.
+ *
* @magentoApiDataFixture Magento/Sales/_files/invoice.php
*/
public function testInvoke()
@@ -115,8 +120,7 @@ public function testInvoke()
);
$this->assertNotEmpty($result);
$order = $this->objectManager->get(OrderRepositoryInterface::class)->get($order->getId());
- //Totally refunded orders still can be processed and shipped.
- $this->assertEquals(Order::STATE_PROCESSING, $order->getState());
+ $this->assertEquals(Order::STATE_CLOSED, $order->getState());
}
private function getItemsForRest($order)
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php
index 3a3796c221ec4..0eb9e4229b957 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php
@@ -232,5 +232,7 @@ public function testOrderGetExtensionAttributes()
$this->assertEquals($expectedTax['type'], $appliedTaxes[0]['type']);
$this->assertNotEmpty($appliedTaxes[0]['applied_taxes']);
$this->assertEquals(true, $result['extension_attributes']['converting_from_quote']);
+ $this->assertArrayHasKey('payment_additional_info', $result['extension_attributes']);
+ $this->assertNotEmpty($result['extension_attributes']['payment_additional_info']);
}
}
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php
index 3ab93f9aecb99..a527c69c7e92d 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php
@@ -77,4 +77,37 @@ protected function assertOrderItem(\Magento\Sales\Model\Order\Item $orderItem, a
$this->assertEquals($orderItem->getBasePrice(), $response['base_price']);
$this->assertEquals($orderItem->getRowTotal(), $response['row_total']);
}
+
+ /**
+ * @return void
+ * @magentoApiDataFixture Magento/Sales/_files/order_with_discount.php
+ */
+ public function testGetOrderWithDiscount()
+ {
+ /** @var \Magento\Sales\Model\Order $order */
+ $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
+ $order->loadByIncrementId(self::ORDER_INCREMENT_ID);
+ /** @var \Magento\Sales\Model\Order\Item $orderItem */
+ $orderItem = current($order->getItems());
+
+ $serviceInfo = [
+ 'rest' => [
+ 'resourcePath' => self::RESOURCE_PATH . '/' . $orderItem->getId(),
+ 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+ ],
+ 'soap' => [
+ 'service' => self::SERVICE_NAME,
+ 'serviceVersion' => self::SERVICE_VERSION,
+ 'operation' => self::SERVICE_NAME . 'get',
+ ],
+ ];
+
+ $response = $this->_webApiCall($serviceInfo, ['id' => $orderItem->getId()]);
+
+ $this->assertTrue(is_array($response));
+ $this->assertEquals(8.00, $response['row_total']);
+ $this->assertEquals(8.00, $response['base_row_total']);
+ $this->assertEquals(9.00, $response['row_total_incl_tax']);
+ $this->assertEquals(9.00, $response['base_row_total_incl_tax']);
+ }
}
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php
index 5143f2c88fe2d..5e092bb1ebd69 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php
@@ -92,6 +92,8 @@ public function testOrderListExtensionAttributes()
$this->assertEquals($expectedTax['type'], $appliedTaxes[0]['type']);
$this->assertNotEmpty($appliedTaxes[0]['applied_taxes']);
$this->assertEquals(true, $result['items'][0]['extension_attributes']['converting_from_quote']);
+ $this->assertArrayHasKey('payment_additional_info', $result['items'][0]['extension_attributes']);
+ $this->assertNotEmpty($result['items'][0]['extension_attributes']['payment_additional_info']);
}
/**
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/RefundOrderTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/RefundOrderTest.php
index aacda763ca2aa..69bbecc1317a7 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/RefundOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/RefundOrderTest.php
@@ -5,8 +5,10 @@
*/
namespace Magento\Sales\Service\V1;
+use Magento\Sales\Model\Order;
+
/**
- * API test for creation of Creditmemo for certain Order.
+ * API tests for creation of Creditmemo for certain Order.
*/
class RefundOrderTest extends \Magento\TestFramework\TestCase\WebapiAbstract
{
@@ -23,6 +25,9 @@ class RefundOrderTest extends \Magento\TestFramework\TestCase\WebapiAbstract
*/
private $creditmemoRepository;
+ /**
+ * @inheritdoc
+ */
protected function setUp()
{
$this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -86,9 +91,8 @@ public function testShortRequest()
'Failed asserting that proper shipping amount of the Order was refunded'
);
- //Totally refunded orders can be processed.
$this->assertEquals(
- $existingOrder->getStatus(),
+ Order::STATE_COMPLETE,
$updatedOrder->getStatus(),
'Failed asserting that order status has not changed'
);
diff --git a/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php b/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php
index 60abe18f5a7ba..fc54e73ff1ac2 100644
--- a/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php
+++ b/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php
@@ -7,6 +7,7 @@
namespace Magento\Mtf\App\State;
use Magento\Mtf\ObjectManager;
+use Magento\Mtf\Util\Command\Cli;
use Magento\Mtf\Util\Protocol\CurlInterface;
use Magento\Mtf\Util\Protocol\CurlTransport;
@@ -27,7 +28,7 @@ class State1 extends AbstractState
*
* @var string
*/
- protected $config ='admin_session_lifetime_1_hour, wysiwyg_disabled, admin_account_sharing_enable, log_to_file';
+ protected $config ='admin_session_lifetime_1_hour, wysiwyg_disabled, admin_account_sharing_enable';
/**
* HTTP CURL Adapter.
@@ -55,6 +56,7 @@ public function __construct(
* Apply set up configuration profile.
*
* @return void
+ * @throws \Exception
*/
public function apply()
{
@@ -67,6 +69,10 @@ public function apply()
['configData' => $this->config]
)->run();
}
+
+ /** @var Cli $cli */
+ $cli = $this->objectManager->create(Cli::class);
+ $cli->execute('setup:config:set', ['--enable-debug-logging=true']);
}
/**
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml
index 4a1ccf3bcb044..76f60a51c0ece 100644
--- a/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml
@@ -8,6 +8,7 @@
+ MAGETWO-97298: [2.2-develop] Magento\Backend\Test\TestCase\NavigateMenuTest fails on Jenkins
Reports > BI Essentials
false
https://account.magento.com/onboarding/steps/view/step/gmv/
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml
index 1792ddb5abdc9..5587d605e14b3 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml
@@ -175,15 +175,6 @@
-
-
- - default
- - 0
- - Yes
- - 1
-
-
-
- default
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 7c4824c604e29..49cd2a347c687 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
@@ -58,7 +58,6 @@
- stable:no
virtual
downloadableProduct::default
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
index 43741393e7968..90cd6bdb76328 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
@@ -143,5 +143,6 @@ protected function clearDownloadableData()
/** @var Downloadable $downloadableInfoTab */
$downloadableInfoTab = $this->catalogProductEdit->getProductForm()->getSection('downloadable_information');
$downloadableInfoTab->getDownloadableBlock('Links')->clearDownloadableData();
+ $downloadableInfoTab->setIsDownloadable('No');
}
}
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 f3df374a8bac8..5fa1cfe5e5911 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,7 +11,6 @@
catalogProductSimple::default
configurableProduct::default
-
- to_maintain:yes
@@ -21,7 +20,6 @@
- to_maintain:yes
catalogProductSimple::default
catalogProductVirtual::default
-
@@ -29,7 +27,6 @@
- stable:no
configurableProduct::default
catalogProductSimple::product_without_category
deleteVariations
@@ -40,12 +37,10 @@
configurableProduct::default
catalogProductVirtual::required_fields
deleteVariations
- to_maintain:yes
- to_maintain:yes
catalogProductVirtual::default
catalogProductSimple::default
-
@@ -56,7 +51,6 @@
catalogProductVirtual::default
configurableProduct::not_virtual_for_type_switching
-
- to_maintain:yes
@@ -69,7 +63,6 @@
catalogProductVirtual::default
downloadableProduct::default
-
- to_maintain:yes
@@ -81,15 +74,13 @@
downloadableProduct::default
catalogProductSimple::default
-
- to_maintain:yes
downloadableProduct::default
configurableProduct::not_virtual_for_type_switching
- -
- to_maintain:yes
+ clearDownloadableData
@@ -99,7 +90,6 @@
- stable:no
downloadableProduct::default
catalogProductVirtual::default
clearDownloadableData
@@ -110,7 +100,6 @@
catalogProductSimple::default
downloadableProduct::default
-
- to_maintain:yes
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Samples.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Samples.php
index 98c7e1abf0d88..bcc8a012c1a63 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Samples.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Samples.php
@@ -114,8 +114,9 @@ protected function sortSample($position, $sortOrder, SimpleElement $element = nu
foreach ($this->sortRowsData as &$sortRowData) {
if ($sortRowData['sort_order'] > $currentSortRowData['sort_order']) {
// need to reload block because we are changing dom
- $target = $this->getRowBlock($sortRowData['current_position_in_grid'], $element)->getSortHandle();
- $this->getRowBlock($currentSortRowData['current_position_in_grid'], $element)->dragAndDropTo($target);
+ $target = $this->getRowBlock($currentSortRowData['current_position_in_grid'], $element)
+ ->getSortHandle();
+ $this->getRowBlock($sortRowData['current_position_in_grid'], $element)->dragAndDropTo($target);
$currentSortRowData['current_position_in_grid']--;
$sortRowData['current_position_in_grid']++;
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 5afe815edad45..b18f6849e0c8a 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
@@ -18,10 +18,10 @@
one_separately_link
downloadable_one_dollar_product_with_separated_link
downloadableproduct-%isolation%
-
-
-
-
+
+
+
+
DownloadableProduct_%isolation%
@@ -33,16 +33,14 @@
Default Category
with_two_separately_links
downloadableproduct-%isolation%
-
-
-
-
-
-
+
+
+
+
+
+
- to_maintain:yes
- MAGETWO-67096: [FT] Magento\Downloadable\Test\TestCase\CreateDownloadableProductEntityTest fails on Jenkins
DownloadableProduct_%isolation%
DownloadableProduct_%isolation%
1
@@ -53,12 +51,12 @@
with_two_samples
with_two_separately_links
downloadableproduct-%isolation%
-
-
-
-
-
-
+
+
+
+
+
+
DownloadableProduct_%isolation%
@@ -71,16 +69,14 @@
with_two_separately_links
default
downloadableproduct-%isolation%
-
-
-
-
-
-
+
+
+
+
+
+
- to_maintain:yes
- MAGETWO-67096: [FT] Magento\Downloadable\Test\TestCase\CreateDownloadableProductEntityTest fails on Jenkins
DownloadableProduct_%isolation%
DownloadableProduct_%isolation%
55
@@ -91,15 +87,15 @@
with_three_links
two_options
downloadableproduct-%isolation%
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
DownloadableProduct_%isolation%
@@ -111,10 +107,10 @@
Default Category
with_two_separately_links
downloadableproduct-%isolation%
-
-
-
-
+
+
+
+
DownloadableProduct_%isolation%
@@ -127,10 +123,10 @@
123
with_two_separately_links
downloadableproduct-%isolation%
-
-
-
-
+
+
+
+
DownloadableProduct_%isolation%
@@ -143,13 +139,12 @@
This is description for downloadable product
with_two_separately_links
downloadableproduct-%isolation%
-
-
-
-
+
+
+
+
- MAGETWO-59316: Sort order of Customizable Options isn't taken into account while creating Product via Webapi
DownloadableProduct_%isolation%
DownloadableProduct_%isolation%
57
@@ -163,17 +158,15 @@
default
catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option
downloadableproduct-%isolation%
-
-
-
-
-
-
-
+
+
+
+
+
+
+
- to_maintain:yes
- MAGETWO-67096: [FT] Magento\Downloadable\Test\TestCase\CreateDownloadableProductEntityTest fails on Jenkins
DownloadableProduct_%isolation%
DownloadableProduct_%isolation%
65
@@ -187,17 +180,15 @@
with_three_links
default
downloadableproduct-%isolation%
-
-
-
-
-
-
-
+
+
+
+
+
+
+
- to_maintain:yes
- MAGETWO-67096: [FT] Magento\Downloadable\Test\TestCase\CreateDownloadableProductEntityTest fails on Jenkins
DownloadableProduct_%isolation%
DownloadableProduct_%isolation%
65
@@ -209,12 +200,12 @@
with_three_links
default
downloadableproduct-%isolation%
-
-
-
-
-
-
+
+
+
+
+
+
DownloadableProduct_%isolation%
@@ -225,10 +216,10 @@
default_category
with_two_separately_links
downloadableproduct-%isolation%
-
-
-
-
+
+
+
+
DownloadableProduct_%isolation%
@@ -241,11 +232,11 @@
with_two_separately_links
5
downloadableproduct-%isolation%
-
-
-
-
-
+
+
+
+
+
DownloadableProduct_%isolation%
@@ -257,10 +248,10 @@
category %isolation%
with_two_separately_links
downloadableproduct-%isolation%
-
-
-
-
+
+
+
+
DownloadableProduct_%isolation%
@@ -273,11 +264,11 @@
with_two_separately_links
default
downloadableproduct-%isolation%
-
-
-
-
-
+
+
+
+
+
DownloadableProduct_%isolation%
@@ -288,8 +279,8 @@
one_separately_link
downloadableproduct-%isolation%
custom_store
-
-
+
+
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 38ef02ff49441..39f4fd08bb922 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
@@ -8,7 +8,7 @@
- test_type:acceptance_test, test_type:extended_acceptance_test, stable:no
+ test_type:acceptance_test, test_type:extended_acceptance_test
test-grouped-product-%isolation%
GroupedProduct %isolation%
GroupedProduct_sku%isolation%
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
index 5572c06816a39..bc7ee4372d61b 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
@@ -6,7 +6,9 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order;
+use function GuzzleHttp\Psr7\str;
use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
/**
* Abstract Form block.
@@ -42,6 +44,27 @@ function () {
);
}
+ /**
+ * Wait for element is enabled.
+ *
+ * @param string $selector
+ * @param string $strategy
+ * @return bool|null
+ */
+ protected function waitForElementEnabled(string $selector, string $strategy = Locator::SELECTOR_CSS)
+ {
+ $browser = $this->browser;
+
+ return $browser->waitUntil(
+ function () use ($browser, $selector, $strategy) {
+ $element = $browser->find($selector, $strategy);
+ $class = $element->getAttribute('class');
+
+ return (!$element->isDisabled() && !strpos($class, 'disabled')) ? true : null;
+ }
+ );
+ }
+
/**
* Fill form data.
*
@@ -113,7 +136,7 @@ abstract protected function getItemsBlock();
*/
public function submit()
{
- $this->waitLoader();
+ $this->waitForElementEnabled($this->send);
$this->_rootElement->find($this->send)->click();
}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
index 6d3b99ce81a04..9f4181b70e801 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
@@ -11,17 +11,17 @@
/**
* Class AssertOrderCancelMassActionFailMessage
- * Assert cancel fail message is displayed on order index page
+ * Assert cancel fail message is displayed on order index page.
*/
class AssertOrderCancelMassActionFailMessage extends AbstractConstraint
{
/**
- * Text value to be checked
+ * Text value to be checked.
*/
- const FAIL_CANCEL_MESSAGE = '1 order(s) cannot be canceled.';
+ const FAIL_CANCEL_MESSAGE = 'You cannot cancel the order(s).';
/**
- * Assert cancel fail message is displayed on order index page
+ * Assert cancel fail message is displayed on order index page.
*
* @param OrderIndex $orderIndex
* @return void
@@ -35,7 +35,7 @@ public function processAssert(OrderIndex $orderIndex)
}
/**
- * 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/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
index 46f6ebba51fe1..7a46d0c5ef820 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
@@ -39,8 +39,8 @@ public function processAssert(
/** @var \Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info $infoTab */
$infoTab = $salesOrderView->getOrderForm()->openTab('info')->getTab('info');
\PHPUnit_Framework_Assert::assertEquals(
- $infoTab->getOrderStatus(),
- $orderStatus
+ $orderStatus,
+ $infoTab->getOrderStatus()
);
}
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 eddc321e9ca52..1f75b07c8ca1e 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,7 +8,6 @@
- stable:no
cancel orders in status Pending and Processing
-
Cancel
@@ -18,20 +17,20 @@
- try to cancel orders in status Complete, Canceled
+ try to cancel orders in status Complete, Closed
invoice, shipment|invoice, credit memo
Cancel
2
- Complete,Canceled
+ Complete,Closed
- try to cancel orders in status Pending, Closed
+ try to cancel orders in status Processing, Closed
invoice|invoice, credit memo
Cancel
2
- Processing,Canceled
+ Processing,Closed
@@ -45,7 +44,6 @@
- stable:no
Try to put order in status Complete on Hold
invoice, shipment
Hold
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.php
index 6a262798746a6..54cec6cf279f6 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.php
@@ -28,6 +28,13 @@ class PromoQuoteForm extends FormSections
*/
protected $waitForSelectorVisible = false;
+ /**
+ * Selector of name element on the form.
+ *
+ * @var string
+ */
+ private $nameElementSelector = 'input[name=name]';
+
/**
* Fill form with sections.
*
@@ -39,6 +46,7 @@ class PromoQuoteForm extends FormSections
public function fill(FixtureInterface $fixture, SimpleElement $element = null, array $replace = null)
{
$this->waitForElementNotVisible($this->waitForSelector);
+ $this->waitForElementVisible($this->nameElementSelector);
$sections = $this->getFixtureFieldsByContainers($fixture);
if ($replace) {
$sections = $this->prepareData($sections, $replace);
diff --git a/dev/tests/integration/bin/magento b/dev/tests/integration/bin/magento
new file mode 100755
index 0000000000000..303fbfb217d2b
--- /dev/null
+++ b/dev/tests/integration/bin/magento
@@ -0,0 +1,42 @@
+#!/usr/bin/env php
+ $paramValue) {
+ $_SERVER[$paramName] = $paramValue;
+ }
+} else {
+ echo 'Test parameters are required';
+ exit(1);
+}
+
+try {
+ require $_SERVER['MAGE_DIRS']['base']['path'] . '/app/bootstrap.php';
+} catch (\Exception $e) {
+ echo 'Autoload error: ' . $e->getMessage();
+ exit(1);
+}
+try {
+ $handler = new \Magento\Framework\App\ErrorHandler();
+ set_error_handler([$handler, 'handler']);
+ $application = new Magento\Framework\Console\Cli('Magento CLI');
+ $application->run();
+} catch (\Exception $e) {
+ while ($e) {
+ echo $e->getMessage();
+ echo $e->getTraceAsString();
+ echo "\n\n";
+ $e = $e->getPrevious();
+ }
+ exit(Cli::RETURN_FAILURE);
+}
diff --git a/dev/tests/integration/etc/di/preferences/ce.php b/dev/tests/integration/etc/di/preferences/ce.php
index d5aaa7e730826..6839d0ae9a7ff 100644
--- a/dev/tests/integration/etc/di/preferences/ce.php
+++ b/dev/tests/integration/etc/di/preferences/ce.php
@@ -24,5 +24,9 @@
\Magento\Framework\App\ResourceConnection\ConnectionAdapterInterface::class =>
\Magento\TestFramework\Db\ConnectionAdapter::class,
\Magento\Framework\Filesystem\DriverInterface::class => \Magento\Framework\Filesystem\Driver\File::class,
- \Magento\Framework\App\Config\ScopeConfigInterface::class => \Magento\TestFramework\App\Config::class
+ \Magento\Framework\App\Config\ScopeConfigInterface::class => \Magento\TestFramework\App\Config::class,
+ \Magento\Framework\Lock\Backend\Cache::class =>
+ \Magento\TestFramework\Lock\Backend\DummyLocker::class,
+ \Magento\Framework\ShellInterface::class => \Magento\TestFramework\App\Shell::class,
+ \Magento\Framework\App\Shell::class => \Magento\TestFramework\App\Shell::class,
];
diff --git a/dev/tests/integration/framework/Magento/TestFramework/App/Shell.php b/dev/tests/integration/framework/Magento/TestFramework/App/Shell.php
new file mode 100644
index 0000000000000..89f64aec16d06
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/App/Shell.php
@@ -0,0 +1,37 @@
+getAppInitParams();
+
+ $params['MAGE_DIRS']['base']['path'] = BP;
+ $params = 'INTEGRATION_TEST_PARAMS="' . urldecode(http_build_query($params)) . '"';
+ $integrationTestCommand = $params . ' ' . $command;
+ $output = parent::execute($integrationTestCommand, $arguments);
+ return $output;
+ }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Isolation/DeploymentConfig.php b/dev/tests/integration/framework/Magento/TestFramework/Isolation/DeploymentConfig.php
index 873fb0366a8e1..3132aed4d21e3 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Isolation/DeploymentConfig.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Isolation/DeploymentConfig.php
@@ -28,6 +28,17 @@ class DeploymentConfig
*/
private $config;
+ /**
+ * Ignore values in the config nested array, paths are separated by single slash "/".
+ *
+ * Example: compiled_config is not set in default mode, and once set it can't be unset
+ *
+ * @var array
+ */
+ private $ignoreValues = [
+ 'cache_types/compiled_config',
+ ];
+
/**
* Memorizes the initial value of configuration reader and the configuration value
*
@@ -57,7 +68,7 @@ public function startTestSuite()
*/
public function endTest(\PHPUnit\Framework\TestCase $test)
{
- $config = $this->reader->load();
+ $config = $this->filterIgnoredConfigValues($this->reader->load());
if ($this->config != $config) {
$error = "\n\nERROR: deployment configuration is corrupted. The application state is no longer valid.\n"
. 'Further tests may fail.'
@@ -66,4 +77,28 @@ public function endTest(\PHPUnit\Framework\TestCase $test)
$test->fail($error);
}
}
+
+ /**
+ * Filter ignored config values which are not set by default and appear when tests would change state.
+ *
+ * Example: compiled_config is not set in default mode, and once set it can't be unset
+ *
+ * @param array $config
+ * @param string $path
+ * @return array
+ */
+ private function filterIgnoredConfigValues(array $config, string $path = '')
+ {
+ foreach ($config as $configKeyName => $configValue) {
+ $newPath = !empty($path) ? $path . '/' . $configKeyName : $configKeyName;
+ if (is_array($configValue)) {
+ $config[$configKeyName] = $this->filterIgnoredConfigValues($configValue, $newPath);
+ } else {
+ if (array_key_exists($newPath, array_flip($this->ignoreValues))) {
+ unset($config[$configKeyName]);
+ }
+ }
+ }
+ return $config;
+ }
}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Lock/Backend/DummyLocker.php b/dev/tests/integration/framework/Magento/TestFramework/Lock/Backend/DummyLocker.php
new file mode 100644
index 0000000000000..41125493643e3
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Lock/Backend/DummyLocker.php
@@ -0,0 +1,40 @@
+resource === null) {
+ if ($this->resource === null || $this->uri === null) {
$this->markTestIncomplete('Acl test is not complete');
}
$this->_objectManager->get(\Magento\Framework\Acl\Builder::class)
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
index 8370e514dc2f2..a1923e63972ee 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
@@ -69,7 +69,7 @@ public function testGetCategoryId()
{
$this->assertFalse($this->_model->getCategoryId());
$category = new \Magento\Framework\DataObject(['id' => 5]);
-
+ $this->_model->setCategoryIds([5]);
$this->objectManager->get(\Magento\Framework\Registry::class)->register('current_category', $category);
try {
$this->assertEquals(5, $this->_model->getCategoryId());
@@ -83,6 +83,7 @@ public function testGetCategoryId()
public function testGetCategory()
{
$this->assertEmpty($this->_model->getCategory());
+ $this->_model->setCategoryIds([3]);
$this->objectManager->get(\Magento\Framework\Registry::class)
->register('current_category', new \Magento\Framework\DataObject(['id' => 3]));
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/RemoveRedundantImageTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/RemoveRedundantImageTest.php
new file mode 100644
index 0000000000000..1bc545a25ac32
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/RemoveRedundantImageTest.php
@@ -0,0 +1,82 @@
+objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+ /** @var Filesystem $filesystem */
+ $this->filesystem = $this->objectManager->get(Filesystem::class);
+ $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+ $this->categoryRepository = $this->objectManager->get(CategoryRepository::class);
+ }
+
+ /**
+ * Tests removing Image file if it is not used anymore.
+ *
+ * @magentoDataFixture Magento/Catalog/_files/categories_with_image.php
+ *
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation enabled
+ */
+ public function testRemoveRedundantImage()
+ {
+ $imagesPath = 'catalog' . DIRECTORY_SEPARATOR . 'category';
+ $absoluteImagesPath = $this->mediaDirectory->getAbsolutePath($imagesPath);
+ $filePath1 = $absoluteImagesPath . DIRECTORY_SEPARATOR . 'test_image_1.jpg';
+ $filePath2 = $absoluteImagesPath . DIRECTORY_SEPARATOR . 'test_image_2.jpg';
+ $this->mediaDirectory->create($absoluteImagesPath);
+ $this->mediaDirectory->touch($filePath1);
+ $this->mediaDirectory->touch($filePath2);
+
+ $category1 = $this->categoryRepository->get(3);
+ $category1->setImage('test_image_3.jpg');
+ $this->categoryRepository->save($category1);
+ $category2 = $this->categoryRepository->get(5);
+ $category2->setImage('test_image_3.jpg');
+ $this->categoryRepository->save($category2);
+
+ $this->assertTrue($this->mediaDirectory->isExist($filePath1));
+ $this->assertFalse($this->mediaDirectory->isExist($filePath2));
+ }
+
+ protected function tearDown()
+ {
+ $this->mediaDirectory->delete();
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_with_image.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_with_image.php
new file mode 100644
index 0000000000000..6fc0f4e8b6efa
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_with_image.php
@@ -0,0 +1,53 @@
+create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setId(3)
+ ->setName('Category 1')
+ ->setParentId(2)
+ ->setPath('1/2/3')
+ ->setLevel(2)
+ ->setAvailableSortBy('name')
+ ->setDefaultSortBy('name')
+ ->setIsActive(true)
+ ->setPosition(1)
+ ->setImage('test_image_1.jpg')
+ ->save();
+
+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setId(4)
+ ->setName('Category 1.1')
+ ->setParentId(3)
+ ->setPath('1/2/3/4')
+ ->setLevel(3)
+ ->setAvailableSortBy('name')
+ ->setDefaultSortBy('name')
+ ->setIsActive(true)
+ ->setIsAnchor(true)
+ ->setPosition(1)
+ ->setImage('test_image_1.jpg')
+ ->save();
+
+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setId(5)
+ ->setName('Category 2')
+ ->setParentId(2)
+ ->setPath('1/2/5')
+ ->setLevel(2)
+ ->setAvailableSortBy('name')
+ ->setDefaultSortBy('name')
+ ->setIsActive(true)
+ ->setPosition(2)
+ ->setImage('test_image_2.jpg')
+ ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_with_image_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_with_image_rollback.php
new file mode 100644
index 0000000000000..d290a164f639e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_with_image_rollback.php
@@ -0,0 +1,23 @@
+get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+//Remove categories
+/** @var Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
+$collection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
+$collection
+ ->addAttributeToFilter('level', 2)
+ ->load()
+ ->delete();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
index 81592b6901f1c..47d74fcfd6719 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
@@ -325,8 +325,10 @@ public function testExportWithMedia()
/**
* @magentoDataFixture Magento/CatalogImportExport/_files/product_export_data.php
+ *
+ * @return void
*/
- public function testExportWithCustomOptions()
+ public function testExportWithCustomOptionsAndSecondStore()
{
$storeCode = 'default';
$expectedData = [];
@@ -380,6 +382,56 @@ public function testExportWithCustomOptions()
self::assertSame($expectedData, $customOptionData);
}
+ /**
+ * @magentoDataFixture Magento/Catalog/_files/product_simple_with_custom_options.php
+ *
+ * @return void
+ */
+ public function testExportWithCustomOptions()
+ {
+ $expectedData = [];
+ /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+ $productRepository = $this->objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+ /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
+ $product = $productRepository->get('simple_with_custom_options', true);
+
+ foreach ($product->getOptions() as $customOption) {
+ $optionTitle = $customOption->getTitle();
+ $expectedData[$optionTitle] = [];
+ if ($customOption->getValues()) {
+ foreach ($customOption->getValues() as $customOptionValue) {
+ $expectedData[$optionTitle][] = $customOptionValue->getTitle();
+ }
+ }
+ }
+
+ ksort($expectedData);
+
+ $this->model->setWriter(
+ $this->objectManager->create(
+ \Magento\ImportExport\Model\Export\Adapter\Csv::class
+ )
+ );
+ $exportData = $this->model->export();
+ /** @var $varDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
+ $varDirectory = $this->objectManager->get(\Magento\Framework\Filesystem::class)
+ ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR);
+ $varDirectory->writeFile('test_product_with_custom_options.csv', $exportData);
+ /** @var \Magento\Framework\File\Csv $csv */
+ $csv = $this->objectManager->get(\Magento\Framework\File\Csv::class);
+ $data = $csv->getData($varDirectory->getAbsolutePath('test_product_with_custom_options.csv'));
+
+ foreach ($data[0] as $columnNumber => $columnName) {
+ if ($columnName === 'custom_options') {
+ $exportedCustomOptionData = $this->parseExportedCustomOption($data[1][$columnNumber]);
+ }
+ }
+
+ ksort($exportedCustomOptionData);
+
+ self::assertSame($expectedData, $exportedCustomOptionData);
+ }
+
/**
* @param $exportedCustomOption
* @return array
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index 2e1e6b6be970e..9cc7c452e646f 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -741,7 +741,6 @@ protected function getOptionValues(\Magento\Catalog\Model\Product\Option $option
/**
* Test that product import with images works properly
*
- * @magentoDataIsolation enabled
* @magentoDataFixture mediaImportImageFixture
* @magentoAppIsolation enabled
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -792,7 +791,6 @@ public function testSaveMediaImage()
/**
* Test that errors occurred during importing images are logged.
*
- * @magentoDataIsolation enabled
* @magentoAppIsolation enabled
* @magentoDataFixture mediaImportImageFixture
* @magentoDataFixture mediaImportImageFixtureError
@@ -2190,7 +2188,6 @@ public function testImportWithDifferentSkuCase()
/**
* Test that product import with images for non-default store works properly.
*
- * @magentoDataIsolation enabled
* @magentoDataFixture mediaImportImageFixture
* @magentoAppIsolation enabled
*/
@@ -2237,7 +2234,6 @@ public function testProductsWithMultipleStoresWhenMediaIsDisabled()
/**
* Test that imported product stock status with backorders functionality enabled can be set to 'out of stock'.
*
- * @magentoDataIsolation enabled
* @magentoAppIsolation enabled
*/
public function testImportWithBackordersEnabled()
@@ -2247,6 +2243,20 @@ public function testImportWithBackordersEnabled()
$this->assertFalse($product->getDataByKey('quantity_and_stock_status')['is_in_stock']);
}
+ /**
+ * Test that imported product stock status with stock quantity > 0 and backorders functionality disabled
+ * can be set to 'out of stock'.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
+ */
+ public function testImportWithBackordersDisabled()
+ {
+ $this->importFile('products_to_import_with_backorders_disabled_and_not_0_qty.csv');
+ $product = $this->getProductBySku('simple_new');
+ $this->assertFalse($product->getDataByKey('quantity_and_stock_status')['is_in_stock']);
+ }
+
/**
* Import file by providing import filename in parameters
*
@@ -2364,7 +2374,6 @@ public function testImportProductWithUpdateUrlKey()
/**
* Test that product import with non existing images does not broke roles on existing images.
*
- * @magentoDataIsolation enabled
* @magentoDataFixture mediaImportImageFixture
* @magentoAppIsolation enabled
* @return void
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_backorders_disabled_and_not_0_qty.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_backorders_disabled_and_not_0_qty.csv
new file mode 100644
index 0000000000000..b22427a8af120
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_backorders_disabled_and_not_0_qty.csv
@@ -0,0 +1,2 @@
+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,related_skus,crosssell_skus,upsell_skus,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,associated_skus
+simple_new,,Default,simple,,base,New Product,,,,1,Taxable Goods,"Catalog, Search",10,,,,new-product,New Product,New Product,New Product ,,,,,,,10/20/2015 7:05,10/20/2015 7:05,,,Block after Info Column,,,,,,,,,,,,,"has_options=1,quantity_and_stock_status=In Stock,required_options=1",100,0,1,0,0,0,1,1,10000,1,0,1,1,1,0,1,1,0,0,0,1,,,,,,,,,,,,,
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
index 59ad91ae7b076..993462350b638 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
@@ -29,6 +29,8 @@ protected function setUp()
}
/**
+ * Testing fulltext index rebuild.
+ *
* @magentoDataFixture Magento/CatalogSearch/_files/products_for_index.php
* @magentoDataFixture Magento/CatalogSearch/_files/product_configurable_not_available.php
* @magentoDataFixture Magento/Framework/Search/_files/product_configurable.php
@@ -58,6 +60,8 @@ public function testGetIndexData()
}
/**
+ * Prepare and return expected index data.
+ *
* @return array
*/
private function getExpectedIndexData()
@@ -68,32 +72,49 @@ private function getExpectedIndexData()
$nameId = $attributeRepository->get(ProductInterface::NAME)->getAttributeId();
/** @see dev/tests/integration/testsuite/Magento/Framework/Search/_files/configurable_attribute.php */
$configurableId = $attributeRepository->get('test_configurable')->getAttributeId();
+ $statusId = $attributeRepository->get(ProductInterface::STATUS)->getAttributeId();
+ $taxClassId = $attributeRepository
+ ->get(\Magento\Customer\Api\Data\GroupInterface::TAX_CLASS_ID)
+ ->getAttributeId();
+
return [
'configurable' => [
$skuId => 'configurable',
$configurableId => 'Option 1 | Option 2',
$nameId => 'Configurable Product | Configurable OptionOption 1 | Configurable OptionOption 2',
+ $taxClassId => 'Taxable Goods | Taxable Goods | Taxable Goods',
+ $statusId => 'Enabled | Enabled | Enabled',
],
'index_enabled' => [
$skuId => 'index_enabled',
$nameId => 'index enabled',
+ $taxClassId => 'Taxable Goods',
+ $statusId => 'Enabled',
],
'index_visible_search' => [
$skuId => 'index_visible_search',
$nameId => 'index visible search',
+ $taxClassId => 'Taxable Goods',
+ $statusId => 'Enabled',
],
'index_visible_category' => [
$skuId => 'index_visible_category',
$nameId => 'index visible category',
+ $taxClassId => 'Taxable Goods',
+ $statusId => 'Enabled',
],
'index_visible_both' => [
$skuId => 'index_visible_both',
$nameId => 'index visible both',
+ $taxClassId => 'Taxable Goods',
+ $statusId => 'Enabled',
]
];
}
/**
+ * Testing fulltext index rebuild with configurations.
+ *
* @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
*/
public function testRebuildStoreIndexConfigurable()
@@ -114,6 +135,8 @@ public function testRebuildStoreIndexConfigurable()
}
/**
+ * Get product Id by its SKU.
+ *
* @param string $sku
* @return int
*/
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
index 2036042d0463c..661593b65adca 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php
@@ -6,6 +6,8 @@
namespace Magento\Checkout\Controller\Cart\Index;
+use Magento\Framework\App\Request\Http as HttpRequest;
+
/**
* @magentoDbIsolation enabled
*/
@@ -36,4 +38,35 @@ public function testExecute()
\Magento\Framework\Message\MessageInterface::TYPE_ERROR
);
}
+
+ /**
+ * Testing by adding a valid coupon to cart
+ *
+ * @magentoDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+ * @magentoDataFixture Magento/Usps/Fixtures/cart_rule_coupon_free_shipping.php
+ * @return void
+ */
+ public function testAddingValidCoupon()
+ {
+ /** @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);
+
+ $couponCode = 'IMPHBR852R61';
+ $inputData = [
+ 'remove' => 0,
+ 'coupon_code' => $couponCode
+ ];
+ $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+ $this->getRequest()->setPostValue($inputData);
+ $this->dispatch(
+ 'checkout/cart/couponPost/'
+ );
+
+ $this->assertSessionMessages(
+ $this->equalTo(['You used coupon code "' . $couponCode . '".']),
+ \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+ );
+ }
}
diff --git a/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php b/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
index 3f333a36c9c93..a1998c6c89536 100644
--- a/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
@@ -27,7 +27,7 @@
/**
* Tests the different flows of config:set command.
*
- * {@inheritdoc}
+ * @inheritdoc
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @magentoDbIsolation enabled
*/
@@ -291,8 +291,7 @@ public function runExtendedDataProvider()
* @param string $scope
* @param $scopeCode string|null
* @dataProvider configSetValidationErrorDataProvider
- *
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
*/
public function testConfigSetValidationError(
$path,
@@ -306,6 +305,7 @@ public function testConfigSetValidationError(
/**
* Data provider for testConfigSetValidationError
+ *
* @return array
*/
public function configSetValidationErrorDataProvider()
@@ -398,7 +398,6 @@ public function testConfigSetCurrency()
* Saving values with successful validation
*
* @dataProvider configSetValidDataProvider
- *
* @magentoDbIsolation enabled
*/
public function testConfigSetValid()
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
index ff0d838cb6f82..4fed6c84ab09d 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
@@ -19,10 +19,13 @@
use Magento\Framework\App\Http;
use Magento\Framework\Data\Form\FormKey;
use Magento\Framework\Message\MessageInterface;
-use Magento\Store\Model\ScopeInterface;
use Magento\TestFramework\Helper\Bootstrap;
use Magento\TestFramework\Request;
use Magento\TestFramework\Response;
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Stdlib\CookieManagerInterface;
+use Magento\Theme\Controller\Result\MessagePlugin;
use Zend\Stdlib\Parameters;
/**
@@ -30,6 +33,20 @@
*/
class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
{
+ /**
+ * @var TransportBuilderMock
+ */
+ private $transportBuilderMock;
+
+ /**
+ * @inheritdoc
+ */
+ protected function setUp()
+ {
+ parent::setUp();
+ $this->transportBuilderMock = $this->_objectManager->get(TransportBuilderMock::class);
+ }
+
/**
* Login the user
*
@@ -102,11 +119,7 @@ public function testForgotPasswordEmailMessageWithSpecialCharacters()
$this->dispatch('customer/account/forgotPasswordPost');
$this->assertRedirect($this->stringContains('customer/account/'));
- /** @var \Magento\TestFramework\Mail\Template\TransportBuilderMock $transportBuilder */
- $transportBuilder = $this->_objectManager->get(
- \Magento\TestFramework\Mail\Template\TransportBuilderMock::class
- );
- $subject = $transportBuilder->getSentMessage()->getSubject();
+ $subject = $this->transportBuilderMock->getSentMessage()->getSubject();
$this->assertContains(
'Test special\' characters',
$subject
@@ -228,26 +241,10 @@ public function testNoFormKeyCreatePostAction()
/**
* @magentoDbIsolation enabled
* @magentoAppIsolation enabled
+ * @magentoDataFixture Magento/Customer/_files/customer_confirmation_config_disable.php
*/
public function testNoConfirmCreatePostAction()
{
- /** @var \Magento\Framework\App\Config\MutableScopeConfigInterface $mutableScopeConfig */
- $mutableScopeConfig = Bootstrap::getObjectManager()
- ->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class);
-
- $scopeValue = $mutableScopeConfig->getValue(
- 'customer/create_account/confirm',
- ScopeInterface::SCOPE_WEBSITES,
- null
- );
-
- $mutableScopeConfig->setValue(
- 'customer/create_account/confirm',
- 0,
- ScopeInterface::SCOPE_WEBSITES,
- null
- );
-
$this->fillRequestWithAccountDataAndFormKey();
$this->dispatch('customer/account/createPost');
$this->assertRedirect($this->stringEndsWith('customer/account/'));
@@ -255,38 +252,15 @@ public function testNoConfirmCreatePostAction()
$this->equalTo(['Thank you for registering with Main Website Store.']),
MessageInterface::TYPE_SUCCESS
);
-
- $mutableScopeConfig->setValue(
- 'customer/create_account/confirm',
- $scopeValue,
- ScopeInterface::SCOPE_WEBSITES,
- null
- );
}
/**
* @magentoDbIsolation enabled
* @magentoAppIsolation enabled
+ * @magentoDataFixture Magento/Customer/_files/customer_confirmation_config_enable.php
*/
public function testWithConfirmCreatePostAction()
{
- /** @var \Magento\Framework\App\Config\MutableScopeConfigInterface $mutableScopeConfig */
- $mutableScopeConfig = Bootstrap::getObjectManager()
- ->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class);
-
- $scopeValue = $mutableScopeConfig->getValue(
- 'customer/create_account/confirm',
- ScopeInterface::SCOPE_WEBSITES,
- null
- );
-
- $mutableScopeConfig->setValue(
- 'customer/create_account/confirm',
- 1,
- ScopeInterface::SCOPE_WEBSITES,
- null
- );
-
$this->fillRequestWithAccountDataAndFormKey();
$this->dispatch('customer/account/createPost');
$this->assertRedirect($this->stringContains('customer/account/index/'));
@@ -298,13 +272,6 @@ public function testWithConfirmCreatePostAction()
]),
MessageInterface::TYPE_SUCCESS
);
-
- $mutableScopeConfig->setValue(
- 'customer/create_account/confirm',
- $scopeValue,
- ScopeInterface::SCOPE_WEBSITES,
- null
- );
}
/**
@@ -690,6 +657,46 @@ public function testLoginPostRedirect($redirectDashboard, string $redirectUrl)
$this->assertTrue($this->_objectManager->get(Session::class)->isLoggedIn());
}
+ /**
+ * Test that confirmation email address displays special characters correctly.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoDataFixture Magento/Customer/_files/customer_confirmation_email_address_with_special_chars.php
+ *
+ * @return void
+ */
+ public function testConfirmationEmailWithSpecialCharacters()
+ {
+ $email = 'customer+confirmation@example.com';
+ $this->dispatch('customer/account/confirmation/email/customer%2Bconfirmation%40email.com');
+ $this->getRequest()->setPostValue('email', $email);
+ $this->dispatch('customer/account/confirmation/email/customer%2Bconfirmation%40email.com');
+
+ $this->assertRedirect($this->stringContains('customer/account/index'));
+ $this->assertSessionMessages(
+ $this->equalTo(['Please check your email for confirmation key.']),
+ MessageInterface::TYPE_SUCCESS
+ );
+
+ /** @var $message \Magento\Framework\Mail\Message */
+ $message = $this->transportBuilderMock->getSentMessage();
+ $rawMessage = $message->getRawMessage();
+
+ $this->assertContains('To: ' . $email, $rawMessage);
+
+ $content = $message->getBody()->getPartContent(0);
+ $confirmationUrl = $this->getConfirmationUrlFromMessageContent($content);
+ $this->setRequestInfo($confirmationUrl, 'confirm');
+ $this->clearCookieMessagesList();
+ $this->dispatch($confirmationUrl);
+
+ $this->assertRedirect($this->stringContains('customer/account/index'));
+ $this->assertSessionMessages(
+ $this->equalTo(['Thank you for registering with Main Website Store.']),
+ MessageInterface::TYPE_SUCCESS
+ );
+ }
+
/**
* Data provider for testLoginPostRedirect.
*
@@ -705,16 +712,17 @@ public function loginPostRedirectDataProvider()
}
/**
+ * @param string $email
* @return void
*/
- private function fillRequestWithAccountData()
+ private function fillRequestWithAccountData(string $email = 'test1@email.com')
{
$this->getRequest()
->setMethod('POST')
->setParam('firstname', 'firstname1')
->setParam('lastname', 'lastname1')
->setParam('company', '')
- ->setParam('email', 'test1@email.com')
+ ->setParam('email', $email)
->setParam('password', '_Password1')
->setParam('password_confirmation', '_Password1')
->setParam('telephone', '5123334444')
@@ -731,11 +739,12 @@ private function fillRequestWithAccountData()
}
/**
+ * @param string $email
* @return void
*/
- private function fillRequestWithAccountDataAndFormKey()
+ private function fillRequestWithAccountDataAndFormKey(string $email = 'test1@email.com')
{
- $this->fillRequestWithAccountData();
+ $this->fillRequestWithAccountData($email);
$formKey = $this->_objectManager->get(FormKey::class);
$this->getRequest()->setParam('form_key', $formKey->getFormKey());
}
@@ -805,4 +814,53 @@ private function assertResponseRedirect(Response $response, string $redirectUrl)
$this->assertTrue($response->isRedirect());
$this->assertSame($redirectUrl, $response->getHeader('Location')->getUri());
}
+
+ /**
+ * Add new request info (request uri, path info, action name).
+ *
+ * @param string $uri
+ * @param string $actionName
+ * @return void
+ */
+ private function setRequestInfo(string $uri, string $actionName)
+ {
+ $this->getRequest()
+ ->setRequestUri($uri)
+ ->setPathInfo()
+ ->setActionName($actionName);
+ }
+
+ /**
+ * Clear cookie messages list.
+ *
+ * @return void
+ */
+ private function clearCookieMessagesList()
+ {
+ $cookieManager = $this->_objectManager->get(CookieManagerInterface::class);
+ $jsonSerializer = $this->_objectManager->get(Json::class);
+ $cookieManager->setPublicCookie(
+ MessagePlugin::MESSAGES_COOKIES_NAME,
+ $jsonSerializer->serialize([])
+ );
+ }
+
+ /**
+ * Get confirmation URL from message content.
+ *
+ * @param string $content
+ * @return string
+ */
+ private function getConfirmationUrlFromMessageContent(string $content): string
+ {
+ $confirmationUrl = '';
+
+ if (preg_match('.*?)".*>', $content, $matches)) {
+ $confirmationUrl = $matches['url'];
+ $confirmationUrl = str_replace('http://localhost/index.php/', '', $confirmationUrl);
+ $confirmationUrl = html_entity_decode($confirmationUrl);
+ }
+
+ return $confirmationUrl;
+ }
}
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
index 2b74a58288600..37a36b1b3c42a 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
@@ -17,6 +17,8 @@
use Magento\Store\Api\WebsiteRepositoryInterface;
/**
+ * Class with integration tests for AddressRepository.
+ *
* @SuppressWarnings(PHPMD.TooManyMethods)
* @SuppressWarnings(PHPMD.ExcessivePublicCount)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -39,6 +41,9 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
/** @var \Magento\Framework\Api\DataObjectHelper */
private $dataObjectHelper;
+ /**
+ * @inheritdoc
+ */
protected function setUp()
{
$this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -87,6 +92,9 @@ protected function setUp()
$this->expectedAddresses = [$address, $address2];
}
+ /**
+ * @inheritdoc
+ */
protected function tearDown()
{
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -96,6 +104,8 @@ protected function tearDown()
}
/**
+ * Test for save address changes.
+ *
* @magentoDataFixture Magento/Customer/_files/customer.php
* @magentoDataFixture Magento/Customer/_files/customer_address.php
* @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
@@ -117,6 +127,8 @@ public function testSaveAddressChanges()
}
/**
+ * Test for method save address with new id.
+ *
* @magentoDataFixture Magento/Customer/_files/customer.php
* @magentoDataFixture Magento/Customer/_files/customer_address.php
* @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
@@ -131,6 +143,8 @@ public function testSaveAddressesIdSetButNotAlreadyExisting()
}
/**
+ * Test for method get address by id.
+ *
* @magentoDataFixture Magento/Customer/_files/customer.php
* @magentoDataFixture Magento/Customer/_files/customer_address.php
* @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
@@ -144,6 +158,8 @@ public function testGetAddressById()
}
/**
+ * Test for method get address by id with incorrect id.
+ *
* @magentoDataFixture Magento/Customer/_files/customer.php
* @expectedException \Magento\Framework\Exception\NoSuchEntityException
* @expectedExceptionMessage No such entity with addressId = 12345
@@ -154,6 +170,8 @@ public function testGetAddressByIdBadAddressId()
}
/**
+ * Test for method save new address.
+ *
* @magentoDataFixture Magento/Customer/_files/customer.php
* @magentoDataFixture Magento/Customer/_files/customer_address.php
* @magentoAppIsolation enabled
@@ -174,6 +192,8 @@ public function testSaveNewAddress()
}
/**
+ * Test for saving address with invalid address.
+ *
* @magentoDataFixture Magento/Customer/_files/customer.php
* @magentoDataFixture Magento/Customer/_files/customer_address.php
* @magentoAppIsolation enabled
@@ -199,6 +219,8 @@ public function testSaveNewAddressWithAttributes()
}
/**
+ * Test for method saaveNewAddress with new attributes.
+ *
* @magentoDataFixture Magento/Customer/_files/customer.php
* @magentoDataFixture Magento/Customer/_files/customer_address.php
* @magentoAppIsolation enabled
@@ -222,6 +244,11 @@ public function testSaveNewInvalidAddress()
}
}
+ /**
+ * Test for saving address without existing customer.
+ *
+ * @return void
+ */
public function testSaveAddressesCustomerIdNotExist()
{
$proposedAddress = $this->_createSecondAddress()->setCustomerId(4200);
@@ -233,6 +260,11 @@ public function testSaveAddressesCustomerIdNotExist()
}
}
+ /**
+ * Test for saving addresses with invalid customer id.
+ *
+ * @return void
+ */
public function testSaveAddressesCustomerIdInvalid()
{
$proposedAddress = $this->_createSecondAddress()->setCustomerId('this_is_not_a_valid_id');
@@ -245,6 +277,8 @@ public function testSaveAddressesCustomerIdInvalid()
}
/**
+ * Test for deleteAddressById.
+ *
* @magentoDataFixture Magento/Customer/_files/customer.php
* @magentoDataFixture Magento/Customer/_files/customer_address.php
*/
@@ -268,6 +302,8 @@ public function testDeleteAddress()
}
/**
+ * Test for delete method.
+ *
* @magentoDataFixture Magento/Customer/_files/customer.php
* @magentoDataFixture Magento/Customer/_files/customer_address.php
*/
@@ -291,6 +327,8 @@ public function testDeleteAddressById()
}
/**
+ * Test delete address from customer with incorrect address id.
+ *
* @magentoDataFixture Magento/Customer/_files/customer.php
*/
public function testDeleteAddressFromCustomerBadAddressId()
@@ -304,10 +342,14 @@ public function testDeleteAddressFromCustomerBadAddressId()
}
/**
+ * Test for searching addressed.
+ *
* @param \Magento\Framework\Api\Filter[] $filters
- * @param \Magento\Framework\Api\Filter[] $filterGroup
- * @param \Magento\Framework\Api\SortOrder[] $filterOrders
+ * @param \Magento\Framework\Api\Filter[]|null $filterGroup
+ * @param \Magento\Framework\Api\SortOrder[]|null $filterOrders
* @param array $expectedResult array of expected results indexed by ID
+ * @param int $currentPage current page for search criteria
+ * @return void
*
* @dataProvider searchAddressDataProvider
*
@@ -315,8 +357,13 @@ public function testDeleteAddressFromCustomerBadAddressId()
* @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
* @magentoAppIsolation enabled
*/
- public function testSearchAddresses($filters, $filterGroup, $filterOrders, $expectedResult)
- {
+ public function testSearchAddresses(
+ array $filters,
+ $filterGroup,
+ $filterOrders,
+ array $expectedResult,
+ int $currentPage
+ ) {
/** @var \Magento\Framework\Api\SearchCriteriaBuilder $searchBuilder */
$searchBuilder = $this->objectManager->create(\Magento\Framework\Api\SearchCriteriaBuilder::class);
foreach ($filters as $filter) {
@@ -332,7 +379,7 @@ public function testSearchAddresses($filters, $filterGroup, $filterOrders, $expe
}
$searchBuilder->setPageSize(1);
- $searchBuilder->setCurrentPage(2);
+ $searchBuilder->setCurrentPage($currentPage);
$searchCriteria = $searchBuilder->create();
$searchResults = $this->repository->getList($searchCriteria);
@@ -350,7 +397,12 @@ public function testSearchAddresses($filters, $filterGroup, $filterOrders, $expe
$this->assertEquals($expectedResult[$expectedResultIndex]['firstname'], $items[0]->getFirstname());
}
- public function searchAddressDataProvider()
+ /**
+ * Data provider for searchAddresses.
+ *
+ * @return array
+ */
+ public function searchAddressDataProvider(): array
{
/**
* @var \Magento\Framework\Api\FilterBuilder $filterBuilder
@@ -365,23 +417,25 @@ public function searchAddressDataProvider()
return [
'Address with postcode 75477' => [
[$filterBuilder->setField('postcode')->setValue('75477')->create()],
- null,
+ [],
null,
[
['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
],
+ 1,
],
'Address with city CityM' => [
[$filterBuilder->setField('city')->setValue('CityM')->create()],
- null,
+ [],
null,
[
['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
],
+ 1,
],
'Addresses with firstname John sorted by firstname desc, city asc' => [
[$filterBuilder->setField('firstname')->setValue('John')->create()],
- null,
+ [],
[
$orderBuilder->setField('firstname')->setDirection(SortOrder::SORT_DESC)->create(),
$orderBuilder->setField('city')->setDirection(SortOrder::SORT_ASC)->create(),
@@ -390,6 +444,7 @@ public function searchAddressDataProvider()
['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
['id' => 2, 'city' => 'CityX', 'postcode' => 47676, 'firstname' => 'John'],
],
+ 2,
],
'Addresses with postcode of either 75477 or 47676 sorted by city desc' => [
[],
@@ -404,10 +459,11 @@ public function searchAddressDataProvider()
['id' => 2, 'city' => 'CityX', 'postcode' => 47676, 'firstname' => 'John'],
['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
],
+ 2,
],
'Addresses with postcode greater than 0 sorted by firstname asc, postcode desc' => [
[$filterBuilder->setField('postcode')->setValue('0')->setConditionType('gt')->create()],
- null,
+ [],
[
$orderBuilder->setField('firstname')->setDirection(SortOrder::SORT_ASC)->create(),
$orderBuilder->setField('postcode')->setDirection(SortOrder::SORT_ASC)->create(),
@@ -416,11 +472,14 @@ public function searchAddressDataProvider()
['id' => 2, 'city' => 'CityX', 'postcode' => 47676, 'firstname' => 'John'],
['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
],
+ 2,
],
];
}
/**
+ * Test for save addresses with restricted countries.
+ *
* @magentoDataFixture Magento/Customer/Fixtures/customer_sec_website.php
*/
public function testSaveAddressWithRestrictedCountries()
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable.php
new file mode 100644
index 0000000000000..7d4e451db514b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable.php
@@ -0,0 +1,21 @@
+create(MutableScopeConfigInterface::class);
+
+$mutableScopeConfig->setValue(
+ 'customer/create_account/confirm',
+ 0,
+ ScopeInterface::SCOPE_WEBSITES,
+ null
+);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable_rollback.php
new file mode 100644
index 0000000000000..36743b4a20e9a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable_rollback.php
@@ -0,0 +1,23 @@
+get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var Config $config */
+$config = Bootstrap::getObjectManager()->create(Config::class);
+$config->deleteConfig('customer/create_account/confirm');
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable.php
new file mode 100644
index 0000000000000..c8deb7ec2a536
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable.php
@@ -0,0 +1,21 @@
+create(MutableScopeConfigInterface::class);
+
+$mutableScopeConfig->setValue(
+ 'customer/create_account/confirm',
+ 1,
+ ScopeInterface::SCOPE_WEBSITES,
+ null
+);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable_rollback.php
new file mode 100644
index 0000000000000..36743b4a20e9a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable_rollback.php
@@ -0,0 +1,23 @@
+get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var Config $config */
+$config = Bootstrap::getObjectManager()->create(Config::class);
+$config->deleteConfig('customer/create_account/confirm');
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars.php
new file mode 100644
index 0000000000000..c4f046bac57a6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars.php
@@ -0,0 +1,37 @@
+create(Customer::class);
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->create(CustomerRepositoryInterface::class);
+/** @var CustomerInterface $customerInterface */
+$customerInterface = $objectManager->create(CustomerInterface::class);
+
+$customerInterface->setWebsiteId(1)
+ ->setEmail('customer+confirmation@example.com')
+ ->setConfirmation($customer->getRandomConfirmationKey())
+ ->setGroupId(1)
+ ->setStoreId(1)
+ ->setFirstname('John')
+ ->setLastname('Smith')
+ ->setDefaultBilling(1)
+ ->setDefaultShipping(1)
+ ->setTaxvat('12')
+ ->setGender(0);
+
+$customerRepository->save($customerInterface, 'password');
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars_rollback.php
new file mode 100644
index 0000000000000..7a0ebf74ed8a0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars_rollback.php
@@ -0,0 +1,31 @@
+get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = Bootstrap::getObjectManager()->create(CustomerRepositoryInterface::class);
+
+try {
+ $customer = $customerRepository->get('customer+confirmation@example.com');
+ $customerRepository->delete($customer);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+ // Customer with the specified email does not exist
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Deploy/Console/Command/SetModeCommandTest.php b/dev/tests/integration/testsuite/Magento/Deploy/Console/Command/SetModeCommandTest.php
new file mode 100644
index 0000000000000..687c80cc952af
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Deploy/Console/Command/SetModeCommandTest.php
@@ -0,0 +1,203 @@
+objectManager = Bootstrap::getObjectManager();
+ $this->reader = $this->objectManager->get(FileReader::class);
+ $this->writer = $this->objectManager->get(Writer::class);
+ $this->prevMode = $this->objectManager->get(State::class)->getMode();
+ $this->filesystem = $this->objectManager->get(Filesystem::class);
+
+ // Load the original config to restore it on teardown
+ $this->config = $this->reader->load(ConfigFilePool::APP_CONFIG);
+ $this->envConfig = $this->reader->load(ConfigFilePool::APP_ENV);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function tearDown()
+ {
+ // Restore the original config
+ $this->writer->saveConfig([ConfigFilePool::APP_CONFIG => $this->config]);
+ $this->writer->saveConfig([ConfigFilePool::APP_ENV => $this->envConfig]);
+
+ $this->clearStaticFiles();
+ // enable default mode
+ $this->commandTester = new CommandTester($this->getStaticContentDeployCommand());
+ $this->commandTester->execute(
+ ['mode' => 'default']
+ );
+ $commandOutput = $this->commandTester->getDisplay();
+ $this->assertEquals(Cli::RETURN_SUCCESS, $this->commandTester->getStatusCode());
+ $this->assertContains('Enabled default mode', $commandOutput);
+ }
+
+ /**
+ * Clear pub/static and var/view_preprocessed directories
+ *
+ * @return void
+ */
+ private function clearStaticFiles()
+ {
+ $this->filesystem->getDirectoryWrite(DirectoryList::PUB)->delete(DirectoryList::STATIC_VIEW);
+ $this->filesystem->getDirectoryWrite(DirectoryList::VAR_DIR)->delete(DirectoryList::TMP_MATERIALIZATION_DIR);
+ }
+
+ public function testSwitchMode()
+ {
+ if ($this->prevMode === 'production') {
+ //in production mode, so we have to switch to dev, then to production
+ $this->enableAndAssertDeveloperMode();
+ $this->enableAndAssertProductionMode();
+ } else {
+ //already in non production mode
+ $this->enableAndAssertProductionMode();
+ }
+ }
+
+ /**
+ * Enable production mode
+ *
+ * @return void
+ */
+ private function enableAndAssertProductionMode()
+ {
+ // Enable production mode
+ $this->commandTester = new CommandTester($this->getStaticContentDeployCommand());
+ $this->commandTester->execute(
+ ['mode' => 'production']
+ );
+ $commandOutput = $this->commandTester->getDisplay();
+
+ $this->assertEquals(Cli::RETURN_SUCCESS, $this->commandTester->getStatusCode(), $commandOutput);
+
+ $this->assertContains('Deployment of static content complete', $commandOutput);
+ $this->assertContains('Enabled production mode', $commandOutput);
+ }
+
+ /**
+ * Enable developer mode
+ *
+ * @return void
+ */
+ private function enableAndAssertDeveloperMode()
+ {
+ $this->commandTester = new CommandTester($this->getStaticContentDeployCommand());
+ $this->commandTester->execute(
+ ['mode' => 'developer']
+ );
+ $commandOutput = $this->commandTester->getDisplay();
+
+ $this->assertEquals(Cli::RETURN_SUCCESS, $this->commandTester->getStatusCode());
+ $this->assertContains('Enabled developer mode', $commandOutput);
+ }
+
+ /**
+ * Create SetModeCommand instance with mocked loggers
+ *
+ * @return SetModeCommand
+ */
+ private function getStaticContentDeployCommand()
+ {
+ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+ $consoleLoggerFactoryMock = $this->getMockBuilder(ConsoleLoggerFactory::class)
+ ->setMethods(['getLogger'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $consoleLoggerFactoryMock
+ ->method('getLogger')
+ ->will($this->returnCallback(
+ function ($output) use ($objectManager) {
+ return $objectManager->create(ConsoleLogger::class, ['output' => $output]);
+ }
+ ));
+ $objectManagerProviderMock = $this->getMockBuilder(ObjectManagerProvider::class)
+ ->setMethods(['get'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $objectManagerProviderMock
+ ->method('get')
+ ->willReturn(\Magento\TestFramework\Helper\Bootstrap::getObjectManager());
+ $deployStaticContentCommand = $objectManager->create(
+ SetModeCommand::class,
+ [
+ 'consoleLoggerFactory' => $consoleLoggerFactoryMock,
+ 'objectManagerProvider' => $objectManagerProviderMock
+ ]
+ );
+
+ return $deployStaticContentCommand;
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php b/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php
index 3bef48d8801f7..f7a47017f8b18 100644
--- a/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php
+++ b/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php
@@ -5,34 +5,20 @@
*/
namespace Magento\Developer\Model\Logger\Handler;
-use Magento\Config\Console\Command\ConfigSetCommand;
-use Magento\Framework\App\Config;
-use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Config\Setup\ConfigOptionsList;
+use Magento\Framework\App\DeploymentConfig;
use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\State;
use Magento\Framework\Filesystem;
use Magento\Framework\Filesystem\Directory\WriteInterface;
use Magento\Framework\Logger\Monolog;
+use Magento\Framework\Shell;
+use Magento\Setup\Mvc\Bootstrap\InitParamListener;
use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Deploy\Model\Mode;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
+use Magento\TestFramework\ObjectManager;
/**
- * Preconditions
- * - Developer mode enabled
- * - Log file isn't exists
- * - 'Log to file' setting are enabled
- *
- * Test steps
- * - Enable production mode without compilation
- * - Try to log message into log file
- * - Assert that log file isn't exists
- * - Assert that 'Log to file' setting are disabled
- *
- * - Enable 'Log to file' setting
- * - Try to log message into debug file
- * - Assert that log file is exists
- * - Assert that log file contain logged message
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class DebugTest extends \PHPUnit\Framework\TestCase
{
@@ -42,127 +28,212 @@ class DebugTest extends \PHPUnit\Framework\TestCase
private $logger;
/**
- * @var Mode
+ * @var WriteInterface
*/
- private $mode;
+ private $etcDirectory;
/**
- * @var InputInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var ObjectManager
*/
- private $inputMock;
+ private $objectManager;
/**
- * @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var Shell
*/
- private $outputMock;
+ private $shell;
/**
- * @var ConfigSetCommand
+ * @var DeploymentConfig
*/
- private $configSetCommand;
+ private $deploymentConfig;
/**
- * @var WriteInterface
+ * @var string
*/
- private $etcDirectory;
+ private $debugLogPath = '';
+
+ /**
+ * @var string
+ */
+ private static $backupFile = 'env.base.php';
+
+ /**
+ * @var string
+ */
+ private static $configFile = 'env.php';
/**
- * @var Config
+ * @var Debug
*/
- private $appConfig;
+ private $debugHandler;
+ /**
+ * @inheritdoc
+ * @throws \Magento\Framework\Exception\FileSystemException
+ * @throws \Exception
+ */
public function setUp()
{
+ $this->objectManager = Bootstrap::getObjectManager();
+ $this->shell = $this->objectManager->get(Shell::class);
+ $this->logger = $this->objectManager->get(Monolog::class);
+ $this->deploymentConfig = $this->objectManager->get(DeploymentConfig::class);
+
/** @var Filesystem $filesystem */
- $filesystem = Bootstrap::getObjectManager()->create(Filesystem::class);
+ $filesystem = $this->objectManager->create(Filesystem::class);
$this->etcDirectory = $filesystem->getDirectoryWrite(DirectoryList::CONFIG);
- $this->etcDirectory->copyFile('env.php', 'env.base.php');
-
- $this->inputMock = $this->getMockBuilder(InputInterface::class)
- ->getMockForAbstractClass();
- $this->outputMock = $this->getMockBuilder(OutputInterface::class)
- ->getMockForAbstractClass();
- $this->logger = Bootstrap::getObjectManager()->get(Monolog::class);
- $this->mode = Bootstrap::getObjectManager()->create(
- Mode::class,
- [
- 'input' => $this->inputMock,
- 'output' => $this->outputMock
- ]
- );
- $this->configSetCommand = Bootstrap::getObjectManager()->create(ConfigSetCommand::class);
- $this->appConfig = Bootstrap::getObjectManager()->create(Config::class);
-
- // Preconditions
- $this->mode->enableDeveloperMode();
- $this->enableDebugging();
- if (file_exists($this->getDebuggerLogPath())) {
- unlink($this->getDebuggerLogPath());
- }
+ $this->etcDirectory->copyFile(self::$configFile, self::$backupFile);
}
+ /**
+ * @inheritdoc
+ * @throws \Magento\Framework\Exception\FileSystemException
+ */
public function tearDown()
{
- $this->etcDirectory->delete('env.php');
- $this->etcDirectory->renameFile('env.base.php', 'env.php');
+ $this->reinitDeploymentConfig();
+ $this->etcDirectory->delete(self::$backupFile);
}
- private function enableDebugging()
+ /**
+ * @param bool $flag
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ private function enableDebugging(bool $flag)
{
- $this->inputMock = $this->getMockBuilder(InputInterface::class)
- ->getMockForAbstractClass();
- $this->outputMock = $this->getMockBuilder(OutputInterface::class)
- ->getMockForAbstractClass();
- $this->inputMock->expects($this->exactly(4))
- ->method('getOption')
- ->withConsecutive(
- [ConfigSetCommand::OPTION_LOCK_ENV],
- [ConfigSetCommand::OPTION_LOCK_CONFIG],
- [ConfigSetCommand::OPTION_SCOPE],
- [ConfigSetCommand::OPTION_SCOPE_CODE]
- )
- ->willReturnOnConsecutiveCalls(
- true,
- false,
- ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
- null
- );
- $this->inputMock->expects($this->exactly(2))
- ->method('getArgument')
- ->withConsecutive([ConfigSetCommand::ARG_PATH], [ConfigSetCommand::ARG_VALUE])
- ->willReturnOnConsecutiveCalls('dev/debug/debug_logging', 1);
- $this->outputMock->expects($this->once())
- ->method('writeln')
- ->with('Value was saved in app/etc/env.php and locked.');
- $this->assertFalse((bool)$this->configSetCommand->run($this->inputMock, $this->outputMock));
+ $this->shell->execute(
+ PHP_BINARY . ' -f %s setup:config:set -n --%s=%s --%s=%s',
+ [
+ BP . '/bin/magento',
+ ConfigOptionsList::INPUT_KEY_DEBUG_LOGGING,
+ (int)$flag,
+ InitParamListener::BOOTSTRAP_PARAM,
+ urldecode(http_build_query(Bootstrap::getInstance()->getAppInitParams())),
+ ]
+ );
+ $this->deploymentConfig->resetData();
+ $this->assertSame((int)$flag, $this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_DEBUG_LOGGING));
}
+ /**
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
public function testDebugInProductionMode()
{
$message = 'test message';
+ $this->reinitDebugHandler(State::MODE_PRODUCTION);
- $this->mode->enableProductionModeMinimal();
+ $this->removeDebugLog();
$this->logger->debug($message);
$this->assertFileNotExists($this->getDebuggerLogPath());
- $this->assertFalse((bool)$this->appConfig->getValue('dev/debug/debug_logging'));
+ $this->assertNull($this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_DEBUG_LOGGING));
- $this->enableDebugging();
- $this->logger->debug($message);
+ $this->checkCommonFlow($message);
+ $this->reinitDeploymentConfig();
+ }
+
+ /**
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ public function testDebugInDeveloperMode()
+ {
+ $message = 'test message';
+ $this->reinitDebugHandler(State::MODE_DEVELOPER);
+ $this->removeDebugLog();
+ $this->logger->debug($message);
$this->assertFileExists($this->getDebuggerLogPath());
$this->assertContains($message, file_get_contents($this->getDebuggerLogPath()));
+ $this->assertNull($this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_DEBUG_LOGGING));
+
+ $this->checkCommonFlow($message);
+ $this->reinitDeploymentConfig();
}
/**
- * @return bool|string
+ * @return string
*/
private function getDebuggerLogPath()
{
- foreach ($this->logger->getHandlers() as $handler) {
- if ($handler instanceof Debug) {
- return $handler->getUrl();
+ if (!$this->debugLogPath) {
+ foreach ($this->logger->getHandlers() as $handler) {
+ if ($handler instanceof Debug) {
+ $this->debugLogPath = $handler->getUrl();
+ }
}
}
- return false;
+
+ return $this->debugLogPath;
+ }
+
+ /**
+ * @throws \Magento\Framework\Exception\FileSystemException
+ */
+ private function reinitDeploymentConfig()
+ {
+ $this->etcDirectory->delete(self::$configFile);
+ $this->etcDirectory->copyFile(self::$backupFile, self::$configFile);
+ }
+
+ /**
+ * @param string $instanceMode
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ private function reinitDebugHandler(string $instanceMode)
+ {
+ $this->debugHandler = $this->objectManager->create(
+ Debug::class,
+ [
+ 'filePath' => Bootstrap::getInstance()->getAppTempDir(),
+ 'state' => $this->objectManager->create(
+ State::class,
+ [
+ 'mode' => $instanceMode,
+ ]
+ ),
+ ]
+ );
+ $this->logger->setHandlers(
+ [
+ $this->debugHandler,
+ ]
+ );
+ }
+
+ /**
+ * @return void
+ */
+ private function detachLogger()
+ {
+ $this->debugHandler->close();
+ }
+
+ /**
+ * @return void
+ */
+ private function removeDebugLog()
+ {
+ $this->detachLogger();
+ if (file_exists($this->getDebuggerLogPath())) {
+ unlink($this->getDebuggerLogPath());
+ }
+ }
+
+ /**
+ * @param string $message
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ private function checkCommonFlow(string $message)
+ {
+ $this->enableDebugging(true);
+ $this->removeDebugLog();
+ $this->logger->debug($message);
+ $this->assertFileExists($this->getDebuggerLogPath());
+ $this->assertContains($message, file_get_contents($this->getDebuggerLogPath()));
+
+ $this->enableDebugging(false);
+ $this->removeDebugLog();
+ $this->logger->debug($message);
+ $this->assertFileNotExists($this->getDebuggerLogPath());
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/IpnTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/IpnTest.php
index 6b92338e9932a..3c126bcdc2c5b 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/IpnTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/IpnTest.php
@@ -64,7 +64,7 @@ public function testProcessIpnRequestFullRefund()
$creditmemoItems = $order->getCreditmemosCollection()->getItems();
$creditmemo = current($creditmemoItems);
- $this->assertEquals(Order::STATE_PROCESSING, $order->getState());
+ $this->assertEquals(Order::STATE_CLOSED, $order->getState());
$this->assertEquals(1, count($creditmemoItems));
$this->assertEquals(Creditmemo::STATE_REFUNDED, $creditmemo->getState());
$this->assertEquals(10, $order->getSubtotalRefunded());
@@ -146,7 +146,7 @@ public function testProcessIpnRequestRestRefund()
$creditmemoItems = $order->getCreditmemosCollection()->getItems();
- $this->assertEquals(Order::STATE_PROCESSING, $order->getState());
+ $this->assertEquals(Order::STATE_CLOSED, $order->getState());
$this->assertEquals(1, count($creditmemoItems));
$this->assertEquals(10, $order->getSubtotalRefunded());
$this->assertEquals(10, $order->getBaseSubtotalRefunded());
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php
index 999522a49e006..ce3f3a3e1fc8e 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php
@@ -11,26 +11,37 @@
namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
use Magento\Backend\Model\Session\Quote as SessionQuote;
+use Magento\Customer\Api\Data\AttributeMetadataInterface;
use Magento\Customer\Api\Data\AttributeMetadataInterfaceFactory;
+use Magento\Customer\Model\Data\Option;
use Magento\Customer\Model\Metadata\Form;
use Magento\Customer\Model\Metadata\FormFactory;
use Magento\Framework\View\LayoutInterface;
use Magento\Quote\Model\Quote;
use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
/**
* @magentoAppArea adminhtml
*/
class AccountTest extends \PHPUnit\Framework\TestCase
{
- /** @var Account */
+ /**
+ * @var Account
+ */
private $accountBlock;
/**
- * @var Bootstrap
+ * @var ObjectManager
*/
private $objectManager;
+ /**
+ * @var SessionQuote|MockObject
+ */
+ private $session;
+
/**
* @magentoDataFixture Magento/Sales/_files/quote.php
*/
@@ -38,19 +49,23 @@ protected function setUp()
{
$this->objectManager = Bootstrap::getObjectManager();
$quote = $this->objectManager->create(Quote::class)->load(1);
- $sessionQuoteMock = $this->getMockBuilder(
- SessionQuote::class
- )->disableOriginalConstructor()->setMethods(
- ['getCustomerId', 'getStore', 'getStoreId', 'getQuote']
- )->getMock();
- $sessionQuoteMock->expects($this->any())->method('getCustomerId')->will($this->returnValue(1));
- $sessionQuoteMock->expects($this->any())->method('getQuote')->will($this->returnValue($quote));
+
+ $this->session = $this->getMockBuilder(SessionQuote::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getCustomerId', 'getStore', 'getStoreId', 'getQuote', 'getQuoteId'])
+ ->getMock();
+ $this->session->method('getCustomerId')
+ ->willReturn(1);
+ $this->session->method('getQuote')
+ ->willReturn($quote);
+ $this->session->method('getQuoteId')
+ ->willReturn($quote->getId());
/** @var LayoutInterface $layout */
$layout = $this->objectManager->get(LayoutInterface::class);
$this->accountBlock = $layout->createBlock(
Account::class,
'address_block' . rand(),
- ['sessionQuote' => $sessionQuoteMock]
+ ['sessionQuote' => $this->session]
);
parent::setUp();
}
@@ -62,13 +77,13 @@ public function testGetForm()
{
$expectedFields = ['group_id', 'email'];
$form = $this->accountBlock->getForm();
- $this->assertEquals(1, $form->getElements()->count(), "Form has invalid number of fieldsets");
+ self::assertEquals(1, $form->getElements()->count(), "Form has invalid number of fieldsets");
$fieldset = $form->getElements()[0];
- $this->assertEquals(count($expectedFields), $fieldset->getElements()->count());
+ self::assertEquals(count($expectedFields), $fieldset->getElements()->count());
foreach ($fieldset->getElements() as $element) {
- $this->assertTrue(
+ self::assertTrue(
in_array($element->getId(), $expectedFields),
sprintf('Unexpected field "%s" in form.', $element->getId())
);
@@ -79,6 +94,7 @@ public function testGetForm()
* Tests a case when user defined custom attribute has default value.
*
* @magentoDataFixture Magento/Customer/_files/customer.php
+ * @magentoConfigFixture current_store customer/create_account/default_group 3
*/
public function testGetFormWithUserDefinedAttribute()
{
@@ -91,18 +107,27 @@ public function testGetFormWithUserDefinedAttribute()
$form = $accountBlock->getForm();
$form->setUseContainer(true);
+ $content = $form->toHtml();
- $this->assertContains(
+ self::assertContains(
'',
- $form->toHtml(),
- 'Default value for user defined custom attribute should be selected'
+ $content,
+ 'Default value for user defined custom attribute should be selected.'
+ );
+
+ self::assertContains(
+ '',
+ $content,
+ 'The Customer Group specified for the chosen store should be selected.'
);
}
/**
- * @return \PHPUnit_Framework_MockObject_MockObject
+ * Creates a mock for Form object.
+ *
+ * @return MockObject
*/
- private function getFormFactoryMock(): \PHPUnit_Framework_MockObject_MockObject
+ private function getFormFactoryMock()
{
/** @var AttributeMetadataInterfaceFactory $attributeMetadataFactory */
$attributeMetadataFactory = $this->objectManager->create(AttributeMetadataInterfaceFactory::class);
@@ -113,11 +138,12 @@ private function getFormFactoryMock(): \PHPUnit_Framework_MockObject_MockObject
->setDefaultValue('1')
->setFrontendLabel('Yes/No');
+ /** @var Form|MockObject $form */
$form = $this->getMockBuilder(Form::class)
->disableOriginalConstructor()
->getMock();
$form->method('getUserAttributes')->willReturn([$booleanAttribute]);
- $form->method('getSystemAttributes')->willReturn([]);
+ $form->method('getSystemAttributes')->willReturn([$this->createCustomerGroupAttribute()]);
$formFactory = $this->getMockBuilder(FormFactory::class)
->disableOriginalConstructor()
@@ -126,4 +152,33 @@ private function getFormFactoryMock(): \PHPUnit_Framework_MockObject_MockObject
return $formFactory;
}
+
+ /**
+ * Creates a customer group attribute object.
+ *
+ * @return AttributeMetadataInterface
+ */
+ private function createCustomerGroupAttribute(): AttributeMetadataInterface
+ {
+ /** @var Option $option1 */
+ $option1 = $this->objectManager->create(Option::class);
+ $option1->setValue(3);
+ $option1->setLabel('Customer Group 1');
+
+ /** @var Option $option2 */
+ $option2 = $this->objectManager->create(Option::class);
+ $option2->setValue(4);
+ $option2->setLabel('Customer Group 2');
+
+ /** @var AttributeMetadataInterfaceFactory $attributeMetadataFactory */
+ $attributeMetadataFactory = $this->objectManager->create(AttributeMetadataInterfaceFactory::class);
+ $attribute = $attributeMetadataFactory->create()
+ ->setAttributeCode('group_id')
+ ->setBackendType('static')
+ ->setFrontendInput('select')
+ ->setOptions([$option1, $option2])
+ ->setIsRequired(true);
+
+ return $attribute;
+ }
}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php
index b9573c99b4493..da0f2be856c51 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php
@@ -8,21 +8,61 @@
use Magento\Backend\Model\Session\Quote;
use Magento\Customer\Api\CustomerRepositoryInterface;
use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Data\Form\FormKey;
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Message\MessageInterface;
use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\OrderRepository;
use Magento\Sales\Model\Service\OrderService;
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
use Magento\TestFramework\TestCase\AbstractBackendController;
+use PHPUnit\Framework\Constraint\StringContains;
use PHPUnit_Framework_MockObject_MockObject as MockObject;
+/**
+ * Class test backend order save.
+ *
+ * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class SaveTest extends AbstractBackendController
{
+ /**
+ * @var TransportBuilderMock
+ */
+ private $transportBuilder;
+
+ /**
+ * @var FormKey
+ */
+ private $formKey;
+
+ /**
+ * @var string
+ */
+ protected $resource = 'Magento_Sales::create';
+
+ /**
+ * @var string
+ */
+ protected $uri = 'backend/sales/order_create/save';
+
+ /**
+ * @inheritdoc
+ */
+ protected function setUp()
+ {
+ parent::setUp();
+ $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
+ $this->formKey = $this->_objectManager->get(FormKey::class);
+ }
+
/**
* Checks a case when order creation is failed on payment method processing but new customer already created
* in the database and after new controller dispatching the customer should be already loaded in session
* to prevent invalid validation.
*
- * @magentoAppArea adminhtml
* @magentoDataFixture Magento/Sales/_files/quote_with_new_customer.php
*/
public function testExecuteWithPaymentOperation()
@@ -35,7 +75,7 @@ public function testExecuteWithPaymentOperation()
$email = 'john.doe001@test.com';
$data = [
'account' => [
- 'email' => $email
+ 'email' => $email,
]
];
$this->getRequest()->setPostValue(['order' => $data]);
@@ -64,6 +104,45 @@ public function testExecuteWithPaymentOperation()
$this->_objectManager->removeSharedInstance(OrderService::class);
}
+ /**
+ * @magentoDbIsolation enabled
+ * @magentoDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+ *
+ * @return void
+ */
+ public function testSendEmailOnOrderSave()
+ {
+ $this->prepareRequest(['send_confirmation' => true]);
+ $this->dispatch('backend/sales/order_create/save');
+ $this->assertSessionMessages(
+ $this->equalTo([(string)__('You created the order.')]),
+ MessageInterface::TYPE_SUCCESS
+ );
+
+ $this->assertRedirect($this->stringContains('sales/order/view/'));
+
+ $orderId = $this->getOrderId();
+ if ($orderId === false) {
+ $this->fail('Order is not created.');
+ }
+ $order = $this->getOrder($orderId);
+
+ $message = $this->transportBuilder->getSentMessage();
+ $subject = __('Your %1 order confirmation', $order->getStore()->getFrontendName())->render();
+ $assert = $this->logicalAnd(
+ new StringContains($order->getBillingAddress()->getName()),
+ new StringContains(
+ 'Thank you for your order from ' . $order->getStore()->getFrontendName()
+ ),
+ new StringContains(
+ "Your Order #{$order->getIncrementId()}"
+ )
+ );
+
+ $this->assertEquals($message->getSubject(), $subject);
+ $this->assertThat($message->getRawMessage(), $assert);
+ }
+
/**
* Gets quote by reserved order id.
*
@@ -82,4 +161,78 @@ private function getQuote($reservedOrderId)
$items = $quoteRepository->getList($searchCriteria)->getItems();
return array_pop($items);
}
+
+ /**
+ * @inheritdoc
+ * @magentoDbIsolation enabled
+ * @magentoDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+ */
+ public function testAclHasAccess()
+ {
+ $this->prepareRequest();
+
+ parent::testAclHasAccess();
+ }
+
+ /**
+ * @inheritdoc
+ * @magentoDbIsolation enabled
+ * @magentoDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+ */
+ public function testAclNoAccess()
+ {
+ $this->prepareRequest();
+
+ parent::testAclNoAccess();
+ }
+
+ /**
+ * @param int $orderId
+ * @return OrderInterface
+ */
+ private function getOrder(int $orderId): OrderInterface
+ {
+ return $this->_objectManager->get(OrderRepository::class)->get($orderId);
+ }
+
+ /**
+ * @param array $params
+ * @return void
+ */
+ private function prepareRequest(array $params = [])
+ {
+ $quote = $this->getQuote('guest_quote');
+ $session = $this->_objectManager->get(Quote::class);
+ $session->setQuoteId($quote->getId());
+ $session->setCustomerId(0);
+
+ $email = 'john.doe001@test.com';
+ $data = [
+ 'account' => [
+ 'email' => $email,
+ ],
+ ];
+
+ $data = array_replace_recursive($data, $params);
+
+ $this->getRequest()
+ ->setMethod('POST')
+ ->setParams(['form_key' => $this->formKey->getFormKey()])
+ ->setPostValue(['order' => $data]);
+ }
+
+ /**
+ * @return string|bool
+ */
+ protected function getOrderId()
+ {
+ $currentUrl = $this->getResponse()->getHeader('Location');
+ $orderId = false;
+
+ if (preg_match('/order_id\/(?\d+)/', $currentUrl, $matches)) {
+ $orderId = $matches['order_id'] ?? '';
+ }
+
+ return $orderId;
+ }
}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AbstractCreditmemoControllerTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AbstractCreditmemoControllerTest.php
new file mode 100644
index 0000000000000..2a7731715021b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AbstractCreditmemoControllerTest.php
@@ -0,0 +1,92 @@
+transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
+ $this->orderRepository = $this->_objectManager->get(OrderRepository::class);
+ $this->formKey = $this->_objectManager->get(FormKey::class);
+ }
+
+ /**
+ * @param string $incrementalId
+ * @return OrderInterface|null
+ */
+ protected function getOrder(string $incrementalId)
+ {
+ /** @var SearchCriteria $searchCriteria */
+ $searchCriteria = $this->_objectManager->create(SearchCriteriaBuilder::class)
+ ->addFilter(OrderInterface::INCREMENT_ID, $incrementalId)
+ ->create();
+
+ $orders = $this->orderRepository->getList($searchCriteria)->getItems();
+ /** @var OrderInterface|null $order */
+ $order = reset($orders);
+
+ return $order;
+ }
+
+ /**
+ * @param OrderInterface $order
+ * @return CreditmemoInterface
+ */
+ protected function getCreditMemo(OrderInterface $order): CreditmemoInterface
+ {
+ /** @var \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Collection $creditMemoCollection */
+ $creditMemoCollection = $this->_objectManager->create(
+ \Magento\Sales\Model\ResourceModel\Order\Creditmemo\CollectionFactory::class
+ )->create();
+
+ /** @var CreditmemoInterface $creditMemo */
+ $creditMemo = $creditMemoCollection
+ ->setOrderFilter($order)
+ ->setPageSize(1)
+ ->getFirstItem();
+
+ return $creditMemo;
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php
new file mode 100644
index 0000000000000..ac11f777daf9c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php
@@ -0,0 +1,102 @@
+prepareRequest(
+ [
+ 'comment' => ['comment' => $comment, 'is_customer_notified' => true],
+ ]
+ );
+ $this->dispatch('backend/sales/order_creditmemo/addComment');
+ $html = $this->getResponse()->getBody();
+ $this->assertContains($comment, $html);
+
+ $message = $this->transportBuilder->getSentMessage();
+ $subject =__('Update to your %1 credit memo', $order->getStore()->getFrontendName())->render();
+ $messageConstraint = $this->logicalAnd(
+ new StringContains($order->getBillingAddress()->getName()),
+ new RegularExpression(
+ sprintf(
+ "/Your order #%s has been updated with a status of.*%s/",
+ $order->getIncrementId(),
+ $order->getFrontendStatusLabel()
+ )
+ ),
+ new StringContains($comment)
+ );
+
+ $this->assertEquals($message->getSubject(), $subject);
+ $this->assertThat($message->getRawMessage(), $messageConstraint);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function testAclHasAccess()
+ {
+ $this->prepareRequest(['comment' => ['comment' => 'Comment']]);
+
+ parent::testAclHasAccess();
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function testAclNoAccess()
+ {
+ $this->prepareRequest(['comment' => ['comment' => 'Comment']]);
+
+ parent::testAclNoAccess();
+ }
+
+ /**
+ * @param array $params
+ * @return \Magento\Sales\Api\Data\OrderInterface|null
+ */
+ private function prepareRequest(array $params = [])
+ {
+ $order = $this->getOrder('100000001');
+ $creditmemo = $this->getCreditMemo($order);
+
+ $this->getRequest()->setMethod('POST');
+ $this->getRequest()->setParams(
+ [
+ 'id' => $creditmemo->getEntityId(),
+ 'form_key' => $this->formKey->getFormKey(),
+ ]
+ );
+
+ $data = $params ?? [];
+ $this->getRequest()->setPostValue($data);
+
+ return $order;
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
new file mode 100644
index 0000000000000..4df7710bb4388
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
@@ -0,0 +1,99 @@
+prepareRequest(['creditmemo' => ['send_email' => true]]);
+ $this->dispatch('backend/sales/order_creditmemo/save');
+
+ $this->assertSessionMessages(
+ $this->equalTo([(string)__('You created the credit memo.')]),
+ \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+ );
+ $this->assertRedirect($this->stringContains('sales/order/view/order_id/' . $order->getEntityId()));
+
+ $creditMemo = $this->getCreditMemo($order);
+ $message = $this->transportBuilder->getSentMessage();
+ $subject = __('Credit memo for your %1 order', $order->getStore()->getFrontendName())->render();
+ $messageConstraint = $this->logicalAnd(
+ new StringContains($order->getBillingAddress()->getName()),
+ new StringContains(
+ 'Thank you for your order from ' . $creditMemo->getStore()->getFrontendName()
+ ),
+ new StringContains(
+ "Your Credit Memo #{$creditMemo->getIncrementId()} for Order #{$order->getIncrementId()}"
+ )
+ );
+
+ $this->assertEquals($message->getSubject(), $subject);
+ $this->assertThat($message->getRawMessage(), $messageConstraint);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function testAclHasAccess()
+ {
+ $this->prepareRequest();
+
+ parent::testAclHasAccess();
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function testAclNoAccess()
+ {
+ $this->prepareRequest();
+
+ parent::testAclNoAccess();
+ }
+
+ /**
+ * @param array $params
+ * @return \Magento\Sales\Api\Data\OrderInterface|null
+ */
+ private function prepareRequest(array $params = [])
+ {
+ $order = $this->getOrder('100000001');
+ $this->getRequest()->setMethod('POST');
+ $this->getRequest()->setParams(
+ [
+ 'order_id' => $order->getEntityId(),
+ 'form_key' => $this->formKey->getFormKey(),
+ ]
+ );
+
+ $data = ['creditmemo' => ['do_offline' => true]];
+ $data = array_replace_recursive($data, $params);
+
+ $this->getRequest()->setPostValue($data);
+
+ return $order;
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php
new file mode 100644
index 0000000000000..337ad206ade91
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php
@@ -0,0 +1,136 @@
+orderRepository = $this->_objectManager->get(OrderRepository::class);
+ $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
+ }
+
+ /**
+ * @return void
+ */
+ public function testSendOrderEmail()
+ {
+ $order = $this->prepareRequest();
+ $this->dispatch('backend/sales/order/email');
+
+ $this->assertSessionMessages(
+ $this->equalTo([(string)__('You sent the order email.')]),
+ \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+ );
+
+ $redirectUrl = 'sales/order/view/order_id/' . $order->getEntityId();
+ $this->assertRedirect($this->stringContains($redirectUrl));
+
+ $message = $this->transportBuilder->getSentMessage();
+ $subject = __('Your %1 order confirmation', $order->getStore()->getFrontendName())->render();
+ $assert = $this->logicalAnd(
+ new StringContains($order->getBillingAddress()->getName()),
+ new StringContains(
+ 'Thank you for your order from ' . $order->getStore()->getFrontendName()
+ ),
+ new StringContains(
+ "Your Order #{$order->getIncrementId()}"
+ )
+ );
+
+ $this->assertEquals($message->getSubject(), $subject);
+ $this->assertThat($message->getRawMessage(), $assert);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function testAclHasAccess()
+ {
+ $this->prepareRequest();
+
+ parent::testAclHasAccess();
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function testAclNoAccess()
+ {
+ $this->prepareRequest();
+
+ parent::testAclNoAccess();
+ }
+
+ /**
+ * @param string $incrementalId
+ * @return OrderInterface|null
+ */
+ private function getOrder(string $incrementalId)
+ {
+ /** @var SearchCriteria $searchCriteria */
+ $searchCriteria = $this->_objectManager->create(SearchCriteriaBuilder::class)
+ ->addFilter(OrderInterface::INCREMENT_ID, $incrementalId)
+ ->create();
+
+ $orders = $this->orderRepository->getList($searchCriteria)->getItems();
+ /** @var OrderInterface|null $order */
+ $order = reset($orders);
+
+ return $order;
+ }
+
+ /**
+ * @return OrderInterface|null
+ */
+ private function prepareRequest()
+ {
+ $order = $this->getOrder('100000001');
+ $this->getRequest()->setParams(['order_id' => $order->getEntityId()]);
+
+ return $order;
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AbstractInvoiceControllerTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AbstractInvoiceControllerTest.php
new file mode 100644
index 0000000000000..3ba54418b6c26
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AbstractInvoiceControllerTest.php
@@ -0,0 +1,92 @@
+transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
+ $this->orderRepository = $this->_objectManager->get(OrderRepository::class);
+ $this->formKey = $this->_objectManager->get(FormKey::class);
+ }
+
+ /**
+ * @param string $incrementalId
+ * @return OrderInterface|null
+ */
+ protected function getOrder(string $incrementalId)
+ {
+ /** @var SearchCriteria $searchCriteria */
+ $searchCriteria = $this->_objectManager->create(SearchCriteriaBuilder::class)
+ ->addFilter(OrderInterface::INCREMENT_ID, $incrementalId)
+ ->create();
+
+ $orders = $this->orderRepository->getList($searchCriteria)->getItems();
+ /** @var OrderInterface $order */
+ $order = reset($orders);
+
+ return $order;
+ }
+
+ /**
+ * @param OrderInterface $order
+ * @return InvoiceInterface
+ */
+ protected function getInvoiceByOrder(OrderInterface $order): InvoiceInterface
+ {
+ /** @var \Magento\Sales\Model\ResourceModel\Order\Invoice\Collection $invoiceCollection */
+ $invoiceCollection = $this->_objectManager->create(
+ \Magento\Sales\Model\ResourceModel\Order\Invoice\CollectionFactory::class
+ )->create();
+
+ /** @var InvoiceInterface $invoice */
+ $invoice = $invoiceCollection
+ ->setOrderFilter($order)
+ ->setPageSize(1)
+ ->getFirstItem();
+
+ return $invoice;
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php
new file mode 100644
index 0000000000000..8643dfc66f1b9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php
@@ -0,0 +1,103 @@
+prepareRequest(
+ [
+ 'comment' => ['comment' => $comment, 'is_customer_notified' => true],
+ ]
+ );
+ $this->dispatch('backend/sales/order_invoice/addComment');
+
+ $html = $this->getResponse()->getBody();
+ $this->assertContains($comment, $html);
+
+ $message = $this->transportBuilder->getSentMessage();
+ $subject = __('Update to your %1 invoice', $order->getStore()->getFrontendName())->render();
+ $messageConstraint = $this->logicalAnd(
+ new StringContains($order->getBillingAddress()->getName()),
+ new RegularExpression(
+ sprintf(
+ "/Your order #%s has been updated with a status of.*%s/",
+ $order->getIncrementId(),
+ $order->getFrontendStatusLabel()
+ )
+ ),
+ new StringContains($comment)
+ );
+
+ $this->assertEquals($message->getSubject(), $subject);
+ $this->assertThat($message->getRawMessage(), $messageConstraint);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function testAclHasAccess()
+ {
+ $this->prepareRequest(['comment' => ['comment' => 'Comment']]);
+
+ parent::testAclHasAccess();
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function testAclNoAccess()
+ {
+ $this->prepareRequest(['comment' => ['comment' => 'Comment']]);
+
+ parent::testAclNoAccess();
+ }
+
+ /**
+ * @param array $params
+ * @return \Magento\Sales\Api\Data\OrderInterface|null
+ */
+ private function prepareRequest(array $params = [])
+ {
+ $order = $this->getOrder('100000001');
+ $invoice = $this->getInvoiceByOrder($order);
+
+ $this->getRequest()->setMethod('POST');
+ $this->getRequest()->setParams(
+ [
+ 'id' => $invoice->getEntityId(),
+ 'form_key' => $this->formKey->getFormKey(),
+ ]
+ );
+
+ $data = $params ?? [];
+ $this->getRequest()->setPostValue($data);
+
+ return $order;
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/EmailTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/EmailTest.php
new file mode 100644
index 0000000000000..39b7fc8ef0267
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/EmailTest.php
@@ -0,0 +1,88 @@
+getOrder('100000001');
+ $invoice = $this->getInvoiceByOrder($order);
+
+ $this->getRequest()->setParams(['invoice_id' => $invoice->getEntityId()]);
+ $this->dispatch('backend/sales/order_invoice/email');
+
+ $this->assertSessionMessages(
+ $this->equalTo([(string)__('You sent the message.')]),
+ \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+ );
+
+ $redirectUrl = sprintf(
+ 'sales/invoice/view/order_id/%s/invoice_id/%s',
+ $order->getEntityId(),
+ $invoice->getEntityId()
+ );
+ $this->assertRedirect($this->stringContains($redirectUrl));
+
+ $message = $this->transportBuilder->getSentMessage();
+ $subject = __('Invoice for your %1 order', $order->getStore()->getFrontendName())->render();
+ $messageConstraint = $this->logicalAnd(
+ new StringContains($invoice->getBillingAddress()->getName()),
+ new StringContains(
+ 'Thank you for your order from ' . $invoice->getStore()->getFrontendName()
+ ),
+ new StringContains(
+ "Your Invoice #{$invoice->getIncrementId()} for Order #{$order->getIncrementId()}"
+ )
+ );
+
+ $this->assertEquals($message->getSubject(), $subject);
+ $this->assertThat($message->getRawMessage(), $messageConstraint);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function testAclHasAccess()
+ {
+ $order = $this->getOrder('100000001');
+ $invoice = $this->getInvoiceByOrder($order);
+ $this->uri .= '/invoice_id/' . $invoice->getEntityId();
+
+ parent::testAclHasAccess();
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function testAclNoAccess()
+ {
+ $order = $this->getOrder('100000001');
+ $invoice = $this->getInvoiceByOrder($order);
+ $this->uri .= '/invoice_id/' . $invoice->getEntityId();
+
+ parent::testAclNoAccess();
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php
new file mode 100644
index 0000000000000..d451bdcb287cf
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php
@@ -0,0 +1,97 @@
+prepareRequest(['invoice' => ['send_email' => true]]);
+ $this->dispatch('backend/sales/order_invoice/save');
+
+ $this->assertSessionMessages(
+ $this->equalTo([(string)__('The invoice has been created.')]),
+ \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+ );
+ $this->assertRedirect($this->stringContains('sales/order/view/order_id/' . $order->getEntityId()));
+
+ $invoice = $this->getInvoiceByOrder($order);
+ $message = $this->transportBuilder->getSentMessage();
+ $subject = __('Invoice for your %1 order', $order->getStore()->getFrontendName())->render();
+ $messageConstraint = $this->logicalAnd(
+ new StringContains($invoice->getBillingAddress()->getName()),
+ new StringContains(
+ 'Thank you for your order from ' . $invoice->getStore()->getFrontendName()
+ ),
+ new StringContains(
+ "Your Invoice #{$invoice->getIncrementId()} for Order #{$order->getIncrementId()}"
+ )
+ );
+
+ $this->assertEquals($message->getSubject(), $subject);
+ $this->assertThat($message->getRawMessage(), $messageConstraint);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function testAclHasAccess()
+ {
+ $this->prepareRequest();
+
+ parent::testAclHasAccess();
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function testAclNoAccess()
+ {
+ $this->prepareRequest();
+
+ parent::testAclNoAccess();
+ }
+
+ /**
+ * @param array $params
+ * @return \Magento\Sales\Api\Data\OrderInterface|null
+ */
+ private function prepareRequest(array $params = [])
+ {
+ $order = $this->getOrder('100000001');
+ $this->getRequest()->setMethod('POST');
+ $this->getRequest()->setParams(
+ [
+ 'order_id' => $order->getEntityId(),
+ 'form_key' => $this->formKey->getFormKey(),
+ ]
+ );
+
+ $data = $params ?? [];
+ $this->getRequest()->setPostValue($data);
+
+ return $order;
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/CustomerData/LastOrderedItemsTest.php b/dev/tests/integration/testsuite/Magento/Sales/CustomerData/LastOrderedItemsTest.php
new file mode 100644
index 0000000000000..adeff2c89a241
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/CustomerData/LastOrderedItemsTest.php
@@ -0,0 +1,55 @@
+objectManager = Bootstrap::getObjectManager();
+ }
+
+ /**
+ * Test to check count in items collection.
+ *
+ * @magentoDataFixture Magento/Sales/_files/order_with_customer_and_multiple_order_items.php
+ */
+ public function testDefaultFormatterIsAppliedWhenBasicIntegration()
+ {
+ /** @var Session $customerSession */
+ $customerSession = $this->objectManager->get(Session::class);
+ $customerSession->loginById(1);
+
+ /** @var LastOrderedItems $customerDataSectionSource */
+ $customerDataSectionSource = $this->objectManager->get(LastOrderedItems::class);
+ $data = $customerDataSectionSource->getSectionData();
+
+ $this->assertEquals(
+ LastOrderedItems::SIDEBAR_ORDER_LIMIT,
+ count($data['items']),
+ 'Section items count should not be greater then ' . LastOrderedItems::SIDEBAR_ORDER_LIMIT
+ );
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/CreateTest.php
new file mode 100644
index 0000000000000..4ff4ad384d3e4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/CreateTest.php
@@ -0,0 +1,100 @@
+objectManager = Bootstrap::getObjectManager();
+ $this->transportBuilder = $this->objectManager->get(TransportBuilderMock::class);
+ $this->quoteIdMaskFactory = $this->objectManager->get(QuoteIdMaskFactory::class);
+ $this->formKey = $this->objectManager->get(FormKey::class);
+ }
+
+ /**
+ * @magentoDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+ * @return void
+ */
+ public function testSendEmailOnOrderPlace()
+ {
+ /** @var Quote $quote */
+ $quote = $this->objectManager->create(Quote::class);
+ $quote->load('guest_quote', 'reserved_order_id');
+
+ $checkoutSession = $this->objectManager->get(CheckoutSession::class);
+ $checkoutSession->setQuoteId($quote->getId());
+
+ /** @var QuoteIdMask $quoteIdMask */
+ $quoteIdMask = $this->quoteIdMaskFactory->create();
+ $quoteIdMask->load($quote->getId(), 'quote_id');
+ $cartId = $quoteIdMask->getMaskedId();
+
+ /** @var GuestCartManagementInterface $cartManagement */
+ $cartManagement = $this->objectManager->get(GuestCartManagementInterface::class);
+ $orderId = $cartManagement->placeOrder($cartId);
+ $order = $this->objectManager->get(OrderRepository::class)->get($orderId);
+
+ $message = $this->transportBuilder->getSentMessage();
+ $subject = __('Your %1 order confirmation', $order->getStore()->getFrontendName())->render();
+ $assert = $this->logicalAnd(
+ new StringContains($order->getBillingAddress()->getName()),
+ new StringContains(
+ 'Thank you for your order from ' . $order->getStore()->getFrontendName()
+ ),
+ new StringContains(
+ "Your Order #{$order->getIncrementId()}"
+ )
+ );
+
+ $this->assertEquals($message->getSubject(), $subject);
+ $this->assertThat($message->getRawMessage(), $assert);
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses.php b/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses.php
new file mode 100644
index 0000000000000..601c500c18429
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses.php
@@ -0,0 +1,68 @@
+loadArea('frontend');
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Catalog\Model\Product $product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId('simple')
+ ->setAttributeSetId($product->getDefaultAttributeSetId())
+ ->setName('Simple Product')
+ ->setSku('simple-product-guest-quote')
+ ->setPrice(10)
+ ->setTaxClassId(0)
+ ->setMetaTitle('meta title')
+ ->setMetaKeyword('meta keyword')
+ ->setMetaDescription('meta description')
+ ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+ ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+ ->setStockData(
+ [
+ 'qty' => 100,
+ 'is_in_stock' => 1,
+ ]
+ )->save();
+
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$product = $productRepository->get('simple-product-guest-quote');
+
+$addressData = reset($addresses);
+
+$billingAddress = $objectManager->create(
+ \Magento\Quote\Model\Quote\Address::class,
+ ['data' => $addressData]
+);
+$billingAddress->setAddressType('billing');
+
+$shippingAddress = clone $billingAddress;
+$shippingAddress->setId(null)->setAddressType('shipping');
+
+$store = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->getStore();
+
+/** @var \Magento\Quote\Model\Quote $quote */
+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+$quote->setCustomerIsGuest(true)
+ ->setStoreId($store->getId())
+ ->setReservedOrderId('guest_quote')
+ ->setBillingAddress($billingAddress)
+ ->setShippingAddress($shippingAddress)
+ ->addProduct($product);
+$quote->getPayment()->setMethod('checkmo');
+$quote->getShippingAddress()->setShippingMethod('flatrate_flatrate')->setCollectShippingRates(1);
+$quote->collectTotals();
+
+$quoteRepository = $objectManager->create(\Magento\Quote\Api\CartRepositoryInterface::class);
+$quoteRepository->save($quote);
+
+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+$quoteIdMask = $objectManager->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)->create();
+$quoteIdMask->setQuoteId($quote->getId());
+$quoteIdMask->setDataChanges(true);
+$quoteIdMask->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses_rollback.php
new file mode 100644
index 0000000000000..02c42153b72c3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses_rollback.php
@@ -0,0 +1,32 @@
+get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $quote \Magento\Quote\Model\Quote */
+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+$quote->load('guest_quote', 'reserved_order_id');
+if ($quote->getId()) {
+ $quote->delete();
+}
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+try {
+ $product = $productRepository->get('simple-product-guest-quote', false, null, true);
+ $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+ //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
index 9f9f2f740c84e..65b143d9d68f7 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
@@ -43,7 +43,8 @@
->setBasePrice($product->getPrice())
->setPrice($product->getPrice())
->setRowTotal($product->getPrice())
- ->setProductType('simple');
+ ->setProductType('simple')
+ ->setName($product->getName());
/** @var Order $order */
$order = $objectManager->create(Order::class);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
index 890c475b0c316..221f5b559c9f2 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
@@ -5,6 +5,9 @@
*/
use Magento\Sales\Model\Order;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order\Address as OrderAddress;
+use Magento\Sales\Model\Order\Payment;
require 'order.php';
/** @var Order $order */
@@ -49,17 +52,42 @@
];
$orderList = [];
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
/** @var array $orderData */
foreach ($orders as $orderData) {
- /** @var $order \Magento\Sales\Model\Order */
- $order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- \Magento\Sales\Model\Order::class
- );
+ /** @var Order $order */
+ $order = $objectManager->create(Order::class);
+
+ // Reset addresses
+ /** @var Order\Address $billingAddress */
+ $billingAddress = $objectManager->create(OrderAddress::class, ['data' => $addressData]);
+ $billingAddress->setAddressType('billing');
+
+ $shippingAddress = clone $billingAddress;
+ $shippingAddress->setId(null)->setAddressType('shipping');
+
+ /** @var Payment $payment */
+ $payment = $objectManager->create(Payment::class);
+ $payment->setMethod('checkmo')
+ ->setAdditionalInformation('last_trans_id', '11122')
+ ->setAdditionalInformation(
+ 'metadata',
+ [
+ 'type' => 'free',
+ 'fraudulent' => false,
+ ]
+ );
+
$order
->setData($orderData)
->addItem($orderItem)
+ ->setCustomerIsGuest(true)
+ ->setCustomerEmail('customer@null.com')
->setBillingAddress($billingAddress)
- ->setBillingAddress($shippingAddress)
- ->save();
+ ->setShippingAddress($shippingAddress)
+ ->setPayment($payment);
+
+ $orderRepository->save($order);
$orderList[] = $order;
}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_and_multiple_order_items.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_and_multiple_order_items.php
new file mode 100644
index 0000000000000..586863dd07696
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_and_multiple_order_items.php
@@ -0,0 +1,12 @@
+setCustomerId($customerIdFromFixture)->setCustomerIsGuest(false)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount.php
new file mode 100644
index 0000000000000..29a7aa4d90334
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount.php
@@ -0,0 +1,73 @@
+create(OrderAddress::class, ['data' => $addressData]);
+$billingAddress->setAddressType('billing');
+
+$shippingAddress = clone $billingAddress;
+$shippingAddress->setId(null)->setAddressType('shipping');
+
+/** @var Payment $payment */
+$payment = $objectManager->create(Payment::class);
+$payment->setMethod('checkmo')
+ ->setAdditionalInformation('last_trans_id', '11122')
+ ->setAdditionalInformation(
+ 'metadata',
+ [
+ 'type' => 'free',
+ 'fraudulent' => false,
+ ]
+ );
+
+/** @var OrderItem $orderItem */
+$orderItem = $objectManager->create(OrderItem::class);
+$orderItem->setProductId($product->getId())
+ ->setQtyOrdered(2)
+ ->setBasePrice($product->getPrice())
+ ->setPrice($product->getPrice())
+ ->setRowTotal($product->getPrice())
+ ->setProductType('simple')
+ ->setDiscountAmount(2)
+ ->setBaseRowTotal($product->getPrice())
+ ->setBaseDiscountAmount(2)
+ ->setTaxAmount(1)
+ ->setBaseTaxAmount(1);
+
+/** @var Order $order */
+$order = $objectManager->create(Order::class);
+$order->setIncrementId('100000001')
+ ->setState(Order::STATE_PROCESSING)
+ ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_PROCESSING))
+ ->setSubtotal(100)
+ ->setGrandTotal(100)
+ ->setBaseSubtotal(100)
+ ->setBaseGrandTotal(100)
+ ->setCustomerIsGuest(true)
+ ->setCustomerEmail('customer@null.com')
+ ->setBillingAddress($billingAddress)
+ ->setShippingAddress($shippingAddress)
+ ->setStoreId($objectManager->get(StoreManagerInterface::class)->getStore()->getId())
+ ->addItem($orderItem)
+ ->setPayment($payment);
+
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
+$orderRepository->save($order);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount_rollback.php
new file mode 100644
index 0000000000000..1fb4b4636ab29
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount_rollback.php
@@ -0,0 +1,8 @@
+ $product->getId(),
+ 'base_price' => 123,
+ 'order_id' => $order->getId(),
+ 'price' => 123,
+ 'row_total' => 126,
+ 'product_type' => 'simple'
+];
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_duplicated.php';
+$orderItems[] = [
+ 'product_id' => $product->getId(),
+ 'base_price' => 123,
+ 'order_id' => $order->getId(),
+ 'price' => 123,
+ 'row_total' => 126,
+ 'product_type' => 'simple'
+];
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_decimal_qty.php';
+$orderItems[] = [
+ 'product_id' => $product->getId(),
+ 'base_price' => 123,
+ 'order_id' => $order->getId(),
+ 'price' => 123,
+ 'row_total' => 126,
+ 'product_type' => 'simple'
+];
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_url_key.php';
+$orderItems[] = [
+ 'product_id' => $product->getId(),
+ 'base_price' => 123,
+ 'order_id' => $order->getId(),
+ 'price' => 123,
+ 'row_total' => 126,
+ 'product_type' => 'simple'
+];
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_sku_with_slash.php';
+$orderItems[] = [
+ 'product_id' => $product->getId(),
+ 'base_price' => 123,
+ 'order_id' => $order->getId(),
+ 'price' => 123,
+ 'row_total' => 126,
+ 'product_type' => 'simple'
+];
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_xss.php';
+$orderItems[] = [
+ 'product_id' => $product->getId(),
+ 'base_price' => 123,
+ 'order_id' => $order->getId(),
+ 'price' => 123,
+ 'row_total' => 126,
+ 'product_type' => 'simple'
+];
+
+/** @var array $orderItemData */
+foreach ($orderItems as $orderItemData) {
+ /** @var $orderItem \Magento\Sales\Model\Order\Item */
+ $orderItem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ \Magento\Sales\Model\Order\Item::class
+ );
+ $orderItem
+ ->setData($orderItemData)
+ ->save();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php
index a889235ea1862..61d8be98bdd22 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php
@@ -3,6 +3,9 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
+use Magento\Sales\Model\Order\ShipmentFactory;
+
require 'order.php';
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -36,4 +39,11 @@
$order->setIsInProcess(true);
-$transaction->addObject($invoice)->addObject($order)->save();
+$items = [];
+foreach ($order->getItems() as $orderItem) {
+ $items[$orderItem->getId()] = $orderItem->getQtyOrdered();
+}
+$shipment = $objectManager->get(ShipmentFactory::class)->create($order, $items);
+$shipment->register();
+
+$transaction->addObject($invoice)->addObject($shipment)->addObject($order)->save();
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Observer/AssignCouponDataAfterOrderCustomerAssignTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Observer/AssignCouponDataAfterOrderCustomerAssignTest.php
new file mode 100644
index 0000000000000..397650df416e9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Observer/AssignCouponDataAfterOrderCustomerAssignTest.php
@@ -0,0 +1,291 @@
+objectManager = Bootstrap::getObjectManager();
+ $this->eventManager = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
+ $this->orderRepository = $this->objectManager->get(\Magento\Sales\Model\OrderRepository::class);
+ $this->delegateCustomerService = $this->objectManager->get(Order\OrderCustomerDelegate::class);
+ $this->customerRepository = $this->objectManager->get(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+ $this->ruleCustomerFactory = $this->objectManager->get(\Magento\SalesRule\Model\Rule\CustomerFactory::class);
+ $this->assignCouponToCustomerObserver = $this->objectManager->get(
+ \Magento\SalesRule\Observer\AssignCouponDataAfterOrderCustomerAssignObserver::class
+ );
+
+ $this->salesRule = $this->prepareSalesRule();
+ $this->coupon = $this->attachSalesruleCoupon($this->salesRule);
+ $this->order = $this->makeOrderWithCouponAsGuest($this->coupon);
+ $this->delegateOrderToBeAssigned($this->order);
+ $this->customer = $this->registerNewCustomer();
+ $this->order->setCustomerId($this->customer->getId());
+ }
+
+ /**
+ * @inheritdoc
+ */
+ protected function tearDown()
+ {
+ $this->salesRule = null;
+ $this->customer = null;
+ $this->coupon = null;
+ $this->order = null;
+ }
+
+ /**
+ * @magentoDataFixture Magento/Sales/_files/order.php
+ */
+ public function testCouponDataHasBeenAssignedTest()
+ {
+ $ruleCustomer = $this->getSalesruleCustomerUsage($this->customer, $this->salesRule);
+
+ // Assert, that rule customer model has been created for specific customer
+ $this->assertEquals(
+ $ruleCustomer->getCustomerId(),
+ $this->customer->getId()
+ );
+
+ // Assert, that customer has increased coupon usage of specific rule
+ $this->assertEquals(
+ 1,
+ $ruleCustomer->getTimesUsed()
+ );
+ }
+
+ /**
+ * @magentoDataFixture Magento/Sales/_files/order.php
+ */
+ public function testOrderCancelingDecreasesCouponUsages()
+ {
+ $this->processOrder($this->order);
+
+ // Should not throw exception as bux is fixed now
+ $this->order->cancel();
+ $ruleCustomer = $this->getSalesruleCustomerUsage($this->customer, $this->salesRule);
+
+ // Assert, that rule customer model has been created for specific customer
+ $this->assertEquals(
+ $ruleCustomer->getCustomerId(),
+ $this->customer->getId()
+ );
+
+ // Assert, that customer has increased coupon usage of specific rule
+ $this->assertEquals(
+ 0,
+ $ruleCustomer->getTimesUsed()
+ );
+ }
+
+ /**
+ * @param Order $order
+ * @return \Magento\Sales\Api\Data\OrderInterface
+ */
+ private function processOrder(Order $order)
+ {
+ $order->setState(Order::STATE_PROCESSING);
+ $order->setStatus(Order::STATE_PROCESSING);
+ return $this->orderRepository->save($order);
+ }
+
+ /**
+ * @param Customer $customer
+ * @param Rule $rule
+ * @return Rule\Customer
+ */
+ private function getSalesruleCustomerUsage(Customer $customer, Rule $rule) : \Magento\SalesRule\Model\Rule\Customer
+ {
+ $ruleCustomer = $this->ruleCustomerFactory->create();
+ return $ruleCustomer->loadByCustomerRule($customer->getId(), $rule->getRuleId());
+ }
+
+ /**
+ * @return Rule
+ */
+ private function prepareSalesRule() : Rule
+ {
+ /** @var Rule $salesRule */
+ $salesRule = $this->objectManager->create(Rule::class);
+ $salesRule->setData(
+ [
+ 'name' => '15$ fixed discount on whole cart',
+ 'is_active' => 1,
+ 'customer_group_ids' => [GroupManagement::NOT_LOGGED_IN_ID],
+ 'coupon_type' => Rule::COUPON_TYPE_SPECIFIC,
+ 'conditions' => [
+ [
+ 'type' => \Magento\SalesRule\Model\Rule\Condition\Address::class,
+ 'attribute' => 'base_subtotal',
+ 'operator' => '>',
+ 'value' => 45,
+ ],
+ ],
+ 'simple_action' => Rule::CART_FIXED_ACTION,
+ 'discount_amount' => 15,
+ 'discount_step' => 0,
+ 'stop_rules_processing' => 1,
+ 'website_ids' => [
+ $this->objectManager->get(StoreManagerInterface::class)->getWebsite()->getId(),
+ ],
+ ]
+ );
+ Bootstrap::getObjectManager()->get(
+ \Magento\SalesRule\Model\ResourceModel\Rule::class
+ )->save($salesRule);
+
+ return $salesRule;
+ }
+
+ /**
+ * @param Rule $salesRule
+ * @return Coupon
+ */
+ private function attachSalesruleCoupon(Rule $salesRule) : Coupon
+ {
+ $coupon = $this->objectManager->create(Coupon::class);
+ $coupon->setRuleId($salesRule->getId())
+ ->setCode('CART_FIXED_DISCOUNT_15')
+ ->setType(0);
+
+ Bootstrap::getObjectManager()->get(CouponRepositoryInterface::class)->save($coupon);
+
+ return $coupon;
+ }
+
+ /**
+ * @param Coupon $coupon
+ * @return Order
+ */
+ private function makeOrderWithCouponAsGuest(Coupon $coupon) : Order
+ {
+ $order = Bootstrap::getObjectManager()->create(\Magento\Sales\Model\Order::class);
+ $order->loadByIncrementId('100000001')
+ ->setCustomerIsGuest(true)
+ ->setCouponCode($coupon->getCode())
+ ->setCreatedAt('2014-10-25 10:10:10')
+ ->setAppliedRuleIds($coupon->getRuleId())
+ ->save();
+
+ return $order;
+ }
+
+ /**
+ * @param Order $order
+ */
+ private function delegateOrderToBeAssigned(Order $order)
+ {
+ $this->delegateCustomerService->delegateNew($order->getId());
+ }
+
+ /**
+ * @return Customer
+ * @throws \Magento\Framework\Exception\InputException
+ * @throws \Magento\Framework\Exception\LocalizedException
+ * @throws \Magento\Framework\Exception\State\InputMismatchException
+ */
+ private function registerNewCustomer() : Customer
+ {
+ $customer = Bootstrap::getObjectManager()->create(
+ \Magento\Customer\Api\Data\CustomerInterface::class
+ );
+
+ /** @var Magento\Customer\Api\Data\CustomerInterface $customer */
+ $customer->setWebsiteId(1)
+ ->setEmail('customer@example.com')
+ ->setGroupId(1)
+ ->setStoreId(1)
+ ->setPrefix('Mr.')
+ ->setFirstname('John')
+ ->setMiddlename('A')
+ ->setLastname('Smith')
+ ->setSuffix('Esq.')
+ ->setDefaultBilling(1)
+ ->setDefaultShipping(1)
+ ->setTaxvat('12')
+ ->setGender(0);
+
+ $customer = $this->customerRepository->save($customer, 'password');
+
+ return $customer;
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php
new file mode 100644
index 0000000000000..a075398e9cdb7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php
@@ -0,0 +1,143 @@
+getProduct();
+ $this->login(1);
+ $this->prepareRequestData();
+
+ $this->dispatch('sendfriend/product/sendmail/id/' . $product->getId());
+ $this->assertSessionMessages(
+ $this->equalTo(['The link to a friend was sent.']),
+ MessageInterface::TYPE_SUCCESS
+ );
+ }
+
+ /**
+ * Share the product to friend as guest customer
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
+ * @magentoConfigFixture default_store sendfriend/email/enabled 1
+ * @magentoConfigFixture default_store sendfriend/email/allow_guest 1
+ * @magentoDataFixture Magento/Catalog/_files/products.php
+ */
+ public function testSendActionAsGuest()
+ {
+ $product = $this->getProduct();
+ $this->prepareRequestData();
+
+ $this->dispatch('sendfriend/product/sendmail/id/' . $product->getId());
+ $this->assertSessionMessages(
+ $this->equalTo(['The link to a friend was sent.']),
+ MessageInterface::TYPE_SUCCESS
+ );
+ }
+
+ /**
+ * Share the product to friend as guest customer with invalid post data
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
+ * @magentoConfigFixture default_store sendfriend/email/enabled 1
+ * @magentoConfigFixture default_store sendfriend/email/allow_guest 1
+ * @magentoDataFixture Magento/Catalog/_files/products.php
+ */
+ public function testSendActionAsGuestWithInvalidData()
+ {
+ $product = $this->getProduct();
+ $this->prepareRequestData(true);
+
+ $this->dispatch('sendfriend/product/sendmail/id/' . $product->getId());
+ $this->assertSessionMessages(
+ $this->equalTo(['Invalid Sender Email']),
+ MessageInterface::TYPE_ERROR
+ );
+ }
+
+ /**
+ * @return ProductInterface
+ */
+ private function getProduct()
+ {
+ return $this->_objectManager->get(ProductRepositoryInterface::class)->get('custom-design-simple-product');
+ }
+
+ /**
+ * Login the user
+ *
+ * @param string $customerId Customer to mark as logged in for the session
+ * @return void
+ */
+ protected function login($customerId)
+ {
+ /** @var Session $session */
+ $session = Bootstrap::getObjectManager()
+ ->get(Session::class);
+ $session->loginById($customerId);
+ }
+
+ /**
+ * @param bool $invalidData
+ * @return void
+ */
+ private function prepareRequestData($invalidData = false)
+ {
+ /** @var FormKey $formKey */
+ $formKey = $this->_objectManager->get(FormKey::class);
+ $post = [
+ 'sender' => [
+ 'name' => 'Test',
+ 'email' => 'test@example.com',
+ 'message' => 'Message',
+ ],
+ 'recipients' => [
+ 'name' => [
+ 'Recipient 1',
+ 'Recipient 2'
+ ],
+ 'email' => [
+ 'r1@example.com',
+ 'r2@example.com'
+ ]
+ ],
+ 'form_key' => $formKey->getFormKey(),
+ ];
+ if ($invalidData) {
+ unset($post['sender']['email']);
+ }
+
+ $this->getRequest()->setMethod(Request::METHOD_POST);
+ $this->getRequest()->setPostValue($post);
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/_files/disable_allow_guest_config.php b/dev/tests/integration/testsuite/Magento/SendFriend/_files/disable_allow_guest_config.php
new file mode 100644
index 0000000000000..202a396132485
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SendFriend/_files/disable_allow_guest_config.php
@@ -0,0 +1,24 @@
+create(Value::class);
+$config->setPath('sendfriend/email/enabled');
+$config->setScope('default');
+$config->setScopeId(0);
+$config->setValue(1);
+$config->save();
+
+/** @var Value $config */
+$config = Bootstrap::getObjectManager()->create(Value::class);
+$config->setPath('sendfriend/email/allow_guest');
+$config->setScope('default');
+$config->setScopeId(0);
+$config->setValue(0);
+$config->save();
diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AbstractShipmentControllerTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AbstractShipmentControllerTest.php
new file mode 100644
index 0000000000000..0a1926d58624c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AbstractShipmentControllerTest.php
@@ -0,0 +1,92 @@
+transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
+ $this->orderRepository = $this->_objectManager->get(OrderRepository::class);
+ $this->formKey = $this->_objectManager->get(FormKey::class);
+ }
+
+ /**
+ * @param string $incrementalId
+ * @return OrderInterface|null
+ */
+ protected function getOrder(string $incrementalId)
+ {
+ /** @var SearchCriteria $searchCriteria */
+ $searchCriteria = $this->_objectManager->create(SearchCriteriaBuilder::class)
+ ->addFilter(OrderInterface::INCREMENT_ID, $incrementalId)
+ ->create();
+
+ $orders = $this->orderRepository->getList($searchCriteria)->getItems();
+ /** @var OrderInterface|null $order */
+ $order = reset($orders);
+
+ return $order;
+ }
+
+ /**
+ * @param OrderInterface $order
+ * @return ShipmentInterface
+ */
+ protected function getShipment(OrderInterface $order): ShipmentInterface
+ {
+ /** @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Collection $shipmentCollection */
+ $shipmentCollection = $this->_objectManager->create(
+ \Magento\Sales\Model\ResourceModel\Order\Shipment\CollectionFactory::class
+ )->create();
+
+ /** @var ShipmentInterface $shipment */
+ $shipment = $shipmentCollection
+ ->setOrderFilter($order)
+ ->setPageSize(1)
+ ->getFirstItem();
+
+ return $shipment;
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php
new file mode 100644
index 0000000000000..c86ad71e7d5ca
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php
@@ -0,0 +1,102 @@
+prepareRequest(
+ [
+ 'comment' => ['comment' => $comment, 'is_customer_notified' => true],
+ ]
+ );
+ $this->dispatch('backend/admin/order_shipment/addComment');
+ $html = $this->getResponse()->getBody();
+ $this->assertContains($comment, $html);
+
+ $message = $this->transportBuilder->getSentMessage();
+ $subject =__('Update to your %1 shipment', $order->getStore()->getFrontendName())->render();
+ $messageConstraint = $this->logicalAnd(
+ new StringContains($order->getBillingAddress()->getName()),
+ new RegularExpression(
+ sprintf(
+ "/Your order #%s has been updated with a status of.*%s/",
+ $order->getIncrementId(),
+ $order->getFrontendStatusLabel()
+ )
+ ),
+ new StringContains($comment)
+ );
+
+ $this->assertEquals($message->getSubject(), $subject);
+ $this->assertThat($message->getRawMessage(), $messageConstraint);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function testAclHasAccess()
+ {
+ $this->prepareRequest(['comment', ['comment' => 'Comment']]);
+
+ parent::testAclHasAccess();
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function testAclNoAccess()
+ {
+ $this->prepareRequest(['comment', ['comment' => 'Comment']]);
+
+ parent::testAclNoAccess();
+ }
+
+ /**
+ * @param array $params
+ * @return \Magento\Sales\Api\Data\OrderInterface|null
+ */
+ private function prepareRequest(array $params = [])
+ {
+ $order = $this->getOrder('100000001');
+ $shipment = $this->getShipment($order);
+
+ $this->getRequest()->setMethod('POST');
+ $this->getRequest()->setParams(
+ [
+ 'id' => $shipment->getEntityId(),
+ 'form_key' => $this->formKey->getFormKey(),
+ ]
+ );
+
+ $data = $params ?? [];
+ $this->getRequest()->setPostValue($data);
+
+ return $order;
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php
new file mode 100644
index 0000000000000..4eb65678583aa
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php
@@ -0,0 +1,97 @@
+prepareRequest(['shipment' => ['send_email' => true]]);
+ $this->dispatch('backend/admin/order_shipment/save');
+
+ $this->assertSessionMessages(
+ $this->equalTo([(string)__('The shipment has been created.')]),
+ \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+ );
+ $this->assertRedirect($this->stringContains('sales/order/view/order_id/' . $order->getEntityId()));
+
+ $shipment = $this->getShipment($order);
+ $message = $this->transportBuilder->getSentMessage();
+ $subject = __('Your %1 order has shipped', $order->getStore()->getFrontendName())->render();
+ $messageConstraint = $this->logicalAnd(
+ new StringContains($order->getBillingAddress()->getName()),
+ new StringContains(
+ 'Thank you for your order from ' . $shipment->getStore()->getFrontendName()
+ ),
+ new StringContains(
+ "Your Shipment #{$shipment->getIncrementId()} for Order #{$order->getIncrementId()}"
+ )
+ );
+
+ $this->assertEquals($message->getSubject(), $subject);
+ $this->assertThat($message->getRawMessage(), $messageConstraint);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function testAclHasAccess()
+ {
+ $this->prepareRequest();
+
+ parent::testAclHasAccess();
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function testAclNoAccess()
+ {
+ $this->prepareRequest();
+
+ parent::testAclNoAccess();
+ }
+
+ /**
+ * @param array $params
+ * @return \Magento\Sales\Api\Data\OrderInterface|null
+ */
+ private function prepareRequest(array $params = [])
+ {
+ $order = $this->getOrder('100000001');
+ $this->getRequest()->setMethod('POST');
+ $this->getRequest()->setParams(
+ [
+ 'order_id' => $order->getEntityId(),
+ 'form_key' => $this->formKey->getFormKey(),
+ ]
+ );
+
+ $data = $params ?? [];
+ $this->getRequest()->setPostValue($data);
+
+ return $order;
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/StoreResolver/WebsiteTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/StoreResolver/WebsiteTest.php
new file mode 100644
index 0000000000000..cc10b91a031cc
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/StoreResolver/WebsiteTest.php
@@ -0,0 +1,62 @@
+reader = Bootstrap::getObjectManager()->create(Website::class);
+ }
+
+ /**
+ * Tests retrieving of stores id by passed scope.
+ *
+ * @param string|null $scopeCode website code
+ * @param int $storesCount
+ * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
+ * @magentoDbIsolation disabled
+ * @magentoAppIsolation enabled
+ * @dataProvider scopeDataProvider
+ */
+ public function testGetAllowedStoreIds($scopeCode, $storesCount)
+ {
+ $this->assertCount($storesCount, $this->reader->getAllowedStoreIds($scopeCode));
+ }
+
+ /**
+ * Provides scopes and corresponding count of resolved stores.
+ *
+ * @return array
+ */
+ public function scopeDataProvider(): array
+ {
+ return [
+ [null, 4],
+ ['test', 2]
+ ];
+ }
+
+ /**
+ * Tests retrieving of stores id by passing incorrect scope.
+ *
+ * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+ * @expectedExceptionMessage The website with code not_exists that was requested wasn't found.
+ */
+ public function testIncorrectScope()
+ {
+ $this->reader->getAllowedStoreIds('not_exists');
+ }
+}
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig.php
index 615c295675adc..beb4f98ae76bd 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig.php
@@ -70,6 +70,11 @@ public function get($key = null, $defaultValue = null)
if ($key === null) {
return $this->flatData;
}
+
+ if (array_key_exists($key, $this->flatData) && $this->flatData[$key] === null) {
+ return '';
+ }
+
return $this->flatData[$key] ?? $defaultValue;
}
diff --git a/lib/internal/Magento/Framework/App/ScopeDefault.php b/lib/internal/Magento/Framework/App/ScopeDefault.php
index 2ea62387145bf..e62d19f9ffbb4 100644
--- a/lib/internal/Magento/Framework/App/ScopeDefault.php
+++ b/lib/internal/Magento/Framework/App/ScopeDefault.php
@@ -17,7 +17,7 @@ class ScopeDefault implements ScopeInterface
*/
public function getCode()
{
- return 'default';
+ return '';
}
/**
@@ -27,7 +27,7 @@ public function getCode()
*/
public function getId()
{
- return 1;
+ return 0;
}
/**
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php
index 80ab2302dc91c..3508cfed0777b 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php
@@ -140,4 +140,43 @@ public function keyCollisionDataProvider()
]
];
}
+
+ /**
+ * @param string $key
+ * @param string|null $expectedFlattenData
+ * @return void
+ * @dataProvider getDataProvider
+ */
+ public function testGet(string $key, $expectedFlattenData)
+ {
+ $flatData = [
+ 'key1' => 'value',
+ 'key2' => null,
+ ];
+
+ $this->reader->expects($this->once())->method('load')->willReturn($flatData);
+
+ $this->assertEquals($expectedFlattenData, $this->_deploymentConfig->get($key));
+ }
+
+ /**
+ * @return array
+ */
+ public function getDataProvider(): array
+ {
+ return [
+ [
+ 'key' => 'key1',
+ 'expectedFlattenData' => 'value',
+ ],
+ [
+ 'key' => 'key2',
+ 'expectedFlattenData' => '',
+ ],
+ [
+ 'key' => 'key3',
+ 'expectedFlattenData' => null,
+ ],
+ ];
+ }
}
diff --git a/lib/internal/Magento/Framework/Cache/Backend/Database.php b/lib/internal/Magento/Framework/Cache/Backend/Database.php
index 291078383014a..231a8584cc8a5 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/Database.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/Database.php
@@ -27,11 +27,11 @@
* ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
*/
-/**
- * Database cache backend
- */
namespace Magento\Framework\Cache\Backend;
+/**
+ * Database cache backend.
+ */
class Database extends \Zend_Cache_Backend implements \Zend_Cache_Backend_ExtendedInterface
{
/**
@@ -139,7 +139,7 @@ protected function _getTagsTable()
*
* Note : return value is always "string" (unserialization is done by the core not by the backend)
*
- * @param string $id Cache id
+ * @param string $id Cache id
* @param boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
* @return string|false cached datas
*/
@@ -432,7 +432,7 @@ public function touch($id, $extraLifetime)
return $this->_getConnection()->update(
$this->_getDataTable(),
['expire_time' => new \Zend_Db_Expr('expire_time+' . $extraLifetime)],
- ['id=?' => $id, 'expire_time = 0 OR expire_time>' => time()]
+ ['id=?' => $id, 'expire_time = 0 OR expire_time>?' => time()]
);
} else {
return true;
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index 3d06e27542f07..3689aeef81e0b 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -2854,6 +2854,7 @@ public function endSetup()
* - array("gteq" => $greaterOrEqualValue)
* - array("lteq" => $lessOrEqualValue)
* - array("finset" => $valueInSet)
+ * - array("nfinset" => $valueNotInSet)
* - array("regexp" => $regularExpression)
* - array("seq" => $stringValue)
* - array("sneq" => $stringValue)
@@ -2883,6 +2884,7 @@ public function prepareSqlCondition($fieldName, $condition)
'gteq' => "{{fieldName}} >= ?",
'lteq' => "{{fieldName}} <= ?",
'finset' => "FIND_IN_SET(?, {{fieldName}})",
+ 'nfinset' => "NOT FIND_IN_SET(?, {{fieldName}})",
'regexp' => "{{fieldName}} REGEXP ?",
'from' => "{{fieldName}} >= ?",
'to' => "{{fieldName}} <= ?",
diff --git a/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php b/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
index cc2f5a91f73fd..af0ddc9b18b9f 100644
--- a/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
+++ b/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
@@ -107,7 +107,7 @@ public function __construct(
public function current()
{
if (null === $this->currentSelect) {
- $this->isValid = ($this->currentOffset + $this->batchSize) <= $this->totalItemCount;
+ $this->isValid = $this->currentOffset < $this->totalItemCount;
$this->currentSelect = $this->initSelectObject();
}
return $this->currentSelect;
@@ -138,7 +138,7 @@ public function next()
if (null === $this->currentSelect) {
$this->current();
}
- $this->isValid = ($this->batchSize + $this->currentOffset) <= $this->totalItemCount;
+ $this->isValid = $this->currentOffset < $this->totalItemCount;
$select = $this->initSelectObject();
if ($this->isValid) {
$this->iteration++;
diff --git a/lib/internal/Magento/Framework/Data/Collection.php b/lib/internal/Magento/Framework/Data/Collection.php
index 099753ac1b56f..4e9132d49a2e2 100644
--- a/lib/internal/Magento/Framework/Data/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Collection.php
@@ -7,6 +7,7 @@
use Magento\Framework\Data\Collection\EntityFactoryInterface;
use Magento\Framework\Option\ArrayInterface;
+use Magento\Framework\Exception\InputException;
/**
* Data collection
@@ -234,12 +235,20 @@ protected function _setIsLoaded($flag = true)
* Get current collection page
*
* @param int $displacement
+ * @throws \Magento\Framework\Exception\InputException
* @return int
*/
public function getCurPage($displacement = 0)
{
if ($this->_curPage + $displacement < 1) {
return 1;
+ } elseif ($this->_curPage > $this->getLastPageNumber() && $displacement === 0) {
+ throw new InputException(
+ __(
+ 'currentPage value %1 specified is greater than the %2 page(s) available.',
+ [$this->_curPage, $this->getLastPageNumber()]
+ )
+ );
} elseif ($this->_curPage + $displacement > $this->getLastPageNumber()) {
return $this->getLastPageNumber();
} else {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
index 2ecc67e1eb70e..0b6ddd6999d3e 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
@@ -7,6 +7,9 @@
// @codingStandardsIgnoreFile
+/**
+ * Class for Collection test.
+ */
class CollectionTest extends \PHPUnit\Framework\TestCase
{
/**
@@ -14,6 +17,9 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
*/
protected $_model;
+ /**
+ * @inheritdoc
+ */
protected function setUp()
{
$this->_model = new \Magento\Framework\Data\Collection(
@@ -21,6 +27,11 @@ protected function setUp()
);
}
+ /**
+ * Test for method removeAllItems.
+ *
+ * @return void
+ */
public function testRemoveAllItems()
{
$this->_model->addItem(new \Magento\Framework\DataObject());
@@ -32,6 +43,7 @@ public function testRemoveAllItems()
/**
* Test loadWithFilter()
+ *
* @return void
*/
public function testLoadWithFilter()
@@ -44,6 +56,8 @@ public function testLoadWithFilter()
}
/**
+ * Test for method etItemObjectClass.
+ *
* @dataProvider setItemObjectClassDataProvider
*/
public function testSetItemObjectClass($class)
@@ -53,6 +67,8 @@ public function testSetItemObjectClass($class)
}
/**
+ * Data provider.
+ *
* @return array
*/
public function setItemObjectClassDataProvider()
@@ -61,6 +77,8 @@ public function setItemObjectClassDataProvider()
}
/**
+ * Test for method setItemObjectClass with exception.
+ *
* @expectedException \InvalidArgumentException
* @expectedExceptionMessage Incorrect_ClassName does not extend \Magento\Framework\DataObject
*/
@@ -69,12 +87,22 @@ public function testSetItemObjectClassException()
$this->_model->setItemObjectClass('Incorrect_ClassName');
}
+ /**
+ * Test for method addFilter.
+ *
+ * @return void
+ */
public function testAddFilter()
{
$this->_model->addFilter('field1', 'value');
$this->assertEquals('field1', $this->_model->getFilter('field1')->getData('field'));
}
+ /**
+ * Test for method getFilters.
+ *
+ * @return void
+ */
public function testGetFilters()
{
$this->_model->addFilter('field1', 'value');
@@ -83,12 +111,22 @@ public function testGetFilters()
$this->assertEquals('field2', $this->_model->getFilter(['field1', 'field2'])[1]->getData('field'));
}
+ /**
+ * Test for method get non existion filters.
+ *
+ * @return void
+ */
public function testGetNonExistingFilters()
{
$this->assertEmpty($this->_model->getFilter([]));
$this->assertEmpty($this->_model->getFilter('non_existing_filter'));
}
+ /**
+ * Test for lag.
+ *
+ * @return void
+ */
public function testFlag()
{
$this->_model->setFlag('flag_name', 'flag_value');
@@ -97,12 +135,35 @@ public function testFlag()
$this->assertNull($this->_model->getFlag('non_existing_flag'));
}
+ /**
+ * Test for method getCurPage.
+ *
+ * @return void
+ */
public function testGetCurPage()
{
- $this->_model->setCurPage(10);
+ $this->_model->setCurPage(1);
$this->assertEquals(1, $this->_model->getCurPage());
}
+ /**
+ * Test for getCurPage with exception.
+ *
+ * @expectedException \Magento\Framework\Exception\InputException
+ * @expectedExceptionMessage currentPage value 10 specified is greater than the 1 page(s) available.
+ * @return void
+ */
+ public function testGetCurPageWithException()
+ {
+ $this->_model->setCurPage(10);
+ $this->_model->getCurPage();
+ }
+
+ /**
+ * Test for method possibleFlowWithItem.
+ *
+ * @return void
+ */
public function testPossibleFlowWithItem()
{
$firstItemMock = $this->createPartialMock(\Magento\Framework\DataObject::class, ['getId', 'getData', 'toArray']);
@@ -164,6 +225,11 @@ public function testPossibleFlowWithItem()
$this->assertEquals([], $this->_model->getItems());
}
+ /**
+ * Test for method eachCallsMethodOnEachItemWithNoArgs.
+ *
+ * @return void
+ */
public function testEachCallsMethodOnEachItemWithNoArgs()
{
for ($i = 0; $i < 3; $i++) {
@@ -173,7 +239,12 @@ public function testEachCallsMethodOnEachItemWithNoArgs()
}
$this->_model->each('testCallback');
}
-
+
+ /**
+ * Test for method eachCallsMethodOnEachItemWithArgs.
+ *
+ * @return void
+ */
public function testEachCallsMethodOnEachItemWithArgs()
{
for ($i = 0; $i < 3; $i++) {
@@ -184,6 +255,11 @@ public function testEachCallsMethodOnEachItemWithArgs()
$this->_model->each('testCallback', ['a', 'b', 'c']);
}
+ /**
+ * Test for method callsClosureWithEachItemAndNoArgs.
+ *
+ * @return void
+ */
public function testCallsClosureWithEachItemAndNoArgs()
{
for ($i = 0; $i < 3; $i++) {
@@ -196,6 +272,11 @@ public function testCallsClosureWithEachItemAndNoArgs()
});
}
+ /**
+ * Test for method callsClosureWithEachItemAndArgs.
+ *
+ * @return void
+ */
public function testCallsClosureWithEachItemAndArgs()
{
for ($i = 0; $i < 3; $i++) {
@@ -208,6 +289,11 @@ public function testCallsClosureWithEachItemAndArgs()
}, ['a', 'b', 'c']);
}
+ /**
+ * Test for method callsCallableArrayWithEachItemNoArgs.
+ *
+ * @return void
+ */
public function testCallsCallableArrayWithEachItemNoArgs()
{
$mockCallbackObject = $this->getMockBuilder('DummyEachCallbackInstance')
@@ -226,6 +312,11 @@ public function testCallsCallableArrayWithEachItemNoArgs()
$this->_model->each([$mockCallbackObject, 'testObjCallback']);
}
+ /**
+ * Test for method callsCallableArrayWithEachItemAndArgs.
+ *
+ * @return void
+ */
public function testCallsCallableArrayWithEachItemAndArgs()
{
$mockCallbackObject = $this->getMockBuilder('DummyEachCallbackInstance')
diff --git a/lib/internal/Magento/Framework/Interception/Config/Config.php b/lib/internal/Magento/Framework/Interception/Config/Config.php
index 7c80051537baa..ba1a0f9685eac 100644
--- a/lib/internal/Magento/Framework/Interception/Config/Config.php
+++ b/lib/internal/Magento/Framework/Interception/Config/Config.php
@@ -125,7 +125,7 @@ public function __construct(
*/
public function initialize($classDefinitions = [])
{
- $this->_cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [$this->_cacheId]);
+ $this->_cache->remove($this->_cacheId);
$config = [];
foreach ($this->_scopeList->getAllScopes() as $scope) {
$config = array_replace_recursive($config, $this->_reader->read($scope));
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Cache.php b/lib/internal/Magento/Framework/Lock/Backend/Cache.php
new file mode 100644
index 0000000000000..61818cbb8c53c
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Backend/Cache.php
@@ -0,0 +1,52 @@
+cache = $cache;
+ }
+ /**
+ * @inheritdoc
+ */
+ public function lock(string $name, int $timeout = -1): bool
+ {
+ return $this->cache->save('1', $name, [], $timeout);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function unlock(string $name): bool
+ {
+ return $this->cache->remove($name);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function isLocked(string $name): bool
+ {
+ return (bool)$this->cache->test($name);
+ }
+}
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Database.php b/lib/internal/Magento/Framework/Lock/Backend/Database.php
index 61857685a7bb4..a9dbecedab238 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Database.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Database.php
@@ -3,8 +3,8 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-
declare(strict_types=1);
+
namespace Magento\Framework\Lock\Backend;
use Magento\Framework\App\DeploymentConfig;
@@ -14,6 +14,9 @@
use Magento\Framework\Exception\InputException;
use Magento\Framework\Phrase;
+/**
+ * Implementation of the lock manager on the basis of MySQL.
+ */
class Database implements \Magento\Framework\Lock\LockManagerInterface
{
/** @var ResourceConnection */
@@ -53,9 +56,13 @@ public function __construct(
* @return bool
* @throws InputException
* @throws AlreadyExistsException
+ * @throws \Zend_Db_Statement_Exception
*/
public function lock(string $name, int $timeout = -1): bool
{
+ if (!$this->deploymentConfig->isDbAvailable()) {
+ return true;
+ };
$name = $this->addPrefix($name);
/**
@@ -66,7 +73,7 @@ public function lock(string $name, int $timeout = -1): bool
if ($this->currentLock) {
throw new AlreadyExistsException(
new Phrase(
- 'Current connection is already holding lock for $1, only single lock allowed',
+ 'Current connection is already holding lock for %1, only single lock allowed',
[$this->currentLock]
)
);
@@ -90,9 +97,13 @@ public function lock(string $name, int $timeout = -1): bool
* @param string $name lock name
* @return bool
* @throws InputException
+ * @throws \Zend_Db_Statement_Exception
*/
public function unlock(string $name): bool
{
+ if (!$this->deploymentConfig->isDbAvailable()) {
+ return true;
+ };
$name = $this->addPrefix($name);
$result = (bool)$this->resource->getConnection()->query(
@@ -113,9 +124,13 @@ public function unlock(string $name): bool
* @param string $name lock name
* @return bool
* @throws InputException
+ * @throws \Zend_Db_Statement_Exception
*/
public function isLocked(string $name): bool
{
+ if (!$this->deploymentConfig->isDbAvailable()) {
+ return false;
+ };
$name = $this->addPrefix($name);
return (bool)$this->resource->getConnection()->query(
diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/DatabaseTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/DatabaseTest.php
index a31b686dfacd8..e853d272aa372 100644
--- a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/DatabaseTest.php
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/DatabaseTest.php
@@ -5,8 +5,13 @@
*/
namespace Magento\Framework\Lock\Test\Unit\Backend;
+use Magento\Framework\App\DeploymentConfig;
use Magento\Framework\Lock\Backend\Database;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+/**
+ * @inheritdoc
+ */
class DatabaseTest extends \PHPUnit\Framework\TestCase
{
/**
@@ -25,13 +30,21 @@ class DatabaseTest extends \PHPUnit\Framework\TestCase
private $statement;
/**
- * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+ * @var ObjectManager
*/
private $objectManager;
/** @var Database $database */
private $database;
+ /**
+ * @var DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $deploymentConfig;
+
+ /**
+ * @inheritdoc
+ */
protected function setUp()
{
$this->connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
@@ -52,17 +65,33 @@ protected function setUp()
->method('query')
->willReturn($this->statement);
- $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $this->objectManager = new ObjectManager($this);
+
+ $this->deploymentConfig = $this->getMockBuilder(DeploymentConfig::class)
+ ->disableOriginalConstructor()
+ ->getMock();
/** @var Database $database */
$this->database = $this->objectManager->getObject(
Database::class,
- ['resource' => $this->resource]
+ [
+ 'resource' => $this->resource,
+ 'deploymentConfig' => $this->deploymentConfig,
+ ]
);
}
+ /**
+ * @return void
+ * @throws \Magento\Framework\Exception\AlreadyExistsException
+ * @throws \Magento\Framework\Exception\InputException
+ */
public function testLock()
{
+ $this->deploymentConfig
+ ->method('isDbAvailable')
+ ->with()
+ ->willReturn(true);
$this->statement->expects($this->once())
->method('fetchColumn')
->willReturn(true);
@@ -75,14 +104,23 @@ public function testLock()
*/
public function testlockWithTooLongName()
{
+ $this->deploymentConfig
+ ->method('isDbAvailable')
+ ->with()
+ ->willReturn(true);
$this->database->lock('BbXbyf9rIY5xuAVdviQJmh76FyoeeVHTDpcjmcImNtgpO4Hnz4xk76ZGEyYALvrQu');
}
/**
* @expectedException \Magento\Framework\Exception\AlreadyExistsException
+ * @throws \Magento\Framework\Exception\InputException
*/
public function testlockWithAlreadyAcquiredLockInSameSession()
{
+ $this->deploymentConfig
+ ->method('isDbAvailable')
+ ->with()
+ ->willReturn(true);
$this->statement->expects($this->any())
->method('fetchColumn')
->willReturn(true);
@@ -90,4 +128,47 @@ public function testlockWithAlreadyAcquiredLockInSameSession()
$this->database->lock('testLock');
$this->database->lock('differentLock');
}
+
+ /**
+ * @return void
+ * @throws \Magento\Framework\Exception\AlreadyExistsException
+ * @throws \Magento\Framework\Exception\InputException
+ */
+ public function testLockWithUnavailableDeploymentConfig()
+ {
+ $this->deploymentConfig
+ ->expects($this->atLeast(1))
+ ->method('isDbAvailable')
+ ->with()
+ ->willReturn(false);
+ $this->assertTrue($this->database->lock('testLock'));
+ }
+
+ /**
+ * @return void
+ * @throws \Magento\Framework\Exception\InputException
+ */
+ public function testUnlockWithUnavailableDeploymentConfig()
+ {
+ $this->deploymentConfig
+ ->expects($this->atLeast(1))
+ ->method('isDbAvailable')
+ ->with()
+ ->willReturn(false);
+ $this->assertTrue($this->database->unlock('testLock'));
+ }
+
+ /**
+ * @return void
+ * @throws \Magento\Framework\Exception\InputException
+ */
+ public function testIsLockedWithUnavailableDB()
+ {
+ $this->deploymentConfig
+ ->expects($this->atLeast(1))
+ ->method('isDbAvailable')
+ ->with()
+ ->willReturn(false);
+ $this->assertFalse($this->database->isLocked('testLock'));
+ }
}
diff --git a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
index 6311003bd2ad5..2f3caf08c534e 100644
--- a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
@@ -40,25 +40,33 @@ class DataObjectProcessor
*/
private $customAttributesProcessor;
+ /**
+ * @var array
+ */
+ private $processors;
+
/**
* @param MethodsMap $methodsMapProcessor
* @param TypeCaster $typeCaster
* @param FieldNamer $fieldNamer
* @param CustomAttributesProcessor $customAttributesProcessor
* @param ExtensionAttributesProcessor $extensionAttributesProcessor
+ * @param array $processors
*/
public function __construct(
MethodsMap $methodsMapProcessor,
TypeCaster $typeCaster,
FieldNamer $fieldNamer,
CustomAttributesProcessor $customAttributesProcessor,
- ExtensionAttributesProcessor $extensionAttributesProcessor
+ ExtensionAttributesProcessor $extensionAttributesProcessor,
+ array $processors = []
) {
$this->methodsMapProcessor = $methodsMapProcessor;
$this->typeCaster = $typeCaster;
$this->fieldNamer = $fieldNamer;
$this->extensionAttributesProcessor = $extensionAttributesProcessor;
$this->customAttributesProcessor = $customAttributesProcessor;
+ $this->processors = $processors;
}
/**
@@ -121,6 +129,27 @@ public function buildOutputDataArray($dataObject, $dataObjectType)
$outputData[$key] = $value;
}
+
+ $outputData = $this->changeOutputArray($dataObject, $outputData);
+
+ return $outputData;
+ }
+
+ /**
+ * Change output array if needed.
+ *
+ * @param mixed $dataObject
+ * @param array $outputData
+ * @return array
+ */
+ private function changeOutputArray($dataObject, array $outputData): array
+ {
+ foreach ($this->processors as $dataObjectClassName => $processor) {
+ if ($dataObject instanceof $dataObjectClassName) {
+ $outputData = $processor->execute($dataObject, $outputData);
+ }
+ }
+
return $outputData;
}
}
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
index 28e321d4c5d47..ffd5b41f7933d 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
@@ -24,7 +24,7 @@ class Match implements QueryInterface
/**
* @var string
*/
- const SPECIAL_CHARACTERS = '+~/\\<>\'":*$#@()!,.?`=%&^';
+ const SPECIAL_CHARACTERS = '-+~/\\<>\'":*$#@()!,.?`=%&^';
const MINIMAL_CHARACTER_LENGTH = 3;
diff --git a/lib/internal/Magento/Framework/Serialize/README.md b/lib/internal/Magento/Framework/Serialize/README.md
index 5af8fb7f71b6b..d900f89208a54 100644
--- a/lib/internal/Magento/Framework/Serialize/README.md
+++ b/lib/internal/Magento/Framework/Serialize/README.md
@@ -3,6 +3,7 @@
**Serialize** library provides interface *SerializerInterface* and multiple implementations:
* *Json* - default implementation. Uses PHP native json_encode/json_decode functions;
+ * *JsonHexTag* - default implementation. Uses PHP native json_encode/json_decode functions with `JSON_HEX_TAG` option enabled;
* *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
index e352d0c2d7124..7ce9756ff243d 100644
--- a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
+++ b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
@@ -16,27 +16,27 @@
class Json implements SerializerInterface
{
/**
- * {@inheritDoc}
+ * @inheritDoc
* @since 100.2.0
*/
public function serialize($data)
{
$result = json_encode($data);
if (false === $result) {
- throw new \InvalidArgumentException('Unable to serialize value.');
+ throw new \InvalidArgumentException("Unable to serialize value. Error: " . json_last_error_msg());
}
return $result;
}
/**
- * {@inheritDoc}
+ * @inheritDoc
* @since 100.2.0
*/
public function unserialize($string)
{
$result = json_decode($string, true);
if (json_last_error() !== JSON_ERROR_NONE) {
- throw new \InvalidArgumentException('Unable to unserialize value.');
+ throw new \InvalidArgumentException("Unable to unserialize value. Error: " . json_last_error_msg());
}
return $result;
}
diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/JsonHexTag.php b/lib/internal/Magento/Framework/Serialize/Serializer/JsonHexTag.php
new file mode 100644
index 0000000000000..4a5406ff3fd99
--- /dev/null
+++ b/lib/internal/Magento/Framework/Serialize/Serializer/JsonHexTag.php
@@ -0,0 +1,35 @@
+ are converted to \u003C and \u003E),
+ * unserialize JSON encoded data
+ *
+ * @api
+ * @since 100.2.0
+ */
+class JsonHexTag extends Json implements SerializerInterface
+{
+ /**
+ * @inheritDoc
+ * @since 100.2.0
+ */
+ public function serialize($data): string
+ {
+ $result = json_encode($data, JSON_HEX_TAG);
+ if (false === $result) {
+ throw new \InvalidArgumentException('Unable to serialize value.');
+ }
+ return $result;
+ }
+}
diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php
new file mode 100644
index 0000000000000..c867dced0fc6e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php
@@ -0,0 +1,118 @@
+json = $objectManager->getObject(JsonHexTag::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, '{}'],
+ ['< >', '"\u003C \u003E"'],
+ ];
+ }
+
+ /**
+ * @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)
+ );
+ }
+
+ /**
+ * @return array
+ */
+ public function unserializeDataProvider(): array
+ {
+ return [
+ ['""', ''],
+ ['"string"', 'string'],
+ ['null', null],
+ ['false', false],
+ ['{"a":"b","d":123}', ['a' => 'b', 'd' => 123]],
+ ['123', 123],
+ ['10.56', 10.56],
+ ['{}', []],
+ ['"\u003C \u003E"', '< >'],
+ ];
+ }
+
+ /**
+ * @expectedException \InvalidArgumentException
+ * @expectedExceptionMessage Unable to serialize value.
+ */
+ public function testSerializeException()
+ {
+ $this->json->serialize(STDOUT);
+ }
+
+ /**
+ * @expectedException \InvalidArgumentException
+ * @expectedExceptionMessage Unable to unserialize value.
+ * @dataProvider unserializeExceptionDataProvider
+ */
+ public function testUnserializeException($value)
+ {
+ $this->json->unserialize($value);
+ }
+
+ /**
+ * @return array
+ */
+ public function unserializeExceptionDataProvider(): array
+ {
+ return [
+ [''],
+ [false],
+ [null],
+ ['{']
+ ];
+ }
+}
diff --git a/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php b/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php
index 22fdf0a05686a..9e2014c1b070a 100644
--- a/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php
@@ -116,6 +116,6 @@ public function testIterations()
$iterations++;
}
- $this->assertEquals(10, $iterations);
+ $this->assertEquals(11, $iterations);
}
}
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php b/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
index 43bfd46c1193a..7aac210dcab89 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
@@ -5,6 +5,10 @@
*/
namespace Magento\Framework\View\Element\Html\Link;
+use Magento\Framework\App\DefaultPathInterface;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+
/**
* Block representing link with two possible states.
* "Current" state means link leads to URL equivalent to URL of currently displayed page.
@@ -17,25 +21,25 @@
* @method null|bool getCurrent()
* @method \Magento\Framework\View\Element\Html\Link\Current setCurrent(bool $value)
*/
-class Current extends \Magento\Framework\View\Element\Template
+class Current extends Template
{
/**
* Default path
*
- * @var \Magento\Framework\App\DefaultPathInterface
+ * @var DefaultPathInterface
*/
protected $_defaultPath;
/**
* Constructor
*
- * @param \Magento\Framework\View\Element\Template\Context $context
- * @param \Magento\Framework\App\DefaultPathInterface $defaultPath
+ * @param Context $context
+ * @param DefaultPathInterface $defaultPath
* @param array $data
*/
public function __construct(
- \Magento\Framework\View\Element\Template\Context $context,
- \Magento\Framework\App\DefaultPathInterface $defaultPath,
+ Context $context,
+ DefaultPathInterface $defaultPath,
array $data = []
) {
parent::__construct($context, $data);
@@ -56,18 +60,20 @@ public function getHref()
* Get current mca
*
* @return string
+ * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
*/
private function getMca()
{
$routeParts = [
- 'module' => $this->_request->getModuleName(),
- 'controller' => $this->_request->getControllerName(),
- 'action' => $this->_request->getActionName(),
+ (string)$this->_request->getModuleName(),
+ (string)$this->_request->getControllerName(),
+ (string)$this->_request->getActionName(),
];
$parts = [];
+ $pathParts = explode('/', trim($this->_request->getPathInfo(), '/'));
foreach ($routeParts as $key => $value) {
- if (!empty($value) && $value != $this->_defaultPath->getPart($key)) {
+ if (isset($pathParts[$key]) && $pathParts[$key] === $value) {
$parts[] = $value;
}
}
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php
index 909748722a081..7070ec9d48c11 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php
@@ -17,11 +17,6 @@ class CurrentTest extends \PHPUnit\Framework\TestCase
*/
protected $_requestMock;
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $_defaultPathMock;
-
/**
* @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
*/
@@ -32,7 +27,6 @@ protected function setUp()
$this->_objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
$this->_urlBuilderMock = $this->createMock(\Magento\Framework\UrlInterface::class);
$this->_requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
- $this->_defaultPathMock = $this->createMock(\Magento\Framework\App\DefaultPathInterface::class);
}
public function testGetUrl()
@@ -60,29 +54,46 @@ public function testIsCurrentIfIsset()
$this->assertTrue($link->isCurrent());
}
+ /**
+ * Test if the current url is the same as link path
+ *
+ * @return void
+ */
public function testIsCurrent()
{
- $path = 'test/path';
- $url = 'http://example.com/a/b';
-
- $this->_requestMock->expects($this->once())->method('getModuleName')->will($this->returnValue('a'));
- $this->_requestMock->expects($this->once())->method('getControllerName')->will($this->returnValue('b'));
- $this->_requestMock->expects($this->once())->method('getActionName')->will($this->returnValue('d'));
- $this->_defaultPathMock->expects($this->atLeastOnce())->method('getPart')->will($this->returnValue('d'));
+ $path = 'test/index';
+ $url = 'http://example.com/test/index';
+
+ $this->_requestMock->expects($this->once())
+ ->method('getPathInfo')
+ ->will($this->returnValue('/test/index/'));
+ $this->_requestMock->expects($this->once())
+ ->method('getModuleName')
+ ->will($this->returnValue('test'));
+ $this->_requestMock->expects($this->once())
+ ->method('getControllerName')
+ ->will($this->returnValue('index'));
+ $this->_requestMock->expects($this->once())
+ ->method('getActionName')
+ ->will($this->returnValue('index'));
+ $this->_urlBuilderMock->expects($this->at(0))
+ ->method('getUrl')
+ ->with($path)
+ ->will($this->returnValue($url));
+ $this->_urlBuilderMock->expects($this->at(1))
+ ->method('getUrl')
+ ->with('test/index')
+ ->will($this->returnValue($url));
- $this->_urlBuilderMock->expects($this->at(0))->method('getUrl')->with($path)->will($this->returnValue($url));
- $this->_urlBuilderMock->expects($this->at(1))->method('getUrl')->with('a/b')->will($this->returnValue($url));
-
- $this->_requestMock->expects($this->once())->method('getControllerName')->will($this->returnValue('b'));
/** @var \Magento\Framework\View\Element\Html\Link\Current $link */
$link = $this->_objectManager->getObject(
\Magento\Framework\View\Element\Html\Link\Current::class,
[
'urlBuilder' => $this->_urlBuilderMock,
- 'request' => $this->_requestMock,
- 'defaultPath' => $this->_defaultPathMock
+ 'request' => $this->_requestMock
]
);
+
$link->setPath($path);
$this->assertTrue($link->isCurrent());
}
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php b/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php
index b4cfc61611a93..f25cd219e3eae 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php
@@ -7,6 +7,9 @@
*/
namespace Magento\Framework\Webapi\Rest\Response\Renderer;
+/**
+ * Renders response data in Xml format.
+ */
class Xml implements \Magento\Framework\Webapi\Rest\Response\RendererInterface
{
/**
@@ -111,8 +114,7 @@ protected function _formatValue($value)
/** Without the following transformation boolean values are rendered incorrectly */
$value = $value ? 'true' : 'false';
}
- $replacementMap = ['&' => '&'];
- return str_replace(array_keys($replacementMap), array_values($replacementMap), $value);
+ return (string) $value;
}
/**
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/Renderer/XmlTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/Renderer/XmlTest.php
index 396fbcdb1978b..71fb41491cc74 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/Renderer/XmlTest.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/Renderer/XmlTest.php
@@ -76,6 +76,11 @@ public function providerXmlRender()
'value',
'Invalid XML render with numeric symbol in data index.'
],
+ [
+ ['key' => 'test & foo'],
+ 'test & foo',
+ 'Invalid XML render with ampersand symbol in data index.'
+ ],
[
['.key' => 'value'],
'value',
diff --git a/lib/web/css/source/lib/_forms.less b/lib/web/css/source/lib/_forms.less
index b1c7a49da4a7a..5b6ff81bb4a65 100644
--- a/lib/web/css/source/lib/_forms.less
+++ b/lib/web/css/source/lib/_forms.less
@@ -300,6 +300,8 @@
input[type="checkbox"] {
.lib-form-element-choice(@_type: input-checkbox);
+ position: relative;
+ top: 2px;
}
input[type="radio"] {
diff --git a/lib/web/mage/dataPost.js b/lib/web/mage/dataPost.js
index 5d052f12db8fb..cc56ee266e08a 100644
--- a/lib/web/mage/dataPost.js
+++ b/lib/web/mage/dataPost.js
@@ -57,7 +57,7 @@ define([
*/
postData: function (params) {
var formKey = $(this.options.formKeyInputSelector).val(),
- $form;
+ $form, input;
if (formKey) {
params.data['form_key'] = formKey;
@@ -67,6 +67,19 @@ define([
data: params
}));
+ if (params.files) {
+ $form[0].enctype = 'multipart/form-data';
+ $.each(params.files, function (key, files) {
+ if (files instanceof FileList) {
+ input = document.createElement('input');
+ input.type = 'file';
+ input.name = key;
+ input.files = files;
+ $form[0].appendChild(input);
+ }
+ });
+ }
+
if (params.data.confirmation) {
uiConfirm({
content: params.data.confirmationMessage,
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index aa8282d5b6f46..a742b8e6bbb27 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -1944,6 +1944,9 @@
}
if (firstActive.length) {
+ $('html, body').animate({
+ scrollTop: firstActive.offset().top
+ });
firstActive.focus();
}
}
diff --git a/lib/web/varien/js.js b/lib/web/varien/js.js
index 55e41a1652cb8..45032829f2fd8 100644
--- a/lib/web/varien/js.js
+++ b/lib/web/varien/js.js
@@ -607,17 +607,11 @@ if (!("console" in window) || !("firebug" in console))
* @example fireEvent($('my-input', 'click'));
*/
function fireEvent(element, event) {
- if (document.createEvent) {
- // dispatch for all browsers except IE before version 9
- var evt = document.createEvent('HTMLEvents');
+ // dispatch event
+ var evt = document.createEvent('HTMLEvents');
- evt.initEvent(event, true, true); // event type, bubbling, cancelable
- return element.dispatchEvent(evt);
- }
- // dispatch for IE before version 9
- var evt = document.createEventObject();
-
- return element.fireEvent('on' + event, evt);
+ evt.initEvent(event, true, true); // event type, bubbling, cancelable
+ return element.dispatchEvent(evt);
}
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ApplicationCodeGenerator.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ApplicationCodeGenerator.php
index 76cd6a20bf669..07b9a7110e643 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ApplicationCodeGenerator.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ApplicationCodeGenerator.php
@@ -74,7 +74,7 @@ public function doOperation()
$this->directoryScanner->scan($path, $this->data['filePatterns'], $this->data['excludePatterns'])
);
}
- $entities = $this->phpScanner->collectEntities($files['php']);
+ $entities = isset($files['php']) ? $this->phpScanner->collectEntities($files['php']) : [];
foreach ($entities as $entityName) {
class_exists($entityName);
}
|