-
-
-
+ $helper = $block->getData('imageHelper');
+ $mainImageData = $mainImage ?
+ $mainImage->getData('medium_image_url') :
+ $helper->getDefaultPlaceholderUrl('image');
+
+?>
+
+
-
-
-  ?>)
-
-
-
+ 
+
+
diff --git a/app/code/Magento/PageCache/etc/varnish4.vcl b/app/code/Magento/PageCache/etc/varnish4.vcl
index 8068447e5ca99..c73c4e39170e6 100644
--- a/app/code/Magento/PageCache/etc/varnish4.vcl
+++ b/app/code/Magento/PageCache/etc/varnish4.vcl
@@ -91,10 +91,11 @@ sub vcl_recv {
}
}
- # Remove Google gclid parameters to minimize the cache objects
- set req.url = regsuball(req.url,"\?gclid=[^&]+$",""); # strips when QS = "?gclid=AAA"
- set req.url = regsuball(req.url,"\?gclid=[^&]+&","?"); # strips when QS = "?gclid=AAA&foo=bar"
- set req.url = regsuball(req.url,"&gclid=[^&]+",""); # strips when QS = "?foo=bar&gclid=AAA" or QS = "?foo=bar&gclid=AAA&bar=baz"
+ # Remove all marketing get parameters to minimize the cache objects
+ if (req.url ~ "(\?|&)(gclid|cx|ie|cof|siteurl|zanpid|origin|mc_[a-z]+|utm_[a-z]+)=") {
+ set req.url = regsuball(req.url, "(gclid|cx|ie|cof|siteurl|zanpid|origin|mc_[a-z]+|utm_[a-z]+)=[-_A-z0-9+()%.]+&?", "");
+ set req.url = regsub(req.url, "[?|&]+$", "");
+ }
# Static files caching
if (req.url ~ "^/(pub/)?(media|static)/") {
diff --git a/app/code/Magento/PageCache/etc/varnish5.vcl b/app/code/Magento/PageCache/etc/varnish5.vcl
index 6c8414a5cb641..ea586858eff75 100644
--- a/app/code/Magento/PageCache/etc/varnish5.vcl
+++ b/app/code/Magento/PageCache/etc/varnish5.vcl
@@ -92,10 +92,11 @@ sub vcl_recv {
}
}
- # Remove Google gclid parameters to minimize the cache objects
- set req.url = regsuball(req.url,"\?gclid=[^&]+$",""); # strips when QS = "?gclid=AAA"
- set req.url = regsuball(req.url,"\?gclid=[^&]+&","?"); # strips when QS = "?gclid=AAA&foo=bar"
- set req.url = regsuball(req.url,"&gclid=[^&]+",""); # strips when QS = "?foo=bar&gclid=AAA" or QS = "?foo=bar&gclid=AAA&bar=baz"
+ # Remove all marketing get parameters to minimize the cache objects
+ if (req.url ~ "(\?|&)(gclid|cx|ie|cof|siteurl|zanpid|origin|mc_[a-z]+|utm_[a-z]+)=") {
+ set req.url = regsuball(req.url, "(gclid|cx|ie|cof|siteurl|zanpid|origin|mc_[a-z]+|utm_[a-z]+)=[-_A-z0-9+()%.]+&?", "");
+ set req.url = regsub(req.url, "[?|&]+$", "");
+ }
# Static files caching
if (req.url ~ "^/(pub/)?(media|static)/") {
diff --git a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
index afa71fe591495..ea06c60c30e20 100644
--- a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
@@ -40,7 +40,7 @@ $params = $block->getParams();
$(parent).trigger('clearTimeout');
fullScreenLoader.stopLoader();
globalMessageList.addErrorMessage({
- message: $t()
+ message: $t()
});
}
);
diff --git a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
index f4b4c39ca4021..e2701bab1f062 100644
--- a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
+++ b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
@@ -90,6 +90,10 @@ public function execute()
return $this->getErrorResponse();
}
+ if (!$this->transparent->isActive($quote->getStoreId())) {
+ return $this->getErrorResponse();
+ }
+
$this->sessionTransparent->setQuoteId($quote->getId());
try {
$token = $this->secureTokenService->requestToken($quote);
diff --git a/app/code/Magento/Paypal/README.md b/app/code/Magento/Paypal/README.md
index 8f4453ae0a058..0ed4f2e90291b 100644
--- a/app/code/Magento/Paypal/README.md
+++ b/app/code/Magento/Paypal/README.md
@@ -1,6 +1,6 @@
Module Magento\PayPal implements integration with the PayPal payment system. Namely, it enables the following payment methods:
-*PayPal Express Checkout
-*PayPal Payments Standard
-*PayPal Payments Pro
-*PayPal Credit
-*PayFlow Payment Gateway
+* PayPal Express Checkout
+* PayPal Payments Standard
+* PayPal Payments Pro
+* PayPal Credit
+* PayFlow Payment Gateway
diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php
index 60451a9827097..6752eab6a7783 100644
--- a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php
@@ -3,16 +3,18 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Paypal\Test\Unit\Controller\Transparent;
use Magento\Framework\App\Action\Context;
use Magento\Framework\Controller\Result\JsonFactory;
use Magento\Framework\Session\Generic;
use Magento\Framework\Session\SessionManager;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
use Magento\Paypal\Controller\Transparent\RequestSecureToken;
use Magento\Paypal\Model\Payflow\Service\Request\SecureToken;
use Magento\Paypal\Model\Payflow\Transparent;
+use PHPUnit\Framework\MockObject\MockObject;
/**
* Class RequestSecureTokenTest
@@ -22,39 +24,39 @@
class RequestSecureTokenTest extends \PHPUnit\Framework\TestCase
{
/**
- * @var Transparent|\PHPUnit_Framework_MockObject_MockObject
+ * @var Transparent|MockObject
*/
- protected $transparentMock;
+ private $transparent;
/**
- * @var RequestSecureToken|\PHPUnit_Framework_MockObject_MockObject
+ * @var RequestSecureToken|MockObject
*/
- protected $controller;
+ private $controller;
/**
- * @var Context|\PHPUnit_Framework_MockObject_MockObject
+ * @var Context|MockObject
*/
- protected $contextMock;
+ private $context;
/**
- * @var JsonFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var JsonFactory|MockObject
*/
- protected $resultJsonFactoryMock;
+ private $resultJsonFactory;
/**
- * @var Generic|\PHPUnit_Framework_MockObject_MockObject
+ * @var Generic|MockObject
*/
- protected $sessionTransparentMock;
+ private $sessionTransparent;
/**
- * @var SecureToken|\PHPUnit_Framework_MockObject_MockObject
+ * @var SecureToken|MockObject
*/
- protected $secureTokenServiceMock;
+ private $secureTokenService;
/**
- * @var SessionManager|\PHPUnit_Framework_MockObject_MockObject
+ * @var SessionManager|MockObject
*/
- protected $sessionManagerMock;
+ private $sessionManager;
/**
* Set up
@@ -64,45 +66,46 @@ class RequestSecureTokenTest extends \PHPUnit\Framework\TestCase
protected function setUp()
{
- $this->contextMock = $this->getMockBuilder(\Magento\Framework\App\Action\Context::class)
+ $this->context = $this->getMockBuilder(\Magento\Framework\App\Action\Context::class)
->disableOriginalConstructor()
->getMock();
- $this->resultJsonFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\JsonFactory::class)
+ $this->resultJsonFactory = $this->getMockBuilder(\Magento\Framework\Controller\Result\JsonFactory::class)
->setMethods(['create'])
->disableOriginalConstructor()
->getMock();
- $this->sessionTransparentMock = $this->getMockBuilder(\Magento\Framework\Session\Generic::class)
+ $this->sessionTransparent = $this->getMockBuilder(\Magento\Framework\Session\Generic::class)
->setMethods(['setQuoteId'])
->disableOriginalConstructor()
->getMock();
- $this->secureTokenServiceMock = $this->getMockBuilder(
+ $this->secureTokenService = $this->getMockBuilder(
\Magento\Paypal\Model\Payflow\Service\Request\SecureToken::class
)
->setMethods(['requestToken'])
->disableOriginalConstructor()
->getMock();
- $this->sessionManagerMock = $this->getMockBuilder(\Magento\Framework\Session\SessionManager::class)
+ $this->sessionManager = $this->getMockBuilder(\Magento\Framework\Session\SessionManager::class)
->setMethods(['getQuote'])
->disableOriginalConstructor()
->getMock();
- $this->transparentMock = $this->getMockBuilder(\Magento\Paypal\Model\Payflow\Transparent::class)
- ->setMethods(['getCode'])
+ $this->transparent = $this->getMockBuilder(\Magento\Paypal\Model\Payflow\Transparent::class)
+ ->setMethods(['getCode', 'isActive'])
->disableOriginalConstructor()
->getMock();
$this->controller = new \Magento\Paypal\Controller\Transparent\RequestSecureToken(
- $this->contextMock,
- $this->resultJsonFactoryMock,
- $this->sessionTransparentMock,
- $this->secureTokenServiceMock,
- $this->sessionManagerMock,
- $this->transparentMock
+ $this->context,
+ $this->resultJsonFactory,
+ $this->sessionTransparent,
+ $this->secureTokenService,
+ $this->sessionManager,
+ $this->transparent
);
}
public function testExecuteSuccess()
{
$quoteId = 99;
+ $storeId = 2;
$tokenFields = ['fields-1', 'fields-2', 'fields-3'];
$secureToken = 'token_hash';
$resultExpectation = [
@@ -116,6 +119,8 @@ public function testExecuteSuccess()
$quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
->disableOriginalConstructor()
->getMock();
+ $quoteMock->method('getStoreId')
+ ->willReturn($storeId);
$tokenMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
->disableOriginalConstructor()
->getMock();
@@ -123,21 +128,23 @@ public function testExecuteSuccess()
->disableOriginalConstructor()
->getMock();
- $this->sessionManagerMock->expects($this->atLeastOnce())
+ $this->sessionManager->expects($this->atLeastOnce())
->method('getQuote')
->willReturn($quoteMock);
+ $this->transparent->method('isActive')
+ ->with($storeId)
+ ->willReturn(true);
$quoteMock->expects($this->once())
->method('getId')
->willReturn($quoteId);
- $this->sessionTransparentMock->expects($this->once())
+ $this->sessionTransparent->expects($this->once())
->method('setQuoteId')
->with($quoteId);
- $this->secureTokenServiceMock->expects($this->once())
+ $this->secureTokenService->expects($this->once())
->method('requestToken')
->with($quoteMock)
->willReturn($tokenMock);
- $this->transparentMock->expects($this->once())
- ->method('getCode')
+ $this->transparent->method('getCode')
->willReturn('transparent');
$tokenMock->expects($this->atLeastOnce())
->method('getData')
@@ -147,7 +154,7 @@ public function testExecuteSuccess()
['securetoken', null, $secureToken]
]
);
- $this->resultJsonFactoryMock->expects($this->once())
+ $this->resultJsonFactory->expects($this->once())
->method('create')
->willReturn($jsonMock);
$jsonMock->expects($this->once())
@@ -161,6 +168,7 @@ public function testExecuteSuccess()
public function testExecuteTokenRequestException()
{
$quoteId = 99;
+ $storeId = 2;
$resultExpectation = [
'success' => false,
'error' => true,
@@ -170,24 +178,29 @@ public function testExecuteTokenRequestException()
$quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
->disableOriginalConstructor()
->getMock();
+ $quoteMock->method('getStoreId')
+ ->willReturn($storeId);
$jsonMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Json::class)
->disableOriginalConstructor()
->getMock();
- $this->sessionManagerMock->expects($this->atLeastOnce())
+ $this->sessionManager->expects($this->atLeastOnce())
->method('getQuote')
->willReturn($quoteMock);
$quoteMock->expects($this->once())
->method('getId')
->willReturn($quoteId);
- $this->sessionTransparentMock->expects($this->once())
+ $this->transparent->method('isActive')
+ ->with($storeId)
+ ->willReturn(true);
+ $this->sessionTransparent->expects($this->once())
->method('setQuoteId')
->with($quoteId);
- $this->secureTokenServiceMock->expects($this->once())
+ $this->secureTokenService->expects($this->once())
->method('requestToken')
->with($quoteMock)
->willThrowException(new \Exception());
- $this->resultJsonFactoryMock->expects($this->once())
+ $this->resultJsonFactory->expects($this->once())
->method('create')
->willReturn($jsonMock);
$jsonMock->expects($this->once())
@@ -211,10 +224,10 @@ public function testExecuteEmptyQuoteError()
->disableOriginalConstructor()
->getMock();
- $this->sessionManagerMock->expects($this->atLeastOnce())
+ $this->sessionManager->expects($this->atLeastOnce())
->method('getQuote')
->willReturn($quoteMock);
- $this->resultJsonFactoryMock->expects($this->once())
+ $this->resultJsonFactory->expects($this->once())
->method('create')
->willReturn($jsonMock);
$jsonMock->expects($this->once())
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
index f1b14831bab31..d6fb2f3e6fc75 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
@@ -58,6 +58,7 @@
+
diff --git a/app/code/Magento/PaypalCaptcha/LICENSE.txt b/app/code/Magento/PaypalCaptcha/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/LICENSE.txt
@@ -0,0 +1,48 @@
+
+Open Software License ("OSL") v. 3.0
+
+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Open Software License version 3.0
+
+ 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+ 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+ 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+ 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
+
+ 4. to perform the Original Work publicly; and
+
+ 5. to display the Original Work publicly.
+
+ 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+ 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+ 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+ 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+ 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+ 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+ 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+ 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+ 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+ 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+ 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+ 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+ 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+ 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+ 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/app/code/Magento/PaypalCaptcha/LICENSE_AFL.txt b/app/code/Magento/PaypalCaptcha/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/LICENSE_AFL.txt
@@ -0,0 +1,48 @@
+
+Academic Free License ("AFL") v. 3.0
+
+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Academic Free License version 3.0
+
+ 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+ 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+ 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+ 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
+
+ 4. to perform the Original Work publicly; and
+
+ 5. to display the Original Work publicly.
+
+ 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+ 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+ 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+ 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+ 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+ 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+ 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+ 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+ 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+ 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+ 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+ 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+ 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+ 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+ 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/app/code/Magento/PaypalCaptcha/Model/Checkout/ConfigProviderPayPal.php b/app/code/Magento/PaypalCaptcha/Model/Checkout/ConfigProviderPayPal.php
new file mode 100644
index 0000000000000..289a1631ed1f6
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/Model/Checkout/ConfigProviderPayPal.php
@@ -0,0 +1,135 @@
+storeManager = $storeManager;
+ $this->captchaData = $captchaData;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getConfig(): array
+ {
+ $config['captchaPayments'][self::$formId] = [
+ 'isCaseSensitive' => $this->isCaseSensitive(self::$formId),
+ 'imageHeight' => $this->getImageHeight(self::$formId),
+ 'imageSrc' => $this->getImageSrc(self::$formId),
+ 'refreshUrl' => $this->getRefreshUrl(),
+ 'isRequired' => $this->isRequired(self::$formId),
+ 'timestamp' => time()
+ ];
+
+ return $config;
+ }
+
+ /**
+ * Returns is captcha case sensitive
+ *
+ * @param string $formId
+ * @return bool
+ */
+ private function isCaseSensitive(string $formId): bool
+ {
+ return (bool)$this->getCaptchaModel($formId)->isCaseSensitive();
+ }
+
+ /**
+ * Returns captcha image height
+ *
+ * @param string $formId
+ * @return int
+ */
+ private function getImageHeight(string $formId): int
+ {
+ return (int)$this->getCaptchaModel($formId)->getHeight();
+ }
+
+ /**
+ * Returns captcha image source path
+ *
+ * @param string $formId
+ * @return string
+ */
+ private function getImageSrc(string $formId): string
+ {
+ if ($this->isRequired($formId)) {
+ $captcha = $this->getCaptchaModel($formId);
+ $captcha->generate();
+ return $captcha->getImgSrc();
+ }
+
+ return '';
+ }
+
+ /**
+ * Returns URL to controller action which returns new captcha image
+ *
+ * @return string
+ */
+ private function getRefreshUrl(): string
+ {
+ $store = $this->storeManager->getStore();
+ return $store->getUrl('captcha/refresh', ['_secure' => $store->isCurrentlySecure()]);
+ }
+
+ /**
+ * Whether captcha is required to be inserted to this form
+ *
+ * @param string $formId
+ * @return bool
+ */
+ private function isRequired(string $formId): bool
+ {
+ return (bool)$this->getCaptchaModel($formId)->isRequired();
+ }
+
+ /**
+ * Return captcha model for specified form
+ *
+ * @param string $formId
+ * @return CaptchaInterface
+ */
+ private function getCaptchaModel(string $formId): CaptchaInterface
+ {
+ return $this->captchaData->getCaptcha($formId);
+ }
+}
diff --git a/app/code/Magento/PaypalCaptcha/Observer/CaptchaRequestToken.php b/app/code/Magento/PaypalCaptcha/Observer/CaptchaRequestToken.php
new file mode 100644
index 0000000000000..e7cb282b1799b
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/Observer/CaptchaRequestToken.php
@@ -0,0 +1,76 @@
+helper = $helper;
+ $this->jsonSerializer = $jsonSerializer;
+ $this->actionFlag = $actionFlag;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function execute(Observer $observer)
+ {
+ $formId = 'co-payment-form';
+ $captcha = $this->helper->getCaptcha($formId);
+
+ if (!$captcha->isRequired()) {
+ return;
+ }
+
+ /** @var Action $controller */
+ $controller = $observer->getControllerAction();
+ $word = $controller->getRequest()->getPost('captcha_string');
+ if ($captcha->isCorrect($word)) {
+ return;
+ }
+
+ $data = $this->jsonSerializer->serialize([
+ 'success' => false,
+ 'error' => true,
+ 'error_messages' => __('Incorrect CAPTCHA.')
+ ]);
+ $this->actionFlag->set('', Action::FLAG_NO_DISPATCH, true);
+ $controller->getResponse()->representJson($data);
+ }
+}
diff --git a/app/code/Magento/PaypalCaptcha/README.md b/app/code/Magento/PaypalCaptcha/README.md
new file mode 100644
index 0000000000000..71588599a5ecd
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/README.md
@@ -0,0 +1 @@
+The PayPal Captcha module provides a possibility to enable Captcha validation on Payflow Pro payment form.
\ No newline at end of file
diff --git a/app/code/Magento/PaypalCaptcha/composer.json b/app/code/Magento/PaypalCaptcha/composer.json
new file mode 100644
index 0000000000000..e71ef8c0ec7de
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/composer.json
@@ -0,0 +1,30 @@
+{
+ "name": "magento/module-paypal-captcha",
+ "description": "Provides CAPTCHA validation for PayPal Payflow Pro",
+ "config": {
+ "sort-packages": true
+ },
+ "require": {
+ "php": "~7.1.3||~7.2.0",
+ "magento/framework": "*",
+ "magento/module-captcha": "*",
+ "magento/module-checkout": "*",
+ "magento/module-store": "*"
+ },
+ "suggest": {
+ "magento/module-paypal": "*"
+ },
+ "type": "magento2-module",
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "autoload": {
+ "files": [
+ "registration.php"
+ ],
+ "psr-4": {
+ "Magento\\PaypalCaptcha\\": ""
+ }
+ }
+}
diff --git a/app/code/Magento/PaypalCaptcha/etc/adminhtml/system.xml b/app/code/Magento/PaypalCaptcha/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..12afd8ceda60e
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/etc/adminhtml/system.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+ CAPTCHA for "Create user", "Forgot password", "Payflow Pro" forms is always enabled if chosen.
+
+
+
+
+
diff --git a/app/code/Magento/PaypalCaptcha/etc/config.xml b/app/code/Magento/PaypalCaptcha/etc/config.xml
new file mode 100644
index 0000000000000..133a78a42f7b4
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/etc/config.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+ 1
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/PaypalCaptcha/etc/frontend/di.xml b/app/code/Magento/PaypalCaptcha/etc/frontend/di.xml
new file mode 100644
index 0000000000000..c236d5ea04ca0
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/etc/frontend/di.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+ - Magento\PaypalCaptcha\Model\Checkout\ConfigProviderPayPal
+
+
+
+
diff --git a/app/code/Magento/PaypalCaptcha/etc/frontend/events.xml b/app/code/Magento/PaypalCaptcha/etc/frontend/events.xml
new file mode 100644
index 0000000000000..ae706c4485d61
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/etc/frontend/events.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/PaypalCaptcha/etc/module.xml b/app/code/Magento/PaypalCaptcha/etc/module.xml
new file mode 100644
index 0000000000000..425c829a5d391
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/etc/module.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/PaypalCaptcha/registration.php b/app/code/Magento/PaypalCaptcha/registration.php
new file mode 100644
index 0000000000000..4dac0582a6d1b
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/registration.php
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+ -
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- uiComponent
+ - paypal-captcha
+ - paypal-captcha
+ - checkoutProvider
+ -
+
- Magento_Checkout/payment/before-place-order
+
+ -
+
-
+
- Magento_PaypalCaptcha/js/view/checkout/paymentCaptcha
+ - paypal-captcha
+ - co-payment-form
+ - checkoutConfig
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/requirejs-config.js b/app/code/Magento/PaypalCaptcha/view/frontend/requirejs-config.js
new file mode 100644
index 0000000000000..78e7add4ec690
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/view/frontend/requirejs-config.js
@@ -0,0 +1,14 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+ config: {
+ mixins: {
+ 'Magento_Checkout/js/view/payment/list': {
+ 'Magento_PaypalCaptcha/js/view/payment/list-mixin': true
+ }
+ }
+ }
+};
diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/checkout/paymentCaptcha.js b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/checkout/paymentCaptcha.js
new file mode 100644
index 0000000000000..f8f119e3b3396
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/checkout/paymentCaptcha.js
@@ -0,0 +1,44 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'jquery',
+ 'Magento_Captcha/js/view/checkout/defaultCaptcha',
+ 'Magento_Captcha/js/model/captchaList',
+ 'Magento_Captcha/js/model/captcha'
+],
+function ($, defaultCaptcha, captchaList, Captcha) {
+ 'use strict';
+
+ return defaultCaptcha.extend({
+
+ /** @inheritdoc */
+ initialize: function () {
+ var captchaConfigPayment,
+ currentCaptcha;
+
+ this._super();
+
+ if (window[this.configSource] && window[this.configSource].captchaPayments) {
+ captchaConfigPayment = window[this.configSource].captchaPayments;
+
+ $.each(captchaConfigPayment, function (formId, captchaData) {
+ var captcha;
+
+ captchaData.formId = formId;
+ captcha = Captcha(captchaData);
+ captchaList.add(captcha);
+ });
+ }
+
+ currentCaptcha = captchaList.getCaptchaByFormId(this.formId);
+
+ if (currentCaptcha != null) {
+ currentCaptcha.setIsVisible(true);
+ this.setCurrentCaptcha(currentCaptcha);
+ }
+ }
+ });
+});
diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js
new file mode 100644
index 0000000000000..60172f696e9ed
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js
@@ -0,0 +1,54 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'jquery',
+ 'Magento_Captcha/js/model/captchaList'
+], function ($, captchaList) {
+ 'use strict';
+
+ var mixin = {
+
+ formId: 'co-payment-form',
+
+ /**
+ * Sets custom template for Payflow Pro
+ *
+ * @param {Object} payment
+ * @returns {Object}
+ */
+ createComponent: function (payment) {
+
+ var component = this._super(payment);
+
+ if (component.component === 'Magento_Paypal/js/view/payment/method-renderer/payflowpro-method') {
+ component.template = 'Magento_PaypalCaptcha/payment/payflowpro-form';
+ $(window).off('clearTimeout')
+ .on('clearTimeout', this.clearTimeout.bind(this));
+ }
+
+ return component;
+ },
+
+ /**
+ * Overrides default window.clearTimeout() to catch errors from iframe and reload Captcha.
+ */
+ clearTimeout: function () {
+ var captcha = captchaList.getCaptchaByFormId(this.formId);
+
+ if (captcha !== null) {
+ captcha.refresh();
+ }
+ clearTimeout();
+ }
+ };
+
+ /**
+ * Overrides `Magento_Checkout/js/view/payment/list::createComponent`
+ */
+ return function (target) {
+ return target.extend(mixin);
+ };
+});
diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/web/template/payment/payflowpro-form.html b/app/code/Magento/PaypalCaptcha/view/frontend/web/template/payment/payflowpro-form.html
new file mode 100644
index 0000000000000..fec5cf96b0324
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/view/frontend/web/template/payment/payflowpro-form.html
@@ -0,0 +1,90 @@
+
+
+ 2
+
+
+
+
+ abc
+
+
+
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
index 145e9c01980a5..3506ffc8c8792 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
@@ -13,6 +13,7 @@
use Magento\Quote\Api\CartRepositoryInterface;
use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
use Magento\Quote\Model\Quote;
+use Magento\Store\Model\StoreManagerInterface;
/**
* Get cart
@@ -29,16 +30,24 @@ class GetCartForUser
*/
private $cartRepository;
+ /**
+ * @var StoreManagerInterface
+ */
+ private $storeManager;
+
/**
* @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
* @param CartRepositoryInterface $cartRepository
+ * @param StoreManagerInterface $storeManager
*/
public function __construct(
MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
- CartRepositoryInterface $cartRepository
+ CartRepositoryInterface $cartRepository,
+ StoreManagerInterface $storeManager
) {
$this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
$this->cartRepository = $cartRepository;
+ $this->storeManager = $storeManager;
}
/**
@@ -75,6 +84,15 @@ public function execute(string $cartHash, ?int $customerId): Quote
);
}
+ if ((int)$cart->getStoreId() !== (int)$this->storeManager->getStore()->getId()) {
+ throw new GraphQlNoSuchEntityException(
+ __(
+ 'Wrong store code specified for cart "%masked_cart_id"',
+ ['masked_cart_id' => $cartHash]
+ )
+ );
+ }
+
$cartCustomerId = (int)$cart->getCustomerId();
/* Guest cart, allow operations */
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
index 76bdc74611131..13d6a1d3dce70 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
@@ -7,9 +7,12 @@
namespace Magento\QuoteGraphQl\Model\Cart;
-use Magento\Customer\Api\Data\AddressInterface as CustomerAddress;
+use Magento\Customer\Helper\Address as AddressHelper;
+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
use Magento\Quote\Model\Quote\Address as QuoteAddress;
use Magento\Quote\Model\Quote\AddressFactory as BaseQuoteAddressFactory;
@@ -23,13 +26,29 @@ class QuoteAddressFactory
*/
private $quoteAddressFactory;
+ /**
+ * @var GetCustomerAddress
+ */
+ private $getCustomerAddress;
+
+ /**
+ * @var AddressHelper
+ */
+ private $addressHelper;
+
/**
* @param BaseQuoteAddressFactory $quoteAddressFactory
+ * @param GetCustomerAddress $getCustomerAddress
+ * @param AddressHelper $addressHelper
*/
public function __construct(
- BaseQuoteAddressFactory $quoteAddressFactory
+ BaseQuoteAddressFactory $quoteAddressFactory,
+ GetCustomerAddress $getCustomerAddress,
+ AddressHelper $addressHelper
) {
$this->quoteAddressFactory = $quoteAddressFactory;
+ $this->getCustomerAddress = $getCustomerAddress;
+ $this->addressHelper = $addressHelper;
}
/**
@@ -37,25 +56,38 @@ public function __construct(
*
* @param array $addressInput
* @return QuoteAddress
+ * @throws GraphQlInputException
*/
public function createBasedOnInputData(array $addressInput): QuoteAddress
{
$addressInput['country_id'] = $addressInput['country_code'] ?? '';
+ $maxAllowedLineCount = $this->addressHelper->getStreetLines();
+ if (is_array($addressInput['street']) && count($addressInput['street']) > $maxAllowedLineCount) {
+ throw new GraphQlInputException(
+ __('"Street Address" cannot contain more than %1 lines.', $maxAllowedLineCount)
+ );
+ }
+
$quoteAddress = $this->quoteAddressFactory->create();
$quoteAddress->addData($addressInput);
return $quoteAddress;
}
/**
- * Create QuoteAddress based on CustomerAddress
+ * Create Quote Address based on Customer Address
*
- * @param CustomerAddress $customerAddress
+ * @param int $customerAddressId
+ * @param int $customerId
* @return QuoteAddress
* @throws GraphQlInputException
+ * @throws GraphQlAuthorizationException
+ * @throws GraphQlNoSuchEntityException
*/
- public function createBasedOnCustomerAddress(CustomerAddress $customerAddress): QuoteAddress
+ public function createBasedOnCustomerAddress(int $customerAddressId, int $customerId): QuoteAddress
{
+ $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, $customerId);
+
$quoteAddress = $this->quoteAddressFactory->create();
try {
$quoteAddress->importCustomerAddressData($customerAddress);
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
index 31524ea023222..c2bac13c07067 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
@@ -7,8 +7,9 @@
namespace Magento\QuoteGraphQl\Model\Cart;
-use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
@@ -29,11 +30,6 @@ class SetBillingAddressOnCart
*/
private $getCustomer;
- /**
- * @var GetCustomerAddress
- */
- private $getCustomerAddress;
-
/**
* @var AssignBillingAddressToCart
*/
@@ -42,18 +38,15 @@ class SetBillingAddressOnCart
/**
* @param QuoteAddressFactory $quoteAddressFactory
* @param GetCustomer $getCustomer
- * @param GetCustomerAddress $getCustomerAddress
* @param AssignBillingAddressToCart $assignBillingAddressToCart
*/
public function __construct(
QuoteAddressFactory $quoteAddressFactory,
GetCustomer $getCustomer,
- GetCustomerAddress $getCustomerAddress,
AssignBillingAddressToCart $assignBillingAddressToCart
) {
$this->quoteAddressFactory = $quoteAddressFactory;
$this->getCustomer = $getCustomer;
- $this->getCustomerAddress = $getCustomerAddress;
$this->assignBillingAddressToCart = $assignBillingAddressToCart;
}
@@ -65,6 +58,8 @@ public function __construct(
* @param array $billingAddressInput
* @return void
* @throws GraphQlInputException
+ * @throws GraphQlAuthenticationException
+ * @throws GraphQlAuthorizationException
* @throws GraphQlNoSuchEntityException
*/
public function execute(ContextInterface $context, CartInterface $cart, array $billingAddressInput): void
@@ -97,8 +92,10 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
$billingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
} else {
$customer = $this->getCustomer->execute($context);
- $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, (int)$customer->getId());
- $billingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress($customerAddress);
+ $billingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress(
+ (int)$customerAddressId,
+ (int)$customer->getId()
+ );
}
$this->assignBillingAddressToCart->execute($cart, $billingAddress, $useForShipping);
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
index bbca7721754cb..6b0e2a311bf44 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
@@ -7,7 +7,6 @@
namespace Magento\QuoteGraphQl\Model\Cart;
-use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
@@ -28,11 +27,6 @@ class SetShippingAddressesOnCart implements SetShippingAddressesOnCartInterface
*/
private $getCustomer;
- /**
- * @var GetCustomerAddress
- */
- private $getCustomerAddress;
-
/**
* @var AssignShippingAddressToCart
*/
@@ -41,18 +35,15 @@ class SetShippingAddressesOnCart implements SetShippingAddressesOnCartInterface
/**
* @param QuoteAddressFactory $quoteAddressFactory
* @param GetCustomer $getCustomer
- * @param GetCustomerAddress $getCustomerAddress
* @param AssignShippingAddressToCart $assignShippingAddressToCart
*/
public function __construct(
QuoteAddressFactory $quoteAddressFactory,
GetCustomer $getCustomer,
- GetCustomerAddress $getCustomerAddress,
AssignShippingAddressToCart $assignShippingAddressToCart
) {
$this->quoteAddressFactory = $quoteAddressFactory;
$this->getCustomer = $getCustomer;
- $this->getCustomerAddress = $getCustomerAddress;
$this->assignShippingAddressToCart = $assignShippingAddressToCart;
}
@@ -86,8 +77,10 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
$shippingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
} else {
$customer = $this->getCustomer->execute($context);
- $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, (int)$customer->getId());
- $shippingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress($customerAddress);
+ $shippingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress(
+ (int)$customerAddressId,
+ (int)$customer->getId()
+ );
}
$this->assignShippingAddressToCart->execute($cart, $shippingAddress);
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/AppliedCoupon.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/AppliedCoupon.php
index ca69b763929be..8251089abcd60 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/AppliedCoupon.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/AppliedCoupon.php
@@ -11,12 +11,27 @@
use Magento\Framework\GraphQl\Config\Element\Field;
use Magento\Framework\GraphQl\Query\ResolverInterface;
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Quote\Api\CouponManagementInterface;
/**
* @inheritdoc
*/
class AppliedCoupon implements ResolverInterface
{
+ /**
+ * @var CouponManagementInterface
+ */
+ private $couponManagement;
+
+ /**
+ * @param CouponManagementInterface $couponManagement
+ */
+ public function __construct(
+ CouponManagementInterface $couponManagement
+ ) {
+ $this->couponManagement = $couponManagement;
+ }
+
/**
* @inheritdoc
*/
@@ -26,9 +41,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
throw new LocalizedException(__('"model" value should be specified'));
}
$cart = $value['model'];
+ $cartId = $cart->getId();
- $appliedCoupon = $cart->getCouponCode();
-
+ $appliedCoupon = $this->couponManagement->get($cartId);
return $appliedCoupon ? ['code' => $appliedCoupon] : null;
}
}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
new file mode 100644
index 0000000000000..3bd46a664f2ab
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
@@ -0,0 +1,83 @@
+getCartForUser = $getCartForUser;
+ $this->cartManagement = $cartManagement;
+ $this->orderRepository = $orderRepository;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+ {
+ if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
+ throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
+ }
+ $maskedCartId = $args['input']['cart_id'];
+
+ $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
+
+ try {
+ $orderId = $this->cartManagement->placeOrder($cart->getId());
+ $order = $this->orderRepository->get($orderId);
+
+ return [
+ 'order' => [
+ 'order_id' => $order->getIncrementId(),
+ ],
+ ];
+ } catch (NoSuchEntityException $e) {
+ throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+ } catch (LocalizedException $e) {
+ throw new GraphQlInputException(__('Unable to place order: %message', ['message' => $e->getMessage()]), $e);
+ }
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
index 5a708ceaedc28..f81ea3020d3d0 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
@@ -62,7 +62,11 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
try {
$this->couponManagement->remove($cartId);
} catch (NoSuchEntityException $e) {
- throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+ $message = $e->getMessage();
+ if (preg_match('/The "\d+" Cart doesn\'t contain products/', $message)) {
+ $message = 'Cart does not contain products';
+ }
+ throw new GraphQlNoSuchEntityException(__($message), $e);
} catch (CouldNotDeleteException $e) {
throw new LocalizedException(__($e->getMessage()), $e);
}
diff --git a/app/code/Magento/QuoteGraphQl/composer.json b/app/code/Magento/QuoteGraphQl/composer.json
index 1bf4d581a5fe3..22ca9cfdfae9a 100644
--- a/app/code/Magento/QuoteGraphQl/composer.json
+++ b/app/code/Magento/QuoteGraphQl/composer.json
@@ -10,7 +10,8 @@
"magento/module-catalog": "*",
"magento/module-store": "*",
"magento/module-customer": "*",
- "magento/module-customer-graph-ql": "*"
+ "magento/module-customer-graph-ql": "*",
+ "magento/module-sales": "*"
},
"suggest": {
"magento/module-graph-ql": "*"
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 79cea3855f6f3..9ec3492f64531 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -17,6 +17,7 @@ type Mutation {
setBillingAddressOnCart(input: SetBillingAddressOnCartInput): SetBillingAddressOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetBillingAddressOnCart")
setShippingMethodsOnCart(input: SetShippingMethodsOnCartInput): SetShippingMethodsOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetShippingMethodsOnCart")
setPaymentMethodOnCart(input: SetPaymentMethodOnCartInput): SetPaymentMethodOnCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\SetPaymentMethodOnCart")
+ placeOrder(input: PlaceOrderInput): PlaceOrderOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\PlaceOrder")
}
input AddSimpleProductsToCartInput {
@@ -114,6 +115,10 @@ input ShippingMethodInput {
method_code: String!
}
+input PlaceOrderInput {
+ cart_id: String!
+}
+
input SetPaymentMethodOnCartInput {
cart_id: String!
payment_method: PaymentMethodInput!
@@ -144,6 +149,10 @@ type ApplyCouponToCartOutput {
cart: Cart!
}
+type PlaceOrderOutput {
+ order: Order!
+}
+
type Cart {
items: [CartItemInterface] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartItems")
applied_coupon: AppliedCoupon @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\AppliedCoupon")
@@ -285,3 +294,7 @@ type CartItemSelectedOptionValuePrice {
units: String!
type: PriceTypeEnum!
}
+
+type Order {
+ order_id: String
+}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
index 83b155293c2b9..8172a3c0db4ad 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
@@ -5,6 +5,11 @@
*/
namespace Magento\Sales\Block\Adminhtml;
+use Magento\Sales\Model\Order;
+
+/**
+ * Adminhtml sales totals block
+ */
class Totals extends \Magento\Sales\Block\Order\Totals
{
/**
@@ -67,12 +72,16 @@ protected function _initTotals()
if (!$this->getSource()->getIsVirtual() && ((double)$this->getSource()->getShippingAmount() ||
$this->getSource()->getShippingDescription())
) {
+ $shippingLabel = __('Shipping & Handling');
+ if ($this->isFreeShipping($this->getOrder()) && $this->getSource()->getDiscountDescription()) {
+ $shippingLabel .= sprintf(' (%s)', $this->getSource()->getDiscountDescription());
+ }
$this->_totals['shipping'] = new \Magento\Framework\DataObject(
[
'code' => 'shipping',
'value' => $this->getSource()->getShippingAmount(),
'base_value' => $this->getSource()->getBaseShippingAmount(),
- 'label' => __('Shipping & Handling'),
+ 'label' => $shippingLabel,
]
);
}
@@ -109,4 +118,23 @@ protected function _initTotals()
return $this;
}
+
+ /**
+ * Availability of free shipping in at least one order item
+ *
+ * @param Order $order
+ * @return bool
+ */
+ private function isFreeShipping(Order $order): bool
+ {
+ $isFreeShipping = false;
+ foreach ($order->getItems() as $orderItem) {
+ if ($orderItem->getFreeShipping() == '1') {
+ $isFreeShipping = true;
+ break;
+ }
+ }
+
+ return $isFreeShipping;
+ }
}
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
index 11908864236f6..48934e24a3795 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
@@ -3,6 +3,8 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Sales\Model\Order\Pdf\Items\Creditmemo;
/**
@@ -66,11 +68,18 @@ public function draw()
$lines = [];
// draw Product name
- $lines[0] = [['text' => $this->string->split($item->getName(), 35, true, true), 'feed' => 35]];
+ $lines[0] = [
+ [
+ // phpcs:ignore Magento2.Functions.DiscouragedFunction
+ 'text' => $this->string->split(html_entity_decode($item->getName()), 35, true, true),
+ 'feed' => 35
+ ]
+ ];
// draw SKU
$lines[0][] = [
- 'text' => $this->string->split($this->getSku($item), 17),
+ // phpcs:ignore Magento2.Functions.DiscouragedFunction
+ 'text' => $this->string->split(html_entity_decode($this->getSku($item)), 17),
'feed' => 255,
'align' => 'right',
];
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
index 8562328025540..23c2c00daadc3 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
@@ -3,6 +3,8 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Sales\Model\Order\Pdf\Items\Invoice;
/**
@@ -66,11 +68,18 @@ public function draw()
$lines = [];
// draw Product name
- $lines[0] = [['text' => $this->string->split($item->getName(), 35, true, true), 'feed' => 35]];
+ $lines[0] = [
+ [
+ // phpcs:ignore Magento2.Functions.DiscouragedFunction
+ 'text' => $this->string->split(html_entity_decode($item->getName()), 35, true, true),
+ 'feed' => 35
+ ]
+ ];
// draw SKU
$lines[0][] = [
- 'text' => $this->string->split($this->getSku($item), 17),
+ // phpcs:ignore Magento2.Functions.DiscouragedFunction
+ 'text' => $this->string->split(html_entity_decode($this->getSku($item)), 17),
'feed' => 290,
'align' => 'right',
];
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
index 6007e1dcf2b47..a88b508ba0789 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
@@ -3,6 +3,8 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Sales\Model\Order\Pdf\Items\Shipment;
/**
@@ -65,14 +67,21 @@ public function draw()
$lines = [];
// draw Product name
- $lines[0] = [['text' => $this->string->split($item->getName(), 60, true, true), 'feed' => 100]];
+ $lines[0] = [
+ [
+ // phpcs:ignore Magento2.Functions.DiscouragedFunction
+ 'text' => $this->string->split(html_entity_decode($item->getName()), 60, true, true),
+ 'feed' => 100
+ ]
+ ];
// draw QTY
$lines[0][] = ['text' => $item->getQty() * 1, 'feed' => 35];
// draw SKU
$lines[0][] = [
- 'text' => $this->string->split($this->getSku($item), 25),
+ // phpcs:ignore Magento2.Functions.DiscouragedFunction
+ 'text' => $this->string->split(html_entity_decode($this->getSku($item)), 25),
'feed' => 565,
'align' => 'right',
];
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
index 0061411d576e2..b90bac7e0881b 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
@@ -19,18 +19,15 @@
@@ -38,7 +35,6 @@
-
-
+
+
-
-
+
+
+
+
+
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
index b690d0190bdd1..d77e30cda24eb 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
@@ -96,4 +96,8 @@
+
+
\ No newline at end of file
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionsSectionActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionsSectionActionGroup.xml
new file mode 100644
index 0000000000000..66f89bfc37365
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionsSectionActionGroup.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleConditionsSectionActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleConditionsSectionActionGroup.xml
new file mode 100644
index 0000000000000..ab45aae46db1d
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleConditionsSectionActionGroup.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleLabelsSectionActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleLabelsSectionActionGroup.xml
new file mode 100644
index 0000000000000..4133cc44ebc15
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleLabelsSectionActionGroup.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleRuleInfoSectionActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleRuleInfoSectionActionGroup.xml
new file mode 100644
index 0000000000000..27b9634cbe28c
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleRuleInfoSectionActionGroup.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminFilterCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminFilterCartPriceRuleActionGroup.xml
index 35e1bee0952cf..7a3a20e603255 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminFilterCartPriceRuleActionGroup.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminFilterCartPriceRuleActionGroup.xml
@@ -18,4 +18,9 @@
+
+
\ No newline at end of file
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AssertCartPriceRuleSuccessSaveMessageActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AssertCartPriceRuleSuccessSaveMessageActionGroup.xml
new file mode 100644
index 0000000000000..8fe0250307c6a
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AssertCartPriceRuleSuccessSaveMessageActionGroup.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AssertStorefrontMiniCartItemsActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AssertStorefrontMiniCartItemsActionGroup.xml
new file mode 100644
index 0000000000000..f9c9a9fd357ee
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AssertStorefrontMiniCartItemsActionGroup.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontAddToTheCartActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontAddToTheCartActionGroup.xml
new file mode 100644
index 0000000000000..fa474194635e6
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontAddToTheCartActionGroup.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontClickOnMiniCartActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontClickOnMiniCartActionGroup.xml
new file mode 100644
index 0000000000000..59028ee1a17b5
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontClickOnMiniCartActionGroup.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
index aa0220ea523f4..3e1a247c7a1e2 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
@@ -193,6 +193,54 @@
by_fixed
+
+ Cart Price Rule with Specific Coupon
+ Description for Cart Price Rule
+ Yes
+ Main Website
+ 'NOT LOGGED IN'
+ Specific Coupon
+ 123-abc-ABC-987
+ Percent of product price discount
+ 50
+ Cart Price Rule with Specific Coupon
+ Cart Price Rule with Specific Coupon
+
+
+ Cart Price Rule with complex conditions
+ Cart Price Rule with complex conditions
+ Yes
+ Main Website
+ 'NOT LOGGED IN', 'General', 'Wholesale', 'Retailer'
+ Specific Coupon
+ 123-abc-ABC-987
+ 13
+ 63
+ 1
+ Yes
+ 300
+ US
+ 123456789a
+ Percent of product price discount
+ 50
+ 0
+ 0
+ Yes
+ Yes
+ For matching items only
+ Cart Price Rule with complex conditions
+ Cart Price Rule with complex conditions
+
+
+ Inactive Cart Price Rule
+ Inactive Cart Price Rule
+ 0
+ Main Website
+ 'NOT LOGGED IN'
+ No Coupon
+ Percent of product price discount
+ 50
+
Cart Price Rule
@@ -209,4 +257,4 @@
Percent of product price discount
50
-
+
\ No newline at end of file
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
index 48d2a2685fcbe..e5e21df91930a 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
@@ -16,6 +16,8 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminDeleteActiveSalesRuleWithPercentPriceAndVerifyDeleteMessageTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminDeleteActiveSalesRuleWithPercentPriceAndVerifyDeleteMessageTest.xml
new file mode 100644
index 0000000000000..41e4221a2c37f
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminDeleteActiveSalesRuleWithPercentPriceAndVerifyDeleteMessageTest.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminDeleteInactiveSalesRuleAndVerifyDeleteMessageTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminDeleteInactiveSalesRuleAndVerifyDeleteMessageTest.xml
new file mode 100644
index 0000000000000..1570bfbdb7a23
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminDeleteInactiveSalesRuleAndVerifyDeleteMessageTest.xml
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminEditSearchTermActionGroup.xml b/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminEditSearchTermActionGroup.xml
new file mode 100644
index 0000000000000..de330bb24a2e6
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminEditSearchTermActionGroup.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Search/Test/Mftf/Data/SearchTermData.xml b/app/code/Magento/Search/Test/Mftf/Data/SearchTermData.xml
index 1518adad01347..8263ff996318e 100644
--- a/app/code/Magento/Search/Test/Mftf/Data/SearchTermData.xml
+++ b/app/code/Magento/Search/Test/Mftf/Data/SearchTermData.xml
@@ -14,4 +14,12 @@
http://example.com/
0
+
+ UpdatedSearchTerm
+ Default Store View
+ 1
+ 20
+ http://example.com
+ No
+
diff --git a/app/code/Magento/Search/i18n/de_DE.csv b/app/code/Magento/Search/i18n/de_DE.csv
deleted file mode 100644
index 8b4b04aa3b9ec..0000000000000
--- a/app/code/Magento/Search/i18n/de_DE.csv
+++ /dev/null
@@ -1 +0,0 @@
-"Search Engine","Search Engine"
diff --git a/app/code/Magento/Search/i18n/es_ES.csv b/app/code/Magento/Search/i18n/es_ES.csv
deleted file mode 100644
index 8b4b04aa3b9ec..0000000000000
--- a/app/code/Magento/Search/i18n/es_ES.csv
+++ /dev/null
@@ -1 +0,0 @@
-"Search Engine","Search Engine"
diff --git a/app/code/Magento/Search/i18n/fr_FR.csv b/app/code/Magento/Search/i18n/fr_FR.csv
deleted file mode 100644
index 8b4b04aa3b9ec..0000000000000
--- a/app/code/Magento/Search/i18n/fr_FR.csv
+++ /dev/null
@@ -1 +0,0 @@
-"Search Engine","Search Engine"
diff --git a/app/code/Magento/Search/i18n/nl_NL.csv b/app/code/Magento/Search/i18n/nl_NL.csv
deleted file mode 100644
index 8b4b04aa3b9ec..0000000000000
--- a/app/code/Magento/Search/i18n/nl_NL.csv
+++ /dev/null
@@ -1 +0,0 @@
-"Search Engine","Search Engine"
diff --git a/app/code/Magento/Search/i18n/pt_BR.csv b/app/code/Magento/Search/i18n/pt_BR.csv
deleted file mode 100644
index c10566a7c9800..0000000000000
--- a/app/code/Magento/Search/i18n/pt_BR.csv
+++ /dev/null
@@ -1 +0,0 @@
-"Search Engine","Mecanismo de Busca"
diff --git a/app/code/Magento/Search/i18n/zh_Hans_CN.csv b/app/code/Magento/Search/i18n/zh_Hans_CN.csv
deleted file mode 100644
index 8b4b04aa3b9ec..0000000000000
--- a/app/code/Magento/Search/i18n/zh_Hans_CN.csv
+++ /dev/null
@@ -1 +0,0 @@
-"Search Engine","Search Engine"
diff --git a/app/code/Magento/Swatches/i18n/de_DE.csv b/app/code/Magento/Swatches/i18n/de_DE.csv
deleted file mode 100644
index f0aa34bbef26e..0000000000000
--- a/app/code/Magento/Swatches/i18n/de_DE.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Swatch","Swatch"
-"Swatches per Product","Swatches per Product"
diff --git a/app/code/Magento/Swatches/i18n/es_ES.csv b/app/code/Magento/Swatches/i18n/es_ES.csv
deleted file mode 100644
index f0aa34bbef26e..0000000000000
--- a/app/code/Magento/Swatches/i18n/es_ES.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Swatch","Swatch"
-"Swatches per Product","Swatches per Product"
diff --git a/app/code/Magento/Swatches/i18n/fr_FR.csv b/app/code/Magento/Swatches/i18n/fr_FR.csv
deleted file mode 100644
index f0aa34bbef26e..0000000000000
--- a/app/code/Magento/Swatches/i18n/fr_FR.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Swatch","Swatch"
-"Swatches per Product","Swatches per Product"
diff --git a/app/code/Magento/Swatches/i18n/nl_NL.csv b/app/code/Magento/Swatches/i18n/nl_NL.csv
deleted file mode 100644
index f0aa34bbef26e..0000000000000
--- a/app/code/Magento/Swatches/i18n/nl_NL.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Swatch","Swatch"
-"Swatches per Product","Swatches per Product"
diff --git a/app/code/Magento/Swatches/i18n/pt_BR.csv b/app/code/Magento/Swatches/i18n/pt_BR.csv
deleted file mode 100644
index f0aa34bbef26e..0000000000000
--- a/app/code/Magento/Swatches/i18n/pt_BR.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Swatch","Swatch"
-"Swatches per Product","Swatches per Product"
diff --git a/app/code/Magento/Swatches/i18n/zh_Hans_CN.csv b/app/code/Magento/Swatches/i18n/zh_Hans_CN.csv
deleted file mode 100644
index f0aa34bbef26e..0000000000000
--- a/app/code/Magento/Swatches/i18n/zh_Hans_CN.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Swatch","Swatch"
-"Swatches per Product","Swatches per Product"
diff --git a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
new file mode 100644
index 0000000000000..a81f29280af96
--- /dev/null
+++ b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
@@ -0,0 +1,38 @@
+getContent();
+ $script = [];
+ if (strpos($content, 'setContent(
+ str_replace('
+
diff --git a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
index 9304d25cc8a98..d16b1eaad7f37 100644
--- a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
+++ b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
@@ -115,7 +115,7 @@ public function __toString()
$this->compiler->compile($templateRootElement, $this->component, $this->component);
$this->appendLayoutConfiguration();
$result = $this->compiler->postprocessing($this->template->__toString());
- } catch (\Exception $e) {
+ } catch (\Throwable $e) {
$this->logger->critical($e->getMessage());
$result = $e->getMessage();
}
diff --git a/app/code/Magento/Ui/i18n/de_DE.csv b/app/code/Magento/Ui/i18n/de_DE.csv
deleted file mode 100644
index 2efac126b857c..0000000000000
--- a/app/code/Magento/Ui/i18n/de_DE.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"Log JS Errors to Session Storage","Log JS Errors to Session Storage"
-"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting"
-"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key"
-"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors"
diff --git a/app/code/Magento/Ui/i18n/es_ES.csv b/app/code/Magento/Ui/i18n/es_ES.csv
deleted file mode 100644
index 2efac126b857c..0000000000000
--- a/app/code/Magento/Ui/i18n/es_ES.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"Log JS Errors to Session Storage","Log JS Errors to Session Storage"
-"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting"
-"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key"
-"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors"
diff --git a/app/code/Magento/Ui/i18n/fr_FR.csv b/app/code/Magento/Ui/i18n/fr_FR.csv
deleted file mode 100644
index 2efac126b857c..0000000000000
--- a/app/code/Magento/Ui/i18n/fr_FR.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"Log JS Errors to Session Storage","Log JS Errors to Session Storage"
-"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting"
-"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key"
-"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors"
diff --git a/app/code/Magento/Ui/i18n/nl_NL.csv b/app/code/Magento/Ui/i18n/nl_NL.csv
deleted file mode 100644
index 2efac126b857c..0000000000000
--- a/app/code/Magento/Ui/i18n/nl_NL.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"Log JS Errors to Session Storage","Log JS Errors to Session Storage"
-"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting"
-"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key"
-"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors"
diff --git a/app/code/Magento/Ui/i18n/pt_BR.csv b/app/code/Magento/Ui/i18n/pt_BR.csv
deleted file mode 100644
index 2efac126b857c..0000000000000
--- a/app/code/Magento/Ui/i18n/pt_BR.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"Log JS Errors to Session Storage","Log JS Errors to Session Storage"
-"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting"
-"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key"
-"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors"
diff --git a/app/code/Magento/Ui/i18n/zh_Hans_CN.csv b/app/code/Magento/Ui/i18n/zh_Hans_CN.csv
deleted file mode 100644
index 2efac126b857c..0000000000000
--- a/app/code/Magento/Ui/i18n/zh_Hans_CN.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"Log JS Errors to Session Storage","Log JS Errors to Session Storage"
-"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting"
-"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key"
-"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors"
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js b/app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js
index 0ae09f14fa946..b490ac557e71b 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js
@@ -11,8 +11,7 @@ define([
'Magento_Ui/js/modal/alert',
'Magento_Ui/js/lib/validation/validator',
'Magento_Ui/js/form/element/file-uploader',
- 'mage/adminhtml/browser',
- 'mage/adminhtml/tools'
+ 'mage/adminhtml/browser'
], function ($, _, utils, uiAlert, validator, Element, browser) {
'use strict';
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js b/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js
index 038907c21224d..adeb510ab3e40 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js
@@ -114,8 +114,8 @@ define([
*
* @param {String} path - Path to the property.
*
- * @example Retrieveing data.
- * localStoarge =>
+ * @example Retrieving data.
+ * localStorage =>
* 'appData' => '
* "one": {"two": "three"}
* '
@@ -139,7 +139,7 @@ define([
*
* @example Setting data.
* storage.set('one.two', 'four');
- * => localStoarge =>
+ * => localStorage =>
* 'appData' => '
* "one": {"two": "four"}
* '
@@ -159,7 +159,7 @@ define([
*
* @example Removing data.
* storage.remove('one.two', 'four');
- * => localStoarge =>
+ * => localStorage =>
* 'appData' => '
* "one": {}
* '
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/renderer.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/renderer.js
index 2e0c53373f807..2cfd961619249 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/renderer.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/renderer.js
@@ -519,7 +519,7 @@ define([
},
/**
- * Custom 'render' attrobute handler function. Wraps child elements
+ * Custom 'render' attribute handler function. Wraps child elements
* of a node with knockout's 'ko template:' comment tag.
*
* @param {HTMLElement} node - Element to be processed.
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/logger/logger-utils.js b/app/code/Magento/Ui/view/base/web/js/lib/logger/logger-utils.js
index fe83f600132ed..bf7ae0cdc3e98 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/logger/logger-utils.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/logger/logger-utils.js
@@ -42,14 +42,14 @@ define([], function () {
* Method that creates object of messages
* @param {String} requested - log message that showing that request for class is started
* @param {String} loaded - log message that show when requested class is loaded
- * @param {String} failded - log message that show when requested class is failed
+ * @param {String} failed - log message that show when requested class is failed
* @returns {Object}
*/
- LogUtils.prototype.createMessages = function (requested, loaded, failded) {
+ LogUtils.prototype.createMessages = function (requested, loaded, failed) {
return {
requested: requested || '',
loaded: loaded || '',
- failed: failded || ''
+ failed: failed || ''
};
};
@@ -57,14 +57,14 @@ define([], function () {
* Method that creates object of log levels
* @param {String} requested - log message that showing that request for class is started
* @param {String} loaded - log message that show when requested class is loaded
- * @param {String} failded - log message that show when requested class is failed
+ * @param {String} failed - log message that show when requested class is failed
* @returns {Object}
*/
- LogUtils.prototype.createLevels = function (requested, loaded, failded) {
+ LogUtils.prototype.createLevels = function (requested, loaded, failed) {
return {
requested: requested || 'info',
loaded: loaded || 'info',
- failed: failded || 'warn'
+ failed: failed || 'warn'
};
};
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
index 8ebbf88775b86..407984c7881a2 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
@@ -64,7 +64,7 @@ define([
}
/**
- * Validates provied value by a specified set of rules.
+ * Validates provided value by a specified set of rules.
*
* @param {(String|Object)} rules - One or many validation rules.
* @param {*} value - Value to be checked.
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js
index 03012918f4a0d..f8e752fb77af2 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js
@@ -141,7 +141,7 @@ define([
}
/**
- * Calls handlers assocoiated with an added node.
+ * Calls handlers associated with an added node.
* Adds listeners for the node removal.
*
* @param {HTMLElement} node - Added node.
@@ -163,7 +163,7 @@ define([
}
/**
- * Calls handlers assocoiated with a removed node.
+ * Calls handlers associated with a removed node.
*
* @param {HTMLElement} node - Removed node.
*/
diff --git a/app/code/Magento/Ui/view/frontend/web/templates/form/element/uploader/uploader.html b/app/code/Magento/Ui/view/frontend/web/templates/form/element/uploader/uploader.html
new file mode 100644
index 0000000000000..226ad2915bb61
--- /dev/null
+++ b/app/code/Magento/Ui/view/frontend/web/templates/form/element/uploader/uploader.html
@@ -0,0 +1,37 @@
+
+
+
-
- integer
- integer
- string
- string
- string
-
-
diff --git a/app/code/Magento/User/Test/Mftf/Data/UserData.xml b/app/code/Magento/User/Test/Mftf/Data/UserData.xml
index 80c1cc3022964..d602f094ce4e5 100644
--- a/app/code/Magento/User/Test/Mftf/Data/UserData.xml
+++ b/app/code/Magento/User/Test/Mftf/Data/UserData.xml
@@ -8,6 +8,14 @@
+
+ {{_ENV.MAGENTO_ADMIN_USERNAME}}
+ {{_ENV.MAGENTO_ADMIN_PASSWORD}}
+
+
+ username_
+ password_
+
admin@magento.com
admin123
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
index cc2af4996d562..32bae10c801c8 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
@@ -91,7 +91,7 @@ public function getMainFieldset()
if ($this->_getData('main_fieldset') instanceof \Magento\Framework\Data\Form\Element\Fieldset) {
return $this->_getData('main_fieldset');
}
- $mainFieldsetHtmlId = 'options_fieldset' . md5($this->getWidgetType());
+ $mainFieldsetHtmlId = 'options_fieldset' . hash('sha256', $this->getWidgetType());
$this->setMainFieldsetHtmlId($mainFieldsetHtmlId);
$fieldset = $this->getForm()->addFieldset(
$mainFieldsetHtmlId,
@@ -141,7 +141,6 @@ protected function _addField($parameter)
{
$form = $this->getForm();
$fieldset = $this->getMainFieldset();
- //$form->getElement('options_fieldset');
// prepare element data with values (either from request of from default values)
$fieldName = $parameter->getKey();
@@ -166,9 +165,13 @@ protected function _addField($parameter)
if (is_array($data['value'])) {
foreach ($data['value'] as &$value) {
- $value = html_entity_decode($value);
+ if (is_string($value)) {
+ // phpcs:ignore Magento2.Functions.DiscouragedFunction
+ $value = html_entity_decode($value);
+ }
}
} else {
+ // phpcs:ignore Magento2.Functions.DiscouragedFunction
$data['value'] = html_entity_decode($data['value']);
}
diff --git a/app/code/Magento/Widget/Model/Widget.php b/app/code/Magento/Widget/Model/Widget.php
index 52dc8e7837a3c..d07e84186b2c9 100644
--- a/app/code/Magento/Widget/Model/Widget.php
+++ b/app/code/Magento/Widget/Model/Widget.php
@@ -248,17 +248,13 @@ public function getWidgets($filters = [])
$result = $widgets;
// filter widgets by params
- if (is_array($filters) && count($filters) > 0) {
+ if (is_array($filters) && !empty($filters)) {
foreach ($widgets as $code => $widget) {
- try {
- foreach ($filters as $field => $value) {
- if (!isset($widget[$field]) || (string)$widget[$field] != $value) {
- throw new \Exception();
- }
+ foreach ($filters as $field => $value) {
+ if (!isset($widget[$field]) || (string)$widget[$field] != $value) {
+ unset($result[$code]);
+ break;
}
- } catch (\Exception $e) {
- unset($result[$code]);
- continue;
}
}
}
@@ -323,8 +319,6 @@ public function getWidgetDeclaration($type, $params = [], $asIs = true)
$directive .= $this->getWidgetPageVarName($params);
- $directive .= sprintf(' type_name="%s"', $widget['name']);
-
$directive .= '}}';
if ($asIs) {
diff --git a/app/code/Magento/Widget/Model/Widget/Config.php b/app/code/Magento/Widget/Model/Widget/Config.php
index 4f81ef33f47f7..00b055b35a69d 100644
--- a/app/code/Magento/Widget/Model/Widget/Config.php
+++ b/app/code/Magento/Widget/Model/Widget/Config.php
@@ -120,6 +120,7 @@ public function getWidgetPlaceholderImageUrls()
/**
* Return url to error image
+ *
* @return string
*/
public function getErrorImageUrl()
@@ -129,6 +130,7 @@ public function getErrorImageUrl()
/**
* Return url to wysiwyg plugin
+ *
* @return string
*/
public function getWysiwygJsPluginSrc()
@@ -157,7 +159,7 @@ public function getWidgetWindowUrl($config)
}
}
- if (count($skipped) > 0) {
+ if (!empty($skipped)) {
$params['skip_widgets'] = $this->encodeWidgetsToQuery($skipped);
}
return $this->_backendUrl->getUrl('adminhtml/widget/index', $params);
@@ -189,6 +191,8 @@ public function decodeWidgetsFromQuery($queryParam)
}
/**
+ * Get available widgets.
+ *
* @param \Magento\Framework\DataObject $config Editor element config
* @return array
*/
@@ -202,7 +206,7 @@ public function getAvailableWidgets($config)
if (is_array($skipped) && in_array($widget['type'], $skipped)) {
continue;
}
- $result[] = $widget['name']->getText();
+ $result[$widget['type']] = $widget['name']->getText();
}
}
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateAndSaveWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateAndSaveWidgetActionGroup.xml
new file mode 100644
index 0000000000000..2f144894111bc
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateAndSaveWidgetActionGroup.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml b/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
index 27222298408de..ffd2d025548cf 100644
--- a/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
@@ -32,4 +32,15 @@
Cart Price Rule Related
Header
+
+ Order by SKU
+ Magento Luma
+ Test Widget
+
+ - All Store Views
+
+ 0
+ All Pages
+ Sidebar Main
+
diff --git a/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php b/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
index 5c546d7e2435c..850a3fbe83211 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
@@ -224,7 +224,6 @@ public function testGetWidgetDeclaration()
$this->assertContains('title="my "widget""', $result);
$this->assertContains('conditions_encoded="encoded-conditions-string"', $result);
$this->assertContains('page_var_name="pasdf"', $result);
- $this->assertContains('type_name=""}}', $result);
}
/**
@@ -275,7 +274,6 @@ public function testGetWidgetDeclarationWithZeroValueParam()
);
$this->assertContains('{{widget type="Magento\CatalogWidget\Block\Product\ProductsList"', $result);
$this->assertContains('page_var_name="pasdf"', $result);
- $this->assertContains('type_name=""}}', $result);
$this->assertContains('products_count=""', $result);
}
}
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payment-options.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
index 3ce46a73a11c4..4d04b6e0b9653 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
@@ -137,6 +137,7 @@
}
}
+ .captcha,
.number {
.input-text {
width: 225px;
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 c9f3c3d72ef4c..26f5ff89e99e3 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_forms.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_forms.less
@@ -101,6 +101,18 @@
.lib-form-validation-note();
}
+ .product-options-wrapper {
+ .date {
+ &.required {
+ div[for*='options'] {
+ &.mage-error {
+ display: none !important;
+ }
+ }
+ }
+ }
+ }
+
.field .tooltip {
.lib-tooltip(right);
.tooltip-content {
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
index e5915969c91b9..77fb53a2ab02a 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
@@ -34,12 +34,12 @@
.product {
&-items {
- font-size: 0;
+ .lib-inline-block-space-container();
&:extend(.abs-reset-list all);
}
&-item {
- font-size: 1.4rem;
+ .lib-inline-block-space-item();
vertical-align: top;
.products-grid & {
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 3ea1f5b7f6842..ac5ab0d87bf62 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
@@ -7,6 +7,8 @@
// Variables
// _____________________________________________
+@import 'fields/_file-uploader.less';
+
@checkout-wrapper__margin: @indent__base;
@checkout-wrapper__columns: 16;
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 3b584bc26fe34..23bb15e6fb4fe 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
@@ -143,6 +143,7 @@
}
}
+ .captcha,
.number {
.input-text {
width: 225px;
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less
new file mode 100644
index 0000000000000..7b06186ef9ad3
--- /dev/null
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less
@@ -0,0 +1,450 @@
+// /**
+// * Copyright © Magento, Inc. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Components -> Single File Uploader
+// _____________________________________________
+
+//
+// Variables
+// ---------------------------------------------
+
+@icon-delete__content: '\e604';
+@icon-file__content: '\e626';
+
+
+@file-uploader-preview__border-color: @color-lighter-grayish;
+@file-uploader-preview__background-color: @color-white;
+@file-uploader-preview-focus__color: @color-blue2;
+
+@file-uploader-document-icon__color: @color-gray80;
+@file-uploader-document-icon__size: 7rem;
+@file-uploader-document-icon__z-index: @data-grid-file-uploader-image__z-index + 1;
+
+@file-uploader-video-icon__color: @color-gray80;
+@file-uploader-video-icon__size: 4rem;
+@file-uploader-video-icon__z-index: @data-grid-file-uploader-image__z-index + 1;
+
+@file-uploader-placeholder-icon__color: @color-gray80;
+@file-uploader-placeholder-icon__z-index: @data-grid-file-uploader-image__z-index + 1;
+
+@file-uploader-delete-icon__color: @color-brownie;
+@file-uploader-delete-icon__hover__color: @color-brownie-vanilla;
+@file-uploader-delete-icon__font-size: 1.6rem;
+
+@file-uploader-muted-text__color: @color-gray62;
+
+@file-uploader-preview__width: 150px;
+@file-uploader-preview__height: @file-uploader-preview__width;
+@file-uploader-preview__opacity: .7;
+
+@file-uploader-spinner-dimensions: 15px;
+
+@file-uploader-dragover__background: @color-gray83;
+@file-uploader-dragover-focus__color: @color-blue2;
+
+// Grid uploader
+
+@data-grid-file-uploader-image__size: 5rem;
+@data-grid-file-uploader-image__z-index: 1;
+
+@data-grid-file-uploader-menu-button__width: 2rem;
+
+@data-grid-file-uploader-upload-icon__color: @color-darkie-gray;
+@data-grid-file-uploader-upload-icon__hover__color: @color-very-dark-gray;
+@data-grid-file-uploader-upload-icon__line-height: 48px;
+
+@data-grid-file-uploader-wrapper__size: @data-grid-file-uploader-image__size + 2rem;
+
+//
+// Single file uploader
+// ---------------------------------------------
+
+.file-uploader-area {
+ position: relative;
+
+ input[type='file'] {
+ cursor: pointer;
+ opacity: 0;
+ overflow: hidden;
+ position: absolute;
+ visibility: hidden;
+ width: 0;
+
+ &:focus {
+ + .file-uploader-button {
+ box-shadow: 0 0 0 1px @file-uploader-preview-focus__color;
+ }
+ }
+
+ &:disabled {
+ + .file-uploader-button {
+ cursor: default;
+ opacity: .5;
+ pointer-events: none;
+ }
+ }
+ }
+}
+
+.file-uploader-summary {
+ display: inline-block;
+ vertical-align: top;
+}
+
+.file-uploader-button {
+ background: @color-gray-darken0;
+ border: 1px solid @color-gray_light;
+ box-sizing: border-box;
+ color: @color-black_dark;
+ cursor: pointer;
+ display: inline-block;
+ font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+ font-size: 1.4rem;
+ font-weight: 600;
+ line-height: 1.6rem;
+ margin: 0;
+ padding: 7px 15px;
+ vertical-align: middle;
+
+ &._is-dragover {
+ background: @file-uploader-dragover__background;
+ border: 1px solid @file-uploader-preview-focus__color;
+ }
+}
+
+.file-uploader-spinner {
+ background-image: url('@{baseDir}images/loader-1.gif');
+ background-position: 50%;
+ background-repeat: no-repeat;
+ background-size: @file-uploader-spinner-dimensions;
+ display: none;
+ height: 30px;
+ margin-left: @indent__s;
+ vertical-align: top;
+ width: @file-uploader-spinner-dimensions;
+}
+
+.file-uploader-preview {
+ .action-remove {
+ &:extend(.abs-action-reset all);
+ .lib-icon-font (
+ @icon-delete__content,
+ @_icon-font: @icons__font-name,
+ @_icon-font-size: @file-uploader-delete-icon__font-size,
+ @_icon-font-color: @file-uploader-delete-icon__color,
+ @_icon-font-color-hover: @file-uploader-delete-icon__hover__color,
+ @_icon-font-text-hide: true,
+ @_icon-font-display: block
+ );
+ bottom: 4px;
+ cursor: pointer;
+ display: block;
+ height: 27px;
+ left: 6px;
+ padding: 2px;
+ position: absolute;
+ text-decoration: none;
+ width: 25px;
+ z-index: 2;
+ }
+
+ &:hover {
+ .preview-image img,
+ .preview-link:before {
+ opacity: @file-uploader-preview__opacity;
+ }
+ }
+
+ .preview-link {
+ display: block;
+ height: 100%;
+ }
+
+ .preview-image img {
+ bottom: 0;
+ left: 0;
+ margin: auto;
+ max-height: 100%;
+ max-width: 100%;
+ position: absolute;
+ right: 0;
+ top: 0;
+ z-index: 1;
+ }
+
+ .preview-video {
+ .lib-icon-font(
+ @icon-file__content,
+ @_icon-font: @icons__font-name,
+ @_icon-font-size: @file-uploader-video-icon__size,
+ @_icon-font-color: @file-uploader-video-icon__color,
+ @_icon-font-color-hover: @file-uploader-video-icon__color
+ );
+
+ &:before {
+ left: 0;
+ margin-top: -@file-uploader-video-icon__size / 2;
+ position: absolute;
+ right: 0;
+ top: 50%;
+ z-index: @file-uploader-video-icon__z-index;
+ }
+ }
+
+ .preview-document {
+ .lib-icon-font(
+ @icon-file__content,
+ @_icon-font: @icons__font-name,
+ @_icon-font-size: @file-uploader-document-icon__size,
+ @_icon-font-color: @file-uploader-document-icon__color,
+ @_icon-font-color-hover: @file-uploader-document-icon__color
+ );
+
+ &:before {
+ left: 0;
+ margin-top: -@file-uploader-document-icon__size / 2;
+ position: absolute;
+ right: 0;
+ top: 50%;
+ z-index: @file-uploader-document-icon__z-index;
+ }
+ }
+}
+
+.file-uploader-preview,
+.file-uploader-placeholder {
+ background: @file-uploader-preview__background-color;
+ border: 1px solid @file-uploader-preview__border-color;
+ box-sizing: border-box;
+ cursor: pointer;
+ display: block;
+ height: @file-uploader-preview__height;
+ line-height: 1;
+ margin: @indent__s @indent__m @indent__s 0;
+ overflow: hidden;
+ position: relative;
+ width: @file-uploader-preview__width;
+}
+
+.file-uploader {
+ &._loading {
+ .file-uploader-spinner {
+ display: inline-block;
+ }
+ }
+
+ .admin__field-note,
+ .admin__field-error {
+ margin-bottom: @indent__s;
+ }
+
+ .file-uploader-filename {
+ .lib-text-overflow();
+ max-width: @file-uploader-preview__width;
+ word-break: break-all;
+
+ &:first-child {
+ margin-bottom: @indent__s;
+ }
+ }
+
+ .file-uploader-meta {
+ color: @file-uploader-muted-text__color;
+ }
+
+ .admin__field-fallback-reset {
+ margin-left: @indent__s;
+ }
+
+ ._keyfocus & .action-remove {
+ &:focus {
+ box-shadow: 0 0 0 1px @file-uploader-preview-focus__color;
+ }
+ }
+}
+
+// Placeholder for multiple uploader
+.file-uploader-placeholder {
+ &.placeholder-document {
+ .lib-icon-font(
+ @icon-file__content,
+ @_icon-font: @icons__font-name,
+ @_icon-font-size: 5rem,
+ @_icon-font-color: @file-uploader-placeholder-icon__color,
+ @_icon-font-color-hover: @file-uploader-placeholder-icon__color
+ );
+
+ &:before {
+ left: 0;
+ position: absolute;
+ right: 0;
+ top: 20px;
+ z-index: @file-uploader-placeholder-icon__z-index;
+ }
+ }
+
+ &.placeholder-image {
+ .lib-icon-font(
+ @icon-file__content,
+ @_icon-font: @icons__font-name,
+ @_icon-font-size: 5rem,
+ @_icon-font-color: @file-uploader-placeholder-icon__color,
+ @_icon-font-color-hover: @file-uploader-placeholder-icon__color
+ );
+
+ &:before {
+ left: 0;
+ position: absolute;
+ right: 0;
+ top: 20px;
+ z-index: @file-uploader-placeholder-icon__z-index;
+ }
+ }
+
+ &.placeholder-video {
+ .lib-icon-font(
+ @icon-file__content,
+ @_icon-font: @icons__font-name,
+ @_icon-font-size: 3rem,
+ @_icon-font-color: @file-uploader-placeholder-icon__color,
+ @_icon-font-color-hover: @file-uploader-placeholder-icon__color
+ );
+
+ &:before {
+ left: 0;
+ position: absolute;
+ right: 0;
+ top: 30px;
+ z-index: @file-uploader-placeholder-icon__z-index;
+ }
+ }
+}
+
+.file-uploader-placeholder-text {
+ bottom: 0;
+ color: @color-blue-dodger;
+ font-size: 1.1rem;
+ left: 0;
+ line-height: @line-height__base;
+ margin-bottom: 15%;
+ padding: 0 @indent__base;
+ position: absolute;
+ right: 0;
+ text-align: center;
+}
+
+//
+// Grid image uploader
+// ---------------------------------------------
+
+.data-grid-file-uploader {
+ min-width: @data-grid-file-uploader-wrapper__size;
+
+ &._loading {
+ .file-uploader-spinner {
+ display: block;
+ }
+
+ .file-uploader-button {
+ &:before {
+ display: none;
+ }
+ }
+ }
+
+ .file-uploader-image {
+ background: transparent;
+ bottom: 0;
+ left: 0;
+ margin: auto;
+ max-height: 100%;
+ max-width: 100%;
+ position: absolute;
+ right: 0;
+ top: 0;
+ z-index: @data-grid-file-uploader-image__z-index;
+
+ + .file-uploader-area {
+ .file-uploader-button {
+ &:before {
+ display: none;
+ }
+ }
+ }
+ }
+
+ .file-uploader-area {
+ z-index: @data-grid-file-uploader-image__z-index + 1;
+ }
+
+ .file-uploader-spinner {
+ height: 100%;
+ margin: 0;
+ position: absolute;
+ top: 0;
+ width: 100%;
+ }
+
+ .file-uploader-button {
+ display: block;
+ height: @data-grid-file-uploader-upload-icon__line-height;
+ text-align: center;
+
+ .lib-icon-font (
+ @icon-file__content,
+ @_icon-font: @icons__font-name,
+ @_icon-font-size: 1.3rem,
+ @_icon-font-line-height: @data-grid-file-uploader-upload-icon__line-height,
+ @_icon-font-color: @data-grid-file-uploader-upload-icon__color,
+ @_icon-font-color-hover: @data-grid-file-uploader-upload-icon__hover__color,
+ @_icon-font-text-hide: true,
+ @_icon-font-display: block
+ );
+ }
+
+ .action-select-wrap {
+ float: left;
+
+ .action-select {
+ border: 1px solid @file-uploader-preview__border-color;
+ display: block;
+ height: @data-grid-file-uploader-image__size;
+ margin-left: -1px;
+ padding: 0;
+ width: @data-grid-file-uploader-menu-button__width;
+
+ &:after {
+ border-color: @data-grid-file-uploader-upload-icon__color transparent transparent transparent;
+ left: 50%;
+ margin: 0 0 0 -5px;
+ }
+
+ &:hover {
+ &:after {
+ border-color: @data-grid-file-uploader-upload-icon__hover__color transparent transparent transparent;
+ }
+ }
+
+ > span {
+ display: none;
+ }
+ }
+
+ .action-menu {
+ left: 4rem;
+ right: auto;
+ z-index: @data-grid-file-uploader-image__z-index + 1;
+ }
+ }
+}
+
+.data-grid-file-uploader-inner {
+ border: 1px solid @file-uploader-preview__border-color;
+ float: left;
+ height: @data-grid-file-uploader-image__size;
+ position: relative;
+ width: @data-grid-file-uploader-image__size;
+}
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 98dd57dead74c..8533318a12d1b 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_forms.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_forms.less
@@ -104,6 +104,10 @@
.select-styling();
}
+ select.admin__control-multiselect {
+ height: auto;
+ }
+
.field-error,
div.mage-error[generated] {
margin-top: 7px;
@@ -113,6 +117,18 @@
.lib-form-validation-note();
}
+ .product-options-wrapper {
+ .date {
+ &.required {
+ div[for*='options'] {
+ &.mage-error {
+ display: none !important;
+ }
+ }
+ }
+ }
+ }
+
// TEMP
.field .tooltip {
diff --git a/composer.json b/composer.json
index aa4976aa50a99..525f3a21d9577 100644
--- a/composer.json
+++ b/composer.json
@@ -193,6 +193,7 @@
"magento/module-page-cache": "*",
"magento/module-payment": "*",
"magento/module-paypal": "*",
+ "magento/module-paypal-captcha": "*",
"magento/module-persistent": "*",
"magento/module-product-alert": "*",
"magento/module-product-video": "*",
diff --git a/composer.lock b/composer.lock
index e2d00ad07c79a..06ab71ee75970 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "825a03a040f3eff4ea6ea537b7530f15",
+ "content-hash": "c43d19692d25afef14dd42eb893eb4ca",
"packages": [
{
"name": "braintree/braintree_php",
@@ -164,21 +164,21 @@
},
{
"name": "colinmollenhour/php-redis-session-abstract",
- "version": "v1.4.0",
+ "version": "v1.4.1",
"source": {
"type": "git",
"url": "https://github.com/colinmollenhour/php-redis-session-abstract.git",
- "reference": "4cb15d557f58f45ad257cbcce3c12511e6deb5bc"
+ "reference": "4949ca28b86037abb44984c77bab9d0a4e075643"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/4cb15d557f58f45ad257cbcce3c12511e6deb5bc",
- "reference": "4cb15d557f58f45ad257cbcce3c12511e6deb5bc",
+ "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/4949ca28b86037abb44984c77bab9d0a4e075643",
+ "reference": "4949ca28b86037abb44984c77bab9d0a4e075643",
"shasum": ""
},
"require": {
"colinmollenhour/credis": "~1.6",
- "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0|~7.2.0"
+ "php": "^5.5 || ^7.0"
},
"type": "library",
"autoload": {
@@ -197,7 +197,7 @@
],
"description": "A Redis-based session handler with optimistic locking",
"homepage": "https://github.com/colinmollenhour/php-redis-session-abstract",
- "time": "2018-03-29T15:54:15+00:00"
+ "time": "2019-03-18T14:43:14+00:00"
},
{
"name": "composer/ca-bundle",
@@ -337,16 +337,16 @@
},
{
"name": "composer/semver",
- "version": "1.4.2",
+ "version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
- "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573"
+ "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573",
- "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573",
+ "url": "https://api.github.com/repos/composer/semver/zipball/46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
+ "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
"shasum": ""
},
"require": {
@@ -395,28 +395,27 @@
"validation",
"versioning"
],
- "time": "2016-08-30T16:08:34+00:00"
+ "time": "2019-03-19T17:25:45+00:00"
},
{
"name": "composer/spdx-licenses",
- "version": "1.5.0",
+ "version": "1.5.1",
"source": {
"type": "git",
"url": "https://github.com/composer/spdx-licenses.git",
- "reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2"
+ "reference": "a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7a9556b22bd9d4df7cad89876b00af58ef20d3a2",
- "reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2",
+ "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d",
+ "reference": "a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d",
"shasum": ""
},
"require": {
- "php": "^5.3.2 || ^7.0"
+ "php": "^5.3.2 || ^7.0 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
- "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 7"
},
"type": "library",
"extra": {
@@ -456,7 +455,7 @@
"spdx",
"validator"
],
- "time": "2018-11-01T09:45:54+00:00"
+ "time": "2019-03-26T10:23:26+00:00"
},
{
"name": "composer/xdebug-handler",
@@ -1106,21 +1105,21 @@
},
{
"name": "paragonie/sodium_compat",
- "version": "v1.8.1",
+ "version": "v1.9.1",
"source": {
"type": "git",
"url": "https://github.com/paragonie/sodium_compat.git",
- "reference": "57bb5ef079d3724148da3d5c99e30695ab17afda"
+ "reference": "87125d5b265f98c4d1b8d83a1f0726607c229421"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/57bb5ef079d3724148da3d5c99e30695ab17afda",
- "reference": "57bb5ef079d3724148da3d5c99e30695ab17afda",
+ "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/87125d5b265f98c4d1b8d83a1f0726607c229421",
+ "reference": "87125d5b265f98c4d1b8d83a1f0726607c229421",
"shasum": ""
},
"require": {
"paragonie/random_compat": ">=1",
- "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7"
+ "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
},
"require-dev": {
"phpunit/phpunit": "^3|^4|^5"
@@ -1184,7 +1183,7 @@
"secret-key cryptography",
"side-channel resistant"
],
- "time": "2019-01-03T21:00:55+00:00"
+ "time": "2019-03-20T17:19:05+00:00"
},
{
"name": "pelago/emogrifier",
@@ -1382,16 +1381,16 @@
},
{
"name": "phpseclib/phpseclib",
- "version": "2.0.14",
+ "version": "2.0.15",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "8ebfcadbf30524aeb75b2c446bc2519d5b321478"
+ "reference": "11cf67cf78dc4acb18dc9149a57be4aee5036ce0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/8ebfcadbf30524aeb75b2c446bc2519d5b321478",
- "reference": "8ebfcadbf30524aeb75b2c446bc2519d5b321478",
+ "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/11cf67cf78dc4acb18dc9149a57be4aee5036ce0",
+ "reference": "11cf67cf78dc4acb18dc9149a57be4aee5036ce0",
"shasum": ""
},
"require": {
@@ -1470,7 +1469,7 @@
"x.509",
"x509"
],
- "time": "2019-01-27T19:37:29+00:00"
+ "time": "2019-03-10T16:53:45+00:00"
},
{
"name": "psr/container",
@@ -2127,16 +2126,16 @@
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.10.0",
+ "version": "v1.11.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+ "reference": "82ebae02209c21113908c229e9883c419720738a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
- "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
+ "reference": "82ebae02209c21113908c229e9883c419720738a",
"shasum": ""
},
"require": {
@@ -2148,7 +2147,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.9-dev"
+ "dev-master": "1.11-dev"
}
},
"autoload": {
@@ -2170,7 +2169,7 @@
},
{
"name": "Gert de Pagter",
- "email": "BackEndTea@gmail.com"
+ "email": "backendtea@gmail.com"
}
],
"description": "Symfony polyfill for ctype functions",
@@ -2181,20 +2180,20 @@
"polyfill",
"portable"
],
- "time": "2018-08-06T14:22:27+00:00"
+ "time": "2019-02-06T07:57:58+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.10.0",
+ "version": "v1.11.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "c79c051f5b3a46be09205c73b80b346e4153e494"
+ "reference": "fe5e94c604826c35a32fa832f35bd036b6799609"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494",
- "reference": "c79c051f5b3a46be09205c73b80b346e4153e494",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609",
+ "reference": "fe5e94c604826c35a32fa832f35bd036b6799609",
"shasum": ""
},
"require": {
@@ -2206,7 +2205,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.9-dev"
+ "dev-master": "1.11-dev"
}
},
"autoload": {
@@ -2240,7 +2239,7 @@
"portable",
"shim"
],
- "time": "2018-09-21T13:07:52+00:00"
+ "time": "2019-02-06T07:57:58+00:00"
},
{
"name": "symfony/process",
@@ -4965,16 +4964,16 @@
},
{
"name": "consolidation/annotated-command",
- "version": "2.11.2",
+ "version": "2.12.0",
"source": {
"type": "git",
"url": "https://github.com/consolidation/annotated-command.git",
- "reference": "004af26391cd7d1cd04b0ac736dc1324d1b4f572"
+ "reference": "512a2e54c98f3af377589de76c43b24652bcb789"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/004af26391cd7d1cd04b0ac736dc1324d1b4f572",
- "reference": "004af26391cd7d1cd04b0ac736dc1324d1b4f572",
+ "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/512a2e54c98f3af377589de76c43b24652bcb789",
+ "reference": "512a2e54c98f3af377589de76c43b24652bcb789",
"shasum": ""
},
"require": {
@@ -5057,7 +5056,7 @@
}
],
"description": "Initialize Symfony Console commands from annotated command class methods.",
- "time": "2019-02-02T02:29:53+00:00"
+ "time": "2019-03-08T16:55:03+00:00"
},
{
"name": "consolidation/config",
@@ -5232,16 +5231,16 @@
},
{
"name": "consolidation/output-formatters",
- "version": "3.4.0",
+ "version": "3.4.1",
"source": {
"type": "git",
"url": "https://github.com/consolidation/output-formatters.git",
- "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19"
+ "reference": "0881112642ad9059071f13f397f571035b527cb9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/a942680232094c4a5b21c0b7e54c20cce623ae19",
- "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19",
+ "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/0881112642ad9059071f13f397f571035b527cb9",
+ "reference": "0881112642ad9059071f13f397f571035b527cb9",
"shasum": ""
},
"require": {
@@ -5251,11 +5250,10 @@
"symfony/finder": "^2.5|^3|^4"
},
"require-dev": {
- "g1a/composer-test-scenarios": "^2",
+ "g1a/composer-test-scenarios": "^3",
+ "php-coveralls/php-coveralls": "^1",
"phpunit/phpunit": "^5.7.27",
- "satooshi/php-coveralls": "^2",
"squizlabs/php_codesniffer": "^2.7",
- "symfony/console": "3.2.3",
"symfony/var-dumper": "^2.8|^3|^4",
"victorjonsson/markdowndocs": "^1.3"
},
@@ -5264,6 +5262,52 @@
},
"type": "library",
"extra": {
+ "scenarios": {
+ "symfony4": {
+ "require": {
+ "symfony/console": "^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^6"
+ },
+ "config": {
+ "platform": {
+ "php": "7.1.3"
+ }
+ }
+ },
+ "symfony3": {
+ "require": {
+ "symfony/console": "^3.4",
+ "symfony/finder": "^3.4",
+ "symfony/var-dumper": "^3.4"
+ },
+ "config": {
+ "platform": {
+ "php": "5.6.32"
+ }
+ }
+ },
+ "symfony2": {
+ "require": {
+ "symfony/console": "^2.8"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.36"
+ },
+ "remove": [
+ "php-coveralls/php-coveralls"
+ ],
+ "config": {
+ "platform": {
+ "php": "5.4.8"
+ }
+ },
+ "scenario-options": {
+ "create-lockfile": "false"
+ }
+ }
+ },
"branch-alias": {
"dev-master": "3.x-dev"
}
@@ -5284,25 +5328,25 @@
}
],
"description": "Format text by applying transformations provided by plug-in formatters.",
- "time": "2018-10-19T22:35:38+00:00"
+ "time": "2019-03-14T03:45:44+00:00"
},
{
"name": "consolidation/robo",
- "version": "1.4.6",
+ "version": "1.4.9",
"source": {
"type": "git",
"url": "https://github.com/consolidation/Robo.git",
- "reference": "d4805a1abbc730e9a6d64ede2eba56f91a2b4eb3"
+ "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/consolidation/Robo/zipball/d4805a1abbc730e9a6d64ede2eba56f91a2b4eb3",
- "reference": "d4805a1abbc730e9a6d64ede2eba56f91a2b4eb3",
+ "url": "https://api.github.com/repos/consolidation/Robo/zipball/5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345",
+ "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345",
"shasum": ""
},
"require": {
"consolidation/annotated-command": "^2.10.2",
- "consolidation/config": "^1.0.10",
+ "consolidation/config": "^1.2",
"consolidation/log": "~1",
"consolidation/output-formatters": "^3.1.13",
"consolidation/self-update": "^1",
@@ -5392,7 +5436,7 @@
}
],
"description": "Modern task runner",
- "time": "2019-02-17T05:32:27+00:00"
+ "time": "2019-03-19T18:07:19+00:00"
},
{
"name": "consolidation/self-update",
@@ -5505,16 +5549,16 @@
},
{
"name": "doctrine/annotations",
- "version": "v1.6.0",
+ "version": "v1.6.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
- "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5"
+ "reference": "53120e0eb10355388d6ccbe462f1fea34ddadb24"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
- "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
+ "url": "https://api.github.com/repos/doctrine/annotations/zipball/53120e0eb10355388d6ccbe462f1fea34ddadb24",
+ "reference": "53120e0eb10355388d6ccbe462f1fea34ddadb24",
"shasum": ""
},
"require": {
@@ -5569,38 +5613,40 @@
"docblock",
"parser"
],
- "time": "2017-12-06T07:11:42+00:00"
+ "time": "2019-03-25T19:12:02+00:00"
},
{
"name": "doctrine/collections",
- "version": "v1.5.0",
+ "version": "v1.6.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/collections.git",
- "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf"
+ "reference": "d2ae4ef05e25197343b6a39bae1d3c427a2f6956"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
- "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
+ "url": "https://api.github.com/repos/doctrine/collections/zipball/d2ae4ef05e25197343b6a39bae1d3c427a2f6956",
+ "reference": "d2ae4ef05e25197343b6a39bae1d3c427a2f6956",
"shasum": ""
},
"require": {
- "php": "^7.1"
+ "php": "^7.1.3"
},
"require-dev": {
- "doctrine/coding-standard": "~0.1@dev",
- "phpunit/phpunit": "^5.7"
+ "doctrine/coding-standard": "^6.0",
+ "phpstan/phpstan-shim": "^0.9.2",
+ "phpunit/phpunit": "^7.0",
+ "vimeo/psalm": "^3.2.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3.x-dev"
+ "dev-master": "1.6.x-dev"
}
},
"autoload": {
- "psr-0": {
- "Doctrine\\Common\\Collections\\": "lib/"
+ "psr-4": {
+ "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -5629,38 +5675,41 @@
"email": "schmittjoh@gmail.com"
}
],
- "description": "Collections Abstraction library",
- "homepage": "http://www.doctrine-project.org",
+ "description": "PHP Doctrine Collections library that adds additional functionality on top of PHP arrays.",
+ "homepage": "https://www.doctrine-project.org/projects/collections.html",
"keywords": [
"array",
"collections",
- "iterator"
+ "iterators",
+ "php"
],
- "time": "2017-07-22T10:37:32+00:00"
+ "time": "2019-03-25T19:03:48+00:00"
},
{
"name": "doctrine/instantiator",
- "version": "1.1.0",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
- "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
+ "reference": "a2c590166b2133a4633738648b6b064edae0814a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
- "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+ "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
+ "reference": "a2c590166b2133a4633738648b6b064edae0814a",
"shasum": ""
},
"require": {
"php": "^7.1"
},
"require-dev": {
- "athletic/athletic": "~0.1.8",
+ "doctrine/coding-standard": "^6.0",
"ext-pdo": "*",
"ext-phar": "*",
- "phpunit/phpunit": "^6.2.3",
- "squizlabs/php_codesniffer": "^3.0.2"
+ "phpbench/phpbench": "^0.13",
+ "phpstan/phpstan-phpunit": "^0.11",
+ "phpstan/phpstan-shim": "^0.11",
+ "phpunit/phpunit": "^7.0"
},
"type": "library",
"extra": {
@@ -5685,12 +5734,12 @@
}
],
"description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
- "homepage": "https://github.com/doctrine/instantiator",
+ "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
"keywords": [
"constructor",
"instantiate"
],
- "time": "2017-07-22T11:58:36+00:00"
+ "time": "2019-03-17T17:37:11+00:00"
},
{
"name": "doctrine/lexer",
@@ -6620,16 +6669,16 @@
},
{
"name": "magento/magento-coding-standard",
- "version": "1.0.0",
+ "version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/magento/magento-coding-standard.git",
- "reference": "b79055fdd16e0657c95ee214ebb81466c5f08745"
+ "reference": "489029a285c637825294e272d31c3f4ac00a454e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/magento/magento-coding-standard/zipball/b79055fdd16e0657c95ee214ebb81466c5f08745",
- "reference": "b79055fdd16e0657c95ee214ebb81466c5f08745",
+ "url": "https://api.github.com/repos/magento/magento-coding-standard/zipball/489029a285c637825294e272d31c3f4ac00a454e",
+ "reference": "489029a285c637825294e272d31c3f4ac00a454e",
"shasum": ""
},
"require": {
@@ -6646,7 +6695,7 @@
"AFL-3.0"
],
"description": "A set of Magento specific PHP CodeSniffer rules.",
- "time": "2019-03-27T14:17:16+00:00"
+ "time": "2019-04-01T17:03:33+00:00"
},
{
"name": "magento/magento2-functional-testing-framework",
@@ -9042,16 +9091,16 @@
},
{
"name": "symfony/polyfill-php70",
- "version": "v1.10.0",
+ "version": "v1.11.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php70.git",
- "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224"
+ "reference": "bc4858fb611bda58719124ca079baff854149c89"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/6b88000cdd431cd2e940caa2cb569201f3f84224",
- "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224",
+ "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/bc4858fb611bda58719124ca079baff854149c89",
+ "reference": "bc4858fb611bda58719124ca079baff854149c89",
"shasum": ""
},
"require": {
@@ -9061,7 +9110,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.9-dev"
+ "dev-master": "1.11-dev"
}
},
"autoload": {
@@ -9097,20 +9146,20 @@
"portable",
"shim"
],
- "time": "2018-09-21T06:26:08+00:00"
+ "time": "2019-02-06T07:57:58+00:00"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.10.0",
+ "version": "v1.11.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631"
+ "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
- "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/ab50dcf166d5f577978419edd37aa2bb8eabce0c",
+ "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c",
"shasum": ""
},
"require": {
@@ -9119,7 +9168,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.9-dev"
+ "dev-master": "1.11-dev"
}
},
"autoload": {
@@ -9152,7 +9201,7 @@
"portable",
"shim"
],
- "time": "2018-09-21T13:07:52+00:00"
+ "time": "2019-02-06T07:57:58+00:00"
},
{
"name": "symfony/stopwatch",
diff --git a/dev/tests/api-functional/testsuite/Magento/Analytics/Api/LinkProviderTest.php b/dev/tests/api-functional/testsuite/Magento/Analytics/Api/LinkProviderTest.php
index 6fd7551676660..4bf1335f20667 100644
--- a/dev/tests/api-functional/testsuite/Magento/Analytics/Api/LinkProviderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Analytics/Api/LinkProviderTest.php
@@ -95,6 +95,6 @@ public function testGetAll()
*/
private function isTestBaseUrlSecure()
{
- return strpos('https://', TESTS_BASE_URL) !== false;
+ return strpos(TESTS_BASE_URL, 'https://') !== false;
}
}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
index 602d969924fbd..264a2c7de4783 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
@@ -13,6 +13,9 @@
use Magento\TestFramework\TestCase\GraphQlAbstract;
use Magento\Integration\Api\CustomerTokenServiceInterface;
+/**
+ * Create customer address tests
+ */
class CreateCustomerAddressTest extends GraphQlAbstract
{
/**
@@ -198,6 +201,72 @@ public function testCreateCustomerAddressWithMissingAttribute()
$this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
}
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function testCreateCustomerAddressWithRedundantStreetLine()
+ {
+ $newAddress = [
+ 'region' => [
+ 'region' => 'Arizona',
+ 'region_id' => 4,
+ 'region_code' => 'AZ'
+ ],
+ 'country_id' => 'US',
+ 'street' => ['Line 1 Street', 'Line 2', 'Line 3'],
+ 'company' => 'Company name',
+ 'telephone' => '123456789',
+ 'fax' => '123123123',
+ 'postcode' => '7777',
+ 'city' => 'City Name',
+ 'firstname' => 'Adam',
+ 'lastname' => 'Phillis',
+ 'middlename' => 'A',
+ 'prefix' => 'Mr.',
+ 'suffix' => 'Jr.',
+ 'vat_id' => '1',
+ 'default_shipping' => true,
+ 'default_billing' => false
+ ];
+
+ $mutation
+ = <<graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+ }
+
/**
* Verify the fields for Customer address
*
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
index 7342800379d13..388028c4ca750 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
@@ -8,16 +8,19 @@
namespace Magento\GraphQl\Customer;
use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\Registry;
use Magento\TestFramework\Helper\Bootstrap;
use Magento\TestFramework\TestCase\GraphQlAbstract;
+/**
+ * Test for create customer functionallity
+ */
class CreateCustomerTest extends GraphQlAbstract
{
/**
- * @var CustomerRegistry
+ * @var Registry
*/
- private $customerRegistry;
+ private $registry;
/**
* @var CustomerRepositoryInterface
@@ -28,7 +31,7 @@ protected function setUp()
{
parent::setUp();
- $this->customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
+ $this->registry = Bootstrap::getObjectManager()->get(Registry::class);
$this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
}
@@ -40,7 +43,7 @@ public function testCreateCustomerAccountWithPassword()
$newFirstname = 'Richard';
$newLastname = 'Rowe';
$currentPassword = 'test123#';
- $newEmail = 'customer_created' . rand(1, 2000000) . '@example.com';
+ $newEmail = 'new_customer@example.com';
$query = <<graphQlQuery($query);
}
+
+ public function tearDown()
+ {
+ $newEmail = 'new_customer@example.com';
+ try {
+ $customer = $this->customerRepository->get($newEmail);
+ } catch (\Exception $exception) {
+ return;
+ }
+
+ $this->registry->unregister('isSecureArea');
+ $this->registry->register('isSecureArea', true);
+ $this->customerRepository->delete($customer);
+ $this->registry->unregister('isSecureArea');
+ $this->registry->register('isSecureArea', false);
+ parent::tearDown();
+ }
}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
deleted file mode 100644
index 828784ca27885..0000000000000
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
+++ /dev/null
@@ -1,225 +0,0 @@
-quoteResource = $objectManager->create(QuoteResource::class);
- $this->quote = $objectManager->create(Quote::class);
- $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
- }
-
- /**
- * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
- * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
- */
- public function testApplyCouponToGuestCartWithItems()
- {
- $couponCode = '2?ds5!2d';
-
- $this->quoteResource->load(
- $this->quote,
- 'test_order_with_simple_product_without_address',
- 'reserved_order_id'
- );
- $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
- $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
- $response = $this->graphQlQuery($query);
-
- self::assertArrayHasKey('applyCouponToCart', $response);
- self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
- }
-
- /**
- * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
- * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
- */
- public function testApplyCouponTwice()
- {
- $couponCode = '2?ds5!2d';
-
- $this->quoteResource->load(
- $this->quote,
- 'test_order_with_simple_product_without_address',
- 'reserved_order_id'
- );
- $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
- $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
- $response = $this->graphQlQuery($query);
-
- self::assertArrayHasKey("applyCouponToCart", $response);
- self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
-
- self::expectExceptionMessage('A coupon is already applied to the cart. Please remove it to apply another');
- $this->graphQlQuery($query);
- }
-
- /**
- * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
- * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
- * @expectedException \Exception
- * @expectedExceptionMessage Cart does not contain products.
- */
- public function testApplyCouponToCartWithNoItems()
- {
- $couponCode = '2?ds5!2d';
-
- $this->quoteResource->load($this->quote, 'test_order_1', 'reserved_order_id');
- $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
- $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-
- $this->graphQlQuery($query);
- }
-
- /**
- * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
- * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
- * @magentoApiDataFixture Magento/Customer/_files/customer.php
- */
- public function testGuestCustomerAttemptToChangeCustomerCart()
- {
- $couponCode = '2?ds5!2d';
-
- $this->quoteResource->load(
- $this->quote,
- 'test_order_with_simple_product_without_address',
- 'reserved_order_id'
- );
- $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
- $this->quote->setCustomerId(1);
- $this->quoteResource->save($this->quote);
- $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-
- self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
- $this->graphQlQuery($query);
- }
-
- /**
- * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
- * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
- */
- public function testRemoveCoupon()
- {
- $couponCode = '2?ds5!2d';
-
- /* Apply coupon to the quote */
- $this->quoteResource->load(
- $this->quote,
- 'test_order_with_simple_product_without_address',
- 'reserved_order_id'
- );
- $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
- $this->quoteResource->load(
- $this->quote,
- 'test_order_with_simple_product_without_address',
- 'reserved_order_id'
- );
- $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
- $this->graphQlQuery($query);
-
- /* Remove coupon from quote */
- $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
- $response = $this->graphQlQuery($query);
-
- self::assertArrayHasKey('removeCouponFromCart', $response);
- self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
- }
-
- /**
- * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
- * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
- * @magentoApiDataFixture Magento/Customer/_files/customer.php
- */
- public function testRemoveCouponFromCustomerCartByGuest()
- {
- $this->quoteResource->load(
- $this->quote,
- 'test_order_with_simple_product_without_address',
- 'reserved_order_id'
- );
- $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
- $this->quoteResource->load(
- $this->quote,
- 'test_order_with_simple_product_without_address',
- 'reserved_order_id'
- );
- $this->quote->setCustomerId(1);
- $this->quoteResource->save($this->quote);
- $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
-
- self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
- $this->graphQlQuery($query);
- }
-
- /**
- * @param string $maskedQuoteId
- * @param string $couponCode
- * @return string
- */
- private function prepareAddCouponRequestQuery(string $maskedQuoteId, string $couponCode): string
- {
- return <<customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+ $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ */
+ public function testApplyCouponToCart()
+ {
+ $couponCode = '2?ds5!2d';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId, $couponCode);
+ $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+ self::assertArrayHasKey('applyCouponToCart', $response);
+ self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage A coupon is already applied to the cart. Please remove it to apply another
+ */
+ public function testApplyCouponTwice()
+ {
+ $couponCode = '2?ds5!2d';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId, $couponCode);
+ $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+ self::assertArrayHasKey("applyCouponToCart", $response);
+ self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
+
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage Cart does not contain products.
+ */
+ public function testApplyCouponToCartWithoutItems()
+ {
+ $couponCode = '2?ds5!2d';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId, $couponCode);
+
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * _security
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+ * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+ * @expectedException \Exception
+ */
+ public function testApplyCouponToGuestCart()
+ {
+ $couponCode = '2?ds5!2d';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId, $couponCode);
+
+ self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * _security
+ * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
+ * @magentoApiDataFixture Magento/Customer/_files/two_customers.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @expectedException \Exception
+ */
+ public function testApplyCouponToAnotherCustomerCart()
+ {
+ $couponCode = '2?ds5!2d';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId, $couponCode);
+
+ self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer_two@example.com'));
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
+ */
+ public function testApplyNonExistentCouponToCart()
+ {
+ $couponCode = 'non_existent_coupon_code';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId, $couponCode);
+
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+ * @expectedException \Exception
+ */
+ public function testApplyCouponToNonExistentCart()
+ {
+ $couponCode = '2?ds5!2d';
+ $maskedQuoteId = 'non_existent_masked_id';
+ $query = $this->getQuery($maskedQuoteId, $couponCode);
+
+ self::expectExceptionMessage('Could not find a cart with ID "' . $maskedQuoteId . '"');
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/make_coupon_expired.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
+ */
+ public function testApplyExpiredCoupon()
+ {
+ $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/574');
+ $couponCode = '2?ds5!2d';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId, $couponCode);
+
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * Products in cart don't fit to the coupon
+ *
+ * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
+ */
+ public function testApplyCouponWhichIsNotApplicable()
+ {
+ $couponCode = '2?ds5!2d';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId, $couponCode);
+
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * @param string $input
+ * @param string $message
+ * @dataProvider dataProviderUpdateWithMissedRequiredParameters
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @expectedException \Exception
+ */
+ public function testApplyCouponWithMissedRequiredParameters(string $input, string $message)
+ {
+ $query = <<expectExceptionMessage($message);
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * @return array
+ */
+ public function dataProviderUpdateWithMissedRequiredParameters(): array
+ {
+ return [
+ 'missed_cart_id' => [
+ 'coupon_code: "test"',
+ 'Required parameter "cart_id" is missing'
+ ],
+ 'missed_coupon_code' => [
+ 'cart_id: "test"',
+ 'Required parameter "coupon_code" is missing'
+ ],
+ ];
+ }
+
+ /**
+ * Retrieve customer authorization headers
+ *
+ * @param string $username
+ * @param string $password
+ * @return array
+ * @throws AuthenticationException
+ */
+ private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
+ {
+ $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+ $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+ return $headerMap;
+ }
+
+ /**
+ * @param string $maskedQuoteId
+ * @param string $couponCode
+ * @return string
+ */
+ private function getQuery(string $maskedQuoteId, string $couponCode): string
+ {
+ return <<guestCartRepository = $objectManager->get(GuestCartRepositoryInterface::class);
$this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+ $this->quoteResource = $objectManager->get(QuoteResource::class);
+ $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+ $this->maskedQuoteIdToQuoteId = $objectManager->get(MaskedQuoteIdToQuoteIdInterface::class);
+ $this->quoteIdMaskFactory = $objectManager->get(QuoteIdMaskFactory::class);
}
/**
@@ -39,23 +72,83 @@ protected function setUp()
*/
public function testCreateEmptyCart()
{
- $query = <<getQuery();
+ $response = $this->graphQlQuery($query, [], '', $this->getHeaderMapWithCustomerToken());
- $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
- $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+ self::assertArrayHasKey('createEmptyCart', $response);
+ self::assertNotEmpty($response['createEmptyCart']);
+
+ $guestCart = $this->guestCartRepository->get($response['createEmptyCart']);
+ $this->maskedQuoteId = $response['createEmptyCart'];
+
+ self::assertNotNull($guestCart->getId());
+ self::assertEquals(1, $guestCart->getCustomer()->getId());
+ self::assertEquals('default', $guestCart->getStore()->getCode());
+ }
+ /**
+ * @magentoApiDataFixture Magento/Store/_files/second_store.php
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ */
+ public function testCreateEmptyCartWithNotDefaultStore()
+ {
+ $query = $this->getQuery();
+
+ $headerMap = $this->getHeaderMapWithCustomerToken();
+ $headerMap['Store'] = 'fixture_second_store';
$response = $this->graphQlQuery($query, [], '', $headerMap);
self::assertArrayHasKey('createEmptyCart', $response);
+ self::assertNotEmpty($response['createEmptyCart']);
- $maskedCartId = $response['createEmptyCart'];
- $guestCart = $this->guestCartRepository->get($maskedCartId);
+ /* guestCartRepository is used for registered customer to get the cart hash */
+ $guestCart = $this->guestCartRepository->get($response['createEmptyCart']);
+ $this->maskedQuoteId = $response['createEmptyCart'];
self::assertNotNull($guestCart->getId());
self::assertEquals(1, $guestCart->getCustomer()->getId());
+ self::assertEquals('fixture_second_store', $guestCart->getStore()->getCode());
+ }
+
+ /**
+ * @return string
+ */
+ private function getQuery(): string
+ {
+ return <<customerTokenService->createCustomerAccessToken($username, $password);
+ $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+ return $headerMap;
+ }
+
+ public function tearDown()
+ {
+ if (null !== $this->maskedQuoteId) {
+ $quoteId = $this->maskedQuoteIdToQuoteId->execute($this->maskedQuoteId);
+
+ $quote = $this->quoteFactory->create();
+ $this->quoteResource->load($quote, $quoteId);
+ $this->quoteResource->delete($quote);
+
+ $quoteIdMask = $this->quoteIdMaskFactory->create();
+ $quoteIdMask->setQuoteId($quoteId)
+ ->delete();
+ }
+ parent::tearDown();
}
}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
index ba640bc3402ba..673d496302662 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
@@ -39,7 +39,7 @@ protected function setUp()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -60,7 +60,7 @@ public function testGetAvailablePaymentMethods()
/**
* _security
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -79,7 +79,7 @@ public function testGetAvailablePaymentMethodsFromGuestCart()
/**
* _security
* @magentoApiDataFixture Magento/Customer/_files/three_customers.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -97,7 +97,7 @@ public function testGetAvailablePaymentMethodsFromAnotherCustomerCart()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
index 71cf0201951a3..2b647f61c4c63 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
@@ -41,7 +41,7 @@ protected function setUp()
* Test case: get available shipping methods from current customer quote
*
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -77,7 +77,7 @@ public function testGetAvailableShippingMethods()
/**
* _security
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -98,7 +98,7 @@ public function testGetAvailableShippingMethodsFromGuestCart()
*
* _security
* @magentoApiDataFixture Magento/Customer/_files/three_customers.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -118,7 +118,7 @@ public function testGetAvailableShippingMethodsFromAnotherCustomerCart()
* Test case: get available shipping methods when all shipping methods are disabled
*
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
index eb62b8c92f310..19b72b9e3ca4c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -36,7 +36,7 @@ protected function setUp()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -55,7 +55,7 @@ public function testGetCart()
self::assertNotEmpty($response['cart']['items'][0]['id']);
self::assertEquals(2, $response['cart']['items'][0]['qty']);
- self::assertEquals('simple', $response['cart']['items'][0]['product']['sku']);
+ self::assertEquals('simple_product', $response['cart']['items'][0]['product']['sku']);
self::assertNotEmpty($response['cart']['items'][1]['id']);
self::assertEquals(2, $response['cart']['items'][1]['qty']);
@@ -124,6 +124,58 @@ public function testGetInactiveCart()
$this->graphQlQuery($query, [], '', $this->getHeaderMap());
}
+ /**
+ * @magentoApiDataFixture Magento/Checkout/_files/active_quote_customer_not_default_store.php
+ */
+ public function testGetCartWithNotDefaultStore()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_not_default_store');
+ $query = $this->getQuery($maskedQuoteId);
+
+ $headerMap = $this->getHeaderMap();
+ $headerMap['Store'] = 'fixture_second_store';
+
+ $response = $this->graphQlQuery($query, [], '', $headerMap);
+
+ self::assertArrayHasKey('cart', $response);
+ self::assertArrayHasKey('items', $response['cart']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+ * @magentoApiDataFixture Magento/Store/_files/second_store.php
+ *
+ * @expectedException \Exception
+ * @expectedExceptionMessage Wrong store code specified for cart
+ */
+ public function testGetCartWithWrongStore()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+ $query = $this->getQuery($maskedQuoteId);
+
+ $headerMap = $this->getHeaderMap();
+ $headerMap['Store'] = 'fixture_second_store';
+
+ $this->graphQlQuery($query, [], '', $headerMap);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Checkout/_files/active_quote_customer_not_default_store.php
+ *
+ * @expectedException \Exception
+ * @expectedExceptionMessage Store code not_existing_store does not exist
+ */
+ public function testGetCartWithNotExistingStore()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_not_default_store');
+ $query = $this->getQuery($maskedQuoteId);
+
+ $headerMap = $this->getHeaderMap();
+ $headerMap['Store'] = 'not_existing_store';
+
+ $this->graphQlQuery($query, [], '', $headerMap);
+ }
+
/**
* @param string $maskedQuoteId
* @return string
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php
index 16d085c1d09be..ba169d7a5bbc9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php
@@ -39,7 +39,7 @@ protected function setUp()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -69,7 +69,7 @@ public function testGetSelectedShippingMethod()
/**
* _security
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -89,7 +89,7 @@ public function testGetSelectedShippingMethodFromGuestCart()
/**
* _security
* @magentoApiDataFixture Magento/Customer/_files/three_customers.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -108,7 +108,7 @@ public function testGetSelectedShippingMethodFromAnotherCustomerCart()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php
new file mode 100644
index 0000000000000..1ba94346073db
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php
@@ -0,0 +1,219 @@
+getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+ $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+ */
+ public function testGeSpecifiedBillingAddress()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId);
+
+ $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ self::assertArrayHasKey('cart', $response);
+ self::assertArrayHasKey('billing_address', $response['cart']);
+
+ $expectedBillingAddressData = [
+ 'firstname' => 'John',
+ 'lastname' => 'Smith',
+ 'company' => 'CompanyName',
+ 'street' => [
+ 'Green str, 67'
+ ],
+ 'city' => 'CityM',
+ 'region' => [
+ 'code' => 'AL',
+ 'label' => 'Alabama',
+ ],
+ 'postcode' => '75477',
+ 'country' => [
+ 'code' => 'US',
+ 'label' => 'US',
+ ],
+ 'telephone' => '3468676',
+ 'address_type' => 'BILLING',
+ 'customer_notes' => null,
+ ];
+ self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ */
+ public function testGeSpecifiedBillingAddressIfBillingAddressIsNotSet()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId);
+
+ $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ self::assertArrayHasKey('cart', $response);
+ self::assertArrayHasKey('billing_address', $response['cart']);
+
+ $expectedBillingAddressData = [
+ 'firstname' => null,
+ 'lastname' => null,
+ 'company' => null,
+ 'street' => [
+ ''
+ ],
+ 'city' => null,
+ 'region' => [
+ 'code' => null,
+ 'label' => null,
+ ],
+ 'postcode' => null,
+ 'country' => [
+ 'code' => null,
+ 'label' => null,
+ ],
+ 'telephone' => null,
+ 'address_type' => 'BILLING',
+ 'customer_notes' => null,
+ ];
+ self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+ */
+ public function testGeSpecifiedBillingAddressOfNonExistentCart()
+ {
+ $maskedQuoteId = 'non_existent_masked_id';
+ $query = $this->getQuery($maskedQuoteId);
+
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * _security
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+ */
+ public function testGeSpecifiedBillingAddressFromAnotherGuestCart()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+ $this->expectExceptionMessage(
+ "The current user cannot perform operations on cart \"$maskedQuoteId\""
+ );
+ $this->graphQlQuery($this->getQuery($maskedQuoteId), [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * _security
+ * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+ */
+ public function testGeSpecifiedBillingAddressFromAnotherCustomerCart()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+ $this->expectExceptionMessage(
+ "The current user cannot perform operations on cart \"$maskedQuoteId\""
+ );
+ $this->graphQlQuery(
+ $this->getQuery($maskedQuoteId),
+ [],
+ '',
+ $this->getHeaderMap('customer2@search.example.com')
+ );
+ }
+
+ /**
+ * @param string $maskedQuoteId
+ * @return string
+ */
+ private function getQuery(string $maskedQuoteId): string
+ {
+ return <<customerTokenService->createCustomerAccessToken($username, $password);
+ $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+ return $headerMap;
+ }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
new file mode 100644
index 0000000000000..4220f8932caa1
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
@@ -0,0 +1,296 @@
+getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+ $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+ $this->orderCollectionFactory = $objectManager->get(CollectionFactory::class);
+ $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+ $this->registry = Bootstrap::getObjectManager()->get(Registry::class);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
+ */
+ public function testPlaceOrder()
+ {
+ $reservedOrderId = 'test_quote';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+
+ $query = $this->getQuery($maskedQuoteId);
+ $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+ self::assertArrayHasKey('placeOrder', $response);
+ self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
+ self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ */
+ public function testPlaceOrderWithNoItemsInCart()
+ {
+ $reservedOrderId = 'test_quote';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+ $query = $this->getQuery($maskedQuoteId);
+
+ self::expectExceptionMessage(
+ 'Unable to place order: A server error stopped your order from being placed. ' .
+ 'Please try to place your order again'
+ );
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ */
+ public function testPlaceOrderWithNoShippingAddress()
+ {
+ $reservedOrderId = 'test_quote';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+ $query = $this->getQuery($maskedQuoteId);
+
+ self::expectExceptionMessage(
+ 'Unable to place order: Some addresses can\'t be used due to the configurations for specific countries'
+ );
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+ */
+ public function testPlaceOrderWithNoShippingMethod()
+ {
+ $reservedOrderId = 'test_quote';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+ $query = $this->getQuery($maskedQuoteId);
+
+ self::expectExceptionMessage(
+ 'Unable to place order: The shipping method is missing. Select the shipping method and try again'
+ );
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+ */
+ public function testPlaceOrderWithNoBillingAddress()
+ {
+ $reservedOrderId = 'test_quote';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+ $query = $this->getQuery($maskedQuoteId);
+
+ self::expectExceptionMessageRegExp(
+ '/Unable to place order: Please check the billing address information*/'
+ );
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+ */
+ public function testPlaceOrderWithNoPaymentMethod()
+ {
+ $reservedOrderId = 'test_quote';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+ $query = $this->getQuery($maskedQuoteId);
+
+ self::expectExceptionMessage('Unable to place order: Enter a valid payment method and try again');
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/set_simple_product_out_of_stock.php
+ */
+ public function testPlaceOrderWithOutOfStockProduct()
+ {
+ $reservedOrderId = 'test_quote';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+ $query = $this->getQuery($maskedQuoteId);
+
+ self::expectExceptionMessage('Unable to place order: Some of the products are out of stock');
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * _security
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
+ */
+ public function testPlaceOrderOfGuestCart()
+ {
+ $reservedOrderId = 'test_quote';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+ $query = $this->getQuery($maskedQuoteId);
+
+ self::expectExceptionMessageRegExp('/The current user cannot perform operations on cart*/');
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * _security
+ * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
+ */
+ public function testPlaceOrderOfAnotherCustomerCart()
+ {
+ $reservedOrderId = 'test_quote';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+ $query = $this->getQuery($maskedQuoteId);
+
+ self::expectExceptionMessageRegExp('/The current user cannot perform operations on cart*/');
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
+ }
+
+ /**
+ * @param string $maskedQuoteId
+ * @return string
+ */
+ private function getQuery(string $maskedQuoteId): string
+ {
+ return <<customerTokenService->createCustomerAccessToken($username, $password);
+ $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+ return $headerMap;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function tearDown()
+ {
+ $this->registry->unregister('isSecureArea');
+ $this->registry->register('isSecureArea', true);
+
+ $orderCollection = $this->orderCollectionFactory->create();
+ foreach ($orderCollection as $order) {
+ $this->orderRepository->delete($order);
+ }
+ $this->registry->unregister('isSecureArea');
+ $this->registry->register('isSecureArea', false);
+
+ parent::tearDown();
+ }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
new file mode 100644
index 0000000000000..feba8c5c64259
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
@@ -0,0 +1,169 @@
+getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+ $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/apply_coupon.php
+ */
+ public function testRemoveCouponFromCart()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+ $query = $this->getQuery($maskedQuoteId);
+ $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+ self::assertArrayHasKey('removeCouponFromCart', $response);
+ self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+ */
+ public function testRemoveCouponFromNonExistentCart()
+ {
+ $maskedQuoteId = 'non_existent_masked_id';
+ $query = $this->getQuery($maskedQuoteId);
+
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage Cart does not contain products
+ */
+ public function testRemoveCouponFromEmptyCart()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId);
+
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ */
+ public function testRemoveCouponFromCartIfCouponWasNotSet()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+ $query = $this->getQuery($maskedQuoteId);
+ $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+ self::assertArrayHasKey('removeCouponFromCart', $response);
+ self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
+ }
+
+ /**
+ * _security
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/apply_coupon.php
+ */
+ public function testRemoveCouponFromGuestCart()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId);
+
+ self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/apply_coupon.php
+ */
+ public function testRemoveCouponFromAnotherCustomerCart()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId);
+
+ self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
+ }
+
+ /**
+ * @param string $maskedQuoteId
+ * @return string
+ */
+ private function getQuery(string $maskedQuoteId): string
+ {
+ return <<customerTokenService->createCustomerAccessToken($username, $password);
+ $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+ return $headerMap;
+ }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
index e80a2127ad420..1b6d1f3b14383 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
@@ -7,11 +7,9 @@
namespace Magento\GraphQl\Quote\Customer;
-use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\GraphQl\Quote\GetQuoteItemIdByReservedQuoteIdAndSku;
use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
use Magento\TestFramework\Helper\Bootstrap;
use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -26,46 +24,37 @@ class RemoveItemFromCartTest extends GraphQlAbstract
private $customerTokenService;
/**
- * @var QuoteResource
+ * @var GetMaskedQuoteIdByReservedOrderId
*/
- private $quoteResource;
+ private $getMaskedQuoteIdByReservedOrderId;
/**
- * @var QuoteFactory
+ * @var GetQuoteItemIdByReservedQuoteIdAndSku
*/
- private $quoteFactory;
-
- /**
- * @var QuoteIdToMaskedQuoteIdInterface
- */
- private $quoteIdToMaskedId;
-
- /**
- * @var ProductRepositoryInterface
- */
- private $productRepository;
+ private $getQuoteItemIdByReservedQuoteIdAndSku;
protected function setUp()
{
$objectManager = Bootstrap::getObjectManager();
- $this->quoteResource = $objectManager->get(QuoteResource::class);
- $this->quoteFactory = $objectManager->get(QuoteFactory::class);
- $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
$this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
- $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+ $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+ $this->getQuoteItemIdByReservedQuoteIdAndSku = $objectManager->get(
+ GetQuoteItemIdByReservedQuoteIdAndSku::class
+ );
}
/**
- * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*/
public function testRemoveItemFromCart()
{
- $quote = $this->quoteFactory->create();
- $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
- $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
- $itemId = (int)$quote->getItemByProduct($this->productRepository->get('simple'))->getId();
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $itemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
- $query = $this->prepareMutationQuery($maskedQuoteId, $itemId);
+ $query = $this->getQuery($maskedQuoteId, $itemId);
$response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
$this->assertArrayHasKey('removeItemFromCart', $response);
@@ -80,105 +69,24 @@ public function testRemoveItemFromCart()
*/
public function testRemoveItemFromNonExistentCart()
{
- $query = $this->prepareMutationQuery('non_existent_masked_id', 1);
+ $query = $this->getQuery('non_existent_masked_id', 1);
$this->graphQlQuery($query, [], '', $this->getHeaderMap());
}
/**
- * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*/
public function testRemoveNonExistentItem()
{
- $quote = $this->quoteFactory->create();
- $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
- $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
$notExistentItemId = 999;
$this->expectExceptionMessage("Cart doesn't contain the {$notExistentItemId} item.");
- $query = $this->prepareMutationQuery($maskedQuoteId, $notExistentItemId);
- $this->graphQlQuery($query, [], '', $this->getHeaderMap());
- }
-
- /**
- * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
- * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
- */
- public function testRemoveItemIfItemIsNotBelongToCart()
- {
- $firstQuote = $this->quoteFactory->create();
- $this->quoteResource->load($firstQuote, 'test_order_1', 'reserved_order_id');
- $firstQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$firstQuote->getId());
-
- $secondQuote = $this->quoteFactory->create();
- $this->quoteResource->load(
- $secondQuote,
- 'test_order_with_virtual_product_without_address',
- 'reserved_order_id'
- );
- $secondQuote->setCustomerId(1);
- $this->quoteResource->save($secondQuote);
- $secondQuoteItemId = (int)$secondQuote
- ->getItemByProduct($this->productRepository->get('virtual-product'))
- ->getId();
-
- $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
-
- $query = $this->prepareMutationQuery($firstQuoteMaskedId, $secondQuoteItemId);
- $this->graphQlQuery($query, [], '', $this->getHeaderMap());
- }
-
- /**
- * @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
- */
- public function testRemoveItemFromGuestCart()
- {
- $guestQuote = $this->quoteFactory->create();
- $this->quoteResource->load(
- $guestQuote,
- 'test_order_with_virtual_product_without_address',
- 'reserved_order_id'
- );
- $guestQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$guestQuote->getId());
- $guestQuoteItemId = (int)$guestQuote
- ->getItemByProduct($this->productRepository->get('virtual-product'))
- ->getId();
-
- $this->expectExceptionMessage(
- "The current user cannot perform operations on cart \"$guestQuoteMaskedId\""
- );
-
- $query = $this->prepareMutationQuery($guestQuoteMaskedId, $guestQuoteItemId);
- $this->graphQlQuery($query, [], '', $this->getHeaderMap());
- }
-
- /**
- * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
- * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
- * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
- */
- public function testRemoveItemFromAnotherCustomerCart()
- {
- $anotherCustomerQuote = $this->quoteFactory->create();
- $this->quoteResource->load(
- $anotherCustomerQuote,
- 'test_order_with_virtual_product_without_address',
- 'reserved_order_id'
- );
- $anotherCustomerQuote->setCustomerId(2);
- $this->quoteResource->save($anotherCustomerQuote);
-
- $anotherCustomerQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$anotherCustomerQuote->getId());
- $anotherCustomerQuoteItemId = (int)$anotherCustomerQuote
- ->getItemByProduct($this->productRepository->get('virtual-product'))
- ->getId();
-
- $this->expectExceptionMessage(
- "The current user cannot perform operations on cart \"$anotherCustomerQuoteMaskedId\""
- );
-
- $query = $this->prepareMutationQuery($anotherCustomerQuoteMaskedId, $anotherCustomerQuoteItemId);
+ $query = $this->getQuery($maskedQuoteId, $notExistentItemId);
$this->graphQlQuery($query, [], '', $this->getHeaderMap());
}
@@ -226,12 +134,77 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
];
}
+ /**
+ * _security
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+ */
+ public function testRemoveItemIfItemIsNotBelongToCart()
+ {
+ $firstQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $secondQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute(
+ 'test_order_with_virtual_product',
+ 'virtual-product'
+ );
+
+ $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
+
+ $query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId);
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * _security
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ */
+ public function testRemoveItemFromGuestCart()
+ {
+ $guestQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $guestQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
+
+ $this->expectExceptionMessage(
+ "The current user cannot perform operations on cart \"$guestQuoteMaskedId\""
+ );
+
+ $query = $this->getQuery($guestQuoteMaskedId, $guestQuoteItemId);
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * _security
+ * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ */
+ public function testRemoveItemFromAnotherCustomerCart()
+ {
+ $anotherCustomerQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $anotherCustomerQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute(
+ 'test_quote',
+ 'simple_product'
+ );
+
+ $this->expectExceptionMessage(
+ "The current user cannot perform operations on cart \"$anotherCustomerQuoteMaskedId\""
+ );
+
+ $query = $this->getQuery($anotherCustomerQuoteMaskedId, $anotherCustomerQuoteItemId);
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
+ }
+
/**
* @param string $maskedQuoteId
* @param int $itemId
* @return string
*/
- private function prepareMutationQuery(string $maskedQuoteId, int $itemId): string
+ private function getQuery(string $maskedQuoteId, int $itemId): string
{
return <<graphQlQuery($query);
}
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ */
+ public function testSetNewBillingAddressWithRedundantStreetLine()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+ $query = <<graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
/**
* @return array
*/
@@ -568,16 +611,16 @@ private function getHeaderMap(string $username = 'customer@example.com', string
}
/**
- * @param string $reversedOrderId
+ * @param string $reservedOrderId
* @param int $customerId
* @return string
*/
private function assignQuoteToCustomer(
- string $reversedOrderId = 'test_order_with_simple_product_without_address',
+ string $reservedOrderId = 'test_order_with_simple_product_without_address',
int $customerId = 1
): string {
$quote = $this->quoteFactory->create();
- $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
+ $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
$quote->setCustomerId($customerId);
$this->quoteResource->save($quote);
return $this->quoteIdToMaskedId->execute((int)$quote->getId());
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php
index bd147cc4a197e..b7b7823263106 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php
@@ -48,7 +48,7 @@ protected function setUp()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
index 98eded8300665..73feefe2b094b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -41,7 +41,7 @@ protected function setUp()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -62,7 +62,7 @@ public function testSetPaymentOnCartWithSimpleProduct()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*
@@ -100,7 +100,7 @@ public function testSetPaymentOnCartWithVirtualProduct()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -135,7 +135,7 @@ public function testSetPaymentOnNonExistentCart()
/**
* _security
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*/
@@ -155,7 +155,7 @@ public function testSetPaymentMethodToGuestCart()
/**
* _security
* @magentoApiDataFixture Magento/Customer/_files/three_customers.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*/
@@ -174,7 +174,7 @@ public function testSetPaymentMethodToAnotherCustomerCart()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*
@@ -227,7 +227,7 @@ public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index 5ff29d20b34d7..0756ba6aeaf22 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -57,7 +57,7 @@ protected function setUp()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*/
@@ -166,7 +166,7 @@ public function testSetNewShippingAddressOnCartWithVirtualProduct()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*/
@@ -211,7 +211,7 @@ public function testSetShippingAddressFromAddressBook()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*
@@ -248,7 +248,7 @@ public function testSetNonExistentShippingAddressFromAddressBook()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*/
@@ -371,7 +371,7 @@ public function testSetShippingAddressToAnotherCustomerCart()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*
@@ -427,7 +427,7 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*
@@ -486,6 +486,52 @@ public function testSetMultipleNewShippingAddresses()
$this->graphQlQuery($query, [], '', $this->getHeaderMap());
}
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ */
+ public function testSetNewShippingAddressOnCartWithRedundantStreetLine()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+ $query = <<graphQlQuery($query, [], '', $this->getHeaderMap());
+ }
+
/**
* Verify the all the whitelisted fields for a New Address Object
*
@@ -541,16 +587,16 @@ private function getHeaderMap(string $username = 'customer@example.com', string
}
/**
- * @param string $reversedOrderId
+ * @param string $reservedOrderId
* @param int $customerId
* @return string
*/
private function assignQuoteToCustomer(
- string $reversedOrderId = 'test_order_with_simple_product_without_address',
+ string $reservedOrderId = 'test_order_with_simple_product_without_address',
int $customerId = 1
): string {
$quote = $this->quoteFactory->create();
- $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
+ $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
$quote->setCustomerId($customerId);
$this->quoteResource->save($quote);
return $this->quoteIdToMaskedId->execute((int)$quote->getId());
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index b5634f51cb366..9219b5a67022c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -7,10 +7,9 @@
namespace Magento\GraphQl\Quote\Customer;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\GraphQl\Quote\GetQuoteShippingAddressIdByReservedQuoteId;
use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
use Magento\TestFramework\Helper\Bootstrap;
use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -20,24 +19,19 @@
class SetShippingMethodsOnCartTest extends GraphQlAbstract
{
/**
- * @var CustomerTokenServiceInterface
- */
- private $customerTokenService;
-
- /**
- * @var QuoteResource
+ * @var GetMaskedQuoteIdByReservedOrderId
*/
- private $quoteResource;
+ private $getMaskedQuoteIdByReservedOrderId;
/**
- * @var QuoteFactory
+ * @var GetQuoteShippingAddressIdByReservedQuoteId
*/
- private $quoteFactory;
+ private $getQuoteShippingAddressIdByReservedQuoteId;
/**
- * @var QuoteIdToMaskedQuoteIdInterface
+ * @var CustomerTokenServiceInterface
*/
- private $quoteIdToMaskedId;
+ private $customerTokenService;
/**
* @inheritdoc
@@ -45,157 +39,393 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
protected function setUp()
{
$objectManager = Bootstrap::getObjectManager();
- $this->quoteResource = $objectManager->get(QuoteResource::class);
- $this->quoteFactory = $objectManager->get(QuoteFactory::class);
- $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+ $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+ $this->getQuoteShippingAddressIdByReservedQuoteId = $objectManager->get(
+ GetQuoteShippingAddressIdByReservedQuoteId::class
+ );
$this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
}
- public function testShippingMethodWithVirtualProduct()
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+ */
+ public function testSetShippingMethodOnCartWithSimpleProduct()
{
- $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
- }
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $carrierCode = 'flatrate';
+ $methodCode = 'flatrate';
+ $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
- public function testShippingMethodWithSimpleProduct()
- {
- $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
- }
+ $query = $this->getQuery(
+ $maskedQuoteId,
+ $methodCode,
+ $carrierCode,
+ $quoteAddressId
+ );
+ $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
- public function testShippingMethodWithSimpleProductWithoutAddress()
- {
- $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+ self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+ self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+ self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+ self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+
+ $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+ self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
+
+ self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+ self::assertEquals($carrierCode, $shippingAddress['selected_shipping_method']['carrier_code']);
+
+ self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+ self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
}
- public function testSetShippingMethodWithMissedRequiredParameters()
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+ */
+ public function testReSetShippingMethod()
{
- $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $carrierCode = 'freeshipping';
+ $methodCode = 'freeshipping';
+ $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
+
+ $query = $this->getQuery(
+ $maskedQuoteId,
+ $methodCode,
+ $carrierCode,
+ $quoteAddressId
+ );
+ $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+ self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+ self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+ self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+ self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+
+ $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+ self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
+
+ self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+ self::assertEquals($carrierCode, $shippingAddress['selected_shipping_method']['carrier_code']);
+
+ self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+ self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
}
- public function testSetNonExistentShippingMethod()
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+ *
+ * @param string $input
+ * @param string $message
+ * @dataProvider dataProviderSetShippingMethodWithWrongParameters
+ * @throws \Exception
+ */
+ public function testSetShippingMethodWithWrongParameters(string $input, string $message)
{
- $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
+ $input = str_replace(['cart_id_value', 'cart_address_id_value'], [$maskedQuoteId, $quoteAddressId], $input);
+
+ $query = <<expectExceptionMessage($message);
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
}
- public function testSetShippingMethodIfAddressIsNotBelongToCart()
+ /**
+ * @return array
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function dataProviderSetShippingMethodWithWrongParameters(): array
{
- $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+ return [
+ 'missed_cart_id' => [
+ 'shipping_methods: [{
+ cart_address_id: cart_address_id_value
+ carrier_code: "flatrate"
+ method_code: "flatrate"
+ }]',
+ 'Required parameter "cart_id" is missing'
+ ],
+ 'missed_shipping_methods' => [
+ 'cart_id: "cart_id_value"',
+ 'Required parameter "shipping_methods" is missing'
+ ],
+ 'shipping_methods_are_empty' => [
+ 'cart_id: "cart_id_value" shipping_methods: []',
+ 'Required parameter "shipping_methods" is missing'
+ ],
+ 'missed_cart_address_id' => [
+ 'cart_id: "cart_id_value", shipping_methods: [{
+ carrier_code: "flatrate"
+ method_code: "flatrate"
+ }]',
+ 'Required parameter "cart_address_id" is missing.'
+ ],
+ 'non_existent_cart_address_id' => [
+ 'cart_id: "cart_id_value", shipping_methods: [{
+ cart_address_id: -1
+ carrier_code: "flatrate"
+ method_code: "flatrate"
+ }]',
+ 'Could not find a cart address with ID "-1"'
+ ],
+ 'missed_carrier_code' => [
+ 'cart_id: "cart_id_value", shipping_methods: [{
+ cart_address_id: cart_address_id_value
+ method_code: "flatrate"
+ }]',
+ 'Field ShippingMethodInput.carrier_code of required type String! was not provided.'
+ ],
+ 'empty_carrier_code' => [
+ 'cart_id: "cart_id_value", shipping_methods: [{
+ cart_address_id: cart_address_id_value
+ carrier_code: ""
+ method_code: "flatrate"
+ }]',
+ 'Required parameter "carrier_code" is missing.'
+ ],
+ 'non_existent_carrier_code' => [
+ 'cart_id: "cart_id_value", shipping_methods: [{
+ cart_address_id: cart_address_id_value
+ carrier_code: "wrong-carrier-code"
+ method_code: "flatrate"
+ }]',
+ 'Carrier with such method not found: wrong-carrier-code, flatrate'
+ ],
+ 'missed_method_code' => [
+ 'cart_id: "cart_id_value", shipping_methods: [{
+ cart_address_id: cart_address_id_value
+ carrier_code: "flatrate"
+ }]',
+ 'Required parameter "method_code" is missing.'
+ ],
+ 'empty_method_code' => [
+ 'cart_id: "cart_id_value", shipping_methods: [{
+ cart_address_id: cart_address_id_value
+ carrier_code: "flatrate"
+ method_code: ""
+ }]',
+ 'Required parameter "method_code" is missing.'
+ ],
+ 'non_existent_method_code' => [
+ 'cart_id: "cart_id_value", shipping_methods: [{
+ cart_address_id: cart_address_id_value
+ carrier_code: "flatrate"
+ method_code: "wrong-carrier-code"
+ }]',
+ 'Carrier with such method not found: flatrate, wrong-carrier-code'
+ ],
+ 'non_existent_shopping_cart' => [
+ 'cart_id: "non_existent_masked_id", shipping_methods: [{
+ cart_address_id: cart_address_id_value
+ carrier_code: "flatrate"
+ method_code: "flatrate"
+ }]',
+ 'Could not find a cart with ID "non_existent_masked_id"'
+ ],
+ ];
}
- public function testSetShippingMethodToNonExistentCart()
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage You cannot specify multiple shipping methods.
+ */
+ public function testSetMultipleShippingMethods()
{
- $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
+
+ $query = <<graphQlQuery($query, [], '', $this->getHeaderMap());
}
+ /**
+ * _security
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+ *
+ * @expectedException \Exception
+ */
public function testSetShippingMethodToGuestCart()
{
- $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
- }
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $carrierCode = 'flatrate';
+ $methodCode = 'flatrate';
+ $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
+ $query = $this->getQuery(
+ $maskedQuoteId,
+ $methodCode,
+ $carrierCode,
+ $quoteAddressId
+ );
- public function testSetShippingMethodToAnotherCustomerCart()
- {
- $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+ $this->expectExceptionMessage(
+ "The current user cannot perform operations on cart \"$maskedQuoteId\""
+ );
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
}
- public function testSetShippingMethodToNonExistentCartAddress()
+ /**
+ * _security
+ * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+ *
+ * @expectedException \Exception
+ */
+ public function testSetShippingMethodToAnotherCustomerCart()
{
- $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
- }
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $carrierCode = 'flatrate';
+ $methodCode = 'flatrate';
+ $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
+ $query = $this->getQuery(
+ $maskedQuoteId,
+ $methodCode,
+ $carrierCode,
+ $quoteAddressId
+ );
- public function testSetShippingMethodToGuestCartAddress()
- {
- $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+ $this->expectExceptionMessage(
+ "The current user cannot perform operations on cart \"$maskedQuoteId\""
+ );
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
}
- public function testSetShippingMethodToAnotherCustomerCartAddress()
+ /**
+ * _security
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/quote_with_address.php
+ */
+ public function testSetShippingMethodIfCustomerIsNotOwnerOfAddress()
{
- $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
- }
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $carrierCode = 'flatrate';
+ $methodCode = 'flatrate';
+ $anotherQuoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('guest_quote_with_address');
+ $query = $this->getQuery(
+ $maskedQuoteId,
+ $methodCode,
+ $carrierCode,
+ $anotherQuoteAddressId
+ );
- public function testSetMultipleShippingMethods()
- {
- $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+ $this->expectExceptionMessage(
+ "Cart does not contain address with ID \"{$anotherQuoteAddressId}\""
+ );
+ $this->graphQlQuery($query, [], '', $this->getHeaderMap());
}
/**
* @param string $maskedQuoteId
* @param string $shippingMethodCode
* @param string $shippingCarrierCode
- * @param string $shippingAddressId
+ * @param int $shippingAddressId
* @return string
- * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
*/
- private function prepareMutationQuery(
+ private function getQuery(
string $maskedQuoteId,
string $shippingMethodCode,
string $shippingCarrierCode,
- string $shippingAddressId
- ) : string {
+ int $shippingAddressId
+ ): string {
return <<quoteFactory->create();
- $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
-
- return $this->quoteIdToMaskedId->execute((int)$quote->getId());
- }
-
- /**
- * @param string $reversedOrderId
- * @param int $customerId
- * @return string
- * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
- */
- private function assignQuoteToCustomer(
- string $reversedOrderId,
- int $customerId
- ): string {
- $quote = $this->quoteFactory->create();
- $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
- $quote->setCustomerId($customerId);
- $this->quoteResource->save($quote);
- return $this->quoteIdToMaskedId->execute((int)$quote->getId());
- }
-
/**
* @param string $username
* @param string $password
* @return array
- * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
*/
private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
{
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php
index eab362c3a0a6f..9bb9bef9bdb09 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php
@@ -50,14 +50,14 @@ public function __construct(
/**
* Get masked quote id by reserved order id
*
- * @param string $reversedOrderId
+ * @param string $reservedOrderId
* @return string
* @throws NoSuchEntityException
*/
- public function execute(string $reversedOrderId): string
+ public function execute(string $reservedOrderId): string
{
$quote = $this->quoteFactory->create();
- $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
+ $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
return $this->quoteIdToMaskedId->execute((int)$quote->getId());
}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteItemIdByReservedQuoteIdAndSku.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteItemIdByReservedQuoteIdAndSku.php
new file mode 100644
index 0000000000000..6f027babc0e27
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteItemIdByReservedQuoteIdAndSku.php
@@ -0,0 +1,66 @@
+quoteFactory = $quoteFactory;
+ $this->quoteResource = $quoteResource;
+ $this->productRepository = $productRepository;
+ }
+
+ /**
+ * Get quote item id by reserved order id and product sku
+ *
+ * @param string $reservedOrderId
+ * @param string $sku
+ * @return int
+ * @throws NoSuchEntityException
+ */
+ public function execute(string $reservedOrderId, string $sku): int
+ {
+ $quote = $this->quoteFactory->create();
+ $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
+ $product = $this->productRepository->get($sku);
+
+ return (int)$quote->getItemByProduct($product)->getId();
+ }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteShippingAddressIdByReservedQuoteId.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteShippingAddressIdByReservedQuoteId.php
index fa42ad4d71fb2..a56949b6f563a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteShippingAddressIdByReservedQuoteId.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteShippingAddressIdByReservedQuoteId.php
@@ -40,13 +40,13 @@ public function __construct(
/**
* Get quote shipping address id by reserved order id
*
- * @param string $reversedOrderId
+ * @param string $reservedOrderId
* @return int
*/
- public function execute(string $reversedOrderId): int
+ public function execute(string $reservedOrderId): int
{
$quote = $this->quoteFactory->create();
- $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
+ $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
return (int)$quote->getShippingAddress()->getId();
}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
new file mode 100644
index 0000000000000..045a28834e0dd
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
@@ -0,0 +1,232 @@
+getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+ */
+ public function testApplyCouponToCart()
+ {
+ $couponCode = '2?ds5!2d';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId, $couponCode);
+ $response = $this->graphQlQuery($query);
+
+ self::assertArrayHasKey('applyCouponToCart', $response);
+ self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage A coupon is already applied to the cart. Please remove it to apply another
+ */
+ public function testApplyCouponTwice()
+ {
+ $couponCode = '2?ds5!2d';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId, $couponCode);
+ $response = $this->graphQlQuery($query);
+
+ self::assertArrayHasKey("applyCouponToCart", $response);
+ self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
+
+ $this->graphQlQuery($query);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage Cart does not contain products.
+ */
+ public function testApplyCouponToCartWithoutItems()
+ {
+ $couponCode = '2?ds5!2d';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId, $couponCode);
+
+ $this->graphQlQuery($query);
+ }
+
+ /**
+ * _security
+ * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @expectedException \Exception
+ */
+ public function testApplyCouponToCustomerCart()
+ {
+ $couponCode = '2?ds5!2d';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId, $couponCode);
+
+ self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
+ $this->graphQlQuery($query);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
+ */
+ public function testApplyNonExistentCouponToCart()
+ {
+ $couponCode = 'non_existent_coupon_code';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId, $couponCode);
+
+ $this->graphQlQuery($query);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+ * @expectedException \Exception
+ */
+ public function testApplyCouponToNonExistentCart()
+ {
+ $couponCode = '2?ds5!2d';
+ $maskedQuoteId = 'non_existent_masked_id';
+ $query = $this->getQuery($maskedQuoteId, $couponCode);
+
+ self::expectExceptionMessage('Could not find a cart with ID "' . $maskedQuoteId . '"');
+ $this->graphQlQuery($query);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/make_coupon_expired.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
+ */
+ public function testApplyExpiredCoupon()
+ {
+ $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/574');
+ $couponCode = '2?ds5!2d';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId, $couponCode);
+
+ $this->graphQlQuery($query);
+ }
+
+ /**
+ * Products in cart don't fit to the coupon
+ *
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
+ */
+ public function testApplyCouponWhichIsNotApplicable()
+ {
+ $couponCode = '2?ds5!2d';
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId, $couponCode);
+
+ $this->graphQlQuery($query);
+ }
+
+ /**
+ * @param string $input
+ * @param string $message
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @dataProvider dataProviderUpdateWithMissedRequiredParameters
+ * @expectedException \Exception
+ */
+ public function testApplyCouponWithMissedRequiredParameters(string $input, string $message)
+ {
+ $query = <<expectExceptionMessage($message);
+ $this->graphQlQuery($query);
+ }
+
+ /**
+ * @return array
+ */
+ public function dataProviderUpdateWithMissedRequiredParameters(): array
+ {
+ return [
+ 'missed_cart_id' => [
+ 'coupon_code: "test"',
+ 'Required parameter "cart_id" is missing'
+ ],
+ 'missed_coupon_code' => [
+ 'cart_id: "test"',
+ 'Required parameter "coupon_code" is missing'
+ ],
+ ];
+ }
+
+ /**
+ * @param string $maskedQuoteId
+ * @param string $couponCode
+ * @return string
+ */
+ private function getQuery(string $maskedQuoteId, string $couponCode): string
+ {
+ return <<guestCartRepository = $objectManager->get(GuestCartRepositoryInterface::class);
+ $this->quoteResource = $objectManager->get(QuoteResource::class);
+ $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+ $this->maskedQuoteIdToQuoteId = $objectManager->get(MaskedQuoteIdToQuoteIdInterface::class);
+ $this->quoteIdMaskFactory = $objectManager->get(QuoteIdMaskFactory::class);
}
public function testCreateEmptyCart()
{
- $query = <<getQuery();
$response = $this->graphQlQuery($query);
self::assertArrayHasKey('createEmptyCart', $response);
+ self::assertNotEmpty($response['createEmptyCart']);
+
+ $guestCart = $this->guestCartRepository->get($response['createEmptyCart']);
+ $this->maskedQuoteId = $response['createEmptyCart'];
+
+ self::assertNotNull($guestCart->getId());
+ self::assertNull($guestCart->getCustomer()->getId());
+ self::assertEquals('default', $guestCart->getStore()->getCode());
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Store/_files/second_store.php
+ */
+ public function testCreateEmptyCartWithNotDefaultStore()
+ {
+ $query = $this->getQuery();
+ $headerMap = ['Store' => 'fixture_second_store'];
+ $response = $this->graphQlQuery($query, [], '', $headerMap);
+
+ self::assertArrayHasKey('createEmptyCart', $response);
+ self::assertNotEmpty($response['createEmptyCart']);
- $maskedCartId = $response['createEmptyCart'];
- $guestCart = $this->guestCartRepository->get($maskedCartId);
+ $guestCart = $this->guestCartRepository->get($response['createEmptyCart']);
+ $this->maskedQuoteId = $response['createEmptyCart'];
self::assertNotNull($guestCart->getId());
self::assertNull($guestCart->getCustomer()->getId());
+ self::assertSame('fixture_second_store', $guestCart->getStore()->getCode());
+ }
+
+ /**
+ * @return string
+ */
+ private function getQuery(): string
+ {
+ return <<maskedQuoteId) {
+ $quoteId = $this->maskedQuoteIdToQuoteId->execute($this->maskedQuoteId);
+
+ $quote = $this->quoteFactory->create();
+ $this->quoteResource->load($quote, $quoteId);
+ $this->quoteResource->delete($quote);
+
+ $quoteIdMask = $this->quoteIdMaskFactory->create();
+ $quoteIdMask->setQuoteId($quoteId)
+ ->delete();
+ }
+ parent::tearDown();
}
}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
index 8271a76d88f12..af1f72fe71620 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
@@ -31,7 +31,7 @@ protected function setUp()
}
/**
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -52,7 +52,7 @@ public function testGetAvailablePaymentMethods()
/**
* _security
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -69,7 +69,7 @@ public function testGetAvailablePaymentMethodsFromCustomerCart()
}
/**
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
index 38fda50ba5836..a8113657eff6e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
@@ -33,7 +33,7 @@ protected function setUp()
/**
* Test case: get available shipping methods from current customer quote
*
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -69,7 +69,7 @@ public function testGetAvailableShippingMethods()
/**
* _security
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -87,7 +87,7 @@ public function testGetAvailableShippingMethodsFromCustomerCart()
/**
* Test case: get available shipping methods when all shipping methods are disabled
*
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
index 6b1f540e4d47a..832e15058a4ee 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
@@ -28,7 +28,7 @@ protected function setUp()
}
/**
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -47,7 +47,7 @@ public function testGetCart()
self::assertNotEmpty($response['cart']['items'][0]['id']);
self::assertEquals(2, $response['cart']['items'][0]['qty']);
- self::assertEquals('simple', $response['cart']['items'][0]['product']['sku']);
+ self::assertEquals('simple_product', $response['cart']['items'][0]['product']['sku']);
self::assertNotEmpty($response['cart']['items'][1]['id']);
self::assertEquals(2, $response['cart']['items'][1]['qty']);
@@ -97,6 +97,54 @@ public function testGetInactiveCart()
$this->graphQlQuery($query);
}
+ /**
+ * @magentoApiDataFixture Magento/Checkout/_files/active_quote_guest_not_default_store.php
+ */
+ public function testGetCartWithNotDefaultStore()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_not_default_store_guest');
+ $query = $this->getQuery($maskedQuoteId);
+
+ $headerMap = ['Store' => 'fixture_second_store'];
+ $response = $this->graphQlQuery($query, [], '', $headerMap);
+
+ self::assertArrayHasKey('cart', $response);
+ self::assertArrayHasKey('items', $response['cart']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+ * @magentoApiDataFixture Magento/Store/_files/second_store.php
+ *
+ * @expectedException \Exception
+ * @expectedExceptionMessage Wrong store code specified for cart
+ */
+ public function testGetCartWithWrongStore()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+ $query = $this->getQuery($maskedQuoteId);
+
+ $headerMap = ['Store' => 'fixture_second_store'];
+ $this->graphQlQuery($query, [], '', $headerMap);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/Checkout/_files/active_quote_guest_not_default_store.php
+ *
+ * @expectedException \Exception
+ * @expectedExceptionMessage Store code not_existing_store does not exist
+ */
+ public function testGetCartWithNotExistingStore()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_not_default_store_guest');
+
+ $headerMap['Store'] = 'not_existing_store';
+ $query = $this->getQuery($maskedQuoteId);
+
+ $this->graphQlQuery($query, [], '', $headerMap);
+ }
+
/**
* @param string $maskedQuoteId
* @return string
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php
index c31b48ccc1087..bfdecca782319 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php
@@ -31,7 +31,7 @@ protected function setUp()
}
/**
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -61,7 +61,7 @@ public function testGetSelectedShippingMethod()
/**
* _security
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -79,7 +79,7 @@ public function testGetSelectedShippingMethodFromCustomerCart()
}
/**
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedBillingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedBillingAddressTest.php
new file mode 100644
index 0000000000000..d592443aed499
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedBillingAddressTest.php
@@ -0,0 +1,170 @@
+getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+ */
+ public function testGeSpecifiedBillingAddress()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId);
+
+ $response = $this->graphQlQuery($query);
+ self::assertArrayHasKey('cart', $response);
+ self::assertArrayHasKey('billing_address', $response['cart']);
+
+ $expectedBillingAddressData = [
+ 'firstname' => 'John',
+ 'lastname' => 'Smith',
+ 'company' => 'CompanyName',
+ 'street' => [
+ 'Green str, 67'
+ ],
+ 'city' => 'CityM',
+ 'region' => [
+ 'code' => 'AL',
+ 'label' => 'Alabama',
+ ],
+ 'postcode' => '75477',
+ 'country' => [
+ 'code' => 'US',
+ 'label' => 'US',
+ ],
+ 'telephone' => '3468676',
+ 'address_type' => 'BILLING',
+ ];
+ self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ */
+ public function testGeSpecifiedBillingAddressIfBillingAddressIsNotSet()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId);
+
+ $response = $this->graphQlQuery($query);
+ self::assertArrayHasKey('cart', $response);
+ self::assertArrayHasKey('billing_address', $response['cart']);
+
+ $expectedBillingAddressData = [
+ 'firstname' => null,
+ 'lastname' => null,
+ 'company' => null,
+ 'street' => [
+ ''
+ ],
+ 'city' => null,
+ 'region' => [
+ 'code' => null,
+ 'label' => null,
+ ],
+ 'postcode' => null,
+ 'country' => [
+ 'code' => null,
+ 'label' => null,
+ ],
+ 'telephone' => null,
+ 'address_type' => 'BILLING',
+ ];
+ self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+ */
+ public function testGetBillingAddressOfNonExistentCart()
+ {
+ $maskedQuoteId = 'non_existent_masked_id';
+ $query = $this->getQuery($maskedQuoteId);
+ $this->graphQlQuery($query);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+ */
+ public function testGetBillingAddressFromAnotherCustomerCart()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId);
+
+ $this->expectExceptionMessage(
+ "The current user cannot perform operations on cart \"$maskedQuoteId\""
+ );
+ $this->graphQlQuery($query);
+ }
+
+ /**
+ * @param string $maskedQuoteId
+ * @return string
+ */
+ private function getQuery(string $maskedQuoteId): string
+ {
+ return <<getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/apply_coupon.php
+ */
+ public function testRemoveCouponFromCart()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+ $query = $this->getQuery($maskedQuoteId);
+ $response = $this->graphQlQuery($query);
+
+ self::assertArrayHasKey('removeCouponFromCart', $response);
+ self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+ */
+ public function testRemoveCouponFromNonExistentCart()
+ {
+ $maskedQuoteId = 'non_existent_masked_id';
+ $query = $this->getQuery($maskedQuoteId);
+
+ $this->graphQlQuery($query);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage Cart does not contain products
+ */
+ public function testRemoveCouponFromEmptyCart()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId);
+
+ $this->graphQlQuery($query);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ */
+ public function testRemoveCouponFromCartIfCouponWasNotSet()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+ $query = $this->getQuery($maskedQuoteId);
+ $response = $this->graphQlQuery($query);
+
+ self::assertArrayHasKey('removeCouponFromCart', $response);
+ self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
+ }
+
+ /**
+ * _security
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/apply_coupon.php
+ */
+ public function testRemoveCouponFromCustomerCart()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId);
+
+ self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
+ $this->graphQlQuery($query);
+ }
+
+ /**
+ * @param string $maskedQuoteId
+ * @return string
+ */
+ private function getQuery(string $maskedQuoteId): string
+ {
+ return <<quoteResource = $objectManager->get(QuoteResource::class);
- $this->quoteFactory = $objectManager->get(QuoteFactory::class);
- $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
- $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+ $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+ $this->getQuoteItemIdByReservedQuoteIdAndSku = $objectManager->get(
+ GetQuoteItemIdByReservedQuoteIdAndSku::class
+ );
}
/**
- * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*/
public function testRemoveItemFromCart()
{
- $quote = $this->quoteFactory->create();
- $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
- $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
- $itemId = (int)$quote->getItemByProduct($this->productRepository->get('simple'))->getId();
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $itemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
- $query = $this->prepareMutationQuery($maskedQuoteId, $itemId);
+ $query = $this->getQuery($maskedQuoteId, $itemId);
$response = $this->graphQlQuery($query);
$this->assertArrayHasKey('removeItemFromCart', $response);
@@ -72,69 +60,23 @@ public function testRemoveItemFromCart()
*/
public function testRemoveItemFromNonExistentCart()
{
- $query = $this->prepareMutationQuery('non_existent_masked_id', 1);
+ $query = $this->getQuery('non_existent_masked_id', 1);
$this->graphQlQuery($query);
}
/**
- * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*/
public function testRemoveNonExistentItem()
{
- $quote = $this->quoteFactory->create();
- $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
- $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
$notExistentItemId = 999;
$this->expectExceptionMessage("Cart doesn't contain the {$notExistentItemId} item.");
- $query = $this->prepareMutationQuery($maskedQuoteId, $notExistentItemId);
- $this->graphQlQuery($query);
- }
-
- /**
- * Test mutation is only able to remove quote item belonging to the requested cart
- *
- * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
- * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
- */
- public function testRemoveItemIfItemIsNotBelongToCart()
- {
- $firstQuote = $this->quoteFactory->create();
- $this->quoteResource->load($firstQuote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
- $firstQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$firstQuote->getId());
-
- $secondQuote = $this->quoteFactory->create();
- $this->quoteResource->load(
- $secondQuote,
- 'test_order_with_virtual_product_without_address',
- 'reserved_order_id'
- );
- $secondQuoteItemId = (int)$secondQuote
- ->getItemByProduct($this->productRepository->get('virtual-product'))
- ->getId();
-
- $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
-
- $query = $this->prepareMutationQuery($firstQuoteMaskedId, $secondQuoteItemId);
- $this->graphQlQuery($query);
- }
-
- /**
- * Test mutation is only able to remove quote item belonging to the requested cart
- *
- * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
- */
- public function testRemoveItemFromCustomerCart()
- {
- $customerQuote = $this->quoteFactory->create();
- $this->quoteResource->load($customerQuote, 'test_order_1', 'reserved_order_id');
- $customerQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$customerQuote->getId());
- $customerQuoteItemId = (int)$customerQuote->getItemByProduct($this->productRepository->get('simple'))->getId();
-
- $this->expectExceptionMessage("The current user cannot perform operations on cart \"$customerQuoteMaskedId\"");
-
- $query = $this->prepareMutationQuery($customerQuoteMaskedId, $customerQuoteItemId);
+ $query = $this->getQuery($maskedQuoteId, $notExistentItemId);
$this->graphQlQuery($query);
}
@@ -181,12 +123,51 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
];
}
+ /**
+ * _security
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+ */
+ public function testRemoveItemIfItemIsNotBelongToCart()
+ {
+ $firstQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $secondQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute(
+ 'test_order_with_virtual_product_without_address',
+ 'virtual-product'
+ );
+
+ $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
+
+ $query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId);
+ $this->graphQlQuery($query);
+ }
+
+ /**
+ * _security
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ */
+ public function testRemoveItemFromCustomerCart()
+ {
+ $customerQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $customerQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
+
+ $this->expectExceptionMessage("The current user cannot perform operations on cart \"$customerQuoteMaskedId\"");
+
+ $query = $this->getQuery($customerQuoteMaskedId, $customerQuoteItemId);
+ $this->graphQlQuery($query);
+ }
+
/**
* @param string $maskedQuoteId
* @param int $itemId
* @return string
*/
- private function prepareMutationQuery(string $maskedQuoteId, int $itemId): string
+ private function getQuery(string $maskedQuoteId, int $itemId): string
{
return <<graphQlQuery($query);
}
+ /**
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ */
+ public function testSetNewBillingAddressRedundantStreetLine()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+ $query = <<graphQlQuery($query);
+ }
+
/**
* @return array
*/
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php
index 8ed9ef84d6fbd..477c93efd31d0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php
@@ -40,7 +40,7 @@ protected function setUp()
}
/**
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
index c9078fd84f6bc..879d0fd917291 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
@@ -33,7 +33,7 @@ protected function setUp()
}
/**
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -53,7 +53,7 @@ public function testSetPaymentOnCartWithSimpleProduct()
}
/**
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*
@@ -89,7 +89,7 @@ public function testSetPaymentOnCartWithVirtualProduct()
}
/**
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -122,7 +122,7 @@ public function testSetPaymentOnNonExistentCart()
/**
* _security
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -141,7 +141,7 @@ public function testSetPaymentMethodToCustomerCart()
}
/**
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -194,7 +194,7 @@ public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
}
/**
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
index e21d9ed64d491..a6981e11799fb 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
@@ -28,7 +28,7 @@ protected function setUp()
}
/**
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*/
@@ -135,7 +135,7 @@ public function testSetNewShippingAddressOnCartWithVirtualProduct()
/**
* _security
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*
@@ -172,7 +172,7 @@ public function testSetShippingAddressFromAddressBook()
/**
* _security
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*
@@ -209,7 +209,7 @@ public function testSetShippingAddressToCustomerCart()
}
/**
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*
@@ -246,6 +246,50 @@ public function testSetNewShippingAddressWithMissedRequiredParameters(string $in
$this->graphQlQuery($query);
}
+ /**
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ */
+ public function testSetNewShippingAddressOnCartWithRedundantStreetLine()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+ $query = <<graphQlQuery($query);
+ }
+
/**
* @return array
*/
@@ -264,7 +308,7 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
}
/**
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
*
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index 6289d88de6ee4..2eac002253ff0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -40,7 +40,7 @@ protected function setUp()
}
/**
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -76,9 +76,14 @@ public function testSetShippingMethodOnCartWithSimpleProduct()
}
/**
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * Shipping address for quote will be created automatically BUT with NULL values (considered that address
+ * is not set)
+ *
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
*
* @expectedException \Exception
* @expectedExceptionMessage The shipping address is missing. Set the address and try again.
@@ -101,7 +106,7 @@ public function testSetShippingMethodOnCartWithSimpleProductAndWithoutAddress()
/**
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -138,7 +143,7 @@ public function testReSetShippingMethod()
}
/**
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -270,7 +275,7 @@ public function dataProviderSetShippingMethodWithWrongParameters(): array
/**
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -315,7 +320,7 @@ public function testSetMultipleShippingMethods()
/**
* _security
* @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -343,8 +348,7 @@ public function testSetShippingMethodToCustomerCart()
/**
* _security
- *
- * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php
index 1aee493d8e0cb..1fb8fc43b0db6 100644
--- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php
@@ -9,6 +9,9 @@
use Magento\TestFramework\TestCase\WebapiAbstract;
+/**
+ * Coupon management service tests
+ */
class CouponManagementTest extends WebapiAbstract
{
const SERVICE_VERSION = 'V1';
@@ -93,7 +96,7 @@ public function testSetCouponThrowsExceptionIfCouponDoesNotExist()
$serviceInfo = [
'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . $cartId . '/coupons/' . $couponCode,
+ 'resourcePath' => self::RESOURCE_PATH . $cartId . '/coupons/' . urlencode($couponCode),
'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
],
'soap' => [
@@ -129,7 +132,7 @@ public function testSetCouponSuccess()
$couponCode = $salesRule->getPrimaryCoupon()->getCode();
$serviceInfo = [
'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . $cartId . '/coupons/' . $couponCode,
+ 'resourcePath' => self::RESOURCE_PATH . $cartId . '/coupons/' . urlencode($couponCode),
'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
],
'soap' => [
@@ -232,7 +235,7 @@ public function testSetMyCouponThrowsExceptionIfCouponDoesNotExist()
$serviceInfo = [
'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . 'mine/coupons/' . $couponCode,
+ 'resourcePath' => self::RESOURCE_PATH . 'mine/coupons/' . urlencode($couponCode),
'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
'token' => $token,
],
@@ -280,7 +283,7 @@ public function testSetMyCouponSuccess()
$serviceInfo = [
'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . 'mine/coupons/' . $couponCode,
+ 'resourcePath' => self::RESOURCE_PATH . 'mine/coupons/' . urlencode($couponCode),
'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
'token' => $token,
],
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaEditCustomerTest.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaEditCustomerTest.xml
index 12b9808adb9e0..0c0e06d63b6c9 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaEditCustomerTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaEditCustomerTest.xml
@@ -14,6 +14,7 @@
3
111
captcha_storefront_user_edit_failures_number, customer_max_login_failures_number
+ mftf_migrated:yes
+ mftf_migrated:yes
default
111
captcha_storefront_login
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.xml
index 8e83c189efc2f..b0ce6dfa561ae 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.xml
@@ -8,6 +8,7 @@
+ mftf_migrated:yes
register_customer
111
captcha_storefront_register
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
index dcc8cce970098..4e8e0f97d70d5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
@@ -128,7 +128,8 @@ class CustomOptions extends Form
*
* @var string
*/
- private $validationErrorMessage = '//div[@class="mage-error"][contains(text(), "required field")]';
+ private $validationErrorMessage = '//div[@class="mage-error"][contains(text(), "required field")' .
+ 'and not(contains(@style,\'display\'))]';
/**
* Get product options
@@ -148,6 +149,7 @@ public function getOptions(FixtureInterface $product)
foreach ($dataOptions as $option) {
$title = $option['title'];
if (!isset($listCustomOptions[$title])) {
+ // phpcs:ignore Magento2.Exceptions.DirectThrow
throw new \Exception("Can't find option: \"{$title}\"");
}
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml
index 9a6a66091d427..dc91608f361c2 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml
@@ -57,11 +57,9 @@
catalogProductSimple::default::name
2
-
- MAGETWO-65509: [FT] Magento\CatalogSearch\Test\TestCase\SearchEntityResultsTest fails on Jenkins
stable:no
catalogProductSimple::default::name
3
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/UpdateSearchTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/UpdateSearchTermEntityTest.xml
index 922973dbf316a..2ce4bbaa8a6d2 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/UpdateSearchTermEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/UpdateSearchTermEntityTest.xml
@@ -14,6 +14,7 @@
20
http://example.com/
No
+ mftf_migrated:yes
- severity:S1
+ severity:S1,mftf_migrated:yes
customer_US
2
captcha_storefront_disable
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/assign_items_per_address.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/assign_items_per_address.php
new file mode 100644
index 0000000000000..91cea7dc96602
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/assign_items_per_address.php
@@ -0,0 +1,40 @@
+getStore();
+$quote->setReservedOrderId('multishipping_quote_id_braintree')
+ ->setStoreId($store->getId())
+ ->setCustomerEmail('customer001@test.com');
+
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+$quote->collectTotals();
+$quoteRepository->save($quote);
+
+$items = $quote->getAllItems();
+$addressList = $quote->getAllShippingAddresses();
+
+foreach ($addressList as $key => $address) {
+ $item = $items[$key];
+ // set correct quantity per shipping address
+ $item->setQty(1);
+ $address->setTotalQty(1);
+ $address->addItem($item);
+}
+
+// assign virtual product to the billing address
+$billingAddress = $quote->getBillingAddress();
+$virtualItem = $items[sizeof($items) - 1];
+$billingAddress->setTotalQty(1);
+$billingAddress->addItem($virtualItem);
+
+// need to recollect totals
+$quote->setTotalsCollectedFlag(false);
+$quote->collectTotals();
+$quoteRepository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree.php
new file mode 100644
index 0000000000000..3e1db90f1f2c8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree.php
@@ -0,0 +1,28 @@
+create(Payment::class);
+$payment->setMethod(ConfigProvider::CODE);
+$quote->setPayment($payment);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree_paypal.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree_paypal.php
new file mode 100644
index 0000000000000..e4bba222078b0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree_paypal.php
@@ -0,0 +1,28 @@
+create(Payment::class);
+$payment->setMethod(ConfigProvider::PAYPAL_CODE);
+$quote->setPayment($payment);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree.php
new file mode 100644
index 0000000000000..1c56e611dd6db
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree.php
@@ -0,0 +1,26 @@
+get(StoreManagerInterface::class);
+
+/** @var Quote $quote */
+$quote = $objectManager->create(Quote::class);
+
+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/shipping_address_list.php';
+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/billing_address.php';
+require __DIR__ . '/payment_braintree.php';
+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/items.php';
+require __DIR__ . '/assign_items_per_address.php';
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree_paypal.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree_paypal.php
new file mode 100644
index 0000000000000..4bd8e926abb76
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree_paypal.php
@@ -0,0 +1,26 @@
+get(StoreManagerInterface::class);
+
+/** @var Quote $quote */
+$quote = $objectManager->create(Quote::class);
+
+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/shipping_address_list.php';
+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/billing_address.php';
+require __DIR__ . '/payment_braintree_paypal.php';
+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/items.php';
+require __DIR__ . '/assign_items_per_address.php';
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Model/MultishippingTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Model/MultishippingTest.php
new file mode 100644
index 0000000000000..91bc0388d8551
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Model/MultishippingTest.php
@@ -0,0 +1,254 @@
+objectManager = Bootstrap::getObjectManager();
+
+ $orderSender = $this->getMockBuilder(OrderSender::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $adapterFactory = $this->getMockBuilder(BraintreeAdapterFactory::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->adapter = $this->getMockBuilder(BraintreeAdapter::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $adapterFactory->method('create')
+ ->willReturn($this->adapter);
+
+ $this->objectManager->addSharedInstance($adapterFactory, BraintreeAdapterFactory::class);
+ $this->objectManager->addSharedInstance($this->getPaymentNonceMock(), GetPaymentNonceCommand::class);
+
+ $this->model = $this->objectManager->create(
+ Multishipping::class,
+ ['orderSender' => $orderSender]
+ );
+ }
+
+ /**
+ * Checks a case when multiple orders are created successfully using Braintree payment method.
+ *
+ * @magentoAppIsolation enabled
+ * @magentoDataFixture Magento/Braintree/Fixtures/quote_with_split_items_braintree.php
+ * @magentoConfigFixture current_store payment/braintree/active 1
+ * @return void
+ */
+ public function testCreateOrdersWithBraintree()
+ {
+ $this->adapter->method('sale')
+ ->willReturn(
+ $this->getTransactionStub()
+ );
+ $this->createOrders();
+ }
+
+ /**
+ * Checks a case when multiple orders are created successfully using Braintree PayPal payment method.
+ *
+ * @magentoAppIsolation enabled
+ * @magentoDataFixture Magento/Braintree/Fixtures/quote_with_split_items_braintree_paypal.php
+ * @magentoConfigFixture current_store payment/braintree_paypal/active 1
+ * @return void
+ */
+ public function testCreateOrdersWithBraintreePaypal()
+ {
+ $this->adapter->method('sale')
+ ->willReturn(
+ $this->getTransactionPaypalStub()
+ );
+ $this->createOrders();
+ }
+
+ /**
+ * Creates orders for multishipping checkout flow.
+ *
+ * @return void
+ */
+ private function createOrders()
+ {
+ $expectedPlacedOrdersNumber = 3;
+ $quote = $this->getQuote('multishipping_quote_id_braintree');
+
+ /** @var CheckoutSession $session */
+ $session = $this->objectManager->get(CheckoutSession::class);
+ $session->replaceQuote($quote);
+
+ $this->model->createOrders();
+
+ $orderList = $this->getOrderList((int)$quote->getId());
+ self::assertCount(
+ $expectedPlacedOrdersNumber,
+ $orderList,
+ 'Total successfully placed orders number mismatch'
+ );
+ }
+
+ /**
+ * Creates stub for Braintree capture Transaction.
+ *
+ * @return Successful
+ */
+ private function getTransactionStub(): Successful
+ {
+ $transaction = $this->getMockBuilder(Transaction::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $transaction->status = 'submitted_for_settlement';
+ $transaction->creditCard = [
+ 'last4' => '1111',
+ 'cardType' => 'Visa',
+ 'expirationMonth' => '12',
+ 'expirationYear' => '2021'
+ ];
+
+ $creditCardDetails = new \stdClass();
+ $creditCardDetails->token = '4fdg';
+ $creditCardDetails->expirationMonth = '12';
+ $creditCardDetails->expirationYear = '2021';
+ $creditCardDetails->cardType = 'Visa';
+ $creditCardDetails->last4 = '1111';
+ $creditCardDetails->expirationDate = '12/2021';
+ $transaction->creditCardDetails = $creditCardDetails;
+
+ $response = new Successful();
+ $response->success = true;
+ $response->transaction = $transaction;
+
+ return $response;
+ }
+
+ /**
+ * Creates stub for BraintreePaypal capture Transaction.
+ *
+ * @return Successful
+ */
+ private function getTransactionPaypalStub(): Successful
+ {
+ $transaction = $this->getMockBuilder(Transaction::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $transaction->status = 'submitted_for_settlement';
+ $transaction->paypal = [
+ 'token' => 'fchxqx',
+ 'payerEmail' => 'payer@example.com',
+ 'paymentId' => 'PAY-33ac47a28e7f54791f6cda45',
+ ];
+ $paypalDetails = new \stdClass();
+ $paypalDetails->token = 'fchxqx';
+ $paypalDetails->payerEmail = 'payer@example.com';
+ $paypalDetails->paymentId = '33ac47a28e7f54791f6cda45';
+ $transaction->paypalDetails = $paypalDetails;
+
+ $response = new Successful();
+ $response->success = true;
+ $response->transaction = $transaction;
+
+ return $response;
+ }
+
+ /**
+ * Retrieves quote by reserved order id.
+ *
+ * @param string $reservedOrderId
+ * @return Quote
+ */
+ private function getQuote(string $reservedOrderId): Quote
+ {
+ /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+ $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+ $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+ ->create();
+
+ /** @var CartRepositoryInterface $quoteRepository */
+ $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
+ $items = $quoteRepository->getList($searchCriteria)->getItems();
+
+ return array_pop($items);
+ }
+
+ /**
+ * Get list of orders by quote id.
+ *
+ * @param int $quoteId
+ * @return array
+ */
+ private function getOrderList(int $quoteId): array
+ {
+ /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+ $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+ $searchCriteria = $searchCriteriaBuilder->addFilter('quote_id', $quoteId)
+ ->create();
+
+ /** @var OrderRepositoryInterface $orderRepository */
+ $orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
+ return $orderRepository->getList($searchCriteria)->getItems();
+ }
+
+ /**
+ * Returns GetPaymentNonceCommand command mock.
+ *
+ * @return MockObject
+ */
+ private function getPaymentNonceMock(): MockObject
+ {
+ $commandResult = $this->createMock(CommandResultInterface::class);
+ $commandResult->method('get')
+ ->willReturn(['paymentMethodNonce' => 'testNonce']);
+ $paymentNonce = $this->createMock(GetPaymentNonceCommand::class);
+ $paymentNonce->method('execute')
+ ->willReturn($commandResult);
+
+ return $paymentNonce;
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store.php
new file mode 100644
index 0000000000000..6448a570424e2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store.php
@@ -0,0 +1,23 @@
+create(\Magento\Quote\Model\Quote::class);
+$quote->setStoreId($store->getId())
+ ->setIsActive(true)
+ ->setIsMultiShipping(false)
+ ->setReservedOrderId('test_order_1_not_default_store')
+ ->setCustomerId($customer->getId())
+ ->save();
+
+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+$quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)
+ ->create();
+$quoteIdMask->setQuoteId($quote->getId());
+$quoteIdMask->setDataChanges(true);
+$quoteIdMask->save();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store_rollback.php
new file mode 100644
index 0000000000000..e3e1513cb6144
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store_rollback.php
@@ -0,0 +1,8 @@
+create(\Magento\Quote\Model\Quote::class);
+$quote->load('test_order_1_not_default_store', 'reserved_order_id')->delete();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store.php
new file mode 100644
index 0000000000000..bbd3d5efbe8c8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store.php
@@ -0,0 +1,21 @@
+create(\Magento\Quote\Model\Quote::class);
+$quote->setStoreId($store->getId())
+ ->setIsActive(true)
+ ->setIsMultiShipping(false)
+ ->setReservedOrderId('test_order_1_not_default_store_guest')
+ ->save();
+
+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+$quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)
+ ->create();
+$quoteIdMask->setQuoteId($quote->getId());
+$quoteIdMask->setDataChanges(true);
+$quoteIdMask->save();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store_rollback.php
new file mode 100644
index 0000000000000..f511133280e7f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store_rollback.php
@@ -0,0 +1,8 @@
+create(\Magento\Quote\Model\Quote::class);
+$quote->load('test_order_1_not_default_store_guest', 'reserved_order_id')->delete();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent_generalusers.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent_generalusers.php
index 507f6b755bcda..e66227a60e8f0 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent_generalusers.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent_generalusers.php
@@ -21,7 +21,7 @@
],
'customer_group_ids' => [1],
'coupon_type' => \Magento\SalesRule\Model\Rule::COUPON_TYPE_SPECIFIC,
- 'coupon_code' => uniqid(),
+ 'coupon_code' => '2?ds5!2d',
'simple_action' => \Magento\SalesRule\Model\Rule::BY_PERCENT_ACTION,
'discount_amount' => 10,
'discount_step' => 1
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/set_simple_product_out_of_stock.php b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/set_simple_product_out_of_stock.php
new file mode 100644
index 0000000000000..f465f482275c1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/set_simple_product_out_of_stock.php
@@ -0,0 +1,19 @@
+get(ProductRepositoryInterface::class);
+
+$product = $productRepository->get('simple_product');
+$extensionAttributes = $product->getExtensionAttributes();
+$stockItem = $extensionAttributes->getStockItem();
+$stockItem->setIsInStock(false);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product.php b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product.php
new file mode 100644
index 0000000000000..732c18d4d7340
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product.php
@@ -0,0 +1,45 @@
+get(ProductInterfaceFactory::class);
+/** @var DataObjectHelper $dataObjectHelper */
+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+$product = $productFactory->create();
+$productData = [
+ ProductInterface::TYPE_ID => Type::TYPE_SIMPLE,
+ ProductInterface::ATTRIBUTE_SET_ID => 4,
+ ProductInterface::SKU => 'simple_product',
+ ProductInterface::NAME => 'Simple Product',
+ ProductInterface::PRICE => 10,
+ ProductInterface::VISIBILITY => Visibility::VISIBILITY_BOTH,
+ ProductInterface::STATUS => Status::STATUS_ENABLED,
+];
+$dataObjectHelper->populateWithArray($product, $productData, ProductInterface::class);
+/** Out of interface */
+$product
+ ->setWebsiteIds([1])
+ ->setStockData([
+ 'qty' => 85.5,
+ 'is_in_stock' => true,
+ 'manage_stock' => true,
+ 'is_qty_decimal' => true
+ ]);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_rollback.php
new file mode 100644
index 0000000000000..9a54f663c9c13
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_rollback.php
@@ -0,0 +1,31 @@
+get(ProductRepositoryInterface::class);
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+
+$currentArea = $registry->registry('isSecureArea');
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+ $productRepository->deleteById('simple_product');
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+ /**
+ * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
+ */
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', $currentArea);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_simple_product.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_simple_product.php
index d23381e33d436..f62b463d94003 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_simple_product.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -20,7 +20,7 @@
/** @var CartRepositoryInterface $cartRepository */
$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
-$product = $productRepository->get('simple');
+$product = $productRepository->get('simple_product');
$quote = $quoteFactory->create();
$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon.php
new file mode 100644
index 0000000000000..c70efa9a12a5d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon.php
@@ -0,0 +1,22 @@
+get(CouponManagementInterface::class);
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
+$couponManagement->set($quote->getId(), '2?ds5!2d');
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon_rollback.php
new file mode 100644
index 0000000000000..5431c25b7df53
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon_rollback.php
@@ -0,0 +1,22 @@
+get(CouponManagementInterface::class);
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
+$couponManagement->remove($quote->getId());
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired.php
new file mode 100644
index 0000000000000..5316b184ecd15
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired.php
@@ -0,0 +1,22 @@
+get(CouponResourceInterface::class);
+/** @var CouponFactory $couponFactory */
+$couponFactory = Bootstrap::getObjectManager()->get(CouponFactory::class);
+
+$coupon = $couponFactory->create();
+$coupon->loadByCode('2?ds5!2d');
+$yesterday = new \DateTime();
+$yesterday->add(\DateInterval::createFromDateString('-1 day'));
+$coupon->setExpirationDate($yesterday->format('Y-m-d'));
+$couponResource->save($coupon);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired_rollback.php
new file mode 100644
index 0000000000000..32c3d78bafd09
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired_rollback.php
@@ -0,0 +1,23 @@
+get(CouponResourceInterface::class);
+/** @var CouponFactory $couponFactory */
+$couponFactory = Bootstrap::getObjectManager()->get(CouponFactory::class);
+
+$coupon = $couponFactory->create();
+$coupon->loadByCode('2?ds5!2d');
+
+if ($coupon->getId()) {
+ $coupon->setExpirationDate(null);
+ $couponResource->save($coupon);
+}
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php
new file mode 100644
index 0000000000000..e58c6b21d8d23
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php
@@ -0,0 +1,52 @@
+get(CouponFactory::class);
+/** @var ConditionInterfaceFactory $conditionFactory */
+$conditionFactory = Bootstrap::getObjectManager()->get(ConditionInterfaceFactory::class);
+/** @var RuleRepositoryInterface $ruleRepository */
+$ruleRepository = Bootstrap::getObjectManager()->get(RuleRepositoryInterface::class);
+
+$couponCode = '2?ds5!2d';
+$sku = 'simple_product';
+
+$coupon = $couponFactory->create();
+$coupon->loadByCode($couponCode);
+$ruleId = $coupon->getRuleId();
+$salesRule = $ruleRepository->getById($ruleId);
+
+/** @var ConditionInterface $conditionProductSku */
+$conditionProductSku = $conditionFactory->create();
+$conditionProductSku->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product::class);
+$conditionProductSku->setAttributeName('sku');
+$conditionProductSku->setValue('1');
+$conditionProductSku->setOperator('!=');
+$conditionProductSku->setValue($sku);
+
+/** @var ConditionInterface $conditionProductFound */
+$conditionProductFound = $conditionFactory->create();
+$conditionProductFound->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product\Found::class);
+$conditionProductFound->setValue('1');
+$conditionProductFound->setAggregatorType('all');
+$conditionProductFound->setConditions([$conditionProductSku]);
+
+/** @var ConditionInterface $conditionCombine */
+$conditionCombine = $conditionFactory->create();
+$conditionCombine->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Combine::class);
+$conditionCombine->setValue('1');
+$conditionCombine->setAggregatorType('all');
+$conditionCombine->setConditions([$conditionProductFound]);
+
+$salesRule->setCondition($conditionCombine);
+$ruleRepository->save($salesRule);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product_rollback.php
new file mode 100644
index 0000000000000..86ab253f1d3c0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product_rollback.php
@@ -0,0 +1,37 @@
+get(CouponFactory::class);
+/** @var ConditionInterfaceFactory $conditionFactory */
+$conditionFactory = Bootstrap::getObjectManager()->get(ConditionInterfaceFactory::class);
+/** @var RuleRepositoryInterface $ruleRepository */
+$ruleRepository = Bootstrap::getObjectManager()->get(RuleRepositoryInterface::class);
+
+$couponCode = '2?ds5!2d';
+$sku = 'simple_product';
+
+$coupon = $couponFactory->create();
+$coupon->loadByCode($couponCode);
+
+if ($coupon->getId()) {
+ $ruleId = $coupon->getRuleId();
+ $salesRule = $ruleRepository->getById($ruleId);
+
+ /** @var ConditionInterface $conditionCombine */
+ $conditionCombine = $conditionFactory->create();
+ $conditionCombine->setConditions([]);
+
+ $salesRule->setCondition($conditionCombine);
+ $ruleRepository->save($salesRule);
+}
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_billing_address.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_billing_address.php
new file mode 100644
index 0000000000000..2e15ef218d0c5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_billing_address.php
@@ -0,0 +1,44 @@
+get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+/** @var AddressInterfaceFactory $quoteAddressFactory */
+$quoteAddressFactory = Bootstrap::getObjectManager()->get(AddressInterfaceFactory::class);
+/** @var DataObjectHelper $dataObjectHelper */
+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
+/** @var BillingAddressManagementInterface $billingAddressManagement */
+$billingAddressManagement = Bootstrap::getObjectManager()->get(BillingAddressManagementInterface::class);
+
+$quoteAddressData = [
+ AddressInterface::KEY_TELEPHONE => 3468676,
+ AddressInterface::KEY_POSTCODE => 75477,
+ AddressInterface::KEY_COUNTRY_ID => 'US',
+ AddressInterface::KEY_CITY => 'CityM',
+ AddressInterface::KEY_COMPANY => 'CompanyName',
+ AddressInterface::KEY_STREET => 'Green str, 67',
+ AddressInterface::KEY_LASTNAME => 'Smith',
+ AddressInterface::KEY_FIRSTNAME => 'John',
+ AddressInterface::KEY_REGION_ID => 1,
+];
+$quoteAddress = $quoteAddressFactory->create();
+$dataObjectHelper->populateWithArray($quoteAddress, $quoteAddressData, AddressInterfaceFactory::class);
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
+$billingAddressManagement->assign($quote->getId(), $quoteAddress);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php
new file mode 100644
index 0000000000000..1125fc1730718
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php
@@ -0,0 +1,59 @@
+layout = $this->_objectManager->get(LayoutInterface::class);
+ $this->block = $this->layout->createBlock(Totals::class, 'totals_block');
+ $this->orderFactory = $this->_objectManager->get(OrderFactory::class);
+ }
+
+ /**
+ * @magentoDataFixture Magento/Sales/_files/order_with_free_shipping_by_coupon.php
+ */
+ public function testShowShippingCoupon()
+ {
+ /** @var Order $order */
+ $order = $this->orderFactory->create();
+ $order->loadByIncrementId('100000001');
+
+ $this->block->setOrder($order);
+ $this->block->toHtml();
+
+ $shippingTotal = $this->block->getTotal('shipping');
+ $this->assertNotFalse($shippingTotal, 'Shipping method is absent on the total\'s block.');
+ $this->assertContains(
+ '1234567890',
+ $shippingTotal->getLabel(),
+ 'Coupon code is absent in the shipping method label name.'
+ );
+ }
+}
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
index b8f2ca38e2489..1d03170d5b1e2 100644
--- 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
@@ -5,11 +5,16 @@
*/
declare(strict_types=1);
+use Magento\Catalog\Api\ProductRepositoryInterface;
+
require __DIR__ . '/address_list.php';
\Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea(\Magento\Framework\App\Area::AREA_FRONTEND);
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
/** @var \Magento\Catalog\Model\Product $product */
$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
$product->setTypeId('simple')
@@ -29,8 +34,6 @@
'is_in_stock' => 1,
]
)->save();
-
-$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
$product = $productRepository->get('simple-product-guest-quote');
$addressData = reset($addresses);
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
index 02c42153b72c3..e8992aec3c924 100644
--- 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
@@ -13,13 +13,19 @@
/** @var $quote \Magento\Quote\Model\Quote */
$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+$quoteIdMask = $objectManager->create(\Magento\Quote\Model\QuoteIdMask::class);
+
$quote->load('guest_quote', 'reserved_order_id');
-if ($quote->getId()) {
+
+$quoteId = $quote->getId();
+if (null !== $quoteId) {
$quote->delete();
+ $quoteIdMask->delete($quoteId);
}
/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
try {
$product = $productRepository->get('simple-product-guest-quote', false, null, true);
@@ -28,5 +34,10 @@
//Product already removed
}
+/** @var \Magento\CatalogInventory\Model\StockRegistryStorage $stockRegistryStorage */
+$stockRegistryStorage = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->get(\Magento\CatalogInventory\Model\StockRegistryStorage::class);
+$stockRegistryStorage->clean();
+
$registry->unregister('isSecureArea');
$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon.php
new file mode 100644
index 0000000000000..57ccffadaa4d0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon.php
@@ -0,0 +1,35 @@
+create(OrderItem::class);
+$orderItem->setProductId($product->getId())
+ ->setQtyOrdered(2)
+ ->setBasePrice($product->getPrice())
+ ->setPrice($product->getPrice())
+ ->setRowTotal($product->getPrice())
+ ->setProductType('simple')
+ ->setName($product->getName())
+ ->setFreeShipping('1');
+
+/** @var Order $order */
+$order->setShippingDescription('Flat Rate - Fixed')
+ ->setShippingAmount(0)
+ ->setCouponCode('1234567890')
+ ->setDiscountDescription('1234567890')
+ ->addItem($orderItem);
+
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
+$orderRepository->save($order);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon_rollback.php
new file mode 100644
index 0000000000000..1fb4b4636ab29
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon_rollback.php
@@ -0,0 +1,8 @@
+_moduleTableMap = $tables;
- }
-
- /**
- * Gets external dependencies information for current module by analyzing db_schema.xml files contents.
- *
- * @param string $currentModule
- * @param string $fileType
- * @param string $file
- * @param string $contents
- * @return array
- * @SuppressWarnings(PHPMD.CyclomaticComplexity)
- * @SuppressWarnings(PHPMD.NPathComplexity)
- */
- public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
- {
- if ('db_schema' != $fileType || !preg_match('#.*/db_schema\.xml$#', $file)) {
- return [];
- }
-
- $dependenciesInfo = [];
- $unKnowTables = [];
-
- $dom = new \DOMDocument();
- $dom->loadXML($contents);
- $tables = $dom->getElementsByTagName('table');
- $constraints = $dom->getElementsByTagName('constraint');
-
- $tableNames = [];
- $foreignKeyTables = [];
- $foreignKeyReferenceTables = [];
-
- /** @var \DOMElement $table */
- foreach ($tables as $table) {
- $tableNames[] = $table->getAttribute('name');
- }
-
- /** @var \DOMElement $constraint */
- foreach ($constraints as $constraint) {
- $xsiType = $constraint->getAttribute('xsi:type');
- if (strtolower($xsiType) == 'foreign' && $constraint->getAttribute('disabled') !== '1') {
- $foreignKeyTables[] = $constraint->getAttribute('table');
- $foreignKeyReferenceTables[] = $constraint->getAttribute('referenceTable');
- }
- }
-
- $tableNames = array_unique(array_merge($tableNames, $foreignKeyReferenceTables, $foreignKeyTables));
-
- /** @var string $table */
- foreach ($tableNames as $table) {
- if (!isset($this->_moduleTableMap[$table])) {
- $unKnowTables[$file][$table] = $table;
- continue;
- }
- if (strtolower($currentModule) !== strtolower($this->_moduleTableMap[$table])) {
- $dependenciesInfo[] = [
- 'module' => $this->_moduleTableMap[$table],
- 'type' => RuleInterface::TYPE_HARD,
- 'source' => $table,
- ];
- }
- }
-
- foreach ($unKnowTables as $tables) {
- foreach ($tables as $table) {
- $dependenciesInfo[] = ['module' => 'Unknown', 'source' => $table];
- }
- }
- return $dependenciesInfo;
- }
-}
diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php
index cdaa49e8d37fb..b3ee0a2880308 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php
@@ -7,11 +7,13 @@
*/
namespace Magento\TestFramework\Dependency;
-use DOMDocument;
-use DOMXPath;
+use Magento\Framework\App\Utility\Classes;
use Magento\Framework\App\Utility\Files;
use Magento\TestFramework\Dependency\VirtualType\VirtualTypeMapper;
+/**
+ * Class provide dependency rule for di.xml config files.
+ */
class DiRule implements RuleInterface
{
/**
@@ -33,6 +35,8 @@ public function __construct(VirtualTypeMapper $mapper)
}
/**
+ * Get class name pattern.
+ *
* @return string
* @throws \Exception
*/
@@ -73,6 +77,7 @@ private function getPattern()
*/
public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
{
+ //phpcs:ignore Magento2.Functions.DiscouragedFunction
if (pathinfo($file, PATHINFO_BASENAME) !== 'di.xml') {
return [];
}
@@ -99,12 +104,14 @@ public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
}
/**
+ * Fetch all possible dependencies.
+ *
* @param string $contents
* @return array
*/
private function fetchPossibleDependencies($contents)
{
- $doc = new DOMDocument();
+ $doc = new \DOMDocument();
$doc->loadXML($contents);
return [
RuleInterface::TYPE_SOFT => $this->getSoftDependencies($doc),
@@ -113,16 +120,22 @@ private function fetchPossibleDependencies($contents)
}
/**
- * @param DOMDocument $doc
+ * Collect soft dependencies.
+ *
+ * @param \DOMDocument $doc
* @return array
*/
- private function getSoftDependencies(DOMDocument $doc)
+ private function getSoftDependencies(\DOMDocument $doc)
{
$result = [];
foreach (self::$tagNameMap as $tagName => $attributeNames) {
$nodes = $doc->getElementsByTagName($tagName);
/** @var \DOMElement $node */
foreach ($nodes as $node) {
+ if ($tagName === 'virtualType' && !$node->getAttribute('type')) {
+ $result[] = Classes::resolveVirtualType($node->getAttribute('name'));
+ continue;
+ }
foreach ($attributeNames as $attributeName) {
$result[] = $node->getAttribute($attributeName);
}
@@ -133,13 +146,15 @@ private function getSoftDependencies(DOMDocument $doc)
}
/**
- * @param DOMDocument $doc
+ * Collect hard dependencies.
+ *
+ * @param \DOMDocument $doc
* @return array
*/
- private function getHardDependencies(DOMDocument $doc)
+ private function getHardDependencies(\DOMDocument $doc)
{
$result = [];
- $xpath = new DOMXPath($doc);
+ $xpath = new \DOMXPath($doc);
$textNodes = $xpath->query('//*[@xsi:type="object"]');
/** @var \DOMElement $node */
foreach ($textNodes as $node) {
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DeclarativeSchemaRuleTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DeclarativeSchemaRuleTest.php
deleted file mode 100644
index 269eff8087a91..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DeclarativeSchemaRuleTest.php
+++ /dev/null
@@ -1,98 +0,0 @@
-model = new DeclarativeSchemaRule(['some_table' => 'SomeModule']);
- }
-
- /**
- * @param string $module
- * @param string $file
- * @param string $contents
- * @param array $expected
- * @dataProvider getDependencyInfoDataProvider
- */
- public function testGetDependencyInfo($module, $file, $contents, array $expected)
- {
- $actualDependencies = $this->model->getDependencyInfo($module, 'db_schema', $file, $contents);
- $this->assertEquals(
- $expected,
- $actualDependencies
- );
- }
-
- public function getDependencyInfoDataProvider()
- {
- return [
- ['any', 'non-db-schema-file.php', 'any', []],
- [
- 'any',
- '/app/Magento/Module/etc/db_schema.xml',
- '
',
- [['module' => 'Unknown', 'source' => 'unknown_table']]
- ],
- [
- 'SomeModule',
- '/app/some/path/etc/db_schema.xml',
- '
',
- []
- ],
- [
- 'any',
- '/app/some/path/etc/db_schema.xml',
- '
',
- [
- [
- 'module' => 'SomeModule',
- 'type' => \Magento\TestFramework\Dependency\RuleInterface::TYPE_HARD,
- 'source' => 'some_table',
- ]
- ]
- ],
- [
- 'any',
- '/app/some/path/etc/db_schema.xml',
- '
-
-
- ',
- [
- [
- 'module' => 'SomeModule',
- 'type' => \Magento\TestFramework\Dependency\RuleInterface::TYPE_HARD,
- 'source' => 'some_table',
- ],
- [
- 'module' => 'Unknown',
- 'source' => 'ref_table',
- ]
- ]
- ]
- ];
- }
-}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
new file mode 100644
index 0000000000000..87cc5afd5ecb3
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
@@ -0,0 +1,179 @@
+readJsonFile($root . '/composer.json', true);
+ if (preg_match('/magento\/project-*/', $rootJson['name']) == 1) {
+ // The Dependency test is skipped for vendor/magento build
+ self::markTestSkipped(
+ 'MAGETWO-43654: The build is running from vendor/magento. DependencyTest is skipped.'
+ );
+ }
+ $this->dependencyProvider = new DeclarativeSchemaDependencyProvider();
+ }
+
+ /**
+ * @throws \Exception
+ */
+ public function testUndeclaredDependencies()
+ {
+ /** TODO: Remove this temporary solution after MC-15534 is closed */
+ $filePattern = __DIR__ . '/_files/dependency_test/blacklisted_dependencies_*.php';
+ $blacklistedDependencies = [];
+ foreach (glob($filePattern) as $fileName) {
+ $blacklistedDependencies = array_merge($blacklistedDependencies, require $fileName);
+ }
+ $this->blacklistedDependencies = $blacklistedDependencies;
+
+ $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
+ $invoker(
+ /**
+ * Check undeclared modules dependencies for specified file
+ *
+ * @param string $fileType
+ * @param string $file
+ */
+ function ($file) {
+ $componentRegistrar = new ComponentRegistrar();
+ $foundModuleName = '';
+ foreach ($componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $moduleName => $moduleDir) {
+ if (strpos($file, $moduleDir . '/') !== false) {
+ $foundModuleName = str_replace('_', '\\', $moduleName);
+ break;
+ }
+ }
+ if (empty($foundModuleName)) {
+ return;
+ }
+
+ $undeclaredDependency = $this->dependencyProvider->getUndeclaredModuleDependencies($foundModuleName);
+
+ $result = [];
+ foreach ($undeclaredDependency as $name => $modules) {
+ $modules = array_unique($modules);
+ if ($this->filterBlacklistedDependencies($foundModuleName, $modules)) {
+ $result[] = $this->getErrorMessage($name) . "\n" . implode("\t\n", $modules) . "\n";
+ }
+ }
+ if (!empty($result)) {
+ $this->fail(
+ 'Module ' . $moduleName . ' has undeclared dependencies: ' . "\n" . implode("\t\n", $result)
+ );
+ }
+ },
+ $this->prepareFiles(Files::init()->getDbSchemaFiles())
+ );
+ }
+
+ /**
+ * Filter blacklisted dependencies.
+ *
+ * @todo Remove this temporary solution after MC-15534 is closed
+ *
+ * @param string $moduleName
+ * @param array $dependencies
+ * @return array
+ */
+ private function filterBlacklistedDependencies(string $moduleName, array $dependencies): array
+ {
+ if (!empty($this->blacklistedDependencies[$moduleName])) {
+ $dependencies = array_diff($dependencies, $this->blacklistedDependencies[$moduleName]);
+ }
+
+ return $dependencies;
+ }
+
+ /**
+ * Convert file list to data provider structure.
+ *
+ * @param string[] $files
+ * @return array
+ */
+ private function prepareFiles(array $files): array
+ {
+ $result = [];
+ foreach ($files as $relativePath => $file) {
+ $absolutePath = reset($file);
+ $result[$relativePath] = [$absolutePath];
+ }
+ return $result;
+ }
+
+ /**
+ * Retrieve error message for dependency.
+ *
+ * @param string $id
+ * @return string
+ */
+ private function getErrorMessage(string $id): string
+ {
+ $decodedId = $this->dependencyProvider->decodeDependencyId($id);
+ $entityType = $decodedId['entityType'];
+ if ($entityType === DeclarativeSchemaDependencyProvider::SCHEMA_ENTITY_TABLE) {
+ $message = sprintf(
+ 'Table %s has undeclared dependency on one of the following modules:',
+ $decodedId['tableName']
+ );
+ } else {
+ $message = sprintf(
+ '%s %s from %s table has undeclared dependency on one of the following modules:',
+ ucfirst($entityType),
+ $decodedId['entityName'],
+ $decodedId['tableName']
+ );
+ }
+
+ return $message;
+ }
+
+ /**
+ * Read data from json file.
+ *
+ * @param string $file
+ * @return mixed
+ * @throws \Exception
+ */
+ private function readJsonFile(string $file, bool $asArray = false)
+ {
+ $decodedJson = json_decode(file_get_contents($file), $asArray);
+ if (null == $decodedJson) {
+ //phpcs:ignore Magento2.Exceptions.DirectThrow
+ throw new \Exception("Invalid Json: $file");
+ }
+
+ return $decodedJson;
+ }
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
new file mode 100644
index 0000000000000..965bc6184144b
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
@@ -0,0 +1,758 @@
+initDeclaredDependencies();
+ $dependencies = $this->getDependenciesFromFiles($this->getSchemaFileNameByModuleName($moduleName));
+ $dependencies = $this->filterSelfDependency($moduleName, $dependencies);
+ $declared = $this->getDeclaredDependencies($moduleName, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
+
+ $existingDeclared = [];
+ foreach ($dependencies as $dependency) {
+ $checkResult = array_intersect($declared, $dependency);
+ if ($checkResult) {
+ $existingDeclared = array_merge($existingDeclared, array_values($checkResult));
+ }
+ }
+
+ return array_unique($existingDeclared);
+ }
+
+ /**
+ * Provide undeclared dependencies between modules based on the declarative schema configuration.
+ *
+ * [
+ * $dependencyId => [$module1, $module2, $module3 ...],
+ * ...
+ * ]
+ *
+ * @param string $moduleName
+ * @return array
+ * @throws \Exception
+ */
+ public function getUndeclaredModuleDependencies(string $moduleName): array
+ {
+ $this->initDeclaredDependencies();
+ $dependencies = $this->getDependenciesFromFiles($this->getSchemaFileNameByModuleName($moduleName));
+ $dependencies = $this->filterSelfDependency($moduleName, $dependencies);
+ return $this->collectDependencies($moduleName, $dependencies);
+ }
+
+ /**
+ * Provide schema file name by module name.
+ *
+ * @param string $module
+ * @return string
+ * @throws \Exception
+ */
+ private function getSchemaFileNameByModuleName(string $module): string
+ {
+ if (empty($this->moduleSchemaFileMapping)) {
+ $componentRegistrar = new ComponentRegistrar();
+ foreach (array_values(Files::init()->getDbSchemaFiles()) as $filePath) {
+ $filePath = reset($filePath);
+ foreach ($componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $moduleName => $moduleDir) {
+ if (strpos($filePath, $moduleDir . '/') !== false) {
+ $foundModuleName = str_replace('_', '\\', $moduleName);
+ $this->moduleSchemaFileMapping[$foundModuleName] = $filePath;
+ break;
+ }
+ }
+ }
+ }
+
+ return $this->moduleSchemaFileMapping[$module] ?? '';
+ }
+
+ /**
+ * Initialise map of dependencies.
+ *
+ * @throws \Exception
+ */
+ private function initDeclaredDependencies()
+ {
+ if (empty($this->mapDependencies)) {
+ $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
+ foreach ($jsonFiles as $file) {
+ $json = new \Magento\Framework\Config\Composer\Package($this->readJsonFile($file));
+ $moduleName = $this->convertModuleName($json->get('name'));
+ $require = array_keys((array)$json->get('require'));
+ $this->presetDependencies($moduleName, $require, self::TYPE_HARD);
+ }
+ }
+ }
+
+ /**
+ * Read data from json file.
+ *
+ * @param string $file
+ * @return mixed
+ * @throws \Exception
+ */
+ private function readJsonFile(string $file, bool $asArray = false)
+ {
+ $decodedJson = json_decode(file_get_contents($file), $asArray);
+ if (null == $decodedJson) {
+ //phpcs:ignore Magento2.Exceptions.DirectThrow
+ throw new \Exception("Invalid Json: $file");
+ }
+
+ return $decodedJson;
+ }
+
+ /**
+ * Remove self dependencies.
+ *
+ * @param string $moduleName
+ * @param array $dependencies
+ * @return array
+ */
+ private function filterSelfDependency(string $moduleName, array $dependencies):array
+ {
+ foreach ($dependencies as $id => $modules) {
+ $decodedId = $this->decodeDependencyId($id);
+ $entityType = $decodedId['entityType'];
+ if ($entityType === self::SCHEMA_ENTITY_TABLE || $entityType === "column") {
+ if (array_search($moduleName, $modules) !== false) {
+ unset($dependencies[$id]);
+ }
+ } else {
+ $dependencies[$id] = $this->filterComplexDependency($moduleName, $modules);
+ }
+ }
+
+ return array_filter($dependencies);
+ }
+
+ /**
+ * Remove already declared dependencies.
+ *
+ * @param string $moduleName
+ * @param array $modules
+ * @return array
+ */
+ private function filterComplexDependency(string $moduleName, array $modules): array
+ {
+ $resultDependencies = [];
+ if (!is_array(reset($modules))) {
+ if (array_search($moduleName, $modules) === false) {
+ $resultDependencies = $modules;
+ }
+ } else {
+ foreach ($modules as $dependencySet) {
+ if (array_search($moduleName, $dependencySet) === false) {
+ $resultDependencies = array_merge(
+ $resultDependencies,
+ $dependencySet
+ );
+ }
+ }
+ }
+
+ return array_values(array_unique($resultDependencies));
+ }
+
+ /**
+ * Retrieve declarative schema declaration.
+ *
+ * @return array
+ * @throws \Exception
+ */
+ private function getDeclarativeSchema(): array
+ {
+ if ($this->dbSchemaDeclaration) {
+ return $this->dbSchemaDeclaration;
+ }
+
+ $entityTypes = [self::SCHEMA_ENTITY_COLUMN, self::SCHEMA_ENTITY_CONSTRAINT, self::SCHEMA_ENTITY_INDEX];
+ $declaration = [];
+ foreach (Files::init()->getDbSchemaFiles() as $filePath) {
+ $filePath = reset($filePath);
+ preg_match('#app/code/(\w+/\w+)#', $filePath, $result);
+ $moduleName = str_replace('/', '\\', $result[1]);
+ $moduleDeclaration = $this->getDbSchemaDeclaration($filePath);
+
+ foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
+ if (!isset($tableDeclaration['modules'])) {
+ $tableDeclaration['modules'] = [];
+ }
+ array_push($tableDeclaration['modules'], $moduleName);
+ $moduleDeclaration = array_replace_recursive(
+ $moduleDeclaration,
+ [self::SCHEMA_ENTITY_TABLE =>
+ [
+ $tableName => $tableDeclaration,
+ ]
+ ]
+ );
+ foreach ($entityTypes as $entityType) {
+ if (!isset($tableDeclaration[$entityType])) {
+ continue;
+ }
+ $moduleDeclaration = array_replace_recursive(
+ $moduleDeclaration,
+ [self::SCHEMA_ENTITY_TABLE =>
+ [
+ $tableName =>
+ $this->addModuleAssigment($tableDeclaration, $entityType, $moduleName)
+ ]
+ ]
+ );
+ }
+ }
+ $declaration = array_merge_recursive($declaration, $moduleDeclaration);
+ }
+ $this->dbSchemaDeclaration = $declaration;
+
+ return $this->dbSchemaDeclaration;
+ }
+
+ /**
+ * Get declared dependencies.
+ *
+ * @param string $tableName
+ * @param string $entityType
+ * @param null|string $entityName
+ * @return array
+ * @throws \Exception
+ */
+ private function resolveEntityDependencies(string $tableName, string $entityType, ?string $entityName = null): array
+ {
+ switch ($entityType) {
+ case self::SCHEMA_ENTITY_COLUMN:
+ case self::SCHEMA_ENTITY_CONSTRAINT:
+ case self::SCHEMA_ENTITY_INDEX:
+ return $this->getDeclarativeSchema()
+ [self::SCHEMA_ENTITY_TABLE][$tableName][$entityType][$entityName]['modules'];
+ case self::SCHEMA_ENTITY_TABLE:
+ return $this->getDeclarativeSchema()[self::SCHEMA_ENTITY_TABLE][$tableName]['modules'];
+ default:
+ return [];
+ }
+ }
+
+ /**
+ * @param string $filePath
+ * @return array
+ */
+ private function getDbSchemaDeclaration(string $filePath): array
+ {
+ $dom = new \DOMDocument();
+ $dom->loadXML(file_get_contents($filePath));
+ return (new Converter())->convert($dom);
+ }
+
+ /**
+ * Add dependency on the current module.
+ *
+ * @param array $tableDeclaration
+ * @param string $entityType
+ * @param string $moduleName
+ * @return array
+ */
+ private function addModuleAssigment(
+ array $tableDeclaration,
+ string $entityType,
+ string $moduleName
+ ): array {
+ $declarationWithAssigment = [];
+ foreach ($tableDeclaration[$entityType] as $entityName => $entityDeclaration) {
+ if (!isset($entityDeclaration['modules'])) {
+ $entityDeclaration['modules'] = [];
+ }
+ if (!$this->isEntityDisabled($entityDeclaration)) {
+ array_push($entityDeclaration['modules'], $moduleName);
+ }
+
+ $declarationWithAssigment[$entityType][$entityName] = $entityDeclaration;
+ }
+
+ return $declarationWithAssigment;
+ }
+
+ /**
+ * Retrieve dependencies from files.
+ *
+ * @param string $file
+ * @return string[]
+ * @throws \Exception
+ */
+ private function getDependenciesFromFiles($file)
+ {
+ if (!$file) {
+ return [];
+ }
+
+ $moduleDbSchema = $this->getDbSchemaDeclaration($file);
+ $dependencies = array_merge_recursive(
+ $this->getDisabledDependencies($moduleDbSchema),
+ $this->getConstraintDependencies($moduleDbSchema),
+ $this->getIndexDependencies($moduleDbSchema)
+ );
+ return $dependencies;
+ }
+
+ /**
+ * Retrieve dependencies for disabled entities.
+ *
+ * @param array $moduleDeclaration
+ * @return array
+ * @throws \Exception
+ */
+ private function getDisabledDependencies(array $moduleDeclaration): array
+ {
+ $disabledDependencies = [];
+ $entityTypes = [self::SCHEMA_ENTITY_COLUMN, self::SCHEMA_ENTITY_CONSTRAINT, self::SCHEMA_ENTITY_INDEX];
+ foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
+ foreach ($entityTypes as $entityType) {
+ if (!isset($tableDeclaration[$entityType])) {
+ continue;
+ }
+ foreach ($tableDeclaration[$entityType] as $entityName => $entityDeclaration) {
+ if ($this->isEntityDisabled($entityDeclaration)) {
+ $dependencyIdentifier = $this->getDependencyId($tableName, $entityType, $entityName);
+ $disabledDependencies[$dependencyIdentifier] =
+ $this->resolveEntityDependencies($tableName, $entityType, $entityName);
+ }
+ }
+ }
+ if ($this->isEntityDisabled($tableDeclaration)) {
+ $disabledDependencies[$this->getDependencyId($tableName)] =
+ $this->resolveEntityDependencies($tableName, self::SCHEMA_ENTITY_TABLE);
+ }
+ }
+
+ return $disabledDependencies;
+ }
+
+ /**
+ * Retrieve dependencies for foreign entities.
+ *
+ * @param array $constraintDeclaration
+ * @return array
+ * @throws \Exception
+ */
+ private function getFKDependencies(array $constraintDeclaration): array
+ {
+ $referenceDependencyIdentifier =
+ $this->getDependencyId(
+ $constraintDeclaration['referenceTable'],
+ self::SCHEMA_ENTITY_CONSTRAINT,
+ $constraintDeclaration['referenceId']
+ );
+ $dependencyIdentifier =
+ $this->getDependencyId(
+ $constraintDeclaration[self::SCHEMA_ENTITY_TABLE],
+ self::SCHEMA_ENTITY_CONSTRAINT,
+ $constraintDeclaration['referenceId']
+ );
+
+ $constraintDependencies = [];
+ $constraintDependencies[$referenceDependencyIdentifier] =
+ $this->resolveEntityDependencies(
+ $constraintDeclaration['referenceTable'],
+ self::SCHEMA_ENTITY_COLUMN,
+ $constraintDeclaration['referenceColumn']
+ );
+ $constraintDependencies[$dependencyIdentifier] =
+ $this->resolveEntityDependencies(
+ $constraintDeclaration[self::SCHEMA_ENTITY_TABLE],
+ self::SCHEMA_ENTITY_COLUMN,
+ $constraintDeclaration[self::SCHEMA_ENTITY_COLUMN]
+ );
+
+ return $constraintDependencies;
+ }
+
+ /**
+ * Retrieve dependencies for constraint entities.
+ *
+ * @param array $moduleDeclaration
+ * @return array
+ * @throws \Exception
+ */
+ private function getConstraintDependencies(array $moduleDeclaration): array
+ {
+ $constraintDependencies = [];
+ foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
+ if (empty($tableDeclaration[self::SCHEMA_ENTITY_CONSTRAINT])) {
+ continue;
+ }
+ foreach ($tableDeclaration[self::SCHEMA_ENTITY_CONSTRAINT] as $constraintName => $constraintDeclaration) {
+ if ($this->isEntityDisabled($constraintDeclaration)) {
+ continue;
+ }
+ $dependencyIdentifier =
+ $this->getDependencyId($tableName, self::SCHEMA_ENTITY_CONSTRAINT, $constraintName);
+ switch ($constraintDeclaration['type']) {
+ case 'foreign':
+ $constraintDependencies = array_merge(
+ $constraintDependencies,
+ $this->getFKDependencies($constraintDeclaration)
+ );
+ break;
+ case 'primary':
+ case 'unique':
+ $constraintDependencies[$dependencyIdentifier] = $this->getComplexDependency(
+ $tableName,
+ $constraintDeclaration
+ );
+ }
+ }
+ }
+ return $constraintDependencies;
+ }
+
+ /**
+ * Calculate complex dependency.
+ *
+ * @param string $tableName
+ * @param array $entityDeclaration
+ * @return array
+ * @throws \Exception
+ */
+ private function getComplexDependency(string $tableName, array $entityDeclaration): array
+ {
+ $complexDependency = [];
+ if (empty($entityDeclaration[self::SCHEMA_ENTITY_COLUMN])) {
+ return $complexDependency;
+ }
+
+ if (!is_array($entityDeclaration[self::SCHEMA_ENTITY_COLUMN])) {
+ $entityDeclaration[self::SCHEMA_ENTITY_COLUMN] = [$entityDeclaration[self::SCHEMA_ENTITY_COLUMN]];
+ }
+
+ foreach (array_keys($entityDeclaration[self::SCHEMA_ENTITY_COLUMN]) as $columnName) {
+ $complexDependency[] =
+ $this->resolveEntityDependencies($tableName, self::SCHEMA_ENTITY_COLUMN, $columnName);
+ }
+
+ return array_values($complexDependency);
+ }
+
+ /**
+ * Retrieve dependencies for index entities.
+ *
+ * @param array $moduleDeclaration
+ * @return array
+ * @throws \Exception
+ */
+ private function getIndexDependencies(array $moduleDeclaration): array
+ {
+ $indexDependencies = [];
+ foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
+ if (empty($tableDeclaration[self::SCHEMA_ENTITY_INDEX])) {
+ continue;
+ }
+ foreach ($tableDeclaration[self::SCHEMA_ENTITY_INDEX] as $indexName => $indexDeclaration) {
+ if ($this->isEntityDisabled($indexDeclaration)) {
+ continue;
+ }
+ $dependencyIdentifier =
+ $this->getDependencyId($tableName, self::SCHEMA_ENTITY_INDEX, $indexName);
+ $indexDependencies[$dependencyIdentifier] =
+ $this->getComplexDependency($tableName, $indexDeclaration);
+ }
+ }
+
+ return $indexDependencies;
+ }
+
+ /**
+ * Check status of the entity declaration.
+ *
+ * @param array $entityDeclaration
+ * @return bool
+ */
+ private function isEntityDisabled(array $entityDeclaration): bool
+ {
+ return isset($entityDeclaration['disabled']) && $entityDeclaration['disabled'] == true;
+ }
+
+ /**
+ * Retrieve dependency id.
+ *
+ * @param string $tableName
+ * @param string $entityType
+ * @param null|string $entityName
+ * @return string
+ */
+ private function getDependencyId(
+ string $tableName,
+ string $entityType = self::SCHEMA_ENTITY_TABLE,
+ ?string $entityName = null
+ ) {
+ return implode('___', [$tableName, $entityType, $entityName ?: $tableName]);
+ }
+
+ /**
+ * Retrieve dependency parameters from dependency id.
+ *
+ * @param string $id
+ * @return array
+ */
+ public static function decodeDependencyId(string $id): array
+ {
+ $decodedValues = explode('___', $id);
+ $result = [
+ 'tableName' => $decodedValues[0],
+ 'entityType' => $decodedValues[1],
+ 'entityName' => $decodedValues[2],
+ ];
+ return $result;
+ }
+
+ /**
+ * Collect module dependencies.
+ *
+ * @param string $currentModuleName
+ * @param array $dependencies
+ * @return array
+ */
+ private function collectDependencies($currentModuleName, $dependencies = [])
+ {
+ if (empty($dependencies)) {
+ return [];
+ }
+ foreach ($dependencies as $dependencyName => $dependency) {
+ $this->collectDependency($dependencyName, $dependency, $currentModuleName);
+ }
+
+ return $this->getDeclaredDependencies($currentModuleName, self::TYPE_HARD, self::MAP_TYPE_FOUND);
+ }
+
+ /**
+ * Collect a module dependency.
+ *
+ * @param string $dependencyName
+ * @param array $dependency
+ * @param string $currentModule
+ */
+ private function collectDependency(
+ string $dependencyName,
+ array $dependency,
+ string $currentModule
+ ) {
+ $declared = $this->getDeclaredDependencies($currentModule, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
+ $checkResult = array_intersect($declared, $dependency);
+
+ if (empty($checkResult)) {
+ $this->addDependencies(
+ $currentModule,
+ self::TYPE_HARD,
+ self::MAP_TYPE_FOUND,
+ [
+ $dependencyName => $dependency,
+ ]
+ );
+ }
+ }
+
+ /**
+ * Add dependencies to dependency list.
+ *
+ * @param string $moduleName
+ * @param array $packageNames
+ * @param string $type
+ *
+ * @return void
+ * @throws \Exception
+ */
+ private function presetDependencies(
+ string $moduleName,
+ array $packageNames,
+ string $type
+ ): void {
+ $packageNames = array_filter($packageNames, function ($packageName) {
+ return $this->getModuleName($packageName) ||
+ 0 === strpos($packageName, 'magento/') && 'magento/magento-composer-installer' != $packageName;
+ });
+
+ foreach ($packageNames as $packageName) {
+ $this->addDependencies(
+ $moduleName,
+ $type,
+ self::MAP_TYPE_DECLARED,
+ [$this->convertModuleName($packageName)]
+ );
+ }
+ }
+
+ /**
+ * Returns package name on module name mapping.
+ *
+ * @return array
+ * @throws \Exception
+ */
+ private function getPackageModuleMapping(): array
+ {
+ if (!$this->packageModuleMapping) {
+ $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
+
+ $packageModuleMapping = [];
+ foreach ($jsonFiles as $file) {
+ $moduleXml = simplexml_load_file(dirname($file) . '/etc/module.xml');
+ $moduleName = str_replace('_', '\\', (string)$moduleXml->module->attributes()->name);
+ $composerJson = $this->readJsonFile($file);
+ $packageName = $composerJson->name;
+ $packageModuleMapping[$packageName] = $moduleName;
+ }
+
+ $this->packageModuleMapping = $packageModuleMapping;
+ }
+
+ return $this->packageModuleMapping;
+ }
+
+ /**
+ * Retrieve Magento style module name.
+ *
+ * @param string $packageName
+ * @return null|string
+ * @throws \Exception
+ */
+ private function getModuleName(string $packageName): ?string
+ {
+ return $this->getPackageModuleMapping()[$packageName] ?? null;
+ }
+
+ /**
+ * Retrieve array of dependency items.
+ *
+ * @param $module
+ * @param $type
+ * @param $mapType
+ * @return array
+ */
+ private function getDeclaredDependencies(string $module, string $type, string $mapType)
+ {
+ return $this->mapDependencies[$module][$type][$mapType] ?? [];
+ }
+
+ /**
+ * Add dependency map items.
+ *
+ * @param $module
+ * @param $type
+ * @param $mapType
+ * @param $dependencies
+ */
+ protected function addDependencies(string $module, string $type, string $mapType, array $dependencies)
+ {
+ $this->mapDependencies[$module][$type][$mapType] = array_merge_recursive(
+ $this->getDeclaredDependencies($module, $type, $mapType),
+ $dependencies
+ );
+ }
+
+ /**
+ * Converts a composer json component name into the Magento Module form.
+ *
+ * @param string $jsonName The name of a composer json component or dependency e.g. 'magento/module-theme'
+ * @return string The corresponding Magento Module e.g. 'Magento\Theme'
+ * @throws \Exception
+ */
+ private function convertModuleName(string $jsonName): string
+ {
+ $moduleName = $this->getModuleName($jsonName);
+ if ($moduleName) {
+ return $moduleName;
+ }
+
+ if (strpos($jsonName, 'magento/magento') !== false
+ || strpos($jsonName, 'magento/framework') !== false
+ ) {
+ $moduleName = str_replace('/', "\t", $jsonName);
+ $moduleName = str_replace('framework-', "Framework\t", $moduleName);
+ $moduleName = str_replace('-', ' ', $moduleName);
+ $moduleName = ucwords($moduleName);
+ $moduleName = str_replace("\t", '\\', $moduleName);
+ $moduleName = str_replace(' ', '', $moduleName);
+ } else {
+ $moduleName = $jsonName;
+ }
+
+ return $moduleName;
+ }
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
index e2e0357a38f77..9c03802602938 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
@@ -10,8 +10,8 @@
use Magento\Framework\App\Utility\Files;
use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Test\Integrity\Dependency\DeclarativeSchemaDependencyProvider;
use Magento\TestFramework\Dependency\DbRule;
-use Magento\TestFramework\Dependency\DeclarativeSchemaRule;
use Magento\TestFramework\Dependency\DiRule;
use Magento\TestFramework\Dependency\LayoutRule;
use Magento\TestFramework\Dependency\PhpRule;
@@ -26,19 +26,28 @@
class DependencyTest extends \PHPUnit\Framework\TestCase
{
/**
- * Types of dependencies between modules
+ * Soft dependency between modules
*/
const TYPE_SOFT = 'soft';
+ /**
+ * Hard dependency between modules
+ */
const TYPE_HARD = 'hard';
/**
- * Types of dependencies map arrays
+ * The identifier of dependency for mapping.
*/
const MAP_TYPE_DECLARED = 'declared';
+ /**
+ * The identifier of dependency for mapping.
+ */
const MAP_TYPE_FOUND = 'found';
+ /**
+ * The identifier of dependency for mapping.
+ */
const MAP_TYPE_REDUNDANT = 'redundant';
/**
@@ -57,17 +66,6 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
*/
protected static $_listConfigXml = [];
- /**
- * List of db_schema.xml files by modules
- *
- * Format: array(
- * '{Module_Name}' => '{Filename}'
- * )
- *
- * @var array
- */
- protected static $_listDbSchemaXml = [];
-
/**
* List of routes.xml files by modules
*
@@ -186,7 +184,6 @@ public static function setUpBeforeClass()
self::$_namespaces = implode('|', Files::init()->getNamespaces());
self::_prepareListConfigXml();
- self::_prepareListDbSchemaXml();
self::_prepareListRoutesXml();
self::_prepareListAnalyticsXml();
@@ -224,6 +221,7 @@ protected static function _initThemes()
$defaultThemes = [];
foreach (self::$_listConfigXml as $file) {
$config = simplexml_load_file($file);
+ //phpcs:ignore Generic.PHP.NoSilencedErrors
$nodes = @($config->xpath("/config/*/design/theme/full_name") ?: []);
foreach ($nodes as $node) {
$defaultThemes[] = (string)$node;
@@ -237,13 +235,13 @@ protected static function _initThemes()
*/
protected static function _initRules()
{
- $replaceFilePattern = str_replace('\\', '/', realpath(__DIR__)) . '/_files/dependency_test/*.php';
+ $replaceFilePattern = str_replace('\\', '/', realpath(__DIR__)) . '/_files/dependency_test/tables_*.php';
$dbRuleTables = [];
foreach (glob($replaceFilePattern) as $fileName) {
+ //phpcs:ignore Generic.PHP.NoSilencedErrors
$dbRuleTables = array_merge($dbRuleTables, @include $fileName);
}
self::$_rulesInstances = [
- new DeclarativeSchemaRule($dbRuleTables),
new PhpRule(self::$_mapRouters, self::$_mapLayoutBlocks),
new DbRule($dbRuleTables),
new LayoutRule(
@@ -275,7 +273,6 @@ protected function _getCleanedFileContents($fileType, $file)
break;
case 'layout':
case 'config':
- case 'db_schema':
//Removing xml comments
$contents = preg_replace('~\~s', '', $contents);
break;
@@ -299,6 +296,9 @@ function ($matches) use ($contents, &$contentsWithoutHtml) {
return $contents;
}
+ /**
+ * @inheritdoc
+ */
public function testUndeclared()
{
$invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
@@ -341,12 +341,12 @@ function ($fileType, $file) {
$result = [];
foreach ($undeclaredDependency as $type => $modules) {
$modules = array_unique($modules);
- if (!count($modules)) {
+ if (empty($modules)) {
continue;
}
$result[] = sprintf("%s [%s]", $type, implode(', ', $modules));
}
- if (count($result)) {
+ if (!empty($result)) {
$this->fail('Module ' . $module . ' has undeclared dependencies: ' . implode(', ', $result));
}
},
@@ -392,7 +392,7 @@ protected function getDependenciesFromFiles($module, $fileType, $file, $contents
*/
protected function _collectDependencies($currentModuleName, $dependencies = [])
{
- if (!count($dependencies)) {
+ if (empty($dependencies)) {
return [];
}
$undeclared = [];
@@ -430,18 +430,35 @@ private function collectDependency($dependency, $currentModule, &$undeclared)
/**
* Collect redundant dependencies
+ *
* @SuppressWarnings(PHPMD.NPathComplexity)
* @test
* @depends testUndeclared
+ * @throws \Exception
*/
public function collectRedundant()
{
+ $schemaDependencyProvider = new DeclarativeSchemaDependencyProvider();
+
+ /** TODO: Remove this temporary solution after MC-5806 is closed */
+ $filePattern = __DIR__ . '/_files/dependency_test/undetected_dependencies_*.php';
+ $undetectedDependencies = [];
+ foreach (glob($filePattern) as $fileName) {
+ $undetectedDependencies = array_merge($undetectedDependencies, require $fileName);
+ }
+
foreach (array_keys(self::$mapDependencies) as $module) {
$declared = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
$found = array_merge(
$this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_FOUND),
- $this->_getDependencies($module, self::TYPE_SOFT, self::MAP_TYPE_FOUND)
+ $this->_getDependencies($module, self::TYPE_SOFT, self::MAP_TYPE_FOUND),
+ $schemaDependencyProvider->getDeclaredExistingModuleDependencies($module)
);
+ /** TODO: Remove this temporary solution after MC-5806 is closed */
+ if (!empty($undetectedDependencies[$module])) {
+ $found = array_merge($found, $undetectedDependencies[$module]);
+ }
+
$found['Magento\Framework'] = 'Magento\Framework';
$this->_setDependencies($module, self::TYPE_HARD, self::MAP_TYPE_REDUNDANT, array_diff($declared, $found));
}
@@ -458,7 +475,7 @@ public function testRedundant()
foreach (array_keys(self::$mapDependencies) as $module) {
$result = [];
$redundant = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_REDUNDANT);
- if (count($redundant)) {
+ if (!empty($redundant)) {
$result[] = sprintf(
"\r\nModule %s: %s [%s]",
$module,
@@ -467,11 +484,11 @@ public function testRedundant()
);
}
- if (count($result)) {
+ if (!empty($result)) {
$output[] = implode(', ', $result);
}
}
- if (count($output)) {
+ if (!empty($output)) {
$this->fail("Redundant dependencies found!\r\n" . implode(' ', $output));
}
}
@@ -501,6 +518,7 @@ protected function _prepareFiles($fileType, $files, $skip = null)
* Return all files
*
* @return array
+ * @throws \Exception
*/
public function getAllFiles()
{
@@ -522,12 +540,6 @@ public function getAllFiles()
$this->_prepareFiles('config', Files::init()->getConfigFiles())
);
- // Get all configuration files
- $files = array_merge(
- $files,
- $this->_prepareFiles('db_schema', Files::init()->getDbSchemaFiles())
- );
-
//Get all layout updates files
$files = array_merge(
$files,
@@ -557,20 +569,6 @@ protected static function _prepareListConfigXml()
}
}
- /**
- * Prepare list of db_schema.xml files (by modules)
- */
- protected static function _prepareListDbSchemaXml()
- {
- $files = Files::init()->getDbSchemaFiles('db_schema.xml', [], false);
- foreach ($files as $file) {
- if (preg_match('/(?[A-Z][a-z]+)[_\/\\\\](?[A-Z][a-zA-Z]+)/', $file, $matches)) {
- $module = $matches['namespace'] . '\\' . $matches['module'];
- self::$_listDbSchemaXml[$module] = $file;
- }
- }
- }
-
/**
* Prepare list of routes.xml files (by modules)
*/
@@ -658,7 +656,7 @@ protected static function _prepareMapLayoutBlocks()
$area = 'default';
if (preg_match('/[\/](?adminhtml|frontend)[\/]/', $file, $matches)) {
$area = $matches['area'];
- self::$_mapLayoutBlocks[$area] = @(self::$_mapLayoutBlocks[$area] ?: []);
+ self::$_mapLayoutBlocks[$area] = self::$_mapLayoutBlocks[$area] ?? [];
}
if (preg_match('/(?[A-Z][a-z]+)[_\/\\\\](?[A-Z][a-zA-Z]+)/', $file, $matches)) {
$module = $matches['namespace'] . '\\' . $matches['module'];
@@ -668,7 +666,7 @@ protected static function _prepareMapLayoutBlocks()
$attributes = $element->attributes();
$block = (string)$attributes->name;
if (!empty($block)) {
- self::$_mapLayoutBlocks[$area][$block] = @(self::$_mapLayoutBlocks[$area][$block] ?: []);
+ self::$_mapLayoutBlocks[$area][$block] = self::$_mapLayoutBlocks[$area][$block] ?? [];
self::$_mapLayoutBlocks[$area][$block][$module] = $module;
}
}
@@ -686,7 +684,7 @@ protected static function _prepareMapLayoutHandles()
$area = 'default';
if (preg_match('/\/(?adminhtml|frontend)\//', $file, $matches)) {
$area = $matches['area'];
- self::$_mapLayoutHandles[$area] = @(self::$_mapLayoutHandles[$area] ?: []);
+ self::$_mapLayoutHandles[$area] = self::$_mapLayoutHandles[$area] ?? [];
}
if (preg_match('/app\/code\/(?[A-Z][a-z]+)[_\/\\\\](?[A-Z][a-zA-Z]+)/', $file, $matches)
) {
@@ -695,7 +693,7 @@ protected static function _prepareMapLayoutHandles()
foreach ((array)$xml->xpath('/layout/child::*') as $element) {
/** @var \SimpleXMLElement $element */
$handle = $element->getName();
- self::$_mapLayoutHandles[$area][$handle] = @(self::$_mapLayoutHandles[$area][$handle] ?: []);
+ self::$_mapLayoutHandles[$area][$handle] = self::$_mapLayoutHandles[$area][$handle] ?? [];
self::$_mapLayoutHandles[$area][$handle][$module] = $module;
}
}
@@ -755,6 +753,7 @@ protected static function _initDependencies()
$contents = file_get_contents($file);
$decodedJson = json_decode($contents);
if (null == $decodedJson) {
+ //phpcs:ignore Magento2.Exceptions.DirectThrow
throw new \Exception("Invalid Json: $file");
}
$json = new \Magento\Framework\Config\Composer\Package(json_decode($contents));
@@ -843,6 +842,7 @@ private static function getPackageModuleMapping(): array
$contents = file_get_contents($file);
$composerJson = json_decode($contents);
if (null == $composerJson) {
+ //phpcs:ignore Magento2.Exceptions.DirectThrow
throw new \Exception("Invalid Json: $file");
}
$moduleXml = simplexml_load_file(dirname($file) . '/etc/module.xml');
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/blacklisted_dependencies_ce.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/blacklisted_dependencies_ce.php
new file mode 100644
index 0000000000000..270cb99c29caa
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/blacklisted_dependencies_ce.php
@@ -0,0 +1,9 @@
+ ["Magento\Inventory"],
+];
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
index 530f55504d009..3fb53be2ec400 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
@@ -96,7 +96,7 @@
'catalogrule_website' => 'Magento\CatalogRule',
'catalogsearch_fulltext' => 'Magento\CatalogSearch',
'catalogsearch_result' => 'Magento\CatalogSearch',
- 'search_query' => 'Magento\CatalogSearch',
+ 'search_query' => 'Magento\Search',
'checkout_agreement' => 'Magento\Checkout',
'checkout_agreement_store' => 'Magento\Checkout',
'cms_block' => 'Magento\Cms',
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/undetected_dependencies_ce.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/undetected_dependencies_ce.php
new file mode 100644
index 0000000000000..407f57ee51257
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/undetected_dependencies_ce.php
@@ -0,0 +1,10 @@
+ ["Magento\CatalogSearch"]
+];
diff --git a/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php b/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
index 92f0302d93baf..6bdb74ef7b89a 100644
--- a/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
+++ b/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
@@ -47,7 +47,7 @@ class ConfigOptionsListConstants
const CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION = 'static_content_on_demand_in_production';
/**
- * Paramater for forcing HTML minification even if file is already minified.
+ * Parameter for forcing HTML minification even if file is already minified.
*/
const CONFIG_PATH_FORCE_HTML_MINIFICATION = 'force_html_minification';
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Label.php b/lib/internal/Magento/Framework/Data/Form/Element/Label.php
index 901dcb5289e8d..70b7885e7a0d0 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Label.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Label.php
@@ -4,13 +4,13 @@
* See COPYING.txt for license details.
*/
-/**
- * Data form abstract class
- *
- * @author Magento Core Team
- */
namespace Magento\Framework\Data\Form\Element;
+use Magento\Framework\Phrase;
+
+/**
+ * Label form element.
+ */
class Label extends \Magento\Framework\Data\Form\Element\AbstractElement
{
/**
@@ -37,8 +37,13 @@ public function __construct(
public function getElementHtml()
{
$html = $this->getBold() ? '${__P(request_protocol,http)}
=
+
+ graphql_port_number
+ ${__P(graphql_port_number,)}
+ =
+
admin_password
${__P(admin_password,123123q)}
@@ -354,6 +359,81 @@
${__P(frontendPoolUsers,1)}
=
+
+ graphQLPoolUsers
+ ${__P(graphQLPoolUsers,1)}
+ =
+
+
+ graphqlAddConfigurableProductToCartPercentage
+ ${__P(graphqlAddConfigurableProductToCartPercentage,0)}
+ =
+
+
+ graphqlAddSimpleProductToCartPercentage
+ ${__P(graphqlAddSimpleProductToCartPercentage,0)}
+ =
+
+
+ graphqlGetCategoryListByCategoryIdPercentage
+ ${__P(graphqlGetCategoryListByCategoryIdPercentage,0)}
+ =
+
+
+ graphqlGetCmsBlockByIdentifierPercentage
+ ${__P(graphqlGetCmsBlockByIdentifierPercentage,0)}
+ =
+
+
+ graphqlGetCmsPageByIdPercentage
+ ${__P(graphqlGetCmsPageByIdPercentage,0)}
+ =
+
+
+ graphqlGetConfigurableProductDetailsByNamePercentage
+ ${__P(graphqlGetConfigurableProductDetailsByNamePercentage,0)}
+ =
+
+
+ graphqlGetConfigurableProductDetailsByProductUrlKeyPercentage
+ ${__P(graphqlGetConfigurableProductDetailsByProductUrlKeyPercentage,0)}
+ =
+
+
+ graphqlGetListOfProductsByCategoryIdPercentage
+ ${__P(graphqlGetListOfProductsByCategoryIdPercentage,0)}
+ =
+
+
+ graphqlGetNavigationMenuByCategoryIdPercentage
+ ${__P(graphqlGetNavigationMenuByCategoryIdPercentage,0)}
+ =
+
+
+ graphqlGetProductSearchByProductNamePercentage
+ ${__P(graphqlGetProductSearchByProductNamePercentage,0)}
+ =
+
+
+ graphqlGetProductSearchByTextAndCategoryIdPercentage
+ ${__P(graphqlGetProductSearchByTextAndCategoryIdPercentage,0)}
+ =
+
+
+ graphqlGetSimpleProductDetailsByNamePercentage
+ ${__P(graphqlGetSimpleProductDetailsByNamePercentage,0)}
+ =
+
+
+ graphqlGetSimpleProductDetailsByProductUrlKeyPercentage
+ ${__P(graphqlGetSimpleProductDetailsByProductUrlKeyPercentage,0)}
+ =
+
+
+ graphqlUrlInfoByUrlKeyPercentage
+ ${__P(graphqlUrlInfoByUrlKeyPercentage,0)}
+ =
+
guest_checkout_percent
${__P(guest_checkout_percent,100)}
@@ -658,6 +738,9 @@ props.remove("configurable_products_list");
props.remove("configurable_products_list_for_edit");
props.remove("users");
props.remove("customer_emails_list");
+props.remove("categories");
+props.remove("cms_pages");
+props.remove("cms_blocks");
/* This is only used when admin is enabled. */
props.put("activeAdminThread", "");
@@ -821,167 +904,253 @@ if (!slash.equals(path.substring(path.length() -1)) || !slash.equals(path.substr
-
- mpaf/tool/fragments/ce/setup/extract_categories.jmx
+
+ mpaf/tool/fragments/ce/setup/extract_admin_users.jmx
-
-
-
-
- Content-Type
- application/json
-
-
- Accept
- */*
+
+
+
+
+ false
+ ${admin_form_key}
+ =
+ true
+ form_key
-
+
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}${admin_path}/admin/user/roleGrid/limit/200/?ajax=true&isAjax=true
+ POST
+ true
+ false
+ true
+ false
+ false
+
+
+ false
+ import java.util.regex.Pattern;
+ import java.util.regex.Matcher;
+ import java.util.LinkedList;
+
+ LinkedList adminUserList = new LinkedList();
+ String response = new String(data);
+ Pattern pattern = Pattern.compile("<td\\W*?data-column=.username[^>]*?>\\W*?(\\w+)\\W*?<");
+ Matcher matcher = pattern.matcher(response);
+
+ while (matcher.find()) {
+ adminUserList.add(matcher.group(1));
+ }
+
+ adminUserList.poll();
+ props.put("adminUserList", adminUserList);
+ props.put("adminUserListIterator", adminUserList.descendingIterator());
+
+
- true
-
-
-
- false
- {"username":"${admin_user}","password":"${admin_password}"}
- =
-
-
-
- 60000
- 200000
- ${request_protocol}
- ${base_path}rest/V1/integration/admin/token
- POST
- true
- false
- true
- false
- false
-
-
-
- admin_token
- $
- BODY
-
-
-
- ^[a-z0-9-]+$
-
- Assertion.response_data
- false
- 1
- variable
- admin_token
-
-
-
-
-
- Authorization
- Bearer ${admin_token}
+
+
+
+
+ mpaf/tool/fragments/ce/setup/extract_customers.jmx
+
+
+
+
+
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}${admin_path}/customer/index/
+ GET
+ true
+ false
+ true
+ false
+ false
+
+
+
+ true
+ import org.apache.jmeter.protocol.http.control.CookieManager;
+import org.apache.jmeter.protocol.http.control.Cookie;
+CookieManager manager = sampler.getCookieManager();
+Cookie cookie = new Cookie("adminhtml",vars.get("COOKIE_adminhtml"),vars.get("host"),"/",false,0);
+manager.add(cookie);
+
+
+
+ Customers
+ <title>Customers / Customers / Magento Admin</title>
+
+ Assertion.response_data
+ false
+ 2
+
+
+
+
+
+
+ true
+ customer_listing
+ =
+ true
+ namespace
+
+
+ true
+ entity_id
+ =
+ true
+ sorting[field]
+
+
+ true
+ asc
+ =
+ true
+ sorting[direction]
+
+
+ true
+ true
+ =
+ true
+ isAjax
+
+
+ true
+ customer_since[locale]=en_US
+ =
+ true
+ filters[placeholder]
+
+
+ true
+ 1
+ =
+ true
+ filters[group_id]
+
+
+ true
+ 1
+ =
+ true
+ filters[website_id]
+
+
+ true
+ ${customers_page_size}
+ =
+ true
+ paging[pageSize]
+
+
+ true
+ 1
+ =
+ true
+ paging[current]
+
+
+ true
+ entity_id
+ =
+ true
+ sorting[field]
+
+
+ true
+ asc
+ =
+ true
+ sorting[direction]
+
+
+ true
+ true
+ =
+ true
+ isAjax
-
+
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}${admin_path}/mui/index/render/
+ GET
+ true
+ false
+ true
+ false
+ false
+
+
+
+ $.totalRecords
+ 0
+ true
+ false
+ true
+ true
+
+
+ customer_emails
+ $.items[*].email
+ BODY
+
+
+ customer_ids
+ $.items[*].entity_id
+ BODY
+
+
+ false
+ import java.util.LinkedList;
+LinkedList emailsList = new LinkedList();
+props.put("customer_emails_list", emailsList);
+
-
-
-
- true
- path
- =
- true
- searchCriteria[filterGroups][0][filters][0][field]
-
-
- true
- 1/2/%
- =
- true
- searchCriteria[filterGroups][0][filters][0][value]
-
-
- true
- like
- =
- true
- searchCriteria[filterGroups][0][filters][0][conditionType]
-
-
- true
- level
- =
- true
- searchCriteria[filterGroups][1][filters][0][field]
-
-
- true
- 2
- =
- true
- searchCriteria[filterGroups][1][filters][0][value]
-
-
- true
- ${categories_count}
- =
- true
- searchCriteria[pageSize]
-
-
-
- 60000
- 200000
- ${request_protocol}
- ${base_path}rest/V1/categories/list
- GET
- true
- false
- false
- false
- false
-
-
-
- false
- category_url_keys
- url_key\",\"value\":\"(.*?)\"
- $1$
- -1
-
-
- false
- category_names
- name\":\"(.*?)\"
- $1$
- -1
-
-
-
- category_url_keys
- category_url_key
+
+ customer_emails
+ customer_email
true
@@ -989,32 +1158,31 @@ if (!slash.equals(path.substring(path.length() -1)) || !slash.equals(path.substr
1
1
- category_url_key_counter
+ email_counter
false
- import java.util.ArrayList;
+
+
+try {
-// If it is first iteration of cycle then recreate category url key list
-if (1 == Integer.parseInt(vars.get("category_url_key_counter"))) {
- categoryUrlKeysList = new ArrayList();
- props.put("category_url_keys_list", categoryUrlKeysList);
- props.put("category_url_key", vars.get("category_url_key"));
-} else {
- categoryUrlKeysList = props.get("category_url_keys_list");
+props.get("customer_emails_list").add(vars.get("customer_email"));
+
+} catch (java.lang.Exception e) {
+ log.error("error…", e);
+ SampleResult.setStopThread(true);
}
-categoryUrlKeysList.add(vars.get("category_url_key"));
+
false
-
- category_names
- category_name
+
+ customer_ids
+ customer_id
true
@@ -1022,166 +1190,177 @@ categoryUrlKeysList.add(vars.get("category_url_key"));
1
1
- category_name_counter
+ id_counter
false
+
import java.util.ArrayList;
-// If it is first iteration of cycle then recreate category name list
-if (1 == Integer.parseInt(vars.get("category_name_counter"))) {
- categoryNamesList = new ArrayList();
- props.put("category_names_list",categoryNamesList);
- props.put("category_name", vars.get("category_name"));
+// If it is first iteration of cycle then recreate idsList
+if (1 == Integer.parseInt(vars.get("id_counter"))) {
+ idsList = new ArrayList();
+ props.put("customer_ids_list", idsList);
} else {
- categoryNamesList = props.get("category_names_list");
+ idsList = props.get("customer_ids_list");
}
-
-categoryNamesList.add(vars.get("category_name"));
+idsList.add(vars.get("customer_id"));
false
-
- props.put("category_url_key", vars.get("category_url_key"));
-props.put("category_name", vars.get("category_name"));
- false
-
-
-
- mpaf/tool/fragments/ce/setup/extract_categories_id_of_last_level.jmx
-
+
+ mpaf/tool/fragments/ce/setup/extract_region_ids.jmx
+
-
- props.remove("admin_category_ids_list");
- false
-
-
-
-
-
- Content-Type
- application/json
-
-
- Accept
- */*
+
+
+
+
+ false
+ US
+ =
+ true
+ parent
-
+
+ ${request_protocol}
+ ${base_path}${admin_path}/directory/json/countryRegion/
+ GET
+ true
+ false
+ true
+ false
+ false
+
+
+ groovy
+ import groovy.json.JsonSlurper
+def jsonSlurper = new JsonSlurper();
+def regionResponse = jsonSlurper.parseText(prev.getResponseDataAsString());
+
+regionResponse.each { region ->
+ if (region.label.toString() == "Alabama") {
+ props.put("alabama_region_id", region.value.toString());
+ } else if (region.label.toString() == 'California') {
+ props.put("california_region_id", region.value.toString());
+ }
+}
+
- true
-
-
-
- false
- {"username":"${admin_user}","password":"${admin_password}"}
- =
-
-
-
- 60000
- 200000
- ${request_protocol}
- ${base_path}rest/V1/integration/admin/token
- POST
- true
- false
- true
- false
- false
-
-
-
- admin_token
- $
- BODY
-
-
-
- ^[a-z0-9-]+$
-
- Assertion.response_data
- false
- 1
- variable
- admin_token
-
-
-
-
-
- Authorization
- Bearer ${admin_token}
-
-
-
-
+
+
+
+
+ mpaf/tool/fragments/ce/simple_controller.jmx
+
+
+
+
+
+ Content-Type
+ application/json
+
+
+ Accept
+ */*
+
+
+ mpaf/tool/fragments/ce/api/header_manager_before_token.jmx
+
+ true
+
+
+
+ false
+ {"username":"${admin_user}","password":"${admin_password}"}
+ =
+
+
+
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}rest/V1/integration/admin/token
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/api/admin_token_retrieval.jmx
+
+
+ admin_token
+ $
+ BODY
+
+
+
+ ^[a-z0-9-]+$
+
+ Assertion.response_data
+ false
+ 1
+ variable
+ admin_token
+
+
+
+
+
+
+ Authorization
+ Bearer ${admin_token}
+
+
+ mpaf/tool/fragments/ce/api/header_manager.jmx
+
+
-
- true
- children_count
- =
- true
- searchCriteria[filterGroups][0][filters][0][field]
-
-
- true
- 0
- =
- true
- searchCriteria[filterGroups][0][filters][0][value]
-
-
- true
- level
- =
- true
- searchCriteria[filterGroups][1][filters][0][field]
-
-
- true
- 2
- =
- true
- searchCriteria[filterGroups][1][filters][0][value]
-
-
+
true
- gt
+ 1
=
true
- searchCriteria[filterGroups][1][filters][0][conditionType]
+ searchCriteria[current_page]
-
- true
- ${adminCategoryCount}
+
+ false
+ 20
=
true
- searchCriteria[pageSize]
+ searchCriteria[page_size]
@@ -1191,7 +1370,7 @@ props.put("category_name", vars.get("category_name"));
200000
${request_protocol}
${base_path}rest/default/V1/categories/list
+ ${base_path}rest/default/V1/cmsPage/search
GET
true
false
@@ -1199,118 +1378,42 @@ props.put("category_name", vars.get("category_name"));
false
false
mpaf/tool/fragments/ce/setup/get_cms_pages.jmx
-
- false
- category_list_id
- \{\"id\":(\d+),
- $1$
- -1
-
+
+ $.total_count
+ 0
+ true
+ false
+ true
+ false
+
-
- category_list_id
- category_id
- true
-
-
-
- import java.util.ArrayList;
+
+ javascript
+ var data = JSON.parse(prev.getResponseDataAsString());
-adminCategoryIdsList = props.get("admin_category_ids_list");
-// If it is first iteration of cycle then recreate categories ids list
-if (adminCategoryIdsList == null) {
- adminCategoryIdsList = new ArrayList();
- props.put("admin_category_ids_list", adminCategoryIdsList);
-}
-adminCategoryIdsList.add(vars.get("category_id"));
- false
-
+var cmsPages = [];
+
+for (var i in data.items) {
+ cmsPages.push({"id": data.items[i].id, "identifier": data.items[i].identifier});
+ }
+
+props.put("cms_pages", cmsPages);
+
+
-
mpaf/tool/fragments/ce/setup/extract_configurable_products.jmx
-
-
-
-
- Content-Type
- application/json
-
-
- Accept
- */*
-
-
-
-
- true
-
-
-
- false
- {"username":"${admin_user}","password":"${admin_password}"}
- =
-
-
-
- 60000
- 200000
- ${request_protocol}
- ${base_path}rest/V1/integration/admin/token
- POST
- true
- false
- true
- false
- false
-
-
-
- admin_token
- $
- BODY
-
-
-
- ^[a-z0-9-]+$
-
- Assertion.response_data
- false
- 1
- variable
- admin_token
-
-
-
-
-
- Authorization
- Bearer ${admin_token}
-
-
-
-
@@ -1437,83 +1540,11 @@ productList.add(productMap);
-
mpaf/tool/fragments/ce/setup/extract_configurable_products_for_edit.jmx
-
-
-
-
- Content-Type
- application/json
-
-
- Accept
- */*
-
-
-
-
- true
-
-
-
- false
- {"username":"${admin_user}","password":"${admin_password}"}
- =
-
-
-
- 60000
- 200000
- ${request_protocol}
- ${base_path}rest/V1/integration/admin/token
- POST
- true
- false
- true
- false
- false
-
-
-
- admin_token
- $
- BODY
-
-
-
- ^[a-z0-9-]+$
-
- Assertion.response_data
- false
- 1
- variable
- admin_token
-
-
-
-
-
- Authorization
- Bearer ${admin_token}
-
-
-
-
@@ -1645,36 +1676,49 @@ editProductList.add(editProductMap);
false
-
- mpaf/tool/fragments/ce/setup/extract_simple_products_for_edit.jmx
+
+ mpaf/tool/fragments/ce/setup/extract_simple_products.jmx
-
-
-
-
- Content-Type
- application/json
-
-
- Accept
- */*
-
-
-
-
- true
-
+
+
-
- false
- {"username":"${admin_user}","password":"${admin_password}"}
+
+ true
+ type_id
+ =
+ true
+ searchCriteria[filterGroups][0][filters][0][field]
+
+
+ true
+ simple
+ =
+ true
+ searchCriteria[filterGroups][0][filters][0][value]
+
+
+ true
+ ${simple_products_count}
+ =
+ true
+ searchCriteria[pageSize]
+
+
+ true
+ attribute_set_id
+ !=
+ true
+ searchCriteria[filterGroups][0][filters][1][field]
+
+
+ true
+ 4
=
+ true
+ searchCriteria[filterGroups][0][filters][1][value]
@@ -1684,8 +1728,8 @@ editProductList.add(editProductMap);
200000
${request_protocol}
${base_path}rest/V1/integration/admin/token
- POST
+ ${base_path}rest/V1/products
+ GET
true
false
true
@@ -1694,35 +1738,94 @@ editProductList.add(editProductMap);
-
- admin_token
- $
- BODY
-
+
+ false
+ simple_products_url_keys
+ url_key\",\"value\":\"(.*?)\"
+ $1$
+ -1
+
-
- ^[a-z0-9-]+$
-
- Assertion.response_data
- false
- 1
- variable
- admin_token
-
+
+ false
+ simple_product_ids
+ \"id\":(\d+),\"sku\"
+ $1$
+ -1
+
+
+ false
+ simple_product_names
+ name\":\"(.*?)\"
+ $1$
+ -1
+
+
+ false
+ simple_product_skus
+ sku\":\"(.*?)\"
+ $1$
+ -1
+
-
-
-
- Authorization
- Bearer ${admin_token}
-
-
-
+
+
+ simple_product_ids
+ simple_product_id
+ true
+
+
+
+ 1
+ 1
+ simple_products_counter
+ false
+
+
+ import java.util.ArrayList;
+import java.util.HashMap;
+import org.apache.commons.codec.binary.Base64;
+
+// If it is first iteration of cycle then recreate productList
+if (1 == Integer.parseInt(vars.get("simple_products_counter"))) {
+ productList = new ArrayList();
+ props.put("simple_products_list", productList);
+} else {
+ productList = props.get("simple_products_list");
+}
+String productUrl = vars.get("request_protocol") + "://" + vars.get("host") + vars.get("base_path") + vars.get("simple_products_url_keys_" + vars.get("simple_products_counter"))+ vars.get("url_suffix");
+encodedUrl = Base64.encodeBase64(productUrl.getBytes());
+// Create product map
+Map productMap = new HashMap();
+productMap.put("id", vars.get("simple_product_id"));
+productMap.put("title", vars.get("simple_product_names_" + vars.get("simple_products_counter")));
+productMap.put("sku", vars.get("simple_product_skus_" + vars.get("simple_products_counter")));
+productMap.put("url_key", vars.get("simple_products_url_keys_" + vars.get("simple_products_counter")));
+productMap.put("uenc", new String(encodedUrl));
+
+// Collect products map in products list
+productList.add(productMap);
+ false
+
+
+
+ mpaf/tool/fragments/ce/setup/extract_simple_products_for_edit.jmx
+
+
@@ -1869,120 +1972,162 @@ editProductList.add(editProductMap);
-
-
- mpaf/tool/fragments/ce/setup/extract_simple_products.jmx
+
+ mpaf/tool/fragments/ce/setup/extract_categories.jmx
-
-
-
-
- Content-Type
- application/json
+
+
+
+
+ true
+ path
+ =
+ true
+ searchCriteria[filterGroups][0][filters][0][field]
-
- Accept
- */*
+
+ true
+ 1/2/%
+ =
+ true
+ searchCriteria[filterGroups][0][filters][0][value]
-
-
-
- true
-
-
-
- false
- {"username":"${admin_user}","password":"${admin_password}"}
- =
-
-
-
- 60000
- 200000
- ${request_protocol}
- ${base_path}rest/V1/integration/admin/token
- POST
- true
- false
- true
- false
- false
-
-
-
- admin_token
- $
- BODY
-
-
-
- ^[a-z0-9-]+$
-
- Assertion.response_data
- false
- 1
- variable
- admin_token
-
-
-
-
-
- Authorization
- Bearer ${admin_token}
+
+ true
+ like
+ =
+ true
+ searchCriteria[filterGroups][0][filters][0][conditionType]
+
+
+ true
+ level
+ =
+ true
+ searchCriteria[filterGroups][1][filters][0][field]
+
+
+ true
+ 2
+ =
+ true
+ searchCriteria[filterGroups][1][filters][0][value]
+
+
+ true
+ ${categories_count}
+ =
+ true
+ searchCriteria[pageSize]
-
+
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}rest/V1/categories/list
+ GET
+ true
+ false
+ false
+ false
+ false
+
+
+ javascript
+ var data = JSON.parse(prev.getResponseDataAsString());
+
+var categoryData = [], categoryNames = [], categoryUrls = [];
+
+for (var i in data.items) {
+ var cat = data.items[i], urlKey = getUrlKey(cat);
+ categoryData.push({"id": cat.id, "name": cat.name, "url_key": urlKey, "children": cat.children.split(",")});
+ categoryNames.push(cat.name);
+ categoryUrls.push(urlKey);
+ }
+
+function getUrlKey(cat) {
+ for (var i in cat.custom_attributes) {
+ if (cat.custom_attributes[i].attribute_code == "url_key") {
+ return cat.custom_attributes[i].value;
+ }
+ }
+ return "";
+}
+
+props.put("categories", categoryData);
+props.put("category_url_keys_list", categoryUrls);
+props.put("category_names_list",categoryNames);
+
-
+
+
+
+
+ mpaf/tool/fragments/ce/setup/extract_categories_id_of_last_level.jmx
+
+
+
+ props.remove("admin_category_ids_list");
+ false
+
+
+
true
- type_id
+ children_count
=
true
searchCriteria[filterGroups][0][filters][0][field]
true
- simple
+ 0
=
true
searchCriteria[filterGroups][0][filters][0][value]
-
+
true
- ${simple_products_count}
+ level
=
true
- searchCriteria[pageSize]
+ searchCriteria[filterGroups][1][filters][0][field]
-
+
true
- attribute_set_id
- !=
+ 2
+ =
true
- searchCriteria[filterGroups][0][filters][1][field]
+ searchCriteria[filterGroups][1][filters][0][value]
-
+
true
- 4
+ gt
=
true
- searchCriteria[filterGroups][0][filters][1][value]
+ searchCriteria[filterGroups][1][filters][0][conditionType]
+
+
+ true
+ ${adminCategoryCount}
+ =
+ true
+ searchCriteria[pageSize]
@@ -1992,7 +2137,7 @@ editProductList.add(editProductMap);
200000
${request_protocol}
${base_path}rest/V1/products
+ ${base_path}rest/default/V1/categories/list
GET
true
false
@@ -2002,648 +2147,238 @@ editProductList.add(editProductMap);
-
- false
- simple_products_url_keys
- url_key\",\"value\":\"(.*?)\"
- $1$
- -1
-
-
- false
- simple_product_ids
- \"id\":(\d+),\"sku\"
- $1$
- -1
-
-
- false
- simple_product_names
- name\":\"(.*?)\"
- $1$
- -1
-
-
+
false
- simple_product_skus
- sku\":\"(.*?)\"
+ category_list_id
+ \{\"id\":(\d+),
$1$
-1
-
-
- simple_product_ids
- simple_product_id
- true
-
-
-
- 1
- 1
- simple_products_counter
- false
-
-
- import java.util.ArrayList;
-import java.util.HashMap;
-import org.apache.commons.codec.binary.Base64;
+
+ category_list_id
+ category_id
+ true
+
+
+
+ import java.util.ArrayList;
-// If it is first iteration of cycle then recreate productList
-if (1 == Integer.parseInt(vars.get("simple_products_counter"))) {
- productList = new ArrayList();
- props.put("simple_products_list", productList);
-} else {
- productList = props.get("simple_products_list");
+adminCategoryIdsList = props.get("admin_category_ids_list");
+// If it is first iteration of cycle then recreate categories ids list
+if (adminCategoryIdsList == null) {
+ adminCategoryIdsList = new ArrayList();
+ props.put("admin_category_ids_list", adminCategoryIdsList);
}
-String productUrl = vars.get("request_protocol") + "://" + vars.get("host") + vars.get("base_path") + vars.get("simple_products_url_keys_" + vars.get("simple_products_counter"))+ vars.get("url_suffix");
-encodedUrl = Base64.encodeBase64(productUrl.getBytes());
-// Create product map
-Map productMap = new HashMap();
-productMap.put("id", vars.get("simple_product_id"));
-productMap.put("title", vars.get("simple_product_names_" + vars.get("simple_products_counter")));
-productMap.put("sku", vars.get("simple_product_skus_" + vars.get("simple_products_counter")));
-productMap.put("url_key", vars.get("simple_products_url_keys_" + vars.get("simple_products_counter")));
-productMap.put("uenc", new String(encodedUrl));
-
-// Collect products map in products list
-productList.add(productMap);
- false
-
-
+adminCategoryIdsList.add(vars.get("category_id"));
+ false
+
+
+
-
- mpaf/tool/fragments/ce/setup/extract_admin_users.jmx
-
+
+ Boolean stopTestOnError (String error) {
+ log.error(error);
+ System.out.println(error);
+ SampleResult.setStopTest(true);
+ return false;
+}
+
+if (props.get("simple_products_list") == null) {
+ return stopTestOnError("Cannot find simple products. Test stopped.");
+}
+if (props.get("simple_products_list_for_edit") == null) {
+ return stopTestOnError("Cannot find simple products for edit. Test stopped.");
+}
+if (props.get("configurable_products_list") == null) {
+ return stopTestOnError("Cannot find configurable products. Test stopped.");
+}
+if (props.get("configurable_products_list_for_edit") == null) {
+ return stopTestOnError("Cannot find configurable products for edit. Test stopped.");
+}
+if (props.get("customer_emails_list") == null) {
+ return stopTestOnError("Cannot find customer emails. Test stopped.");
+}
+if (props.get("category_url_keys_list") == null) {
+ return stopTestOnError("Cannot find category url keys. Test stopped.");
+}
+if (props.get("category_names_list") == null) {
+ return stopTestOnError("Cannot find category names. Test stopped.");
+}
+if (props.get("cms_pages") == null) {
+ return stopTestOnError("Cannot find cms pages. Test stopped.");
+}
+
+ false
+ mpaf/tool/fragments/ce/setup/validate_properties.jmx
+
+
+
+
+ true
+ 1
+ =
+ true
+ product
+
+
+ true
+ =
+ true
+ related_product
+
+
+ true
+ 1
+ =
+ true
+ qty
+
+
+ true
+ ${form_key}
+ =
+ true
+ form_key
+
+
+
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}checkout/cart/add
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/setup/warmup_add_to_cart.jmx
+
+
+
+
+ true
+ ["customer_form_login"]
+ =
+ true
+ blocks
+
+
+ true
+ ["default","customer_account_login"]
+ =
+ true
+ handles
+
+
+ true
+ {"route":"customer","controller":"account","action":"login","uri":"/customer/account/login/"}
+ =
+ true
+ originalRequest
+
+
+ true
+ true
+ =
+ true
+ ajax
+
+
+ true
+ true
+ =
+ true
+ isAjax
+
+
+
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}page_cache/block/render/
+ GET
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/setup/ajax_load_login_form.jmx
-
-
-
-
- false
- ${admin_form_key}
- =
- true
- form_key
+
+
+ "customer_form_login"
+ Registered Customers
+ form_key
+
+ Assertion.response_data
+ false
+ 2
+
+
+
+
+
+ continue
+
+ false
+ ${loops}
-
-
- 60000
- 200000
- ${request_protocol}
- ${base_path}${admin_path}/admin/user/roleGrid/limit/200/?ajax=true&isAjax=true
- POST
- true
- false
- true
- false
- false
-
-
- false
- import java.util.regex.Pattern;
- import java.util.regex.Matcher;
- import java.util.LinkedList;
-
- LinkedList adminUserList = new LinkedList();
- String response = new String(data);
- Pattern pattern = Pattern.compile("<td\\W*?data-column=.username[^>]*?>\\W*?(\\w+)\\W*?<");
- Matcher matcher = pattern.matcher(response);
+ ${frontendPoolUsers}
+ ${ramp_period}
+ 1505803944000
+ 1505803944000
+ false
+ mpaf/tool/fragments/_system/thread_group.jmx
+
+
+ javascript
+ var cacheHitPercent = vars.get("cache_hits_percentage");
- while (matcher.find()) {
- adminUserList.add(matcher.group(1));
- }
+if (
+ cacheHitPercent < 100 &&
+ sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+ doCache();
+}
- adminUserList.poll();
- props.put("adminUserList", adminUserList);
- props.put("adminUserListIterator", adminUserList.descendingIterator());
-
-
-
-
-
-
- mpaf/tool/fragments/ce/setup/extract_customers.jmx
-
-
-
-
-
- 60000
- 200000
- ${request_protocol}
- ${base_path}${admin_path}/customer/index/
- GET
- true
- false
- true
- false
- false
-
-
-
- true
- import org.apache.jmeter.protocol.http.control.CookieManager;
-import org.apache.jmeter.protocol.http.control.Cookie;
-CookieManager manager = sampler.getCookieManager();
-Cookie cookie = new Cookie("adminhtml",vars.get("COOKIE_adminhtml"),vars.get("host"),"/",false,0);
-manager.add(cookie);
-
-
-
- Customers
- <title>Customers / Customers / Magento Admin</title>
-
- Assertion.response_data
- false
- 2
-
-
-
-
-
-
- true
- customer_listing
- =
- true
- namespace
-
-
- true
- entity_id
- =
- true
- sorting[field]
-
-
- true
- asc
- =
- true
- sorting[direction]
-
-
- true
- true
- =
- true
- isAjax
-
-
- true
- customer_since[locale]=en_US
- =
- true
- filters[placeholder]
-
-
- true
- 1
- =
- true
- filters[group_id]
-
-
- true
- 1
- =
- true
- filters[website_id]
-
-
- true
- ${customers_page_size}
- =
- true
- paging[pageSize]
-
-
- true
- 1
- =
- true
- paging[current]
-
-
- true
- entity_id
- =
- true
- sorting[field]
-
-
- true
- asc
- =
- true
- sorting[direction]
-
-
- true
- true
- =
- true
- isAjax
-
-
-
- 60000
- 200000
- ${request_protocol}
- ${base_path}${admin_path}/mui/index/render/
- GET
- true
- false
- true
- false
- false
-
-
-
- $.totalRecords
- 0
- true
- false
- true
- true
-
-
- customer_emails
- $.items[*].email
- BODY
-
-
- customer_ids
- $.items[*].entity_id
- BODY
-
-
- false
- import java.util.LinkedList;
-LinkedList emailsList = new LinkedList();
-props.put("customer_emails_list", emailsList);
-
-
-
- customer_emails
- customer_email
- true
-
-
-
- 1
- 1
- email_counter
- false
-
-
-
-try {
-
-props.get("customer_emails_list").add(vars.get("customer_email"));
-
-} catch (java.lang.Exception e) {
- log.error("error…", e);
- SampleResult.setStopThread(true);
-}
-
- false
-
-
-
- customer_ids
- customer_id
- true
-
-
-
- 1
- 1
- id_counter
- false
-
-
- import java.util.ArrayList;
-
-// If it is first iteration of cycle then recreate idsList
-if (1 == Integer.parseInt(vars.get("id_counter"))) {
- idsList = new ArrayList();
- props.put("customer_ids_list", idsList);
-} else {
- idsList = props.get("customer_ids_list");
-}
-idsList.add(vars.get("customer_id"));
- false
-
-
-
-
-
- mpaf/tool/fragments/ce/setup/extract_region_ids.jmx
-
-
-
-
-
-
- false
- US
- =
- true
- parent
-
-
-
- ${request_protocol}
- ${base_path}${admin_path}/directory/json/countryRegion/
- GET
- true
- false
- true
- false
- false
-
-
-
- groovy
- import groovy.json.JsonSlurper
-def jsonSlurper = new JsonSlurper();
-def regionResponse = jsonSlurper.parseText(prev.getResponseDataAsString());
-
-regionResponse.each { region ->
- if (region.label.toString() == "Alabama") {
- props.put("alabama_region_id", region.value.toString());
- } else if (region.label.toString() == 'California') {
- props.put("california_region_id", region.value.toString());
- }
-}
-
-
-
-
-
- Boolean stopTestOnError (String error) {
- log.error(error);
- System.out.println(error);
- SampleResult.setStopTest(true);
- return false;
-}
-
-if (props.get("simple_products_list") == null) {
- return stopTestOnError("Cannot find simple products. Test stopped.");
-}
-if (props.get("simple_products_list_for_edit") == null) {
- return stopTestOnError("Cannot find simple products for edit. Test stopped.");
-}
-if (props.get("configurable_products_list") == null) {
- return stopTestOnError("Cannot find configurable products. Test stopped.");
-}
-if (props.get("configurable_products_list_for_edit") == null) {
- return stopTestOnError("Cannot find configurable products for edit. Test stopped.");
-}
-if (props.get("customer_emails_list") == null) {
- return stopTestOnError("Cannot find customer emails. Test stopped.");
-}
-if (props.get("category_url_keys_list") == null) {
- return stopTestOnError("Cannot find category url keys. Test stopped.");
-}
-if (props.get("category_names_list") == null) {
- return stopTestOnError("Cannot find category names. Test stopped.");
-}
-
- false
- mpaf/tool/fragments/ce/setup/validate_properties.jmx
-
-
-
-
- true
- 1
- =
- true
- product
-
-
- true
- =
- true
- related_product
-
-
- true
- 1
- =
- true
- qty
-
-
- true
- ${form_key}
- =
- true
- form_key
-
-
-
- 60000
- 200000
- ${request_protocol}
- ${base_path}checkout/cart/add
- POST
- true
- false
- true
- false
- false
- mpaf/tool/fragments/ce/setup/warmup_add_to_cart.jmx
-
-
-
-
- false
- ["customer_form_login"]
- =
- true
- blocks
-
-
- false
- ["default","customer_account_login"]
- =
- true
- handles
-
-
- false
- {"route":"customer","controller":"account","action":"login","uri":"/customer/account/login/"}
- =
- true
- originalRequest
-
-
- true
- true
- =
- true
- ajax
-
-
- true
- true
- =
- true
- isAjax
-
-
-
- 60000
- 200000
- ${request_protocol}
- ${base_path}page_cache/block/render/
- GET
- true
- false
- true
- false
- false
- mpaf/tool/fragments/ce/setup/ajax_load_login_form.jmx
-
-
-
- "customer_form_login"
- Registered Customers
- form_key
-
- Assertion.response_data
- false
- 2
-
-
-
-
-
- continue
-
- false
- ${loops}
-
- ${frontendPoolUsers}
- ${ramp_period}
- 1505803944000
- 1505803944000
- false
- mpaf/tool/fragments/_system/thread_group.jmx
-
-
- javascript
- var cacheHitPercent = vars.get("cache_hits_percentage");
-
-if (
- cacheHitPercent < 100 &&
- sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
- doCache();
-}
-
-function doCache(){
- var random = Math.random() * 100;
- if (cacheHitPercent < random) {
- sampler.setPath(sampler.getPath() + "?cacheModifier=" + Math.random().toString(36).substring(2, 13));
- }
-}
-
- mpaf/tool/fragments/ce/common/cache_hit_miss.jmx
- mpaf/tool/fragments/ce/common/cache_hit_miss.jmx
+
1
@@ -2719,22 +2454,24 @@ vars.putObject("randomIntGenerator", random);
-
-import java.util.Random;
+
+ javascript
+ random = vars.getObject("randomIntGenerator");
-Random random = vars.getObject("randomIntGenerator");
-number = random.nextInt(props.get("category_url_keys_list").size());
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
-vars.put("category_url_key", props.get("category_url_keys_list").get(number));
-vars.put("category_name", props.get("category_names_list").get(number));
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
- false
- mpaf/tool/fragments/ce/common/extract_category_setup.jmx
- mpaf/tool/fragments/ce/common/extract_category_setup.jmx
+
get-email
mpaf/tool/fragments/ce/lock_controller.jmx
@@ -3251,22 +2988,24 @@ vars.putObject("randomIntGenerator", random);
-
-import java.util.Random;
+
+ javascript
+ random = vars.getObject("randomIntGenerator");
-Random random = vars.getObject("randomIntGenerator");
-number = random.nextInt(props.get("category_url_keys_list").size());
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
-vars.put("category_url_key", props.get("category_url_keys_list").get(number));
-vars.put("category_name", props.get("category_names_list").get(number));
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
- false
- mpaf/tool/fragments/ce/common/extract_category_setup.jmx
- mpaf/tool/fragments/ce/common/extract_category_setup.jmx
+
-
-import java.util.Random;
+
+ javascript
+ random = vars.getObject("randomIntGenerator");
-Random random = vars.getObject("randomIntGenerator");
-number = random.nextInt(props.get("category_url_keys_list").size());
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
-vars.put("category_url_key", props.get("category_url_keys_list").get(number));
-vars.put("category_name", props.get("category_names_list").get(number));
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
- false
- mpaf/tool/fragments/ce/common/extract_category_setup.jmx
- mpaf/tool/fragments/ce/common/extract_category_setup.jmx
+
-
-import java.util.Random;
+
+ javascript
+ random = vars.getObject("randomIntGenerator");
-Random random = vars.getObject("randomIntGenerator");
-number = random.nextInt(props.get("category_url_keys_list").size());
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
-vars.put("category_url_key", props.get("category_url_keys_list").get(number));
-vars.put("category_name", props.get("category_names_list").get(number));
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
- false
- mpaf/tool/fragments/ce/common/extract_category_setup.jmx
- mpaf/tool/fragments/ce/common/extract_category_setup.jmx
+
-
-import java.util.Random;
+
+ javascript
+ random = vars.getObject("randomIntGenerator");
-Random random = vars.getObject("randomIntGenerator");
-number = random.nextInt(props.get("category_url_keys_list").size());
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
-vars.put("category_url_key", props.get("category_url_keys_list").get(number));
-vars.put("category_name", props.get("category_names_list").get(number));
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
- false
- mpaf/tool/fragments/ce/common/extract_category_setup.jmx
- mpaf/tool/fragments/ce/common/extract_category_setup.jmx
+
-
-import java.util.Random;
+
+ javascript
+ random = vars.getObject("randomIntGenerator");
-Random random = vars.getObject("randomIntGenerator");
-number = random.nextInt(props.get("category_url_keys_list").size());
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
-vars.put("category_url_key", props.get("category_url_keys_list").get(number));
-vars.put("category_name", props.get("category_names_list").get(number));
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
- false
- mpaf/tool/fragments/ce/common/extract_category_setup.jmx
- mpaf/tool/fragments/ce/common/extract_category_setup.jmx
+
get-email
mpaf/tool/fragments/ce/lock_controller.jmx
@@ -9500,22 +9247,24 @@ vars.put("totalProductsAdded", "0");
-
-import java.util.Random;
+
+ javascript
+ random = vars.getObject("randomIntGenerator");
-Random random = vars.getObject("randomIntGenerator");
-number = random.nextInt(props.get("category_url_keys_list").size());
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
-vars.put("category_url_key", props.get("category_url_keys_list").get(number));
-vars.put("category_name", props.get("category_names_list").get(number));
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
- false
- mpaf/tool/fragments/ce/common/extract_category_setup.jmx
- mpaf/tool/fragments/ce/common/extract_category_setup.jmx
+
get-email
mpaf/tool/fragments/ce/lock_controller.jmx
@@ -38496,78 +38245,2318 @@ vars.put("configurable_sku", "Configurable Product - ${__time(YMD)}-${__threadNu
mpaf/tool/fragments/ce/api/header_manager.jmx
- true
-
-
-
- false
- {"query":"{\n products(\n filter: {\n price: {gt: \"10\"}\n or: {\n sku:{like:\"%Product%\"}\n name:{like:\"%Configurable Product%\"}\n }\n }\n pageSize: 200\n currentPage: 1\n sort: {\n price: ASC\n name:DESC\n }\n ) {\n total_count\n items {\n attribute_set_id\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n short_description {\n html\n }\n sku\n small_image {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n \t... on PhysicalProductInterface {\n \tweight\n \t}\n }\n page_info {\n page_size\n current_page\n }\n }\n}\n","variables":null,"operationName":null}
- =
-
-
-
- ${request_protocol}
- ${base_path}graphql
- POST
- true
- false
- true
- false
- false
- mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_filter_only.jmx
-
-
-
- graphql_multiple_products_query_total_count
- $.data.products.total_count
- BODY
-
-
- String totalCount=vars.get("graphql_multiple_products_query_total_count");
- if (totalCount == null) {
- Failure = true;
- FailureMessage = "Not Expected \"totalCount\" to be null";
- } else {
- if (Integer.parseInt(totalCount) < 200) {
- Failure = true;
- FailureMessage = "Expected \"totalCount\" to be greater than 200, Actual: " + totalCount;
- } else {
- Failure = false;
- }
- }
-
- false
-
-
-
-
+
+ true
+
+
+
+ false
+ {"query":"{\n products(\n filter: {\n price: {gt: \"10\"}\n or: {\n sku:{like:\"%Product%\"}\n name:{like:\"%Configurable Product%\"}\n }\n }\n pageSize: 20\n currentPage: 0\n sort: {\n price: ASC\n name:DESC\n }\n ) {\n total_count\n items {\n attribute_set_id\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n short_description {\n html\n }\n sku\n small_image {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n \t... on PhysicalProductInterface {\n \tweight\n \t}\n }\n page_info {\n page_size\n current_page\n }\n }\n}\n","variables":null,"operationName":null}
+ =
+
+
+
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_filter_only.jmx
+
+
+
+ graphql_multiple_products_query_total_count
+ $.data.products.total_count
+ BODY
+
+
+ String totalCount=vars.get("graphql_multiple_products_query_total_count");
+ if (totalCount == null) {
+ Failure = true;
+ FailureMessage = "Not Expected \"totalCount\" to be null";
+ } else {
+ if (Integer.parseInt(totalCount) < 200) {
+ Failure = true;
+ FailureMessage = "Expected \"totalCount\" to be greater than 200, Actual: " + totalCount;
+ } else {
+ Failure = false;
+ }
+ }
+
+ false
+
+
+
+
+ true
+
+
+
+ false
+ {"query":"{\n products(filter: {sku: { eq: \"${simple_product_sku}\" } })\n {\n total_count\n items {\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n ... on PhysicalProductInterface {\n \t\t\tweight\n \t\t }\n }\n }\n}\n","variables":null,"operationName":null}
+ =
+
+
+
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/query_simple_product_with_extensible_data_objects.jmx
+
+
+
+ graphql_simple_products_query_total_count
+ $.data.products.total_count
+ BODY
+
+
+ graphql_multiple_products_query_response
+ $
+ BODY
+
+
+ String totalCount=vars.get("graphql_simple_products_query_total_count");
+
+if (totalCount == null) {
+ Failure = true;
+ FailureMessage = "Not Expected \"totalCount\" to be null";
+} else {
+ if (Integer.parseInt(totalCount) != 1) {
+ Failure = true;
+ FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
+ } else {
+ Failure = false;
+ }
+}
+
+ false
+
+
+ $.data.products.items[0].sku
+ ${simple_product_sku}
+ true
+ false
+ false
+ true
+
+
+
+
+ true
+
+
+
+ false
+ {"query":"{\n products(filter: {sku: {eq:\"${configurable_product_sku}\"} }) {\n total_count\n items {\n ... on PhysicalProductInterface {\n weight\n }\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n ... on ConfigurableProduct {\n configurable_options {\n id\n attribute_id\n label\n position\n use_default\n attribute_code\n values {\n value_index\n label\n store_label\n default_label\n use_default_value\n }\n product_id\n }\n variants {\n product {\n ... on PhysicalProductInterface {\n weight\n }\n sku\n color\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n\n\n }\n attributes {\n label\n code\n value_index\n }\n }\n }\n }\n }\n}\n","variables":null,"operationName":null}
+ =
+
+
+
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/query_configurable_product_with_extensible_data_objects.jmx
+
+
+
+ graphql_configurable_products_query_total_count
+ $.data.products.total_count
+ BODY
+
+
+ String totalCount=vars.get("graphql_configurable_products_query_total_count");
+
+if (totalCount == null) {
+ Failure = true;
+ FailureMessage = "Not Expected \"totalCount\" to be null";
+} else {
+ if (Integer.parseInt(totalCount) != 1) {
+ Failure = true;
+ FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
+ } else {
+ Failure = false;
+ }
+}
+
+
+
+ false
+
+
+ $.data.products.items[0].sku
+ ${configurable_product_sku}
+ true
+ false
+ false
+ true
+
+
+
+
+ true
+
+
+
+ false
+ {"query":"{\n products(\n pageSize:20\n currentPage:0\n search: \"configurable\"\n filter: {name: {like: \"Configurable Product%\"} }\n ) {\n total_count\n items {\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n ... on PhysicalProductInterface {\n \t\t\tweight\n \t\t\t}\n ... on ConfigurableProduct {\n configurable_options {\n id\n attribute_id\n label\n position\n use_default\n attribute_code\n values {\n value_index\n label\n store_label\n default_label\n use_default_value\n }\n product_id\n }\n variants {\n product {\n ... on PhysicalProductInterface {\n weight\n }\n sku\n color\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n\n\n }\n attributes {\n label\n code\n value_index\n }\n }\n }\n }\n }\n}\n","variables":null,"operationName":null}
+ =
+
+
+
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_full_text_and_filter.jmx
+
+
+
+ graphql_search_products_query_total_count_fulltext_filter
+ $.data.products.total_count
+ BODY
+
+
+ String totalCount=vars.get("graphql_search_products_query_total_count_fulltext_filter");
+
+if (totalCount == null) {
+ Failure = true;
+ FailureMessage = "Not Expected \"totalCount\" to be null";
+} else {
+ if (Integer.parseInt(totalCount) < 1) {
+ Failure = true;
+ FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
+ } else {
+ Failure = false;
+ }
+}
+
+
+
+ false
+
+
+
+
+ true
+
+
+
+ false
+ {"query":"{\n products(\n pageSize:20\n currentPage:0\n search: \"configurable\") {\n total_count\n items {\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n ... on PhysicalProductInterface {\n \t\t\tweight\n \t\t\t}\n ... on ConfigurableProduct {\n configurable_options {\n id\n attribute_id\n label\n position\n use_default\n attribute_code\n values {\n value_index\n label\n store_label\n default_label\n use_default_value\n }\n product_id\n }\n variants {\n product {\n ... on PhysicalProductInterface {\n weight\n }\n sku\n color\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n\n\n }\n attributes {\n label\n code\n value_index\n }\n }\n }\n }\n }\n}\n","variables":null,"operationName":null}
+ =
+
+
+
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_full_text_only.jmx
+
+
+
+ graphql_search_products_query_total_count
+ $.data.products.total_count
+ BODY
+
+
+ String totalCount=vars.get("graphql_search_products_query_total_count");
+
+if (totalCount == null) {
+ Failure = true;
+ FailureMessage = "Not Expected \"totalCount\" to be null";
+} else {
+ if (Integer.parseInt(totalCount) < 1) {
+ Failure = true;
+ FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
+ } else {
+ Failure = false;
+ }
+}
+
+
+
+ false
+
+
+
+
+ true
+
+
+
+ false
+ {"query":"{\n products(\n pageSize:20\n currentPage:0\n search: \"Option 1\") {\n filters {\n name\n filter_items_count\n request_var\n filter_items {\n label\n value_string\n items_count\n ... on SwatchLayerFilterItemInterface {\n swatch_data {\n type\n value\n }\n }\n }\n }\n total_count\n items {\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n ... on PhysicalProductInterface {\n weight\n }\n ... on ConfigurableProduct {\n configurable_options {\n id\n attribute_id\n label\n position\n use_default\n attribute_code\n values {\n value_index\n label\n store_label\n default_label\n use_default_value\n }\n product_id\n }\n variants {\n product {\n ... on PhysicalProductInterface {\n weight\n }\n sku\n color\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n\n\n }\n attributes {\n label\n code\n value_index\n }\n }\n }\n }\n }\n}","variables":null,"operationName":null}
+ =
+
+
+
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_full_text_and_filters.jmx
+
+
+
+ graphql_search_products_query_total_count
+ $.data.products.total_count
+ BODY
+
+
+ String totalCount=vars.get("graphql_search_products_query_total_count");
+
+if (totalCount == null) {
+ Failure = true;
+ FailureMessage = "Not Expected \"totalCount\" to be null";
+} else {
+ if (Integer.parseInt(totalCount) < 1) {
+ Failure = true;
+ FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
+ } else {
+ Failure = false;
+ }
+}
+
+
+
+ false
+
+
+
+
+ true
+
+
+
+ false
+ {"query":"{\nproducts(filter: {sku: {eq:\"${bundle_product_sku}\"} }) {\n total_count\n items {\n ... on PhysicalProductInterface {\n weight\n }\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n ... on BundleProduct {\n weight\n price_view\n dynamic_price\n dynamic_sku\n ship_bundle_items\n dynamic_weight\n items {\n option_id\n title\n required\n type\n position\n sku\n options {\n id\n qty\n position\n is_default\n price\n price_type\n can_change_quantity\n product {\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n }\n }\n }\n }\n }\n }\n}\n","variables":null,"operationName":null}
+ =
+
+
+
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/query_bundle_product_with_extensible_data_objects.jmx
+
+
+
+ graphql_bundle_products_query_total_count
+ $.data.products.total_count
+ BODY
+
+
+ String totalCount=vars.get("graphql_bundle_products_query_total_count");
+
+ if (totalCount == null) {
+ Failure = true;
+ FailureMessage = "Not Expected \"totalCount\" to be null";
+ } else {
+ if (Integer.parseInt(totalCount) != 1) {
+ Failure = true;
+ FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
+ } else {
+ Failure = false;
+ }
+ }
+
+
+
+ false
+
+
+ $.data.products.items[0].sku
+ ${bundle_product_sku}
+ true
+ false
+ false
+ false
+
+
+
+
+ true
+
+
+
+ false
+ {"query":"{\n products(filter: {sku: { eq: \"${downloadable_product_sku}\" } })\n {\n total_count\n items {\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n ... on PhysicalProductInterface {\n \t\t\tweight\n \t\t }\n ... on DownloadableProduct {\n links_purchased_separately\n links_title\n downloadable_product_samples {\n id\n title\n sort_order\n sample_type\n sample_file\n sample_url\n }\n downloadable_product_links {\n id\n title\n sort_order\n is_shareable\n price\n number_of_downloads\n link_type\n sample_type\n sample_file\n sample_url\n }\n }\n }\n }\n}\n","variables":null,"operationName":null}
+ =
+
+
+
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/query_downloadable_product_with_extensible_data_objects.jmx
+
+
+
+ graphql_downloadable_products_query_total_count
+ $.data.products.total_count
+ BODY
+
+
+ String totalCount=vars.get("graphql_downloadable_products_query_total_count");
+
+ if (totalCount == null) {
+ Failure = true;
+ FailureMessage = "Not Expected \"totalCount\" to be null";
+ } else {
+ if (Integer.parseInt(totalCount) != 1) {
+ Failure = true;
+ FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
+ } else {
+ Failure = false;
+ }
+ }
+
+
+
+ false
+
+
+ $.data.products.items[0].sku
+ ${downloadable_product_sku}
+ true
+ false
+ false
+ true
+
+
+ $.data.products.items[0].downloadable_product_samples..title
+ ["sample1","sample2"]
+ true
+ false
+ false
+ false
+
+
+ $.data.products.items[0].downloadable_product_samples..title
+ ["sample1","sample2"]
+ true
+ false
+ false
+ false
+
+
+
+
+ true
+
+
+
+ false
+ {"query":"{\n products(filter: {sku: { eq: \"${virtual_product_sku}\" } })\n {\n total_count\n items {\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n ... on PhysicalProductInterface {\n \t\t\tweight\n \t\t }\n }\n }\n}\n","variables":null,"operationName":null}
+ =
+
+
+
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/query_virtual_product_with_extensible_data_objects.jmx
+
+
+
+ graphql_virtual_products_query_total_count
+ $.data.products.total_count
+ BODY
+
+
+ String totalCount=vars.get("graphql_virtual_products_query_total_count");
+
+if (totalCount == null) {
+ Failure = true;
+ FailureMessage = "Not Expected \"totalCount\" to be null";
+} else {
+ if (Integer.parseInt(totalCount) != 1) {
+ Failure = true;
+ FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
+ } else {
+ Failure = false;
+ }
+}
+
+ false
+
+
+ $.data.products.items[0].sku
+ ${virtual_product_sku}
+ true
+ false
+ false
+ true
+
+
+
+
+ true
+
+
+
+ false
+ {"query":"{\nproducts(filter: {sku: {eq:\"${grouped_product_sku}\"} }) {\n total_count\n items {\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n ... on GroupedProduct {\n weight\n items {\n qty\n position\n product {\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n }\n }\n }\n }\n }\n}\n","variables":null,"operationName":null}
+ =
+
+
+
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/query_grouped_product_with_extensible_data_objects.jmx
+
+
+
+ graphql_grouped_products_query_total_count
+ $.data.products.total_count
+ BODY
+
+
+ String totalCount=vars.get("graphql_grouped_products_query_total_count");
+
+ if (totalCount == null) {
+ Failure = true;
+ FailureMessage = "Not Expected \"totalCount\" to be null";
+ } else {
+ if (Integer.parseInt(totalCount) != 1) {
+ Failure = true;
+ FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
+ } else {
+ Failure = false;
+ }
+ }
+
+
+
+ false
+
+
+ $.data.products.items[0].sku
+ ${grouped_product_sku}
+ true
+ false
+ false
+ true
+
+
+
+
+
+ true
+
+
+
+ false
+ {
+ "customer": {
+
+ "email": "customer_${__time()}-${__threadNum}-${__Random(1,1000000)}@example.com",
+ "firstname": "test_${__time()}-${__threadNum}-${__Random(1,1000000)}",
+ "lastname": "Doe"
+ },
+ "password": "test@123"
+ }
+ =
+
+
+
+ ${request_protocol}
+ ${base_path}rest/default/V1/customers
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/query_frontend_customer.jmx
+
+
+
+ customer_id
+ $.id
+ BODY
+
+
+
+ ^\d+$
+
+ Assertion.response_data
+ false
+ 1
+ variable
+ customer_id
+
+
+
+
+
+ ${request_protocol}
+ ${base_path}rest/default/V1/customers/${customer_id}
+ GET
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/api/check_customer.jmx
+
+
+
+ $.id
+ ${customer_id}
+ true
+ false
+ false
+ true
+
+
+ customer_email
+ $.email
+ BODY
+
+
+
+ true
+
+
+
+ false
+ {
+ "username":"${customer_email}",
+ "password":"test@123"
+ }
+
+ =
+
+
+
+ ${request_protocol}
+ ${base_path}rest/default/V1/integration/customer/token
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/api/create_customer.jmx
+
+
+
+ customer_token
+ $
+ BODY
+
+
+
+ true
+
+
+
+ false
+ {"query":"{\n customer {\n created_at\n group_id\n\n prefix\n firstname\n middlename\n lastname\n suffix\n email\n default_billing\n default_shipping\n\n dob\n taxvat\n\n id\n addresses {\n id\n customer_id\n region {\n region_code\n region\n region_id\n }\n region_id\n country_id\n street \n company\n telephone\n fax\n postcode\n city\n firstname\n lastname\n middlename\n prefix\n suffix\n vat_id\n default_shipping\n default_billing\n }\n is_subscribed\n }\n}","variables":null,"operationName":null}
+ =
+
+
+
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/query_frontend_customer.jmx
+
+
+
+ false
+ import org.apache.jmeter.protocol.http.control.Header;
+
+ sampler.getHeaderManager().removeHeaderNamed("Authorization");
+
+ sampler.getHeaderManager().add(new Header("Authorization","Bearer " + vars.get("customer_token")));
+
+
+ $.data.customer.lastname
+ Doe
+ true
+ false
+ false
+ true
+
+
+
+
+
+ true
+
+
+
+ false
+ {"query":"{\n category(id: 1) {\n name\n id\n level\n description\n path\n path_in_store\n url_key\n url_path\n children {\n id\n description\n default_sort_by\n children {\n id\n description\n level\n children {\n level\n id\n children {\n id\n }\n }\n }\n }\n }\n}","variables":null,"operationName":null}
+ =
+
+
+
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/query_root_category.jmx
+
+
+
+ graphql_category_query_name
+ $.data.category.name
+ BODY
+
+
+ String name = vars.get("graphql_category_query_name");
+if (name == null) {
+ Failure = true;
+ FailureMessage = "Not Expected \"children\" to be null";
+} else {
+ if (!name.equals("Root Catalog")) {
+ Failure = true;
+ FailureMessage = "Expected \"name\" to equal \"Root Catalog\", Actual: " + name;
+ } else {
+ Failure = false;
+ }
+}
+
+ false
+
+
+
+
+
+
+
+
+
+ continue
+
+ false
+ ${loops}
+
+ ${graphQLPoolUsers}
+ ${ramp_period}
+ 1505803944000
+ 1505803944000
+ false
+ mpaf/tool/fragments/_system/thread_group.jmx
+
+
+ 1
+ false
+ 1
+ ${graphqlGetListOfProductsByCategoryIdPercentage}
+ mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx
+
+
+
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+ && sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+ if (sampler.getName().indexOf(testLabel) == -1) {
+ sampler.setName(sampler.getName() + testLabel);
+ }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+ sampler.setName("SetUp - " + sampler.getName());
+}
+
+ javascript
+ mpaf/tool/fragments/_system/setup_label.jmx
+
+
+ vars.put("testLabel", "Get List of Products by category_id");
+
+ true
+
+
+
+
+ Content-Type
+ application/json
+
+
+ Accept
+ */*
+
+
+ mpaf/tool/fragments/ce/api/header_manager_before_token.jmx
+
+ mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx
+
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} > 0) {
+ random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+
+ true
+
+
+ javascript
+ random = vars.getObject("randomIntGenerator");
+
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
+
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
+
+ mpaf/tool/fragments/ce/common/extract_category_setup.jmx
+
+ true
+
+
+
+ false
+ {"query":"query category($id: Int!, $currentPage: Int, $pageSize: Int) {\n category(id: $id) {\n product_count\n description\n url_key\n name\n id\n breadcrumbs {\n category_name\n category_url_key\n __typename\n }\n products(pageSize: $pageSize, currentPage: $currentPage) {\n total_count\n items {\n id\n name\n # small_image\n # short_description\n url_key\n special_price\n special_from_date\n special_to_date\n price {\n regularPrice {\n amount {\n value\n currency\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n }\n}\n","variables":{"id":${category_id},"currentPage":1,"pageSize":12},"operationName":"category"}
+ =
+
+
+
+ ${graphql_port_number}
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/get_list_of_products_by_category_id.jmx
+
+
+
+
+ "name":"${category_name}","id":${category_id},
+
+ Assertion.response_data
+ false
+ 2
+
+
+
+
+
+
+ 1
+ false
+ 1
+ ${graphqlGetSimpleProductDetailsByProductUrlKeyPercentage}
+ mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx
+
+
+
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+ && sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+ if (sampler.getName().indexOf(testLabel) == -1) {
+ sampler.setName(sampler.getName() + testLabel);
+ }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+ sampler.setName("SetUp - " + sampler.getName());
+}
+
+ javascript
+ mpaf/tool/fragments/_system/setup_label.jmx
+
+
+ vars.put("testLabel", "Get Simple Product Details by product_url_key");
+
+ true
+
+
+
+
+ Content-Type
+ application/json
+
+
+ Accept
+ */*
+
+
+ mpaf/tool/fragments/ce/api/header_manager_before_token.jmx
+
+ mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx
+
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} > 0) {
+ random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+
+ true
+
+
+
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("simple_products_list").size());
+product = props.get("simple_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+
+ true
+ mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx
+
+ true
+
+
+
+ false
+ {"query":"query productDetail($urlKey: String, $onServer: Boolean!) {\n productDetail: products(filter: { url_key: { eq: $urlKey } }) {\n items {\n sku\n name\n price {\n regularPrice {\n amount {\n currency\n value\n }\n }\n }\n description {html}\n media_gallery_entries {\n label\n position\n disabled\n file\n }\n ... on ConfigurableProduct {\n configurable_options {\n attribute_code\n attribute_id\n id\n label\n values {\n default_label\n label\n store_label\n use_default_value\n value_index\n }\n }\n variants {\n product {\n id\n media_gallery_entries {\n disabled\n file\n label\n position\n }\n sku\n stock_status\n }\n }\n }\n meta_title @include(if: $onServer)\n # Yes, Products have `meta_keyword` and\n # everything else has `meta_keywords`.\n meta_keyword @include(if: $onServer)\n meta_description @include(if: $onServer)\n }\n }\n}","variables":{"urlKey":"${product_url_key}","onServer":false},"operationName":"productDetail"}
+ =
+
+
+
+ ${graphql_port_number}
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/get_simple_product_details_by_product_url_key.jmx
+
+
+
+
+ "sku":"${product_sku}","name":"${product_name}"
+
+ Assertion.response_data
+ false
+ 2
+
+
+
+
+
+
+ 1
+ false
+ 1
+ ${graphqlGetSimpleProductDetailsByNamePercentage}
+ mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx
+
+
+
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+ && sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+ if (sampler.getName().indexOf(testLabel) == -1) {
+ sampler.setName(sampler.getName() + testLabel);
+ }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+ sampler.setName("SetUp - " + sampler.getName());
+}
+
+ javascript
+ mpaf/tool/fragments/_system/setup_label.jmx
+
+
+ vars.put("testLabel", "Get Simple Product Details by name");
+
+ true
+
+
+
+
+ Content-Type
+ application/json
+
+
+ Accept
+ */*
+
+
+ mpaf/tool/fragments/ce/api/header_manager_before_token.jmx
+
+ mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx
+
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} > 0) {
+ random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+
+ true
+
+
+
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("simple_products_list").size());
+product = props.get("simple_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+
+ true
+ mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx
+
+ true
+
+
+
+ false
+ {"query":"query productDetail($name: String, $onServer: Boolean!) {\n productDetail: products(filter: { name: { eq: $name } }) {\n items {\n sku\n name\n price {\n regularPrice {\n amount {\n currency\n value\n }\n }\n }\n description {html}\n media_gallery_entries {\n label\n position\n disabled\n file\n }\n ... on ConfigurableProduct {\n configurable_options {\n attribute_code\n attribute_id\n id\n label\n values {\n default_label\n label\n store_label\n use_default_value\n value_index\n }\n }\n variants {\n product {\n id\n media_gallery_entries {\n disabled\n file\n label\n position\n }\n sku\n stock_status\n }\n }\n }\n meta_title @include(if: $onServer)\n # Yes, Products have `meta_keyword` and\n # everything else has `meta_keywords`.\n meta_keyword @include(if: $onServer)\n meta_description @include(if: $onServer)\n }\n }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetail"}
+ =
+
+
+
+ ${graphql_port_number}
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/get_simple_product_details_by_name.jmx
+
+
+
+
+ "sku":"${product_sku}","name":"${product_name}"
+
+ Assertion.response_data
+ false
+ 2
+
+
+
+
+
+
+ 1
+ false
+ 1
+ ${graphqlGetConfigurableProductDetailsByProductUrlKeyPercentage}
+ mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx
+
+
+
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+ && sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+ if (sampler.getName().indexOf(testLabel) == -1) {
+ sampler.setName(sampler.getName() + testLabel);
+ }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+ sampler.setName("SetUp - " + sampler.getName());
+}
+
+ javascript
+ mpaf/tool/fragments/_system/setup_label.jmx
+
+
+ vars.put("testLabel", "Get Configurable Product Detail by product_url_key");
+
+ true
+
+
+
+
+ Content-Type
+ application/json
+
+
+ Accept
+ */*
+
+
+ mpaf/tool/fragments/ce/api/header_manager_before_token.jmx
+
+ mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx
+
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} > 0) {
+ random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+
+ true
+
+
+
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("configurable_products_list").size());
+product = props.get("configurable_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+
+ true
+ mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx
+
+ true
+
+
+
+ false
+ {"query":"query productDetail($urlKey: String, $onServer: Boolean!) {\n productDetail: products(filter: { url_key: { eq: $urlKey } }) {\n items {\n sku\n name\n price {\n regularPrice {\n amount {\n currency\n value\n }\n }\n }\n description {html}\n media_gallery_entries {\n label\n position\n disabled\n file\n }\n ... on ConfigurableProduct {\n configurable_options {\n attribute_code\n attribute_id\n id\n label\n values {\n default_label\n label\n store_label\n use_default_value\n value_index\n }\n }\n variants {\n product {\n id\n media_gallery_entries {\n disabled\n file\n label\n position\n }\n sku\n stock_status\n }\n }\n }\n meta_title @include(if: $onServer)\n # Yes, Products have `meta_keyword` and\n # everything else has `meta_keywords`.\n meta_keyword @include(if: $onServer)\n meta_description @include(if: $onServer)\n }\n }\n}","variables":{"urlKey":"${product_url_key}","onServer":false},"operationName":"productDetail"}
+ =
+
+
+
+ ${graphql_port_number}
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/get_configurable_product_details_by_product_url_key.jmx
+
+
+
+
+ "sku":"${product_sku}","name":"${product_name}"
+
+ Assertion.response_data
+ false
+ 2
+
+
+
+
+
+
+ 1
+ false
+ 1
+ ${graphqlGetConfigurableProductDetailsByNamePercentage}
+ mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx
+
+
+
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+ && sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+ if (sampler.getName().indexOf(testLabel) == -1) {
+ sampler.setName(sampler.getName() + testLabel);
+ }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+ sampler.setName("SetUp - " + sampler.getName());
+}
+
+ javascript
+ mpaf/tool/fragments/_system/setup_label.jmx
+
+
+ vars.put("testLabel", "Get Configurable Product Detail by name");
+
+ true
+
+
+
+
+ Content-Type
+ application/json
+
+
+ Accept
+ */*
+
+
+ mpaf/tool/fragments/ce/api/header_manager_before_token.jmx
+
+ mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx
+
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} > 0) {
+ random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+
+ true
+
+
+
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("configurable_products_list").size());
+product = props.get("configurable_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+
+ true
+ mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx
+
+ true
+
+
+
+ false
+ {"query":"query productDetailByName($name: String, $onServer: Boolean!) {\n products(filter: { name: { eq: $name } }) {\n items {\n id\n sku\n name\n ... on ConfigurableProduct {\n configurable_options {\n attribute_code\n attribute_id\n id\n label\n values {\n default_label\n label\n store_label\n use_default_value\n value_index\n }\n }\n variants {\n product {\n #fashion_color\n #fashion_size\n id\n media_gallery_entries {\n disabled\n file\n label\n position\n }\n sku\n stock_status\n }\n }\n }\n meta_title @include(if: $onServer)\n meta_keyword @include(if: $onServer)\n meta_description @include(if: $onServer)\n }\n }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetailByName"}
+ =
+
+
+
+ ${graphql_port_number}
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/get_configurable_product_details_by_name.jmx
+
+
+
+
+ "sku":"${product_sku}","name":"${product_name}"
+
+ Assertion.response_data
+ false
+ 2
+
+
+
+
+
+
+ 1
+ false
+ 1
+ ${graphqlGetProductSearchByProductNamePercentage}
+ mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx
+
+
+
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+ && sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+ if (sampler.getName().indexOf(testLabel) == -1) {
+ sampler.setName(sampler.getName() + testLabel);
+ }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+ sampler.setName("SetUp - " + sampler.getName());
+}
+
+ javascript
+ mpaf/tool/fragments/_system/setup_label.jmx
+
+
+ vars.put("testLabel", "Get Product Search by product_name");
+
+ true
+
+
+
+
+ Content-Type
+ application/json
+
+
+ Accept
+ */*
+
+
+ mpaf/tool/fragments/ce/api/header_manager_before_token.jmx
+
+ mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx
+
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} > 0) {
+ random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+
+ true
+
+
+
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("simple_products_list").size());
+product = props.get("simple_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+
+ true
+ mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx
+
+ true
+
+
+
+ false
+ {"query":"query productDetailByName($name: String, $onServer: Boolean!) {\n products(filter: { name: { eq: $name } }) {\n items {\n id\n sku\n name\n ... on ConfigurableProduct {\n configurable_options {\n attribute_code\n attribute_id\n id\n label\n values {\n default_label\n label\n store_label\n use_default_value\n value_index\n }\n }\n variants {\n product {\n #fashion_color\n #fashion_size\n id\n media_gallery_entries {\n disabled\n file\n label\n position\n }\n sku\n stock_status\n }\n }\n }\n meta_title @include(if: $onServer)\n meta_keyword @include(if: $onServer)\n meta_description @include(if: $onServer)\n }\n }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetailByName"}
+ =
+
+
+
+ ${graphql_port_number}
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/get_product_search_by_product_name.jmx
+
+
+
+
+ "sku":"${product_sku}","name":"${product_name}"
+
+ Assertion.response_data
+ false
+ 2
+
+
+
+
+
+
+ 1
+ false
+ 1
+ ${graphqlGetProductSearchByTextAndCategoryIdPercentage}
+ mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx
+
+
+
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+ && sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+ if (sampler.getName().indexOf(testLabel) == -1) {
+ sampler.setName(sampler.getName() + testLabel);
+ }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+ sampler.setName("SetUp - " + sampler.getName());
+}
+
+ javascript
+ mpaf/tool/fragments/_system/setup_label.jmx
+
+
+ vars.put("testLabel", "Get Product Search by text and category_id");
+
+ true
+
+
+
+
+ Content-Type
+ application/json
+
+
+ Accept
+ */*
+
+
+ mpaf/tool/fragments/ce/api/header_manager_before_token.jmx
+
+ mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx
+
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} > 0) {
+ random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+
+ true
+
+
+ javascript
+ random = vars.getObject("randomIntGenerator");
+
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
+
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
+
+ mpaf/tool/fragments/ce/common/extract_category_setup.jmx
+
+ true
+
+
+
+ false
+ {"query":"query productSearch($inputText: String!, $categoryId: String) {\n products(search: $inputText, filter: { category_id: { eq: $categoryId } }) {\n items {\n id\n name\n small_image {\n label\n url\n }\n url_key\n price {\n regularPrice {\n amount {\n value\n currency\n }\n }\n }\n }\n total_count\n filters {\n name\n filter_items_count\n request_var\n filter_items {\n label\n value_string\n }\n }\n }\n}","variables":{"inputText":"Product","categoryId":"${category_id}"},"operationName":"productSearch"}
+ =
+
+
+
+ ${graphql_port_number}
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/get_product_search_by_text_and_category_id.jmx
+
+
+
+ graphql_search_products_query_total_count
+ $.data.products.total_count
+ BODY
+
+
+ String totalCount=vars.get("graphql_search_products_query_total_count");
+
+if (totalCount == null) {
+ Failure = true;
+ FailureMessage = "Not Expected \"totalCount\" to be null";
+} else {
+ if (Integer.parseInt(totalCount) < 1) {
+ Failure = true;
+ FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
+ } else {
+ Failure = false;
+ }
+}
+
+
+
+ false
+
+
+
+
+
+
+ 1
+ false
+ 1
+ ${graphqlGetCategoryListByCategoryIdPercentage}
+ mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx
+
+
+
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+ && sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+ if (sampler.getName().indexOf(testLabel) == -1) {
+ sampler.setName(sampler.getName() + testLabel);
+ }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+ sampler.setName("SetUp - " + sampler.getName());
+}
+
+ javascript
+ mpaf/tool/fragments/_system/setup_label.jmx
+
+
+ vars.put("testLabel", "Get Category List by category_id");
+
+ true
+
+
+
+
+ Content-Type
+ application/json
+
+
+ Accept
+ */*
+
+
+ mpaf/tool/fragments/ce/api/header_manager_before_token.jmx
+
+ mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx
+
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} > 0) {
+ random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+
+ true
+
+
+ javascript
+ random = vars.getObject("randomIntGenerator");
+
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
+
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
+
+ mpaf/tool/fragments/ce/common/extract_category_setup.jmx
+
+ true
+
+
+
+ false
+
+ {"query":"query categoryList($id: Int!) {\n category(id: $id) {\n id\n children {\n id\n name\n url_key\n url_path\n children_count\n path\n image\n productImagePreview: products(pageSize: 1) {\n items {\n small_image {\n label\n url\n }\n }\n }\n }\n }\n}","variables":{"id":${category_id}},"operationName":"categoryList"}
+
+ =
+
+
+
+ ${graphql_port_number}
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/get_category_list_by_category_id.jmx
+
+
+ javascript
+ var category = vars.getObject("category");
+var response = JSON.parse(prev.getResponseDataAsString());
+
+assertCategoryId(category, response);
+assertCategoryChildren(category, response);
+
+function assertCategoryId(category, response) {
+ if (response.data == undefined || response.data.category == undefined || response.data.category.id != category.id) {
+ AssertionResult.setFailureMessage("Cannot find category with id \"" + category.id + "\"");
+ AssertionResult.setFailure(true);
+ }
+}
+
+function assertCategoryChildren(category, response) {
+ foundCategory = response.data && response.data.category ? response.data.category : null;
+ if (foundCategory) {
+ var childrenFound = foundCategory.children.map(function (c) {return parseInt(c.id)});
+ var children = category.children.map(function (c) {return parseInt(c)});
+ if (JSON.stringify(children.sort()) != JSON.stringify(childrenFound.sort())) {
+ AssertionResult.setFailureMessage("Cannot math children categories \"" + JSON.stringify(children) + "\" for to found one: \"" + JSON.stringify(childrenFound) + "\"");
+ AssertionResult.setFailure(true);
+ }
+ }
+
+}
+
+
+
+
+
+
+
+
+ 1
+ false
+ 1
+ ${graphqlUrlInfoByUrlKeyPercentage}
+ mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx
+
+
+
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+ && sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+ if (sampler.getName().indexOf(testLabel) == -1) {
+ sampler.setName(sampler.getName() + testLabel);
+ }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+ sampler.setName("SetUp - " + sampler.getName());
+}
+
+ javascript
+ mpaf/tool/fragments/_system/setup_label.jmx
+
+
+ vars.put("testLabel", "Get Url Info by url_key");
+
+ true
+
+
+
+
+ Content-Type
+ application/json
+
+
+ Accept
+ */*
+
+
+ mpaf/tool/fragments/ce/api/header_manager_before_token.jmx
+
+ mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx
+
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} > 0) {
+ random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+
+ true
+
+
+ javascript
+ random = vars.getObject("randomIntGenerator");
+
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
+
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
+
+ mpaf/tool/fragments/ce/common/extract_category_setup.jmx
+
+ true
+
+
+
+ false
+
+ {"query":"query resolveUrl($urlKey: String!) {\n urlResolver(url: $urlKey) {\n type\n id\n }\n}","variables":{"urlKey":"${category_url_key}${url_suffix}"},"operationName":"resolveUrl"}
+
+ =
+
+
+
+ ${graphql_port_number}
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/get_url_info_by_url_key.jmx
+
+
+
+ {"type":"CATEGORY","id":${category_id}}
+
+ Assertion.response_data
+ false
+ 2
+
+
+
+
+
+
+ 1
+ false
+ 1
+ ${graphqlGetCmsPageByIdPercentage}
+ mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx
+
+
+
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+ && sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+ if (sampler.getName().indexOf(testLabel) == -1) {
+ sampler.setName(sampler.getName() + testLabel);
+ }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+ sampler.setName("SetUp - " + sampler.getName());
+}
+
+ javascript
+ mpaf/tool/fragments/_system/setup_label.jmx
+
+
+ vars.put("testLabel", "Get Cms Page by id");
+
+ true
+
+
+
+
+ Content-Type
+ application/json
+
+
+ Accept
+ */*
+
+
+ mpaf/tool/fragments/ce/api/header_manager_before_token.jmx
+
+ mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx
+
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} > 0) {
+ random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+
+ true
+
+
+ javascript
+ random = vars.getObject("randomIntGenerator");
+
+var cmsPages = props.get("cms_pages");
+var number = random.nextInt(cmsPages.length);
+
+vars.put("cms_page_id", cmsPages[number].id);
+
+ mpaf/tool/fragments/ce/setup/prepare_cms_page.jmx
+
+ true
+
+
+
+ false
+
+ {"query":"query getCmsPage($id: Int!, $onServer: Boolean!) {\n cmsPage(id: $id) {\n url_key\n content\n content_heading\n title\n page_layout\n meta_title @include(if: $onServer)\n meta_keywords @include(if: $onServer)\n meta_description @include(if: $onServer)\n }\n}","variables":{"id":${cms_page_id},"onServer":false},"operationName":"getCmsPage"}
+
+ =
+
+
+
+ ${graphql_port_number}
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/get_get_cms_page_by_id.jmx
+
+
+ $.data.cmsPage.url_key
+ ${cms_page_id}
+ false
+ false
+ false
+ false
+
+
+
+
+
+
+ 1
+ false
+ 1
+ ${graphqlGetNavigationMenuByCategoryIdPercentage}
+ mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx
+
+
+
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+ && sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+ if (sampler.getName().indexOf(testLabel) == -1) {
+ sampler.setName(sampler.getName() + testLabel);
+ }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+ sampler.setName("SetUp - " + sampler.getName());
+}
+
+ javascript
+ mpaf/tool/fragments/_system/setup_label.jmx
+
+
+ vars.put("testLabel", "Get Navigation Menu by category_id");
+
+ true
+
+
+
+
+ Content-Type
+ application/json
+
+
+ Accept
+ */*
+
+
+ mpaf/tool/fragments/ce/api/header_manager_before_token.jmx
+
+ mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx
+
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} > 0) {
+ random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+
+ true
+
+
+ javascript
+ random = vars.getObject("randomIntGenerator");
+
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
+
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
+
+ mpaf/tool/fragments/ce/common/extract_category_setup.jmx
+
true
false
- {"query":"{\n products(filter: {sku: { eq: \"${simple_product_sku}\" } })\n {\n total_count\n items {\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n ... on PhysicalProductInterface {\n \t\t\tweight\n \t\t }\n }\n }\n}\n","variables":null,"operationName":null}
+ {"query":"query navigationMenu($id: Int!) {\n category(id: $id) {\n id\n name\n product_count\n path\n children {\n id\n name\n position\n level\n url_key\n url_path\n product_count\n children_count\n path\n productImagePreview: products(pageSize: 1) {\n items {\n small_image {\n label\n url\n }\n }\n }\n }\n }\n}","variables":{"id":${category_id}},"operationName":"navigationMenu"}
=
${graphql_port_number}
+ 60000
+ 200000
${request_protocol}
${base_path}graphql
@@ -38578,72 +40567,120 @@ vars.put("configurable_sku", "Configurable Product - ${__time(YMD)}-${__threadNu
false
false
mpaf/tool/fragments/ce/graphql/query_simple_product_with_extensible_data_objects.jmx
+ mpaf/tool/fragments/ce/graphql/get_navigation_menu_by_category_id.jmx
-
- graphql_simple_products_query_total_count
- $.data.products.total_count
- BODY
-
+
+
+ "id":${category_id},"name":"${category_name}","product_count"
+
+ Assertion.response_data
+ false
+ 2
+
+
-
- graphql_multiple_products_query_response
- $
- BODY
-
+
+
+ 1
+ false
+ 1
+ ${graphqlAddSimpleProductToCartPercentage}
+ mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx
+
+
+
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+ && sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+ if (sampler.getName().indexOf(testLabel) == -1) {
+ sampler.setName(sampler.getName() + testLabel);
+ }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+ sampler.setName("SetUp - " + sampler.getName());
+}
+
+ javascript
+ mpaf/tool/fragments/_system/setup_label.jmx
- String totalCount=vars.get("graphql_simple_products_query_total_count");
+
+
+ vars.put("testLabel", "Add Simple Product To Cart");
+
+ true
+
+
+
+
+ Content-Type
+ application/json
+
+
+ Accept
+ */*
+
+
+ mpaf/tool/fragments/ce/api/header_manager_before_token.jmx
+
+ mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx
+
+import java.util.Random;
-if (totalCount == null) {
- Failure = true;
- FailureMessage = "Not Expected \"totalCount\" to be null";
-} else {
- if (Integer.parseInt(totalCount) != 1) {
- Failure = true;
- FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
- } else {
- Failure = false;
- }
+Random random = new Random();
+if (${seedForRandom} > 0) {
+ random.setSeed(${seedForRandom} + ${__threadNum});
}
-
- false
-
-
- $.data.products.items[0].sku
- ${simple_product_sku}
- true
- false
- false
- true
-
+
+vars.putObject("randomIntGenerator", random);
+
+ true
+
+
+
+
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("simple_products_list").size());
+product = props.get("simple_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+
+ true
+ mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx
+
+
true
false
- {"query":"{\n products(filter: {sku: {eq:\"${configurable_product_sku}\"} }) {\n total_count\n items {\n ... on PhysicalProductInterface {\n weight\n }\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n ... on ConfigurableProduct {\n configurable_options {\n id\n attribute_id\n label\n position\n use_default\n attribute_code\n values {\n value_index\n label\n store_label\n default_label\n use_default_value\n }\n product_id\n }\n variants {\n product {\n ... on PhysicalProductInterface {\n weight\n }\n sku\n color\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n\n\n }\n attributes {\n label\n code\n value_index\n }\n }\n }\n }\n }\n}\n","variables":null,"operationName":null}
+ {"query":"mutation {\n createEmptyCart\n}","variables":null,"operationName":null}
=
${graphql_port_number}
+ 60000
+ 200000
${request_protocol}
${base_path}graphql
@@ -38654,65 +40691,34 @@ if (totalCount == null) {
false
false
mpaf/tool/fragments/ce/graphql/query_configurable_product_with_extensible_data_objects.jmx
+ mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx
-
- graphql_configurable_products_query_total_count
- $.data.products.total_count
+
+ quote_id
+ $.data.createEmptyCart
BODY
- String totalCount=vars.get("graphql_configurable_products_query_total_count");
-
-if (totalCount == null) {
- Failure = true;
- FailureMessage = "Not Expected \"totalCount\" to be null";
-} else {
- if (Integer.parseInt(totalCount) != 1) {
- Failure = true;
- FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
- } else {
- Failure = false;
- }
-}
-
-
-
- false
-
-
- $.data.products.items[0].sku
- ${configurable_product_sku}
- true
- false
- false
- true
-
-
-
+
true
false
- {"query":"{\n products(\n search: \"configurable\"\n filter: {price: {gteq: \"1\"} }\n ) {\n total_count\n items {\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n ... on PhysicalProductInterface {\n \t\t\tweight\n \t\t\t}\n ... on ConfigurableProduct {\n configurable_options {\n id\n attribute_id\n label\n position\n use_default\n attribute_code\n values {\n value_index\n label\n store_label\n default_label\n use_default_value\n }\n product_id\n }\n variants {\n product {\n ... on PhysicalProductInterface {\n weight\n }\n sku\n color\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n\n\n }\n attributes {\n label\n code\n value_index\n }\n }\n }\n }\n }\n}\n","variables":null,"operationName":null}
+ {"query":"mutation { \n addSimpleProductsToCart(\n input: {\n cart_id: \"${quote_id}\"\n cartItems: [\n {\n data: {\n qty: 2\n sku: \"${product_sku}\"\n }\n }\n ]\n }\n ) {\n cart {\n items {\n qty\n product {\n sku\n }\n }\n }\n }\n}","variables":null,"operationName":null}
=
${graphql_port_number}
+ 60000
+ 200000
${request_protocol}
${base_path}graphql
@@ -38723,56 +40729,36 @@ if (totalCount == null) {
false
false
mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_full_text_and_filter.jmx
+ mpaf/tool/fragments/ce/graphql/add_simple_product_to_cart.jmx
-
- graphql_search_products_query_total_count_fulltext_filter
- $.data.products.total_count
- BODY
-
-
- String totalCount=vars.get("graphql_search_products_query_total_count_fulltext_filter");
-
-if (totalCount == null) {
- Failure = true;
- FailureMessage = "Not Expected \"totalCount\" to be null";
-} else {
- if (Integer.parseInt(totalCount) < 1) {
- Failure = true;
- FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
- } else {
- Failure = false;
- }
-}
-
-
-
- false
-
+
+
+ addSimpleProductsToCart
+ "sku":"${product_sku}"
+
+ Assertion.response_data
+ false
+ 2
+
-
+
true
false
- {"query":"{\n products(search: \"configurable\") {\n total_count\n items {\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n ... on PhysicalProductInterface {\n \t\t\tweight\n \t\t\t}\n ... on ConfigurableProduct {\n configurable_options {\n id\n attribute_id\n label\n position\n use_default\n attribute_code\n values {\n value_index\n label\n store_label\n default_label\n use_default_value\n }\n product_id\n }\n variants {\n product {\n ... on PhysicalProductInterface {\n weight\n }\n sku\n color\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n\n\n }\n attributes {\n label\n code\n value_index\n }\n }\n }\n }\n }\n}\n","variables":null,"operationName":null}
+ {"query":"{\n cart(cart_id: \"${quote_id}\") {\n items {\n id\n qty\n product {\n sku\n }\n }\n }\n}","variables":null,"operationName":null}
=
${graphql_port_number}
+ 60000
+ 200000
${request_protocol}
${base_path}graphql
@@ -38783,56 +40769,34 @@ if (totalCount == null) {
false
false
mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_full_text_only.jmx
+ mpaf/tool/fragments/ce/graphql/get_cart.jmx
-
- graphql_search_products_query_total_count
- $.data.products.total_count
+
+ item_id
+ $.data.cart.items[0].id
BODY
- String totalCount=vars.get("graphql_search_products_query_total_count");
-
-if (totalCount == null) {
- Failure = true;
- FailureMessage = "Not Expected \"totalCount\" to be null";
-} else {
- if (Integer.parseInt(totalCount) < 1) {
- Failure = true;
- FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
- } else {
- Failure = false;
- }
-}
-
-
-
- false
-
-
-
+
true
false
- {"query":"{\n products(search: \"Option 1\") {\n filters {\n name\n filter_items_count\n request_var\n filter_items {\n label\n value_string\n items_count\n ... on SwatchLayerFilterItemInterface {\n swatch_data {\n type\n value\n }\n }\n }\n }\n total_count\n items {\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n ... on PhysicalProductInterface {\n weight\n }\n ... on ConfigurableProduct {\n configurable_options {\n id\n attribute_id\n label\n position\n use_default\n attribute_code\n values {\n value_index\n label\n store_label\n default_label\n use_default_value\n }\n product_id\n }\n variants {\n product {\n ... on PhysicalProductInterface {\n weight\n }\n sku\n color\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n\n\n }\n attributes {\n label\n code\n value_index\n }\n }\n }\n }\n }\n}","variables":null,"operationName":null}
+ {"query":"mutation {\n removeItemFromCart(\n input: {\n cart_id: \"${quote_id}\"\n cart_item_id: ${item_id}\n }\n ) {\n cart {\n items {\n qty\n }\n }\n }\n}","variables":null,"operationName":null}
=
${graphql_port_number}
+ 60000
+ 200000
${request_protocol}
${base_path}graphql
@@ -38843,212 +40807,168 @@ if (totalCount == null) {
false
false
mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_full_text_and_filters.jmx
+ mpaf/tool/fragments/ce/graphql/remove_simple_product_from_cart.jmx
-
- graphql_search_products_query_total_count
- $.data.products.total_count
- BODY
-
-
- String totalCount=vars.get("graphql_search_products_query_total_count");
-
-if (totalCount == null) {
- Failure = true;
- FailureMessage = "Not Expected \"totalCount\" to be null";
-} else {
- if (Integer.parseInt(totalCount) < 1) {
- Failure = true;
- FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
- } else {
- Failure = false;
- }
-}
-
-
-
- false
-
+
+
+ {"data":{"removeItemFromCart":{"cart":{"items":[]}}}}
+
+ Assertion.response_data
+ false
+ 8
+
-
-
- true
-
-
-
- false
- {"query":"{\nproducts(filter: {sku: {eq:\"${bundle_product_sku}\"} }) {\n total_count\n items {\n ... on PhysicalProductInterface {\n weight\n }\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n ... on BundleProduct {\n weight\n price_view\n dynamic_price\n dynamic_sku\n ship_bundle_items\n dynamic_weight\n items {\n option_id\n title\n required\n type\n position\n sku\n options {\n id\n qty\n position\n is_default\n price\n price_type\n can_change_quantity\n product {\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n }\n }\n }\n }\n }\n }\n}\n","variables":null,"operationName":null}
- =
-
-
-
- ${request_protocol}
- ${base_path}graphql
- POST
- true
- false
- true
- false
- false
- mpaf/tool/fragments/ce/graphql/query_bundle_product_with_extensible_data_objects.jmx
-
-
-
- graphql_bundle_products_query_total_count
- $.data.products.total_count
- BODY
-
-
- String totalCount=vars.get("graphql_bundle_products_query_total_count");
-
- if (totalCount == null) {
- Failure = true;
- FailureMessage = "Not Expected \"totalCount\" to be null";
- } else {
- if (Integer.parseInt(totalCount) != 1) {
- Failure = true;
- FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
- } else {
- Failure = false;
- }
- }
-
+
-
- false
-
-
- $.data.products.items[0].sku
- ${bundle_product_sku}
- true
- false
- false
- false
-
-
+
+
+ 1
+ false
+ 1
+ ${graphqlAddConfigurableProductToCartPercentage}
+ mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx
+
+
+
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+ && sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+ if (sampler.getName().indexOf(testLabel) == -1) {
+ sampler.setName(sampler.getName() + testLabel);
+ }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+ sampler.setName("SetUp - " + sampler.getName());
+}
+
+ javascript
+ mpaf/tool/fragments/_system/setup_label.jmx
+
+
+ vars.put("testLabel", "Add Configurable Product To Cart");
+
+ true
+
+
- true
-
-
-
- false
- {"query":"{\n products(filter: {sku: { eq: \"${downloadable_product_sku}\" } })\n {\n total_count\n items {\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n ... on PhysicalProductInterface {\n \t\t\tweight\n \t\t }\n ... on DownloadableProduct {\n links_purchased_separately\n links_title\n downloadable_product_samples {\n id\n title\n sort_order\n sample_type\n sample_file\n sample_url\n }\n downloadable_product_links {\n id\n title\n sort_order\n is_shareable\n price\n number_of_downloads\n link_type\n sample_type\n sample_file\n sample_url\n }\n }\n }\n }\n}\n","variables":null,"operationName":null}
- =
-
-
-
- ${request_protocol}
- ${base_path}graphql
- POST
- true
- false
- true
- false
- false
- mpaf/tool/fragments/ce/graphql/query_downloadable_product_with_extensible_data_objects.jmx
-
-
-
- graphql_downloadable_products_query_total_count
- $.data.products.total_count
- BODY
-
-
- String totalCount=vars.get("graphql_downloadable_products_query_total_count");
+
+
+
+ Content-Type
+ application/json
+
+
+ Accept
+ */*
+
+
+ mpaf/tool/fragments/ce/api/header_manager_before_token.jmx
+
+ mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx
+
+import java.util.Random;
- if (totalCount == null) {
- Failure = true;
- FailureMessage = "Not Expected \"totalCount\" to be null";
- } else {
- if (Integer.parseInt(totalCount) != 1) {
- Failure = true;
- FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
- } else {
- Failure = false;
- }
- }
+Random random = new Random();
+if (${seedForRandom} > 0) {
+ random.setSeed(${seedForRandom} + ${__threadNum});
+}
+vars.putObject("randomIntGenerator", random);
+
+ true
+
+
+
+import java.util.Random;
-
- false
-
-
- $.data.products.items[0].sku
- ${downloadable_product_sku}
- true
- false
- false
- true
-
-
- $.data.products.items[0].downloadable_product_samples..title
- ["sample1","sample2"]
- true
- false
- false
- false
-
-
- $.data.products.items[0].downloadable_product_samples..title
- ["sample1","sample2"]
- true
- false
- false
- false
-
-
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("configurable_products_list").size());
+product = props.get("configurable_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+
+ true
+ mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx
+
+ true
+
+
+
+ false
+ {"query":"query productDetailByName($name: String, $onServer: Boolean!) {\n products(filter: { name: { eq: $name } }) {\n items {\n id\n sku\n name\n ... on ConfigurableProduct {\n configurable_options {\n attribute_code\n attribute_id\n id\n label\n values {\n default_label\n label\n store_label\n use_default_value\n value_index\n }\n }\n variants {\n product {\n #fashion_color\n #fashion_size\n id\n media_gallery_entries {\n disabled\n file\n label\n position\n }\n sku\n stock_status\n }\n }\n }\n meta_title @include(if: $onServer)\n meta_keyword @include(if: $onServer)\n meta_description @include(if: $onServer)\n }\n }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetailByName"}
+ =
+
+
+
+ ${graphql_port_number}
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/get_configurable_product_details_by_name.jmx
+
+
+
+
+ "sku":"${product_sku}","name":"${product_name}"
+
+ Assertion.response_data
+ false
+ 2
+
+
+
+ product_option
+ $.data.products.items[0].variants[0].product.sku
+ BODY
+ mpaf/tool/fragments/ce/graphql/extract_configurable_product_option.jmx
+
+
+
true
false
- {"query":"{\n products(filter: {sku: { eq: \"${virtual_product_sku}\" } })\n {\n total_count\n items {\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n ... on PhysicalProductInterface {\n \t\t\tweight\n \t\t }\n }\n }\n}\n","variables":null,"operationName":null}
+ {"query":"mutation {\n createEmptyCart\n}","variables":null,"operationName":null}
=
${graphql_port_number}
+ 60000
+ 200000
${request_protocol}
${base_path}graphql
@@ -39059,321 +40979,74 @@ if (totalCount == null) {
false
false
mpaf/tool/fragments/ce/graphql/query_virtual_product_with_extensible_data_objects.jmx
+ mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx
-
- graphql_virtual_products_query_total_count
- $.data.products.total_count
+
+ quote_id
+ $.data.createEmptyCart
BODY
- String totalCount=vars.get("graphql_virtual_products_query_total_count");
-
-if (totalCount == null) {
- Failure = true;
- FailureMessage = "Not Expected \"totalCount\" to be null";
-} else {
- if (Integer.parseInt(totalCount) != 1) {
- Failure = true;
- FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
- } else {
- Failure = false;
- }
-}
-
- false
-
-
- $.data.products.items[0].sku
- ${virtual_product_sku}
- true
- false
- false
- true
-
+
+
+
+ true
+
+
+
+ false
+ {"query":"mutation {\n addConfigurableProductsToCart(\n input: {\n cart_id: \"${quote_id}\"\n cartItems: [\n {\n variant_sku: \"${product_option}\"\n data: {\n qty: 2\n sku: \"${product_option}\"\n }\n }\n ]\n }\n ) {\n cart {\n items {\n id\n qty\n product {\n name\n sku\n }\n ... on ConfigurableCartItem {\n configurable_options {\n option_label\n }\n }\n }\n }\n }\n}","variables":null,"operationName":null}
+ =
+
+
+
+ ${graphql_port_number}
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/add_configurable_product_to_cart.jmx
+
+
+
+
+ addConfigurableProductsToCart
+ "sku":"${product_option}"
+
+ Assertion.response_data
+ false
+ 2
+
-
- true
-
-
-
- false
- {"query":"{\nproducts(filter: {sku: {eq:\"${grouped_product_sku}\"} }) {\n total_count\n items {\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n ... on GroupedProduct {\n weight\n items {\n qty\n position\n product {\n attribute_set_id\n categories\n {\n id\n position\n }\n country_of_manufacture\n created_at\n description {\n html\n }\n gift_message_available\n id\n image\n {\n url\n label\n }\n meta_description\n meta_keyword\n meta_title\n media_gallery_entries\n {\n disabled\n file\n id\n label\n media_type\n position\n types\n content\n {\n base64_encoded_data\n type\n name\n }\n video_content\n {\n media_type\n video_description\n video_metadata\n video_provider\n video_title\n video_url\n }\n }\n name\n new_from_date\n new_to_date\n options_container\n ... on CustomizableProductInterface {\n options\n {\n title\n required\n sort_order\n }\n }\n \n price {\n minimalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n maximalPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n regularPrice {\n amount {\n value\n currency\n }\n adjustments {\n amount {\n value\n currency\n }\n code\n description\n }\n }\n }\n product_links\n {\n link_type\n linked_product_sku\n linked_product_type\n position\n sku\n }\n short_description {\n html\n }\n sku\n small_image\n {\n url\n label\n }\n special_from_date\n special_price\n special_to_date\n swatch_image\n thumbnail\n {\n url\n label\n }\n tier_price\n tier_prices\n {\n customer_group_id\n percentage_value\n qty\n value\n website_id\n }\n type_id\n updated_at\n url_key\n url_path\n websites { id name code sort_order default_group_id is_default }\n }\n }\n }\n }\n }\n}\n","variables":null,"operationName":null}
- =
-
-
-
- ${request_protocol}
- ${base_path}graphql
- POST
- true
- false
- true
- false
- false
- mpaf/tool/fragments/ce/graphql/query_grouped_product_with_extensible_data_objects.jmx
-
-
-
- graphql_grouped_products_query_total_count
- $.data.products.total_count
- BODY
-
-
- String totalCount=vars.get("graphql_grouped_products_query_total_count");
-
- if (totalCount == null) {
- Failure = true;
- FailureMessage = "Not Expected \"totalCount\" to be null";
- } else {
- if (Integer.parseInt(totalCount) != 1) {
- Failure = true;
- FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
- } else {
- Failure = false;
- }
- }
-
-
-
- false
-
-
- $.data.products.items[0].sku
- ${grouped_product_sku}
- true
- false
- false
- true
-
-
-
-
-
- true
-
-
-
- false
- {
- "customer": {
-
- "email": "customer_${__time()}-${__threadNum}-${__Random(1,1000000)}@example.com",
- "firstname": "test_${__time()}-${__threadNum}-${__Random(1,1000000)}",
- "lastname": "Doe"
- },
- "password": "test@123"
- }
- =
-
-
-
- ${request_protocol}
- ${base_path}rest/default/V1/customers
- POST
- true
- false
- true
- false
- false
- mpaf/tool/fragments/ce/graphql/query_frontend_customer.jmx
-
-
-
- customer_id
- $.id
- BODY
-
-
-
- ^\d+$
-
- Assertion.response_data
- false
- 1
- variable
- customer_id
-
-
-
-
-
- ${request_protocol}
- ${base_path}rest/default/V1/customers/${customer_id}
- GET
- true
- false
- true
- false
- false
- mpaf/tool/fragments/ce/api/check_customer.jmx
-
-
-
- $.id
- ${customer_id}
- true
- false
- false
- true
-
-
- customer_email
- $.email
- BODY
-
-
-
- true
-
-
-
- false
- {
- "username":"${customer_email}",
- "password":"test@123"
- }
-
- =
-
-
-
- ${request_protocol}
- ${base_path}rest/default/V1/integration/customer/token
- POST
- true
- false
- true
- false
- false
- mpaf/tool/fragments/ce/api/create_customer.jmx
-
-
-
- customer_token
- $
- BODY
-
-
-
- true
-
-
-
- false
- {"query":"{\n customer {\n created_at\n group_id\n\n prefix\n firstname\n middlename\n lastname\n suffix\n email\n default_billing\n default_shipping\n\n dob\n taxvat\n\n id\n addresses {\n id\n customer_id\n region {\n region_code\n region\n region_id\n }\n region_id\n country_id\n street \n company\n telephone\n fax\n postcode\n city\n firstname\n lastname\n middlename\n prefix\n suffix\n vat_id\n default_shipping\n default_billing\n }\n is_subscribed\n }\n}","variables":null,"operationName":null}
- =
-
-
-
- ${request_protocol}
- ${base_path}graphql
- POST
- true
- false
- true
- false
- false
- mpaf/tool/fragments/ce/graphql/query_frontend_customer.jmx
-
-
-
- false
- import org.apache.jmeter.protocol.http.control.Header;
-
- sampler.getHeaderManager().removeHeaderNamed("Authorization");
-
- sampler.getHeaderManager().add(new Header("Authorization","Bearer " + vars.get("customer_token")));
-
-
- $.data.customer.lastname
- Doe
- true
- false
- false
- true
-
-
-
-
-
+
true
false
- {"query":"{\n category(id: 1) {\n name\n id\n level\n description\n path\n path_in_store\n url_key\n url_path\n children {\n id\n description\n default_sort_by\n children {\n id\n description\n level\n children {\n level\n id\n children {\n id\n }\n }\n }\n }\n }\n}","variables":null,"operationName":null}
+ {"query":"{\n cart(cart_id: \"${quote_id}\") {\n items {\n id\n qty\n product {\n sku\n }\n }\n }\n}","variables":null,"operationName":null}
=
${graphql_port_number}
+ 60000
+ 200000
${request_protocol}
${base_path}graphql
@@ -39384,39 +41057,58 @@ if (totalCount == null) {
false
false
mpaf/tool/fragments/ce/graphql/query_root_category.jmx
+ mpaf/tool/fragments/ce/graphql/get_cart.jmx
-
- graphql_category_query_name
- $.data.category.name
+
+ item_id
+ $.data.cart.items[0].id
BODY
- String name = vars.get("graphql_category_query_name");
-if (name == null) {
- Failure = true;
- FailureMessage = "Not Expected \"children\" to be null";
-} else {
- if (!name.equals("Root Catalog")) {
- Failure = true;
- FailureMessage = "Expected \"name\" to equal \"Root Catalog\", Actual: " + name;
- } else {
- Failure = false;
- }
-}
-
- false
-
+
+
+
+ true
+
+
+
+ false
+ {"query":"mutation {\n removeItemFromCart(\n input: {\n cart_id: \"${quote_id}\"\n cart_item_id: ${item_id}\n }\n ) {\n cart {\n items {\n qty\n }\n }\n }\n}","variables":null,"operationName":null}
+ =
+
+
+
+ ${graphql_port_number}
+ 60000
+ 200000
+ ${request_protocol}
+ ${base_path}graphql
+ POST
+ true
+ false
+ true
+ false
+ false
+ mpaf/tool/fragments/ce/graphql/remove_configurable_product_from_cart.jmx
+
+
+
+
+ {"data":{"removeItemFromCart":{"cart":{"items":[]}}}}
+
+ Assertion.response_data
+ false
+ 8
+
-
@@ -39552,6 +41244,14 @@ if (name == null) {
${response_time_file_name}
mpaf/tool/fragments/ce/common/aggregate_graph.jmx
+ false
+ true
+ true
+ false
+ mpaf/tool/fragments/_system/debug.jmx
+
true
+
diff --git a/app/code/Magento/ProductVideo/i18n/de_DE.csv b/app/code/Magento/ProductVideo/i18n/de_DE.csv
deleted file mode 100644
index ca24668bb8d16..0000000000000
--- a/app/code/Magento/ProductVideo/i18n/de_DE.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"Add video","Add video"
-"New Video","New Video"
-"Product Video","Product Video"
-"YouTube API key","YouTube API key"
-"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
-"Url","Url"
-"Preview Image","Preview Image"
-"Get Video Information","Get Video Information"
-"Youtube or Vimeo supported","Youtube or Vimeo supported"
-"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/i18n/es_ES.csv b/app/code/Magento/ProductVideo/i18n/es_ES.csv
deleted file mode 100644
index ca24668bb8d16..0000000000000
--- a/app/code/Magento/ProductVideo/i18n/es_ES.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"Add video","Add video"
-"New Video","New Video"
-"Product Video","Product Video"
-"YouTube API key","YouTube API key"
-"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
-"Url","Url"
-"Preview Image","Preview Image"
-"Get Video Information","Get Video Information"
-"Youtube or Vimeo supported","Youtube or Vimeo supported"
-"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/i18n/fr_FR.csv b/app/code/Magento/ProductVideo/i18n/fr_FR.csv
deleted file mode 100644
index ca24668bb8d16..0000000000000
--- a/app/code/Magento/ProductVideo/i18n/fr_FR.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"Add video","Add video"
-"New Video","New Video"
-"Product Video","Product Video"
-"YouTube API key","YouTube API key"
-"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
-"Url","Url"
-"Preview Image","Preview Image"
-"Get Video Information","Get Video Information"
-"Youtube or Vimeo supported","Youtube or Vimeo supported"
-"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/i18n/nl_NL.csv b/app/code/Magento/ProductVideo/i18n/nl_NL.csv
deleted file mode 100644
index 5ad8386573040..0000000000000
--- a/app/code/Magento/ProductVideo/i18n/nl_NL.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"Add video","Add video"
-"New Video","New Video"
-"Product Video","Product Video"
-"YouTube API key","YouTube API key"
-"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
-"Url","Url"
-"Preview Image","Preview Image"
-"Get Video Information","Get Video Information"
-"Youtube or Vimeo supported","Youtube or Vimeo supported"
-"Delete image in all store views","Delete image in all store views"
\ No newline at end of file
diff --git a/app/code/Magento/ProductVideo/i18n/pt_BR.csv b/app/code/Magento/ProductVideo/i18n/pt_BR.csv
deleted file mode 100644
index 5ad8386573040..0000000000000
--- a/app/code/Magento/ProductVideo/i18n/pt_BR.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"Add video","Add video"
-"New Video","New Video"
-"Product Video","Product Video"
-"YouTube API key","YouTube API key"
-"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
-"Url","Url"
-"Preview Image","Preview Image"
-"Get Video Information","Get Video Information"
-"Youtube or Vimeo supported","Youtube or Vimeo supported"
-"Delete image in all store views","Delete image in all store views"
\ No newline at end of file
diff --git a/app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv b/app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv
deleted file mode 100644
index 5ad8386573040..0000000000000
--- a/app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"Add video","Add video"
-"New Video","New Video"
-"Product Video","Product Video"
-"YouTube API key","YouTube API key"
-"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
-"Url","Url"
-"Preview Image","Preview Image"
-"Get Video Information","Get Video Information"
-"Youtube or Vimeo supported","Youtube or Vimeo supported"
-"Delete image in all store views","Delete image in all store views"
\ No newline at end of file
diff --git a/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml b/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml
index 4cc2c4f392419..a513b6747f612 100644
--- a/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml
+++ b/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml
@@ -13,4 +13,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/MetaData/url_rewrite-meta.xml b/app/code/Magento/UrlRewrite/Test/Mftf/MetaData/url_rewrite-meta.xml
deleted file mode 100644
index 0738b17d6e0f0..0000000000000
--- a/app/code/Magento/UrlRewrite/Test/Mftf/MetaData/url_rewrite-meta.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ' : '
';
$html .= $this->getAfterElementHtml();
+
return $html;
}
}
diff --git a/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php b/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php
index a7a387b5def81..acd0a61633557 100644
--- a/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php
+++ b/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php
@@ -9,7 +9,12 @@
namespace Magento\Framework\Event\Invoker;
use Magento\Framework\Event\Observer;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\App\State;
+/**
+ * Default Invoker.
+ */
class InvokerDefault implements \Magento\Framework\Event\InvokerInterface
{
/**
@@ -22,20 +27,29 @@ class InvokerDefault implements \Magento\Framework\Event\InvokerInterface
/**
* Application state
*
- * @var \Magento\Framework\App\State
+ * @var State
*/
protected $_appState;
+ /**
+ * @var LoggerInterface
+ */
+ private $logger;
+
/**
* @param \Magento\Framework\Event\ObserverFactory $observerFactory
- * @param \Magento\Framework\App\State $appState
+ * @param State $appState
+ * @param LoggerInterface $logger
*/
public function __construct(
\Magento\Framework\Event\ObserverFactory $observerFactory,
- \Magento\Framework\App\State $appState
+ State $appState,
+ LoggerInterface $logger = null
) {
$this->_observerFactory = $observerFactory;
$this->_appState = $appState;
+ $this->logger = $logger ?: \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(LoggerInterface::class);
}
/**
@@ -61,6 +75,8 @@ public function dispatch(array $configuration, Observer $observer)
}
/**
+ * Execute Observer.
+ *
* @param \Magento\Framework\Event\ObserverInterface $object
* @param Observer $observer
* @return $this
@@ -70,7 +86,7 @@ protected function _callObserverMethod($object, $observer)
{
if ($object instanceof \Magento\Framework\Event\ObserverInterface) {
$object->execute($observer);
- } elseif ($this->_appState->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) {
+ } elseif ($this->_appState->getMode() == State::MODE_DEVELOPER) {
throw new \LogicException(
sprintf(
'Observer "%s" must implement interface "%s"',
@@ -78,6 +94,12 @@ protected function _callObserverMethod($object, $observer)
\Magento\Framework\Event\ObserverInterface::class
)
);
+ } else {
+ $this->logger->warning(sprintf(
+ 'Observer "%s" must implement interface "%s"',
+ get_class($object),
+ \Magento\Framework\Event\ObserverInterface::class
+ ));
}
return $this;
}
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php
index 37f650dbef6a0..e6ec123823854 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php
@@ -5,6 +5,9 @@
*/
namespace Magento\Framework\Event\Test\Unit\Invoker;
+/**
+ * Test for Magento\Framework\Event\Invoker\InvokerDefault.
+ */
class InvokerDefaultTest extends \PHPUnit\Framework\TestCase
{
/**
@@ -32,6 +35,11 @@ class InvokerDefaultTest extends \PHPUnit\Framework\TestCase
*/
protected $_invokerDefault;
+ /**
+ * @var |Psr\Log|LoggerInterface
+ */
+ private $loggerMock;
+
protected function setUp()
{
$this->_observerFactoryMock = $this->createMock(\Magento\Framework\Event\ObserverFactory::class);
@@ -41,10 +49,12 @@ protected function setUp()
['execute']
);
$this->_appStateMock = $this->createMock(\Magento\Framework\App\State::class);
+ $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
$this->_invokerDefault = new \Magento\Framework\Event\Invoker\InvokerDefault(
$this->_observerFactoryMock,
- $this->_appStateMock
+ $this->_appStateMock,
+ $this->loggerMock
);
}
@@ -166,13 +176,15 @@ public function testWrongInterfaceCallWithDisabledDeveloperMode($shared)
$this->returnValue($notObserver)
);
$this->_appStateMock->expects(
- $this->once()
+ $this->exactly(1)
)->method(
'getMode'
)->will(
$this->returnValue(\Magento\Framework\App\State::MODE_PRODUCTION)
);
+ $this->loggerMock->expects($this->once())->method('warning');
+
$this->_invokerDefault->dispatch(
[
'shared' => $shared,
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 51e7ea9be0c24..d4c98cda17e12 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
@@ -3,6 +3,8 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Framework\Search\Adapter\Mysql\Query\Builder;
use Magento\Framework\DB\Helper\Mysql\Fulltext;
@@ -28,7 +30,7 @@ class Match implements QueryInterface
*/
const SPECIAL_CHARACTERS = '-+~/\\<>\'":*$#@()!,.?`=%&^';
- const MINIMAL_CHARACTER_LENGTH = 3;
+ const MINIMAL_CHARACTER_LENGTH = 1;
/**
* @var string[]
diff --git a/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd
index 39cdec05a65ea..6486b39070788 100755
--- a/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd
+++ b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd
@@ -313,6 +313,7 @@
';
- $html .= $this->getEscapedValue() . '
';
+ if (is_string($this->getValue()) || $this->getValue() instanceof Phrase) {
+ $html .= $this->getEscapedValue();
+ }
+
+ $html .= '