' ?>
@@ -48,57 +49,57 @@
escapeHtml($_item->getName()) ?>
- getProductPriceHtml($_item, $type);
- ?>
-
getReviewsSummaryHtml($_item, $templateType) ?>
+ getProductPriceHtml($_item, $type) ?>
+
+ getProductDetailsHtml($_item) ?>
+
-
-
-
- isSaleable()): ?>
- getTypeInstance()->isPossibleBuyFromList($_item)): ?>
-
+
+
+
+
+ isSaleable()): ?>
+ getAddToCartPostParams($_item); ?>
+
- helper('Magento\Framework\Data\Helper\PostHelper');
- $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
- ?>
-
+ getIsSalable()): ?>
+
escapeHtml(__('In stock')) ?>
+
+
escapeHtml(__('Out of stock')) ?>
+
-
- getIsSalable()): ?>
-
escapeHtml(__('In stock')) ?>
-
-
escapeHtml(__('Out of stock')) ?>
+
+
+
+
-
-
-
-
+
+
+
diff --git a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
index de996bed02439..a20c146d68d92 100644
--- a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
+++ b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
@@ -6,10 +6,18 @@
namespace Magento\Checkout\Block\Checkout;
use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
+use Magento\Customer\Api\Data\CustomerInterface;
use Magento\Customer\Helper\Address as AddressHelper;
use Magento\Customer\Model\Session;
use Magento\Directory\Helper\Data as DirectoryHelper;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+/**
+ * Fields attribute merger.
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
class AttributeMerger
{
/**
@@ -46,6 +54,7 @@ class AttributeMerger
'alpha' => 'validate-alpha',
'numeric' => 'validate-number',
'alphanumeric' => 'validate-alphanum',
+ 'alphanum-with-spaces' => 'validate-alphanum-with-spaces',
'url' => 'validate-url',
'email' => 'email2',
'length' => 'validate-length',
@@ -67,7 +76,7 @@ class AttributeMerger
private $customerRepository;
/**
- * @var \Magento\Customer\Api\Data\CustomerInterface
+ * @var CustomerInterface
*/
private $customer;
@@ -309,10 +318,14 @@ protected function getMultilineFieldConfig($attributeCode, array $attributeConfi
}
/**
+ * Returns default attribute value.
+ *
* @param string $attributeCode
+ * @throws NoSuchEntityException
+ * @throws LocalizedException
* @return null|string
*/
- protected function getDefaultValue($attributeCode)
+ protected function getDefaultValue($attributeCode): ?string
{
if ($attributeCode === 'country_id') {
return $this->directoryHelper->getDefaultCountry();
@@ -346,9 +359,13 @@ protected function getDefaultValue($attributeCode)
}
/**
- * @return \Magento\Customer\Api\Data\CustomerInterface|null
+ * Returns logged customer.
+ *
+ * @throws NoSuchEntityException
+ * @throws LocalizedException
+ * @return CustomerInterface|null
*/
- protected function getCustomer()
+ protected function getCustomer(): ?CustomerInterface
{
if (!$this->customer) {
if ($this->customerSession->isLoggedIn()) {
diff --git a/app/code/Magento/Checkout/Block/Onepage.php b/app/code/Magento/Checkout/Block/Onepage.php
index ca6b045ddbb5d..e01d5835b4cf0 100644
--- a/app/code/Magento/Checkout/Block/Onepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage.php
@@ -38,7 +38,7 @@ class Onepage extends \Magento\Framework\View\Element\Template
protected $layoutProcessors;
/**
- * @var \Magento\Framework\Serialize\Serializer\Json
+ * @var \Magento\Framework\Serialize\SerializerInterface
*/
private $serializer;
@@ -48,8 +48,9 @@ class Onepage extends \Magento\Framework\View\Element\Template
* @param \Magento\Checkout\Model\CompositeConfigProvider $configProvider
* @param array $layoutProcessors
* @param array $data
- * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
- * @throws \RuntimeException
+ * @param \Magento\Framework\Serialize\Serializer\Json $serializer
+ * @param \Magento\Framework\Serialize\SerializerInterface $serializerInterface
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
@@ -57,7 +58,8 @@ public function __construct(
\Magento\Checkout\Model\CompositeConfigProvider $configProvider,
array $layoutProcessors = [],
array $data = [],
- \Magento\Framework\Serialize\Serializer\Json $serializer = null
+ \Magento\Framework\Serialize\Serializer\Json $serializer = null,
+ \Magento\Framework\Serialize\SerializerInterface $serializerInterface = null
) {
parent::__construct($context, $data);
$this->formKey = $formKey;
@@ -65,12 +67,12 @@ public function __construct(
$this->jsLayout = isset($data['jsLayout']) && is_array($data['jsLayout']) ? $data['jsLayout'] : [];
$this->configProvider = $configProvider;
$this->layoutProcessors = $layoutProcessors;
- $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
- ->get(\Magento\Framework\Serialize\Serializer\Json::class);
+ $this->serializer = $serializerInterface ?: \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(\Magento\Framework\Serialize\Serializer\JsonHexTag::class);
}
/**
- * @return string
+ * @inheritdoc
*/
public function getJsLayout()
{
@@ -78,7 +80,7 @@ public function getJsLayout()
$this->jsLayout = $processor->process($this->jsLayout);
}
- return json_encode($this->jsLayout, JSON_HEX_TAG);
+ return $this->serializer->serialize($this->jsLayout);
}
/**
@@ -115,11 +117,13 @@ public function getBaseUrl()
}
/**
+ * Retrieve serialized checkout config.
+ *
* @return bool|string
* @since 100.2.0
*/
public function getSerializedCheckoutConfig()
{
- return json_encode($this->getCheckoutConfig(), JSON_HEX_TAG);
+ return $this->serializer->serialize($this->getCheckoutConfig());
}
}
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
index 464ccc1913335..2c5444da6d974 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
@@ -187,16 +187,16 @@
-
-
-
-
+
+
+
+
-
-
+
+
-
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.xml
index 6e5f127eefc18..15c157a982643 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.xml
@@ -5,9 +5,9 @@
* See COPYING.txt for license details.
*/
-->
-
+
@@ -18,5 +18,4 @@
-
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
index 72c5648991ef5..24ed05583b6fb 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
@@ -78,20 +78,20 @@
-
-
-
-
+
+
+
+
-
+
-
-
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml
index 354ad6d2b44ba..d3d96cb9c743c 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -26,4 +26,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/CountryData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/CountryData.xml
index dc82932ec5ca7..7fc349bf9f05c 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Data/CountryData.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Data/CountryData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
- Bahamas
@@ -35,4 +35,4 @@
- United Kingdom
-
\ No newline at end of file
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
index ab82d9fdd93b5..0d3c6e419cc07 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
@@ -31,5 +31,6 @@
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
index d84df3401bab0..8d14a9a561900 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
@@ -23,6 +23,6 @@
-
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
index 34819f641cbc9..bc65f8a2c0816 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
@@ -16,6 +16,7 @@
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml
index d0ef8d347efb5..0d692e4ab143e 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml
@@ -12,5 +12,6 @@
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/IdentityOfDefaultBillingAndShippingAddressSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/IdentityOfDefaultBillingAndShippingAddressSection.xml
index 89b3a25b45e3c..2039128ac2de3 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/IdentityOfDefaultBillingAndShippingAddressSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/IdentityOfDefaultBillingAndShippingAddressSection.xml
@@ -7,8 +7,7 @@
-->
-
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml
index 269ca94b3f772..f3807388399b8 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml
@@ -1,86 +1,86 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
index 35e0058440f6e..5335ec2ad775d 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -96,14 +96,10 @@
-
-
-
-
-
-
-
-
+
+
+
+
@@ -157,14 +153,10 @@
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
index 371826c9e7841..65627787e2a05 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -96,14 +96,10 @@
-
-
-
-
-
-
-
-
+
+
+
+
@@ -157,14 +153,10 @@
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml
index 9664ec47420cc..89028e146c358 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
new file mode 100644
index 0000000000000..693c05684f292
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml
new file mode 100644
index 0000000000000..fb80b4880a6f4
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
index cc5e723c72ea0..8537e10ce5a03 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
@@ -79,8 +79,12 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
new file mode 100644
index 0000000000000..913eb34b34d07
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml
index 70f950f6f6c35..b0e1dead1fff9 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml
@@ -19,18 +19,12 @@
-
-
-
-
-
- 1
-
+
+
-
@@ -48,8 +42,8 @@
-
-
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml
index 2cc21df85ab67..4b3e18fb31877 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml
@@ -36,7 +36,6 @@
-
@@ -99,5 +98,6 @@
+
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Checkout/AttributeMergerTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/AttributeMergerTest.php
new file mode 100644
index 0000000000000..23840da97bd47
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/AttributeMergerTest.php
@@ -0,0 +1,121 @@
+customerRepository = $this->createMock(CustomerRepository::class);
+ $this->customerSession = $this->createMock(CustomerSession::class);
+ $this->addressHelper = $this->createMock(AddressHelper::class);
+ $this->directoryHelper = $this->createMock(DirectoryHelper::class);
+
+ $this->attributeMerger = new AttributeMerger(
+ $this->addressHelper,
+ $this->customerSession,
+ $this->customerRepository,
+ $this->directoryHelper
+ );
+ }
+
+ /**
+ * Tests of element attributes merging.
+ *
+ * @param String $validationRule - validation rule.
+ * @param String $expectedValidation - expected mapped validation.
+ * @dataProvider validationRulesDataProvider
+ */
+ public function testMerge(String $validationRule, String $expectedValidation): void
+ {
+ $elements = [
+ 'field' => [
+ 'visible' => true,
+ 'formElement' => 'input',
+ 'label' => __('City'),
+ 'value' => null,
+ 'sortOrder' => 1,
+ 'validation' => [
+ 'input_validation' => $validationRule
+ ],
+ ]
+ ];
+
+ $actualResult = $this->attributeMerger->merge(
+ $elements,
+ 'provider',
+ 'dataScope',
+ ['field' =>
+ [
+ 'validation' => ['length' => true]
+ ]
+ ]
+ );
+
+ $expectedResult = [
+ $expectedValidation => true,
+ 'length' => true
+ ];
+
+ self::assertEquals($expectedResult, $actualResult['field']['validation']);
+ }
+
+ /**
+ * Provides possible validation types.
+ *
+ * @return array
+ */
+ public function validationRulesDataProvider(): array
+ {
+ return [
+ ['alpha', 'validate-alpha'],
+ ['numeric', 'validate-number'],
+ ['alphanumeric', 'validate-alphanum'],
+ ['alphanum-with-spaces', 'validate-alphanum-with-spaces'],
+ ['url', 'validate-url'],
+ ['email', 'email2'],
+ ['length', 'validate-length']
+ ];
+ }
+}
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
index 54f77c95148ac..b54339aa2c1d8 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
@@ -35,7 +35,7 @@ class OnepageTest extends \PHPUnit\Framework\TestCase
/**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
- private $serializer;
+ private $serializerMock;
protected function setUp()
{
@@ -49,7 +49,7 @@ protected function setUp()
\Magento\Checkout\Block\Checkout\LayoutProcessorInterface::class
);
- $this->serializer = $this->createMock(\Magento\Framework\Serialize\Serializer\Json::class);
+ $this->serializerMock = $this->createMock(\Magento\Framework\Serialize\Serializer\JsonHexTag::class);
$this->model = new \Magento\Checkout\Block\Onepage(
$contextMock,
@@ -57,7 +57,8 @@ protected function setUp()
$this->configProviderMock,
[$this->layoutProcessorMock],
[],
- $this->serializer
+ $this->serializerMock,
+ $this->serializerMock
);
}
@@ -93,6 +94,7 @@ public function testGetJsLayout()
$processedLayout = ['layout' => ['processed' => true]];
$jsonLayout = '{"layout":{"processed":true}}';
$this->layoutProcessorMock->expects($this->once())->method('process')->with([])->willReturn($processedLayout);
+ $this->serializerMock->expects($this->once())->method('serialize')->willReturn($jsonLayout);
$this->assertEquals($jsonLayout, $this->model->getJsLayout());
}
@@ -101,6 +103,7 @@ public function testGetSerializedCheckoutConfig()
{
$checkoutConfig = ['checkout', 'config'];
$this->configProviderMock->expects($this->once())->method('getConfig')->willReturn($checkoutConfig);
+ $this->serializerMock->expects($this->once())->method('serialize')->willReturn(json_encode($checkoutConfig));
$this->assertEquals(json_encode($checkoutConfig), $this->model->getSerializedCheckoutConfig());
}
diff --git a/app/code/Magento/Checkout/etc/frontend/di.xml b/app/code/Magento/Checkout/etc/frontend/di.xml
index d80f88786c87b..00bcd2a27005a 100644
--- a/app/code/Magento/Checkout/etc/frontend/di.xml
+++ b/app/code/Magento/Checkout/etc/frontend/di.xml
@@ -59,6 +59,7 @@
- Magento\Checkout\Block\Checkout\TotalsProcessor
- Magento\Checkout\Block\Checkout\DirectoryDataProcessor
+ Magento\Framework\Serialize\Serializer\JsonHexTag
diff --git a/app/code/Magento/Checkout/etc/frontend/sections.xml b/app/code/Magento/Checkout/etc/frontend/sections.xml
index 35733a6119a25..90c2878f501cf 100644
--- a/app/code/Magento/Checkout/etc/frontend/sections.xml
+++ b/app/code/Magento/Checkout/etc/frontend/sections.xml
@@ -46,7 +46,6 @@
-
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
index 22b37b2da0b2f..1858ce946fb07 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
@@ -10,7 +10,8 @@
*/
define([
'jquery',
- 'Magento_Customer/js/customer-data'
+ 'Magento_Customer/js/customer-data',
+ 'jquery/jquery-storageapi'
], function ($, storage) {
'use strict';
@@ -23,6 +24,22 @@ define([
storage.set(cacheKey, data);
},
+ /**
+ * @return {*}
+ */
+ initData = function () {
+ return {
+ 'selectedShippingAddress': null, //Selected shipping address pulled from persistence storage
+ 'shippingAddressFromData': null, //Shipping address pulled from persistence storage
+ 'newCustomerShippingAddress': null, //Shipping address pulled from persistence storage for customer
+ 'selectedShippingRate': null, //Shipping rate pulled from persistence storage
+ 'selectedPaymentMethod': null, //Payment method pulled from persistence storage
+ 'selectedBillingAddress': null, //Selected billing address pulled from persistence storage
+ 'billingAddressFromData': null, //Billing address pulled from persistence storage
+ 'newCustomerBillingAddress': null //Billing address pulled from persistence storage for new customer
+ };
+ },
+
/**
* @return {*}
*/
@@ -30,17 +47,12 @@ define([
var data = storage.get(cacheKey)();
if ($.isEmptyObject(data)) {
- data = {
- 'selectedShippingAddress': null, //Selected shipping address pulled from persistence storage
- 'shippingAddressFromData': null, //Shipping address pulled from persistence storage
- 'newCustomerShippingAddress': null, //Shipping address pulled from persistence storage for customer
- 'selectedShippingRate': null, //Shipping rate pulled from persistence storage
- 'selectedPaymentMethod': null, //Payment method pulled from persistence storage
- 'selectedBillingAddress': null, //Selected billing address pulled from persistence storage
- 'billingAddressFromData': null, //Billing address pulled from persistence storage
- 'newCustomerBillingAddress': null //Billing address pulled from persistence storage for new customer
- };
- saveData(data);
+ data = $.initNamespaceStorage('mage-cache-storage').localStorage.get(cacheKey);
+
+ if ($.isEmptyObject(data)) {
+ data = initData();
+ saveData(data);
+ }
}
return data;
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js b/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js
index c3c5b9d68cec0..c07878fcaea92 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js
@@ -9,9 +9,10 @@ define(
[
'mage/storage',
'Magento_Checkout/js/model/error-processor',
- 'Magento_Checkout/js/model/full-screen-loader'
+ 'Magento_Checkout/js/model/full-screen-loader',
+ 'Magento_Customer/js/customer-data'
],
- function (storage, errorProcessor, fullScreenLoader) {
+ function (storage, errorProcessor, fullScreenLoader, customerData) {
'use strict';
return function (serviceUrl, payload, messageContainer) {
@@ -23,6 +24,23 @@ define(
function (response) {
errorProcessor.process(response, messageContainer);
}
+ ).success(
+ function (response) {
+ var clearData = {
+ 'selectedShippingAddress': null,
+ 'shippingAddressFromData': null,
+ 'newCustomerShippingAddress': null,
+ 'selectedShippingRate': null,
+ 'selectedPaymentMethod': null,
+ 'selectedBillingAddress': null,
+ 'billingAddressFromData': null,
+ 'newCustomerBillingAddress': null
+ };
+
+ if (response.responseType !== 'error') {
+ customerData.set('checkout-data', clearData);
+ }
+ }
).always(
function () {
fullScreenLoader.stopLoader();
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js
index a95471d90dab8..0a5334a42c7e5 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js
@@ -14,11 +14,13 @@ define([
/**
* @param {*} postCode
* @param {*} countryId
+ * @param {Array} postCodesPatterns
* @return {Boolean}
*/
- validate: function (postCode, countryId) {
- var patterns = window.checkoutConfig.postCodes[countryId],
- pattern, regex;
+ validate: function (postCode, countryId, postCodesPatterns) {
+ var pattern, regex,
+ patterns = postCodesPatterns ? postCodesPatterns[countryId] :
+ window.checkoutConfig.postCodes[countryId];
this.validatedPostCodeExample = [];
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
index fde88ebadb393..8b07c02e4d380 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
@@ -42,6 +42,7 @@ define([
return {
validateAddressTimeout: 0,
+ validateZipCodeTimeout: 0,
validateDelay: 2000,
/**
@@ -133,16 +134,20 @@ define([
});
} else {
element.on('value', function () {
+ clearTimeout(self.validateZipCodeTimeout);
+ self.validateZipCodeTimeout = setTimeout(function () {
+ if (element.index === postcodeElementName) {
+ self.postcodeValidation(element);
+ } else {
+ $.each(postcodeElements, function (index, elem) {
+ self.postcodeValidation(elem);
+ });
+ }
+ }, delay);
+
if (!formPopUpState.isVisible()) {
clearTimeout(self.validateAddressTimeout);
self.validateAddressTimeout = setTimeout(function () {
- if (element.index === postcodeElementName) {
- self.postcodeValidation(element);
- } else {
- $.each(postcodeElements, function (index, elem) {
- self.postcodeValidation(elem);
- });
- }
self.validateFields();
}, delay);
}
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
index dde1ad72ba15e..e66c66006246c 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
@@ -25,6 +25,7 @@ define([
}
},
scrollHeight: 0,
+ shoppingCartUrl: window.checkout.shoppingCartUrl,
/**
* Create sidebar.
@@ -227,6 +228,10 @@ define([
if (!_.isUndefined(productData)) {
$(document).trigger('ajax:updateCartItemQty');
+
+ if (window.location.href === this.shoppingCartUrl) {
+ window.location.reload(false);
+ }
}
this._hideItemButton(elem);
},
diff --git a/app/code/Magento/CheckoutAgreements/etc/di.xml b/app/code/Magento/CheckoutAgreements/etc/di.xml
index 081e3daa781ff..a8ff8f5941f96 100644
--- a/app/code/Magento/CheckoutAgreements/etc/di.xml
+++ b/app/code/Magento/CheckoutAgreements/etc/di.xml
@@ -23,7 +23,7 @@
-
+
Magento\CheckoutAgreements\Model\Api\SearchCriteria\CollectionProcessor
diff --git a/app/code/Magento/Cms/Model/Page/Source/PageLayout.php b/app/code/Magento/Cms/Model/Page/Source/PageLayout.php
index fb759348759b2..23a452c0fe58c 100644
--- a/app/code/Magento/Cms/Model/Page/Source/PageLayout.php
+++ b/app/code/Magento/Cms/Model/Page/Source/PageLayout.php
@@ -20,6 +20,7 @@ class PageLayout implements OptionSourceInterface
/**
* @var array
+ * @deprecated since the cache is now handled by \Magento\Theme\Model\PageLayout\Config\Builder::$configFiles
*/
protected $options;
@@ -34,16 +35,10 @@ public function __construct(BuilderInterface $pageLayoutBuilder)
}
/**
- * Get options
- *
- * @return array
+ * @inheritdoc
*/
public function toOptionArray()
{
- if ($this->options !== null) {
- return $this->options;
- }
-
$configOptions = $this->pageLayoutBuilder->getPageLayoutsConfig()->getOptions();
$options = [];
foreach ($configOptions as $key => $value) {
@@ -54,6 +49,6 @@ public function toOptionArray()
}
$this->options = $options;
- return $this->options;
+ return $options;
}
}
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Block.php b/app/code/Magento/Cms/Model/ResourceModel/Block.php
index 9aab54b02bc14..30e817713755c 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Block.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Block.php
@@ -95,9 +95,11 @@ protected function _beforeSave(AbstractModel $object)
}
/**
+ * Get block id.
+ *
* @param AbstractModel $object
* @param mixed $value
- * @param null $field
+ * @param string $field
* @return bool|int|string
* @throws LocalizedException
* @throws \Exception
@@ -183,10 +185,12 @@ public function getIsUniqueBlockToStores(AbstractModel $object)
$entityMetadata = $this->metadataPool->getMetadata(BlockInterface::class);
$linkField = $entityMetadata->getLinkField();
- if ($this->_storeManager->isSingleStoreMode()) {
- $stores = [Store::DEFAULT_STORE_ID];
- } else {
- $stores = (array)$object->getData('store_id');
+ $stores = (array)$object->getData('store_id');
+ $isDefaultStore = $this->_storeManager->isSingleStoreMode()
+ || array_search(Store::DEFAULT_STORE_ID, $stores) !== false;
+
+ if (!$isDefaultStore) {
+ $stores[] = Store::DEFAULT_STORE_ID;
}
$select = $this->getConnection()->select()
@@ -196,8 +200,11 @@ public function getIsUniqueBlockToStores(AbstractModel $object)
'cb.' . $linkField . ' = cbs.' . $linkField,
[]
)
- ->where('cb.identifier = ?', $object->getData('identifier'))
- ->where('cbs.store_id IN (?)', $stores);
+ ->where('cb.identifier = ? ', $object->getData('identifier'));
+
+ if (!$isDefaultStore) {
+ $select->where('cbs.store_id IN (?)', $stores);
+ }
if ($object->getId()) {
$select->where('cb.' . $entityMetadata->getIdentifierField() . ' <> ?', $object->getId());
@@ -236,6 +243,8 @@ public function lookupStoreIds($id)
}
/**
+ * Save an object.
+ *
* @param AbstractModel $object
* @return $this
* @throws \Exception
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
index 75e059f620c2d..e7379d3c7336f 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
@@ -44,4 +44,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml
new file mode 100644
index 0000000000000..a4b88c544de88
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Data/BlockData.xml b/app/code/Magento/Cms/Test/Mftf/Data/BlockData.xml
new file mode 100644
index 0000000000000..dea047ec43568
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Data/BlockData.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+ Sales25off
+ Sales25off
+ All Store Views
+ sales25off everything!
+ 0
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Data/NewCMSPageData.xml b/app/code/Magento/Cms/Test/Mftf/Data/NewCMSPageData.xml
new file mode 100644
index 0000000000000..61dfb051d101e
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Data/NewCMSPageData.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+ CMSpage
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsEditBlockPage.xml b/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsEditBlockPage.xml
new file mode 100644
index 0000000000000..3fd100ee02aa2
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsEditBlockPage.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/AdminBlockGridSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/AdminBlockGridSection.xml
new file mode 100644
index 0000000000000..ab15570a01f40
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/AdminBlockGridSection.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml
index 4c6014af51264..2efa7f62fc4ec 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml
@@ -17,6 +17,7 @@
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
index 42f8f4d00ee9f..a340d0af1e7a1 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
@@ -22,5 +22,6 @@
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
index ded94eab92042..1adb781a67536 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
@@ -36,7 +36,7 @@
-
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
index 2586ffc11d086..394d79bda1ab3 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
@@ -42,7 +42,7 @@
-
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
index 691a99a73b90b..862f51ea72fad 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
@@ -41,7 +41,7 @@
-
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
index 9cdbccd1f8c32..298aed917fc18 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
@@ -40,7 +40,7 @@
-
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
new file mode 100644
index 0000000000000..c3c92dc59c288
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/StoreViewLanguageCorrectSwitchTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/StoreViewLanguageCorrectSwitchTest.xml
new file mode 100644
index 0000000000000..65fabfe25e817
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/StoreViewLanguageCorrectSwitchTest.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php
index 54e0e17ab7ad6..a624823d02c13 100644
--- a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php
@@ -118,7 +118,8 @@ public function testPrepareMetadata()
'config' => [
'editorConfig' => [
'enabled' => false
- ]
+ ],
+ 'componentType' => \Magento\Ui\Component\Container::NAME
]
]
]
diff --git a/app/code/Magento/Cms/Ui/Component/DataProvider.php b/app/code/Magento/Cms/Ui/Component/DataProvider.php
index 5fc9c5a896037..b02dd6ba98ed0 100644
--- a/app/code/Magento/Cms/Ui/Component/DataProvider.php
+++ b/app/code/Magento/Cms/Ui/Component/DataProvider.php
@@ -13,6 +13,9 @@
use Magento\Framework\AuthorizationInterface;
use Magento\Framework\View\Element\UiComponent\DataProvider\Reporting;
+/**
+ * DataProvider for cms ui.
+ */
class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider
{
/**
@@ -67,6 +70,8 @@ public function __construct(
}
/**
+ * Get authorization info.
+ *
* @deprecated 101.0.7
* @return AuthorizationInterface|mixed
*/
@@ -95,7 +100,8 @@ public function prepareMetadata()
'config' => [
'editorConfig' => [
'enabled' => false
- ]
+ ],
+ 'componentType' => \Magento\Ui\Component\Container::NAME
]
]
]
diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
index 81e39a83296d7..2a29fa33feb74 100644
--- a/app/code/Magento/Config/Block/System/Config/Form.php
+++ b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -134,6 +134,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
* @param \Magento\Config\Block\System\Config\Form\Fieldset\Factory $fieldsetFactory
* @param \Magento\Config\Block\System\Config\Form\Field\Factory $fieldFactory
* @param array $data
+ * @param SettingChecker|null $settingChecker
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
@@ -143,13 +144,15 @@ public function __construct(
\Magento\Config\Model\Config\Structure $configStructure,
\Magento\Config\Block\System\Config\Form\Fieldset\Factory $fieldsetFactory,
\Magento\Config\Block\System\Config\Form\Field\Factory $fieldFactory,
- array $data = []
+ array $data = [],
+ SettingChecker $settingChecker = null
) {
parent::__construct($context, $registry, $formFactory, $data);
$this->_configFactory = $configFactory;
$this->_configStructure = $configStructure;
$this->_fieldsetFactory = $fieldsetFactory;
$this->_fieldFactory = $fieldFactory;
+ $this->settingChecker = $settingChecker ?: ObjectManager::getInstance()->get(SettingChecker::class);
$this->_scopeLabels = [
self::SCOPE_DEFAULT => __('[GLOBAL]'),
@@ -158,18 +161,6 @@ public function __construct(
];
}
- /**
- * @deprecated 100.1.2
- * @return SettingChecker
- */
- private function getSettingChecker()
- {
- if ($this->settingChecker === null) {
- $this->settingChecker = ObjectManager::getInstance()->get(SettingChecker::class);
- }
- return $this->settingChecker;
- }
-
/**
* Initialize objects required to render config form
*
@@ -366,9 +357,8 @@ protected function _initElement(
$sharedClass = $this->_getSharedCssClass($field);
$requiresClass = $this->_getRequiresCssClass($field, $fieldPrefix);
+ $isReadOnly = $this->isReadOnly($field, $path);
- $isReadOnly = $this->getElementVisibility()->isDisabled($field->getPath())
- ?: $this->getSettingChecker()->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
$formField = $fieldset->addField(
$elementId,
$field->getType(),
@@ -417,7 +407,7 @@ private function getFieldData(\Magento\Config\Model\Config\Structure\Element\Fie
{
$data = $this->getAppConfigDataValue($path);
- $placeholderValue = $this->getSettingChecker()->getPlaceholderValue(
+ $placeholderValue = $this->settingChecker->getPlaceholderValue(
$path,
$this->getScope(),
$this->getStringScopeCode()
@@ -541,7 +531,7 @@ public function getConfigValue($path)
}
/**
- * @return \Magento\Backend\Block\Widget\Form|\Magento\Framework\View\Element\AbstractBlock
+ * @inheritdoc
*/
protected function _beforeToHtml()
{
@@ -718,6 +708,7 @@ protected function _getAdditionalElementTypes()
*
* @TODO delete this methods when {^see above^} is done
* @return string
+ * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
*/
public function getSectionCode()
{
@@ -729,6 +720,7 @@ public function getSectionCode()
*
* @TODO delete this methods when {^see above^} is done
* @return string
+ * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
*/
public function getWebsiteCode()
{
@@ -740,6 +732,7 @@ public function getWebsiteCode()
*
* @TODO delete this methods when {^see above^} is done
* @return string
+ * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
*/
public function getStoreCode()
{
@@ -797,6 +790,26 @@ private function getAppConfig()
return $this->appConfig;
}
+ /**
+ * Check Path is Readonly
+ *
+ * @param \Magento\Config\Model\Config\Structure\Element\Field $field
+ * @param string $path
+ * @return boolean
+ */
+ private function isReadOnly(\Magento\Config\Model\Config\Structure\Element\Field $field, $path)
+ {
+ $isReadOnly = $this->settingChecker->isReadOnly(
+ $path,
+ ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+ );
+ if (!$isReadOnly) {
+ $isReadOnly = $this->getElementVisibility()->isDisabled($field->getPath())
+ ?: $this->settingChecker->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
+ }
+ return $isReadOnly;
+ }
+
/**
* Retrieve deployment config data value by path
*
diff --git a/app/code/Magento/Config/Test/Mftf/Data/AllowGuestCheckoutData.xml b/app/code/Magento/Config/Test/Mftf/Data/AllowGuestCheckoutData.xml
new file mode 100644
index 0000000000000..f89cdf1a87b31
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Data/AllowGuestCheckoutData.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+ AllowGuestCheckoutYes
+
+
+ 1
+
+
+
+ AllowGuestCheckoutNo
+
+
+ 0
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml b/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml
new file mode 100644
index 0000000000000..53ca46e746206
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+ AdminAccountAllowCountryUS
+
+
+ US
+
+
+
+ DefaultAdminAccountAllowCountry
+
+
+ 0
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/Data/LocaleOptionsData.xml b/app/code/Magento/Config/Test/Mftf/Data/LocaleOptionsData.xml
new file mode 100644
index 0000000000000..5647283fae181
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Data/LocaleOptionsData.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+ setLocaleOptionsFrance
+
+
+ fr_FR
+
+
+
+ setLocaleOptionsUSA
+
+
+ en_US
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/Data/SystemConfigData.xml b/app/code/Magento/Config/Test/Mftf/Data/SystemConfigData.xml
index 75dc19dc99c8e..85188eb6e04cb 100644
--- a/app/code/Magento/Config/Test/Mftf/Data/SystemConfigData.xml
+++ b/app/code/Magento/Config/Test/Mftf/Data/SystemConfigData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
Yes
diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/allow_guest_checkout-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/allow_guest_checkout-meta.xml
new file mode 100644
index 0000000000000..052d9b6574774
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Metadata/allow_guest_checkout-meta.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/locale_options_config-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/locale_options_config-meta.xml
new file mode 100644
index 0000000000000..055a9896cd2d2
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Metadata/locale_options_config-meta.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml
new file mode 100644
index 0000000000000..bd16c225af51d
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/system_config-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-meta.xml
index 37b8414d1f396..e7544c4e8ae28 100644
--- a/app/code/Magento/Config/Test/Mftf/Metadata/system_config-meta.xml
+++ b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-meta.xml
@@ -5,8 +5,9 @@
* See COPYING.txt for license details.
*/
-->
+
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
index 44ac0981d9577..b3c0d8d9e0047 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
@@ -45,6 +45,16 @@
0
US_Address_TX
+
+ 1
+ John.Doe@example.com
+ John
+ Doe
+ John Doe
+ pwdTest123!
+ 0
+ 0
+
0
true
@@ -73,6 +83,20 @@
US_Address_NY_Not_Default_Address
UK_Not_Default_Address
+
+ 0
+ true
+ true
+ John.Doe@example.com
+ John
+ Doe
+ John Doe
+ pwdTest123!
+ 0
+ 0
+ US_Address_TX_Default_Billing
+ US_Address_NY_Default_Shipping
+
0
true
@@ -142,4 +166,16 @@
0
UK_Not_Default_Address
+
+ 1
+ John.Doe@example.com
+ John
+ Doe
+ John Doe
+ pwdTest123!
+ 0
+ 0
+ US_Default_Billing_Address_TX
+ US_Default_Shipping_Address_CA
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/NewCustomerData.xml
similarity index 77%
rename from app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml
rename to app/code/Magento/Customer/Test/Mftf/Data/NewCustomerData.xml
index 30345ec31bacd..cdd117c2a0b12 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/NewCustomerData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
Abgar
Abgaryan
@@ -20,5 +20,4 @@
9999
Armenia
-
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
index d662c5cef6032..9bd382da8eb92 100644
--- a/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
@@ -13,5 +13,6 @@
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml
index e2ebf638934c6..0d273da353005 100644
--- a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml
@@ -9,6 +9,7 @@
-
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutSuccessPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutSuccessPage.xml
new file mode 100644
index 0000000000000..9c1fc7aa8a88d
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutSuccessPage.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCreateUserSection.xml
similarity index 81%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminCreateUserSection.xml
index 98d748b5a30ea..376b0b9f66db9 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCreateUserSection.xml
@@ -5,7 +5,9 @@
* See COPYING.txt for license details.
*/
-->
-
+
+
-
\ No newline at end of file
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
index d5a410164a6f1..6a3687bb77c8f 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
@@ -9,6 +9,7 @@
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
index 3ff880c64e6d6..0a56763b66704 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
@@ -11,5 +11,6 @@
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerShoppingCartSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerShoppingCartSection.xml
new file mode 100644
index 0000000000000..c4a4d650c1e59
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerShoppingCartSection.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml
similarity index 68%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml
index bf2e2b44eb602..0ba197999be6c 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml
@@ -5,11 +5,13 @@
* See COPYING.txt for license details.
*/
-->
-
+
+
-
\ No newline at end of file
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml
new file mode 100644
index 0000000000000..04d6c4dc2a09d
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminUserGridSection.xml
similarity index 74%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminUserGridSection.xml
index 9564bc61f799c..7c4a76871d58c 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminUserGridSection.xml
@@ -5,7 +5,9 @@
* See COPYING.txt for license details.
*/
-->
-
+
+
-
\ No newline at end of file
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/CustomersPageSection.xml
similarity index 84%
rename from app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/CustomersPageSection.xml
index e4a75b1b6a842..60c635387199a 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/CustomersPageSection.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/CustomersSubmenuSection.xml
similarity index 68%
rename from app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/CustomersSubmenuSection.xml
index 937afb83da96f..6eeef1ba9daf0 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/CustomersSubmenuSection.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/NewCustomerPageSection.xml
similarity index 92%
rename from app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/NewCustomerPageSection.xml
index d302f9c7d0cba..abb8aa6c1d826 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/NewCustomerPageSection.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
new file mode 100644
index 0000000000000..59da4e9279a03
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressFormSection.xml
new file mode 100644
index 0000000000000..112ced1bc375f
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressFormSection.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml
index 05bbc559defac..29a2f549274a7 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml
@@ -9,7 +9,13 @@
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
index 2b5662cdd623e..ee14ee5c165c5 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
@@ -11,9 +11,23 @@
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
index a0c83f5bc491b..1955c6a417ba9 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
@@ -12,5 +12,8 @@
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/SwitchAccountSection.xml
similarity index 78%
rename from app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/SwitchAccountSection.xml
index 3a07cbc6dd145..4442e317694ee 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/SwitchAccountSection.xml
@@ -7,8 +7,7 @@
-->
-
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-
-
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontAddCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontAddCustomerAddressTest.xml
new file mode 100644
index 0000000000000..413bbfd06a539
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontAddCustomerAddressTest.xml
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressTest.xml
new file mode 100644
index 0000000000000..d9d1c9f2e05a0
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressTest.xml
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php b/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
new file mode 100644
index 0000000000000..31bcc37612302
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
@@ -0,0 +1,196 @@
+objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+ $this->currentCustomer = $this->getMockBuilder(\Magento\Customer\Helper\Session\CurrentCustomer::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getCustomer'])
+ ->getMock();
+
+ $this->addressCollectionFactory = $this->getMockBuilder(CollectionFactory::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+
+ $this->countryFactory = $this->getMockBuilder(\Magento\Directory\Model\CountryFactory::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+
+ $this->urlBuilder = $this->getMockForAbstractClass(\Magento\Framework\UrlInterface::class);
+
+ $this->gridBlock = $this->objectManager->getObject(
+ \Magento\Customer\Block\Address\Grid::class,
+ [
+ 'addressCollectionFactory' => $this->addressCollectionFactory,
+ 'currentCustomer' => $this->currentCustomer,
+ 'countryFactory' => $this->countryFactory,
+ '_urlBuilder' => $this->urlBuilder
+ ]
+ );
+ }
+
+ /**
+ * Test for \Magento\Customer\Block\Address\Book::getChildHtml method with 'pager' argument
+ */
+ public function testGetChildHtml()
+ {
+ $customerId = 1;
+
+ /** @var \Magento\Framework\View\Element\BlockInterface|\PHPUnit_Framework_MockObject_MockObject $block */
+ $block = $this->getMockBuilder(\Magento\Framework\View\Element\BlockInterface::class)
+ ->setMethods(['setCollection'])
+ ->getMockForAbstractClass();
+ /** @var $layout \Magento\Framework\View\LayoutInterface|\PHPUnit_Framework_MockObject_MockObject */
+ $layout = $this->getMockForAbstractClass(\Magento\Framework\View\LayoutInterface::class);
+ /** @var \Magento\Customer\Api\Data\CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
+ $customer = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
+ /** @var \PHPUnit_Framework_MockObject_MockObject */
+ $addressCollection = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Address\Collection::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['setOrder', 'setCustomerFilter', 'load'])
+ ->getMock();
+
+ $layout->expects($this->atLeastOnce())->method('getChildName')->with('NameInLayout', 'pager')
+ ->willReturn('ChildName');
+ $layout->expects($this->atLeastOnce())->method('renderElement')->with('ChildName', true)
+ ->willReturn('OutputString');
+ $layout->expects($this->atLeastOnce())->method('createBlock')
+ ->with(\Magento\Theme\Block\Html\Pager::class, 'customer.addresses.pager')->willReturn($block);
+ $customer->expects($this->atLeastOnce())->method('getId')->willReturn($customerId);
+ $this->currentCustomer->expects($this->atLeastOnce())->method('getCustomer')->willReturn($customer);
+ $addressCollection->expects($this->atLeastOnce())->method('setOrder')->with('entity_id', 'desc')
+ ->willReturnSelf();
+ $addressCollection->expects($this->atLeastOnce())->method('setCustomerFilter')->with([$customerId])
+ ->willReturnSelf();
+ $this->addressCollectionFactory->expects($this->atLeastOnce())->method('create')
+ ->willReturn($addressCollection);
+ $block->expects($this->atLeastOnce())->method('setCollection')->with($addressCollection)->willReturnSelf();
+ $this->gridBlock->setNameInLayout('NameInLayout');
+ $this->gridBlock->setLayout($layout);
+ $this->assertEquals('OutputString', $this->gridBlock->getChildHtml('pager'));
+ }
+
+ /**
+ * Test for \Magento\Customer\Block\Address\Grid::getAddressEditUrl method
+ */
+ public function testGetAddAddressUrl()
+ {
+ $addressId = 1;
+ $expectedUrl = 'expected_url';
+ $this->urlBuilder->expects($this->atLeastOnce())->method('getUrl')
+ ->with('customer/address/edit', ['_secure' => true, 'id' => $addressId])
+ ->willReturn($expectedUrl);
+ $this->assertEquals($expectedUrl, $this->gridBlock->getAddressEditUrl($addressId));
+ }
+
+ public function testGetAdditionalAddresses()
+ {
+ $customerId = 1;
+ /** @var \Magento\Customer\Api\Data\CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
+ $customer = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
+ /** @var \PHPUnit_Framework_MockObject_MockObject */
+ $addressCollection = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Address\Collection::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['setOrder', 'setCustomerFilter', 'load', 'getIterator'])
+ ->getMock();
+ $addressDataModel = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\AddressInterface::class);
+ $address = $this->getMockBuilder(\Magento\Customer\Model\Address::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getId', 'getDataModel'])
+ ->getMock();
+ $collection = [$address, $address, $address];
+ $address->expects($this->exactly(3))->method('getId')
+ ->willReturnOnConsecutiveCalls(1, 2, 3);
+ $address->expects($this->atLeastOnce())->method('getDataModel')->willReturn($addressDataModel);
+ $customer->expects($this->atLeastOnce())->method('getId')->willReturn($customerId);
+ $customer->expects($this->atLeastOnce())->method('getDefaultBilling')->willReturn('1');
+ $customer->expects($this->atLeastOnce())->method('getDefaultShipping')->willReturn('2');
+
+ $this->currentCustomer->expects($this->atLeastOnce())->method('getCustomer')->willReturn($customer);
+ $addressCollection->expects($this->atLeastOnce())->method('setOrder')->with('entity_id', 'desc')
+ ->willReturnSelf();
+ $addressCollection->expects($this->atLeastOnce())->method('setCustomerFilter')->with([$customerId])
+ ->willReturnSelf();
+ $addressCollection->expects($this->atLeastOnce())->method('getIterator')
+ ->willReturn(new \ArrayIterator($collection));
+ $this->addressCollectionFactory->expects($this->atLeastOnce())->method('create')
+ ->willReturn($addressCollection);
+
+ $this->assertEquals($addressDataModel, $this->gridBlock->getAdditionalAddresses()[0]);
+ }
+
+ /**
+ * Test for \Magento\Customer\ViewModel\CustomerAddress::getStreetAddress method
+ */
+ public function testGetStreetAddress()
+ {
+ $street = ['Line 1', 'Line 2'];
+ $expectedAddress = 'Line 1, Line 2';
+ $address = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\AddressInterface::class);
+ $address->expects($this->atLeastOnce())->method('getStreet')->willReturn($street);
+ $this->assertEquals($expectedAddress, $this->gridBlock->getStreetAddress($address));
+ }
+
+ /**
+ * Test for \Magento\Customer\ViewModel\CustomerAddress::getCountryByCode method
+ */
+ public function testGetCountryByCode()
+ {
+ $countryId = 'US';
+ $countryName = 'United States';
+ $country = $this->getMockBuilder(\Magento\Directory\Model\Country::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['loadByCode', 'getName'])
+ ->getMock();
+ $this->countryFactory->expects($this->atLeastOnce())->method('create')->willReturn($country);
+ $country->expects($this->atLeastOnce())->method('loadByCode')->with($countryId)->willReturnSelf();
+ $country->expects($this->atLeastOnce())->method('getName')->willReturn($countryName);
+ $this->assertEquals($countryName, $this->gridBlock->getCountryByCode($countryId));
+ }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php
index c2a795fc95016..7ae55f44421c7 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php
@@ -455,14 +455,20 @@ public function testExecute(
$regionCode,
$newRegionId,
$newRegion,
- $newRegionCode
+ $newRegionCode,
+ $existingDefaultBilling = false,
+ $existingDefaultShipping = false,
+ $setDefaultBilling = false,
+ $setDefaultShipping = false
): void {
$existingAddressData = [
'country_id' => $countryId,
'region_id' => $regionId,
'region' => $region,
'region_code' => $regionCode,
- 'customer_id' => $customerId
+ 'customer_id' => $customerId,
+ 'default_billing' => $existingDefaultBilling,
+ 'default_shipping' => $existingDefaultShipping,
];
$newAddressData = [
'country_id' => $countryId,
@@ -486,8 +492,8 @@ public function testExecute(
->method('getParam')
->willReturnMap([
['id', null, $addressId],
- ['default_billing', false, $addressId],
- ['default_shipping', false, $addressId],
+ ['default_billing', $existingDefaultBilling, $setDefaultBilling],
+ ['default_shipping', $existingDefaultShipping, $setDefaultShipping],
]);
$this->addressRepository->expects($this->once())
@@ -565,11 +571,11 @@ public function testExecute(
->willReturnSelf();
$this->addressData->expects($this->once())
->method('setIsDefaultBilling')
- ->with()
+ ->with($setDefaultBilling)
->willReturnSelf();
$this->addressData->expects($this->once())
->method('setIsDefaultShipping')
- ->with()
+ ->with($setDefaultShipping)
->willReturnSelf();
$this->messageManager->expects($this->once())
@@ -628,11 +634,11 @@ public function dataProviderTestExecute(): array
[1, 1, 1, 2, null, null, 12, null, null],
[1, 1, 1, 2, 'Alaska', null, 12, null, 'CA'],
- [1, 1, 1, 2, 'Alaska', 'AK', 12, 'California', null],
+ [1, 1, 1, 2, 'Alaska', 'AK', 12, 'California', null, true, true, true, false],
- [1, 1, 1, 2, null, null, 12, null, null],
- [1, 1, 1, 2, 'Alaska', null, 12, null, 'CA'],
- [1, 1, 1, 2, 'Alaska', 'AK', 12, 'California', null],
+ [1, 1, 1, 2, null, null, 12, null, null, false, false, true, false],
+ [1, 1, 1, 2, 'Alaska', null, 12, null, 'CA', true, false, true, false],
+ [1, 1, 1, 2, 'Alaska', 'AK', 12, 'California', null, true, true, true, true],
];
}
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php
index 78d9dd7003522..45e64f6557d51 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php
@@ -5,10 +5,14 @@
*/
namespace Magento\Customer\Test\Unit\Controller\Adminhtml\Index;
+use Magento\Customer\Model\AddressRegistry;
use Magento\Customer\Model\EmailNotificationInterface;
+use Magento\Framework\DataObject;
use Magento\Framework\Message\MessageInterface;
/**
+ * Unit tests for Inline customer edit
+ *
* @SuppressWarnings(PHPMD.TooManyFields)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
@@ -68,14 +72,27 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
/** @var EmailNotificationInterface|\PHPUnit_Framework_MockObject_MockObject */
private $emailNotification;
+ /** @var AddressRegistry|\PHPUnit_Framework_MockObject_MockObject */
+ private $addressRegistry;
+
/** @var array */
private $items;
+ /**
+ * Sets up mocks
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
protected function setUp()
{
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
- $this->request = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class, [], '', false);
+ $this->request = $this->getMockForAbstractClass(
+ \Magento\Framework\App\RequestInterface::class,
+ [],
+ '',
+ false
+ );
$this->messageManager = $this->getMockForAbstractClass(
\Magento\Framework\Message\ManagerInterface::class,
[],
@@ -125,8 +142,12 @@ protected function setUp()
'',
false
);
- $this->logger = $this->getMockForAbstractClass(\Psr\Log\LoggerInterface::class, [], '', false);
-
+ $this->logger = $this->getMockForAbstractClass(
+ \Psr\Log\LoggerInterface::class,
+ [],
+ '',
+ false
+ );
$this->emailNotification = $this->getMockBuilder(EmailNotificationInterface::class)
->disableOriginalConstructor()
->getMock();
@@ -138,6 +159,7 @@ protected function setUp()
'messageManager' => $this->messageManager,
]
);
+ $this->addressRegistry = $this->createMock(\Magento\Customer\Model\AddressRegistry::class);
$this->controller = $objectManager->getObject(
\Magento\Customer\Controller\Adminhtml\Index\InlineEdit::class,
[
@@ -150,6 +172,7 @@ protected function setUp()
'addressDataFactory' => $this->addressDataFactory,
'addressRepository' => $this->addressRepository,
'logger' => $this->logger,
+ 'addressRegistry' => $this->addressRegistry
]
);
$reflection = new \ReflectionClass(get_class($this->controller));
@@ -166,6 +189,8 @@ protected function setUp()
}
/**
+ * Prepare mocks for tests
+ *
* @param int $populateSequence
*/
protected function prepareMocksForTesting($populateSequence = 0)
@@ -204,6 +229,9 @@ protected function prepareMocksForTesting($populateSequence = 0)
->willReturn(12);
}
+ /**
+ * Prepare mocks for update customers default billing address use case
+ */
protected function prepareMocksForUpdateDefaultBilling()
{
$this->prepareMocksForProcessAddressData();
@@ -212,12 +240,15 @@ protected function prepareMocksForUpdateDefaultBilling()
'firstname' => 'Firstname',
'lastname' => 'Lastname',
];
- $this->customerData->expects($this->once())
+ $this->customerData->expects($this->exactly(2))
->method('getAddresses')
->willReturn([$this->address]);
$this->address->expects($this->once())
->method('isDefaultBilling')
->willReturn(true);
+ $this->addressRegistry->expects($this->once())
+ ->method('retrieve')
+ ->willReturn(new DataObject());
$this->dataObjectHelper->expects($this->at(0))
->method('populateWithArray')
->with(
@@ -227,6 +258,9 @@ protected function prepareMocksForUpdateDefaultBilling()
);
}
+ /**
+ * Prepare mocks for processing customers address data use case
+ */
protected function prepareMocksForProcessAddressData()
{
$this->customerData->expects($this->once())
@@ -237,6 +271,9 @@ protected function prepareMocksForProcessAddressData()
->willReturn('Lastname');
}
+ /**
+ * Prepare mocks for error messages processing test
+ */
protected function prepareMocksForErrorMessagesProcessing()
{
$this->messageManager->expects($this->atLeastOnce())
@@ -261,6 +298,9 @@ protected function prepareMocksForErrorMessagesProcessing()
->willReturnSelf();
}
+ /**
+ * Unit test for updating customers billing address use case
+ */
public function testExecuteWithUpdateBilling()
{
$this->prepareMocksForTesting(1);
@@ -281,6 +321,9 @@ public function testExecuteWithUpdateBilling()
$this->assertSame($this->resultJson, $this->controller->execute());
}
+ /**
+ * Unit test for creating customer with empty data use case
+ */
public function testExecuteWithoutItems()
{
$this->resultJsonFactory->expects($this->once())
@@ -305,6 +348,9 @@ public function testExecuteWithoutItems()
$this->assertSame($this->resultJson, $this->controller->execute());
}
+ /**
+ * Unit test for verifying Localized Exception during inline edit
+ */
public function testExecuteLocalizedException()
{
$exception = new \Magento\Framework\Exception\LocalizedException(__('Exception message'));
@@ -312,6 +358,9 @@ public function testExecuteLocalizedException()
$this->customerData->expects($this->once())
->method('getDefaultBilling')
->willReturn(false);
+ $this->customerData->expects($this->once())
+ ->method('getAddresses')
+ ->willReturn([]);
$this->customerRepository->expects($this->once())
->method('save')
->with($this->customerData)
@@ -327,6 +376,9 @@ public function testExecuteLocalizedException()
$this->assertSame($this->resultJson, $this->controller->execute());
}
+ /**
+ * Unit test for verifying Execute Exception during inline edit
+ */
public function testExecuteException()
{
$exception = new \Exception('Exception message');
@@ -334,6 +386,9 @@ public function testExecuteException()
$this->customerData->expects($this->once())
->method('getDefaultBilling')
->willReturn(false);
+ $this->customerData->expects($this->once())
+ ->method('getAddresses')
+ ->willReturn([]);
$this->customerRepository->expects($this->once())
->method('save')
->with($this->customerData)
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php
index 884aab711d168..10144bdc318c1 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php
@@ -11,6 +11,7 @@
/**
* Class MassAssignGroupTest
+ *
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class MassAssignGroupTest extends \PHPUnit\Framework\TestCase
@@ -70,12 +71,17 @@ class MassAssignGroupTest extends \PHPUnit\Framework\TestCase
*/
protected $customerRepositoryMock;
+ /**
+ * @inheritdoc
+ */
protected function setUp()
{
$objectManagerHelper = new ObjectManagerHelper($this);
$this->contextMock = $this->createMock(\Magento\Backend\App\Action\Context::class);
- $resultRedirectFactory = $this->createMock(\Magento\Backend\Model\View\Result\RedirectFactory::class);
+ $resultRedirectFactory = $this->createMock(
+ \Magento\Backend\Model\View\Result\RedirectFactory::class
+ );
$this->responseMock = $this->createMock(\Magento\Framework\App\ResponseInterface::class);
$this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
->disableOriginalConstructor()->getMock();
@@ -129,7 +135,8 @@ protected function setUp()
$this->customerCollectionFactoryMock->expects($this->once())
->method('create')
->willReturn($this->customerCollectionMock);
- $this->customerRepositoryMock = $this->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
+ $this->customerRepositoryMock = $this
+ ->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
->getMockForAbstractClass();
$this->massAction = $objectManagerHelper->getObject(
\Magento\Customer\Controller\Adminhtml\Index\MassAssignGroup::class,
@@ -142,12 +149,18 @@ protected function setUp()
);
}
+ /**
+ * Unit test to verify mass customer group assignment use case
+ *
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
public function testExecute()
{
$customersIds = [10, 11, 12];
- $customerMock = $this->getMockBuilder(
- \Magento\Customer\Api\Data\CustomerInterface::class
- )->getMockForAbstractClass();
+ $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+ ->setMethods(['setData'])
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
$this->customerCollectionMock->expects($this->any())
->method('getAllIds')
->willReturn($customersIds);
@@ -168,6 +181,11 @@ public function testExecute()
$this->massAction->execute();
}
+ /**
+ * Unit test to verify expected error during mass customer group assignment use case
+ *
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
public function testExecuteWithException()
{
$customersIds = [10, 11, 12];
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
index c52d5b2fb370f..8d802e907a810 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
@@ -14,6 +14,8 @@
use Magento\Framework\Controller\Result\Redirect;
/**
+ * Testing Save Customer use case from admin page
+ *
* @SuppressWarnings(PHPMD.TooManyFields)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @covers \Magento\Customer\Controller\Adminhtml\Index\Save
@@ -435,6 +437,10 @@ public function testExecuteWithExistentCustomer()
$customerEmail = 'customer@email.com';
$customerMock->expects($this->once())->method('getEmail')->willReturn($customerEmail);
+ $customerMock->expects($this->once())
+ ->method('getAddresses')
+ ->willReturn([]);
+
$this->emailNotificationMock->expects($this->once())
->method('credentialsChanged')
->with($customerMock, $customerEmail)
diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
index 0273c445bdd2a..22c9d90c086dc 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
@@ -1472,12 +1472,15 @@ public function testChangePassword()
$passwordHash = '1a2b3f4c';
$this->reInitModel();
- $customer = $this->getMockBuilder(Customer::class)
+ $customer = $this->getMockBuilder(CustomerInterface::class)
->disableOriginalConstructor()
->getMock();
$customer->expects($this->any())
->method('getId')
->willReturn($customerId);
+ $customer->expects($this->once())
+ ->method('getAddresses')
+ ->willReturn([]);
$this->customerRepository
->expects($this->once())
diff --git a/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php b/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
index cb396e32509b7..65831069aa1fb 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
@@ -13,9 +13,12 @@
use Magento\Customer\Model\Customer;
use Magento\Customer\Model\AccountConfirmation;
+use Magento\Customer\Model\ResourceModel\Address\CollectionFactory as AddressCollectionFactory;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
*/
class CustomerTest extends \PHPUnit\Framework\TestCase
{
@@ -68,6 +71,21 @@ class CustomerTest extends \PHPUnit\Framework\TestCase
*/
private $accountConfirmation;
+ /**
+ * @var AddressCollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $addressesFactory;
+
+ /**
+ * @var CustomerInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $customerDataFactory;
+
+ /**
+ * @var \Magento\Framework\Api\DataObjectHelper|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $dataObjectHelper;
+
protected function setUp()
{
$this->_website = $this->createMock(\Magento\Store\Model\Website::class);
@@ -100,6 +118,19 @@ protected function setUp()
$this->_encryptor = $this->createMock(\Magento\Framework\Encryption\EncryptorInterface::class);
$helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
$this->accountConfirmation = $this->createMock(AccountConfirmation::class);
+ $this->addressesFactory = $this->getMockBuilder(AddressCollectionFactory::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+ $this->customerDataFactory = $this->getMockBuilder(CustomerInterfaceFactory::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+ $this->dataObjectHelper = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['populateWithArray'])
+ ->getMock();
+
$this->_model = $helper->getObject(
\Magento\Customer\Model\Customer::class,
[
@@ -112,7 +143,10 @@ protected function setUp()
'registry' => $this->registryMock,
'resource' => $this->resourceMock,
'dataObjectProcessor' => $this->dataObjectProcessor,
- 'accountConfirmation' => $this->accountConfirmation
+ 'accountConfirmation' => $this->accountConfirmation,
+ '_addressesFactory' => $this->addressesFactory,
+ 'customerDataFactory' => $this->customerDataFactory,
+ 'dataObjectHelper' => $this->dataObjectHelper
]
);
}
@@ -186,13 +220,13 @@ public function testSendNewAccountEmailWithoutStoreId()
->will($this->returnValue($transportMock));
$this->_model->setData([
- 'website_id' => 1,
- 'store_id' => 1,
- 'email' => 'email@example.com',
- 'firstname' => 'FirstName',
- 'lastname' => 'LastName',
- 'middlename' => 'MiddleName',
- 'prefix' => 'Name Prefix',
+ 'website_id' => 1,
+ 'store_id' => 1,
+ 'email' => 'email@example.com',
+ 'firstname' => 'FirstName',
+ 'lastname' => 'LastName',
+ 'middlename' => 'MiddleName',
+ 'prefix' => 'Name Prefix',
]);
$this->_model->sendNewAccountEmail('registered');
}
@@ -310,4 +344,43 @@ public function testUpdateData()
$this->assertEquals($this->_model->getData(), $expectedResult);
}
+
+ /**
+ * Test for the \Magento\Customer\Model\Customer::getDataModel() method
+ */
+ public function testGetDataModel()
+ {
+ $customerId = 1;
+ $this->_model->setEntityId($customerId);
+ $this->_model->setId($customerId);
+ $addressDataModel = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\AddressInterface::class);
+ $address = $this->getMockBuilder(\Magento\Customer\Model\Address::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['setCustomer', 'getDataModel'])
+ ->getMock();
+ $address->expects($this->atLeastOnce())->method('getDataModel')->willReturn($addressDataModel);
+ $addresses = new \ArrayIterator([$address, $address]);
+ $addressCollection = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Address\Collection::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['setCustomerFilter', 'addAttributeToSelect', 'getIterator', 'getItems'])
+ ->getMock();
+ $addressCollection->expects($this->atLeastOnce())->method('setCustomerFilter')->willReturnSelf();
+ $addressCollection->expects($this->atLeastOnce())->method('addAttributeToSelect')->willReturnSelf();
+ $addressCollection->expects($this->atLeastOnce())->method('getIterator')
+ ->willReturn($addresses);
+ $addressCollection->expects($this->atLeastOnce())->method('getItems')
+ ->willReturn($addresses);
+ $this->addressesFactory->expects($this->atLeastOnce())->method('create')->willReturn($addressCollection);
+ $customerDataObject = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
+ $this->customerDataFactory->expects($this->atLeastOnce())->method('create')->willReturn($customerDataObject);
+ $this->dataObjectHelper->expects($this->atLeastOnce())->method('populateWithArray')
+ ->with($customerDataObject, $this->_model->getData(), \Magento\Customer\Api\Data\CustomerInterface::class)
+ ->willReturnSelf();
+ $customerDataObject->expects($this->atLeastOnce())->method('setAddresses')
+ ->with([$addressDataModel, $addressDataModel])
+ ->willReturnSelf();
+ $customerDataObject->expects($this->atLeastOnce())->method('setId')->with($customerId)->willReturnSelf();
+ $this->_model->getDataModel();
+ $this->assertEquals($customerDataObject, $this->_model->getDataModel());
+ }
}
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataCacheTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataCacheTest.php
index 658472d13ab93..83915731ea5a9 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataCacheTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataCacheTest.php
@@ -15,7 +15,14 @@
use Magento\Framework\App\CacheInterface;
use Magento\Framework\Serialize\SerializerInterface;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
+/**
+ * AttributeMetadataCache Test
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class AttributeMetadataCacheTest extends \PHPUnit\Framework\TestCase
{
/**
@@ -43,6 +50,16 @@ class AttributeMetadataCacheTest extends \PHPUnit\Framework\TestCase
*/
private $attributeMetadataCache;
+ /**
+ * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $storeMock;
+
+ /**
+ * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $storeManagerMock;
+
protected function setUp()
{
$objectManager = new ObjectManager($this);
@@ -50,13 +67,18 @@ protected function setUp()
$this->stateMock = $this->createMock(StateInterface::class);
$this->serializerMock = $this->createMock(SerializerInterface::class);
$this->attributeMetadataHydratorMock = $this->createMock(AttributeMetadataHydrator::class);
+ $this->storeMock = $this->createMock(StoreInterface::class);
+ $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
+ $this->storeManagerMock->method('getStore')->willReturn($this->storeMock);
+ $this->storeMock->method('getId')->willReturn(1);
$this->attributeMetadataCache = $objectManager->getObject(
AttributeMetadataCache::class,
[
'cache' => $this->cacheMock,
'state' => $this->stateMock,
'serializer' => $this->serializerMock,
- 'attributeMetadataHydrator' => $this->attributeMetadataHydratorMock
+ 'attributeMetadataHydrator' => $this->attributeMetadataHydratorMock,
+ 'storeManager' => $this->storeManagerMock
]
);
}
@@ -80,7 +102,8 @@ public function testLoadNoCache()
{
$entityType = 'EntityType';
$suffix = 'none';
- $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
+ $storeId = 1;
+ $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
$this->stateMock->expects($this->once())
->method('isEnabled')
->with(Type::TYPE_IDENTIFIER)
@@ -96,7 +119,8 @@ public function testLoad()
{
$entityType = 'EntityType';
$suffix = 'none';
- $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
+ $storeId = 1;
+ $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
$serializedString = 'serialized string';
$attributeMetadataOneData = [
'attribute_code' => 'attribute_code',
@@ -156,7 +180,8 @@ public function testSave()
{
$entityType = 'EntityType';
$suffix = 'none';
- $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
+ $storeId = 1;
+ $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
$serializedString = 'serialized string';
$attributeMetadataOneData = [
'attribute_code' => 'attribute_code',
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php
index e4dc22ba40e31..5b4b50ca82117 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php
@@ -205,37 +205,32 @@ public function applyOutputFilterDataProvider()
}
/**
+ * Tests input validation rules.
+ *
* @param null|string $value
* @param null|string $label
* @param null|string $inputValidation
* @param bool|array $expectedOutput
* @dataProvider validateInputRuleDataProvider
*/
- public function testValidateInputRule($value, $label, $inputValidation, $expectedOutput)
+ public function testValidateInputRule($value, $label, $inputValidation, $expectedOutput): void
{
$validationRule = $this->getMockBuilder(\Magento\Customer\Api\Data\ValidationRuleInterface::class)
->disableOriginalConstructor()
->setMethods(['getName', 'getValue'])
->getMockForAbstractClass();
- $validationRule->expects($this->any())
- ->method('getName')
- ->will($this->returnValue('input_validation'));
- $validationRule->expects($this->any())
- ->method('getValue')
- ->will($this->returnValue($inputValidation));
-
- $this->_attributeMock->expects($this->any())->method('getStoreLabel')->will($this->returnValue($label));
- $this->_attributeMock->expects(
- $this->any()
- )->method(
- 'getValidationRules'
- )->will(
- $this->returnValue(
- [
- $validationRule,
- ]
- )
- );
+
+ $validationRule->method('getName')
+ ->willReturn('input_validation');
+
+ $validationRule->method('getValue')
+ ->willReturn($inputValidation);
+
+ $this->_attributeMock->method('getStoreLabel')
+ ->willReturn($label);
+
+ $this->_attributeMock->method('getValidationRules')
+ ->willReturn([$validationRule]);
$this->assertEquals($expectedOutput, $this->_model->validateInputRule($value));
}
@@ -256,6 +251,16 @@ public function validateInputRuleDataProvider()
\Zend_Validate_Alnum::NOT_ALNUM => '"mylabel" contains non-alphabetic or non-numeric characters.'
]
],
+ [
+ 'abc qaz',
+ 'mylabel',
+ 'alphanumeric',
+ [
+ \Zend_Validate_Alnum::NOT_ALNUM => '"mylabel" contains non-alphabetic or non-numeric characters.'
+ ]
+ ],
+ ['abcqaz', 'mylabel', 'alphanumeric', true],
+ ['abc qaz', 'mylabel', 'alphanum-with-spaces', true],
[
'!@#$',
'mylabel',
diff --git a/app/code/Magento/Customer/Test/Unit/Observer/UpgradeCustomerPasswordObserverTest.php b/app/code/Magento/Customer/Test/Unit/Observer/UpgradeCustomerPasswordObserverTest.php
index 8971f155f782e..188bbde71c104 100644
--- a/app/code/Magento/Customer/Test/Unit/Observer/UpgradeCustomerPasswordObserverTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Observer/UpgradeCustomerPasswordObserverTest.php
@@ -7,6 +7,9 @@
use Magento\Customer\Observer\UpgradeCustomerPasswordObserver;
+/**
+ * Class UpgradeCustomerPasswordObserverTest for testing upgrade password observer
+ */
class UpgradeCustomerPasswordObserverTest extends \PHPUnit\Framework\TestCase
{
/**
@@ -29,9 +32,13 @@ class UpgradeCustomerPasswordObserverTest extends \PHPUnit\Framework\TestCase
*/
protected $customerRegistry;
+ /**
+ * @inheritdoc
+ */
protected function setUp()
{
- $this->customerRepository = $this->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
+ $this->customerRepository = $this
+ ->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
->getMockForAbstractClass();
$this->customerRegistry = $this->getMockBuilder(\Magento\Customer\Model\CustomerRegistry::class)
->disableOriginalConstructor()
@@ -47,6 +54,9 @@ protected function setUp()
);
}
+ /**
+ * Unit test for verifying customers password upgrade observer
+ */
public function testUpgradeCustomerPassword()
{
$customerId = '1';
@@ -57,6 +67,8 @@ public function testUpgradeCustomerPassword()
->setMethods(['getId'])
->getMock();
$customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+ ->setMethods(['setData'])
+ ->disableOriginalConstructor()
->getMockForAbstractClass();
$customerSecure = $this->getMockBuilder(\Magento\Customer\Model\Data\CustomerSecure::class)
->disableOriginalConstructor()
diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php
index 130b3acd11e76..07b0a76043200 100644
--- a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php
@@ -18,12 +18,6 @@ class ValidationRulesTest extends \PHPUnit\Framework\TestCase
protected function setUp()
{
- $this->validationRules = $this->getMockBuilder(
- \Magento\Customer\Ui\Component\Listing\Column\ValidationRules::class
- )
- ->disableOriginalConstructor()
- ->getMock();
-
$this->validationRule = $this->getMockBuilder(\Magento\Customer\Api\Data\ValidationRuleInterface::class)
->disableOriginalConstructor()
->getMock();
@@ -31,20 +25,26 @@ protected function setUp()
$this->validationRules = new ValidationRules();
}
- public function testGetValidationRules()
+ /**
+ * Tests input validation rules
+ *
+ * @param String $validationRule - provided input validation rules
+ * @param String $validationClass - expected input validation class
+ * @dataProvider validationRulesDataProvider
+ */
+ public function testGetValidationRules(String $validationRule, String $validationClass): void
{
$expectsRules = [
'required-entry' => true,
- 'validate-number' => true,
+ $validationClass => true,
];
- $this->validationRule->expects($this->atLeastOnce())
- ->method('getName')
+ $this->validationRule->method('getName')
->willReturn('input_validation');
- $this->validationRule->expects($this->atLeastOnce())
- ->method('getValue')
- ->willReturn('numeric');
- $this->assertEquals(
+ $this->validationRule->method('getValue')
+ ->willReturn($validationRule);
+
+ self::assertEquals(
$expectsRules,
$this->validationRules->getValidationRules(
true,
@@ -56,6 +56,23 @@ public function testGetValidationRules()
);
}
+ /**
+ * Provides possible validation rules.
+ *
+ * @return array
+ */
+ public function validationRulesDataProvider(): array
+ {
+ return [
+ ['alpha', 'validate-alpha'],
+ ['numeric', 'validate-number'],
+ ['alphanumeric', 'validate-alphanum'],
+ ['alphanum-with-spaces', 'validate-alphanum-with-spaces'],
+ ['url', 'validate-url'],
+ ['email', 'validate-email']
+ ];
+ }
+
public function testGetValidationRulesWithOnlyRequiredRule()
{
$expectsRules = [
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php
index b8f83421a6d62..6befec8e942a1 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php
@@ -7,6 +7,9 @@
use Magento\Customer\Api\Data\ValidationRuleInterface;
+/**
+ * Provides validation classes according to corresponding rules.
+ */
class ValidationRules
{
/**
@@ -16,6 +19,7 @@ class ValidationRules
'alpha' => 'validate-alpha',
'numeric' => 'validate-number',
'alphanumeric' => 'validate-alphanum',
+ 'alphanum-with-spaces' => 'validate-alphanum-with-spaces',
'url' => 'validate-url',
'email' => 'validate-email',
];
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml b/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
index f053805409fe5..f5ee2b347a5b2 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
@@ -20,6 +20,7 @@
Magento\Customer\Block\DataProviders\AddressAttributeData
+ Magento\Customer\Block\DataProviders\PostCodesPatternsAttributeData
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml b/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml
index bad120e46277f..2c5e5b98e5f7b 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml
@@ -13,6 +13,7 @@
+