+
+
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Gallery/DefaultConfigProvider.php b/app/code/Magento/Cms/Model/Wysiwyg/Gallery/DefaultConfigProvider.php
index 822f9ce2b1cb5..a580365c89df8 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Gallery/DefaultConfigProvider.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Gallery/DefaultConfigProvider.php
@@ -8,6 +8,11 @@
namespace Magento\Cms\Model\Wysiwyg\Gallery;
+use Magento\Ui\Component\Form\Element\DataType\Media\OpenDialogUrl;
+
+/**
+ * @inheritdoc
+ */
class DefaultConfigProvider implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
{
/**
@@ -30,26 +35,34 @@ class DefaultConfigProvider implements \Magento\Framework\Data\Wysiwyg\ConfigPro
*/
private $currentTreePath;
+ /**
+ * @var OpednDialogUrl
+ */
+ private $openDialogUrl;
+
/**
* @param \Magento\Backend\Model\UrlInterface $backendUrl
* @param \Magento\Cms\Helper\Wysiwyg\Images $imagesHelper
+ * @param OpenDialogUrl $openDialogUrl
* @param array $windowSize
* @param string|null $currentTreePath
*/
public function __construct(
\Magento\Backend\Model\UrlInterface $backendUrl,
\Magento\Cms\Helper\Wysiwyg\Images $imagesHelper,
+ OpenDialogUrl $openDialogUrl,
array $windowSize = [],
$currentTreePath = null
) {
$this->backendUrl = $backendUrl;
$this->imagesHelper = $imagesHelper;
+ $this->openDialogUrl = $openDialogUrl;
$this->windowSize = $windowSize;
$this->currentTreePath = $currentTreePath;
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
{
@@ -72,7 +85,7 @@ public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Fram
[
'add_images' => true,
'files_browser_window_url' => $this->backendUrl->getUrl(
- 'cms/wysiwyg_images/index',
+ $this->openDialogUrl->get(),
$fileBrowserUrlParams
),
'files_browser_window_width' => $this->windowSize['width'],
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml
new file mode 100644
index 0000000000000..7e035a47824ee
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml
@@ -0,0 +1,18 @@
+
+
+
+
isSaleable()):?>
-
getTypeInstance()->isPossibleBuyFromList($_item)):?>
-
-
-
@@ -113,10 +105,6 @@
-
@@ -151,8 +152,6 @@
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
index ac730a6c6a7cc..44f7b91324025 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
@@ -73,11 +73,7 @@
@@ -88,10 +84,7 @@
@@ -105,9 +98,7 @@
@@ -104,10 +100,7 @@
@@ -120,9 +113,7 @@
@@ -90,10 +86,7 @@
@@ -104,9 +97,7 @@
@@ -52,9 +48,7 @@
diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml b/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml
index 95d3943d04b80..2cdb2413122bd 100644
--- a/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml
+++ b/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml
@@ -77,6 +77,7 @@
1
+
@@ -103,7 +104,7 @@
+
+
diff --git a/app/code/Magento/CatalogInventory/etc/db_schema_whitelist.json b/app/code/Magento/CatalogInventory/etc/db_schema_whitelist.json
index 2580ec1e336f1..fd881ac6e521c 100644
--- a/app/code/Magento/CatalogInventory/etc/db_schema_whitelist.json
+++ b/app/code/Magento/CatalogInventory/etc/db_schema_whitelist.json
@@ -43,6 +43,7 @@
},
"index": {
"CATALOGINVENTORY_STOCK_ITEM_WEBSITE_ID": true,
+ "CATALOGINVENTORY_STOCK_ITEM_WEBSITE_ID_PRODUCT_ID": true,
"CATALOGINVENTORY_STOCK_ITEM_STOCK_ID": true
},
"constraint": {
@@ -123,4 +124,4 @@
"PRIMARY": true
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCatalogPriceRuleDeleteAllActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCatalogPriceRuleDeleteAllActionGroup.xml
new file mode 100644
index 0000000000000..1170b08b1add9
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCatalogPriceRuleDeleteAllActionGroup.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+ Open Catalog Price Rule grid and delete all rules one by one. Need to avoid interference with other tests that test catalog price rules.
+
+
+
+ {{AdminDataGridTableSection.firstNotEmptyRow}}
+ {{AdminConfirmationModalSection.ok}}
+ {{AdminMainActionsSection.delete}}
+ {{AdminMessagesSection.success}}
+ You deleted the rule.
+
+
+
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Helper/CatalogPriceRuleHelper.php b/app/code/Magento/CatalogRule/Test/Mftf/Helper/CatalogPriceRuleHelper.php
new file mode 100644
index 0000000000000..2119f5c6ca45d
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Helper/CatalogPriceRuleHelper.php
@@ -0,0 +1,62 @@
+getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+ /** @var FacebookWebDriver $webDriver */
+ $webDriver = $magentoWebDriver->webDriver;
+ $rows = $webDriver->findElements(WebDriverBy::cssSelector($firstNotEmptyRow));
+ while (!empty($rows)) {
+ $rows[0]->click();
+ $magentoWebDriver->waitForPageLoad(30);
+ $magentoWebDriver->click($deleteButton);
+ $magentoWebDriver->waitForPageLoad(30);
+ $magentoWebDriver->waitForElementVisible($modalAcceptButton, 10);
+ $magentoWebDriver->waitForPageLoad(60);
+ $magentoWebDriver->click($modalAcceptButton);
+ $magentoWebDriver->waitForPageLoad(60);
+ $magentoWebDriver->waitForLoadingMaskToDisappear();
+ $magentoWebDriver->waitForElementVisible($successMessageContainer, 10);
+ $magentoWebDriver->see($successMessage, $successMessageContainer);
+ $rows = $webDriver->findElements(WebDriverBy::cssSelector($firstNotEmptyRow));
+ }
+ } catch (\Exception $e) {
+ $this->fail($e->getMessage());
+ }
+ }
+}
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
index 4d97338333be8..d1f9ebd4c99a4 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
@@ -26,7 +26,7 @@
-
+
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleForConfigurableProductWithSpecialPricesTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleForConfigurableProductWithSpecialPricesTest.xml
index 9cc0090fef756..882a92a2ee433 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleForConfigurableProductWithSpecialPricesTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleForConfigurableProductWithSpecialPricesTest.xml
@@ -74,6 +74,7 @@
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleByPercentTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleByPercentTest.xml
index 8c3d1dad1b2a3..fcae0065f1b53 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleByPercentTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleByPercentTest.xml
@@ -63,8 +63,7 @@
-
+
website
+
@@ -63,8 +64,7 @@
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
index 0747d42dc8737..1919f7d5cc544 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
@@ -83,7 +83,7 @@
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleAndConfigurableProductTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleAndConfigurableProductTest.xml
index 101883f5ea9f2..23fc7e1a9ffba 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleAndConfigurableProductTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleAndConfigurableProductTest.xml
@@ -77,6 +77,7 @@
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductAndFixedMethodTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductAndFixedMethodTest.xml
index 552a6dc48eb7f..dfd34181108b8 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductAndFixedMethodTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductAndFixedMethodTest.xml
@@ -33,6 +33,7 @@
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductForNewCustomerGroupTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductForNewCustomerGroupTest.xml
index 6e8cb01f64ea2..25351ca650db9 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductForNewCustomerGroupTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductForNewCustomerGroupTest.xml
@@ -24,20 +24,15 @@
$customerGroup.id$
-
-
56.78
+
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml
index aa20a1d72d063..28564d12ceb31 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml
@@ -21,23 +21,15 @@
56.78
-
-
56.78
-
-
56.78
@@ -47,6 +39,7 @@
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml
index 46ba6e30100b1..2df891b24223b 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml
@@ -60,7 +60,7 @@
-
-
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml
similarity index 97%
rename from app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
rename to app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml
index 80ed4f90c2cd0..668d33d26f37a 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml
@@ -36,6 +36,7 @@
-
-
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleDynamicProductFromShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleDynamicProductFromShoppingCartTest.xml
index ef5f5b640b0a2..5fd201290655a 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleDynamicProductFromShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleDynamicProductFromShoppingCartTest.xml
@@ -60,8 +60,7 @@
-
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleFixedProductFromShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleFixedProductFromShoppingCartTest.xml
index e141d0628cc4d..603ee1ecea4df 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleFixedProductFromShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleFixedProductFromShoppingCartTest.xml
@@ -52,8 +52,7 @@
-
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteConfigurableProductFromShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteConfigurableProductFromShoppingCartTest.xml
index 62fa3063de08a..e7b61415723cc 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteConfigurableProductFromShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteConfigurableProductFromShoppingCartTest.xml
@@ -74,8 +74,7 @@
-
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteDownloadableProductFromShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteDownloadableProductFromShoppingCartTest.xml
index 988e3b8d3129d..93fd115ae8577 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteDownloadableProductFromShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteDownloadableProductFromShoppingCartTest.xml
@@ -44,8 +44,7 @@
-
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteGroupedProductFromShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteGroupedProductFromShoppingCartTest.xml
index eb8e753ea0b79..b82df28ebb95f 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteGroupedProductFromShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteGroupedProductFromShoppingCartTest.xml
@@ -58,8 +58,7 @@
-
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml
index c3713206ed1d2..e17a940dfa685 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml
@@ -10,25 +10,24 @@
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-
-
-
-
+
+
-
-
-
+
+
+
-
-
-
+
-
-
-
-
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/ShoppingCartAndMiniShoppingCartPerCustomerTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/ShoppingCartAndMiniShoppingCartPerCustomerTest.xml
index 984f8933efa76..571aa24209389 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/ShoppingCartAndMiniShoppingCartPerCustomerTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/ShoppingCartAndMiniShoppingCartPerCustomerTest.xml
@@ -115,8 +115,7 @@
@@ -155,8 +154,7 @@
-
-
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml
index 57ed8e442af7c..af3a2e6870cd7 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml
@@ -64,8 +64,7 @@
+
+
+
-
@@ -56,16 +58,18 @@
-
-
-
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutDisabledBundleProductTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutDisabledBundleProductTest.xml
index 444ebf653b94f..27d4e4c207ae7 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutDisabledBundleProductTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutDisabledBundleProductTest.xml
@@ -71,7 +71,7 @@
-
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
index 9b536882dc64b..5df8338030efc 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
@@ -65,8 +65,7 @@
@@ -78,7 +78,7 @@
-
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityChangesInBackendAfterCustomerCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityChangesInBackendAfterCustomerCheckoutTest.xml
index 146db30aa7c86..ffdbab03ca337 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityChangesInBackendAfterCustomerCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityChangesInBackendAfterCustomerCheckoutTest.xml
@@ -63,7 +63,7 @@
-
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKCustomerCheckoutWithCouponTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKCustomerCheckoutWithCouponTest.xml
index 849b586594955..792025acf1708 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKCustomerCheckoutWithCouponTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKCustomerCheckoutWithCouponTest.xml
@@ -105,7 +105,7 @@
-
-
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
index 32bbd66d13e68..5489089452d85 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
@@ -112,4 +112,7 @@
getImagesHeight();
data-size="escapeHtmlAttr($file->getSize()) ?>"
data-mime-type="escapeHtmlAttr($file->getMimeType()) ?>"
>
-
+ getFileWidth($file)): ?> + escapeHtmlAttr($width) ?>xescapeHtmlAttr($height) ?> + escapeHtml(__('px.')) ?>
escapeHtml($block->getFileShortName($file)) ?>
-
+
- getFileThumbUrl($file)) : ?>
-
+
+ getFileThumbUrl($file)): ?>
+
+ getFileWidth($file)): ?> + escapeHtmlAttr($width) ?>xescapeHtmlAttr($height) ?> + escapeHtml(__('px.')) ?>
escapeHtml($block->getFileShortName($file)) ?>
escapeHtml(__('No files found')) ?>
diff --git a/app/code/Magento/Config/App/Config/Type/System.php b/app/code/Magento/Config/App/Config/Type/System.php
index c63ccae871657..522ed73fa37d2 100644
--- a/app/code/Magento/Config/App/Config/Type/System.php
+++ b/app/code/Magento/Config/App/Config/Type/System.php
@@ -20,6 +20,8 @@
use Magento\Store\Model\Config\Processor\Fallback;
use Magento\Framework\Encryption\Encryptor;
use Magento\Store\Model\ScopeInterface as StoreScope;
+use Magento\Framework\App\Cache\StateInterface;
+use Magento\Framework\App\Cache\Type\Config;
/**
* System configuration type
@@ -98,6 +100,12 @@ class System implements ConfigTypeInterface
private $lockQuery;
/**
+ * @var StateInterface
+ */
+ private $cacheState;
+
+ /**
+ * System constructor.
* @param ConfigSourceInterface $source
* @param PostProcessorInterface $postProcessor
* @param Fallback $fallback
@@ -110,6 +118,7 @@ class System implements ConfigTypeInterface
* @param Encryptor|null $encryptor
* @param LockManagerInterface|null $locker
* @param LockGuardedCacheLoader|null $lockQuery
+ * @param StateInterface|null $cacheState
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
@@ -125,7 +134,8 @@ public function __construct(
Reader $reader = null,
Encryptor $encryptor = null,
LockManagerInterface $locker = null,
- LockGuardedCacheLoader $lockQuery = null
+ LockGuardedCacheLoader $lockQuery = null,
+ StateInterface $cacheState = null
) {
$this->postProcessor = $postProcessor;
$this->cache = $cache;
@@ -136,6 +146,8 @@ public function __construct(
?: ObjectManager::getInstance()->get(Encryptor::class);
$this->lockQuery = $lockQuery
?: ObjectManager::getInstance()->get(LockGuardedCacheLoader::class);
+ $this->cacheState = $cacheState
+ ?: ObjectManager::getInstance()->get(StateInterface::class);
}
/**
@@ -220,6 +232,10 @@ private function getWithParts($path)
*/
private function loadAllData()
{
+ if (!$this->cacheState->isEnabled(Config::TYPE_IDENTIFIER)) {
+ return $this->readData();
+ }
+
$loadAction = function () {
$cachedData = $this->cache->load($this->configType);
$data = false;
@@ -245,6 +261,10 @@ private function loadAllData()
*/
private function loadDefaultScopeData($scopeType)
{
+ if (!$this->cacheState->isEnabled(Config::TYPE_IDENTIFIER)) {
+ return $this->readData();
+ }
+
$loadAction = function () use ($scopeType) {
$cachedData = $this->cache->load($this->configType . '_' . $scopeType);
$scopeData = false;
@@ -271,6 +291,10 @@ private function loadDefaultScopeData($scopeType)
*/
private function loadScopeData($scopeType, $scopeId)
{
+ if (!$this->cacheState->isEnabled(Config::TYPE_IDENTIFIER)) {
+ return $this->readData();
+ }
+
$loadAction = function () use ($scopeType, $scopeId) {
$cachedData = $this->cache->load($this->configType . '_' . $scopeType . '_' . $scopeId);
$scopeData = false;
@@ -393,6 +417,10 @@ public function clean()
$this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [self::CACHE_TAG]);
};
+ if (!$this->cacheState->isEnabled(Config::TYPE_IDENTIFIER)) {
+ return $cleanAction();
+ }
+
$this->lockQuery->lockedCleanData(
self::$lockName,
$cleanAction
diff --git a/app/code/Magento/Config/Model/Config/Source/Email/Template.php b/app/code/Magento/Config/Model/Config/Source/Email/Template.php
index e4f1ae65bcacd..ac168f16ca182 100644
--- a/app/code/Magento/Config/Model/Config/Source/Email/Template.php
+++ b/app/code/Magento/Config/Model/Config/Source/Email/Template.php
@@ -64,12 +64,6 @@ public function toOptionArray()
$templateLabel = $this->_emailConfig->getTemplateLabel($templateId);
$templateLabel = __('%1 (Default)', $templateLabel);
array_unshift($options, ['value' => $templateId, 'label' => $templateLabel]);
- array_walk(
- $options,
- function (&$item) {
- $item['__disableTmpl'] = true;
- }
- );
return $options;
}
}
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php
index 9fabe6fef0c8e..1fc730ccef30e 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php
@@ -6,6 +6,8 @@
namespace Magento\Config\Test\Unit\Model\Config\Source\Email;
+use PHPUnit\Framework\MockObject\MockObject;
+
/**
* Test class for Template.
*/
@@ -17,12 +19,12 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
protected $_model;
/**
- * @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Registry|MockObject
*/
protected $_coreRegistry;
/**
- * @var \Magento\Email\Model\Template\Config|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Email\Model\Template\Config|MockObject
*/
protected $_emailConfig;
@@ -82,17 +84,14 @@ public function testToOptionArray()
[
'value' => 'template_new',
'label' => 'Template New (Default)',
- '__disableTmpl' => true
],
[
'value' => 'template_one',
'label' => 'Template One',
- '__disableTmpl' => true
],
[
'value' => 'template_two',
'label' => 'Template Two',
- '__disableTmpl' => true
],
];
$this->_model->setPath('template/new');
diff --git a/app/code/Magento/Config/etc/di.xml b/app/code/Magento/Config/etc/di.xml
index 920cac382fcbf..70318553710d3 100644
--- a/app/code/Magento/Config/etc/di.xml
+++ b/app/code/Magento/Config/etc/di.xml
@@ -97,8 +97,6 @@
+
+
+<% } %>
diff --git a/app/code/Magento/LoginAsCustomerUi/view/frontend/layout/default.xml b/app/code/Magento/LoginAsCustomerUi/view/frontend/layout/default.xml
new file mode 100644
index 0000000000000..c27f3adcf23cc
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerUi/view/frontend/layout/default.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/LoginAsCustomerUi/view/frontend/templates/html/notices/logout-link.phtml b/app/code/Magento/LoginAsCustomerUi/view/frontend/templates/html/notices/logout-link.phtml
new file mode 100644
index 0000000000000..ae29324ade0a1
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerUi/view/frontend/templates/html/notices/logout-link.phtml
@@ -0,0 +1,21 @@
+isLoggedIn()) {
+ $dataPostParam = sprintf(" data-post='%s'", $block->getPostParams());
+}
+?>
+
+getLinkAttributes()
+?>>
+ escapeHtml(__('Close Session')) ?>
+
+
diff --git a/app/code/Magento/LoginAsCustomerUi/view/frontend/templates/login.phtml b/app/code/Magento/LoginAsCustomerUi/view/frontend/templates/login.phtml
new file mode 100644
index 0000000000000..2abd8fc204831
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerUi/view/frontend/templates/login.phtml
@@ -0,0 +1,17 @@
+
+
+
diff --git a/app/code/Magento/LoginAsCustomerUi/view/frontend/web/css/source/_module.less b/app/code/Magento/LoginAsCustomerUi/view/frontend/web/css/source/_module.less
new file mode 100644
index 0000000000000..372405c2635ef
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerUi/view/frontend/web/css/source/_module.less
@@ -0,0 +1,77 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+//
+// Variables
+// ---------------------------------------------
+
+@lac-notification-background-color: #373330;
+@lac-notification-color: #fff;
+@lac-notification-links-color: #fff;
+
+//
+// Common
+// ---------------------------------------------
+
+& when (@media-common = true) {
+ .lac-notification {
+ background-color: @lac-notification-background-color;
+ color: @lac-notification-color;
+ font-size: 16px;
+
+ .lac-notification-icon {
+ float: left;
+ margin: 10px 25px 10px 10px;
+
+ .logo-img {
+ display: block
+ }
+ }
+
+ .lac-notification-text {
+ float: left;
+ padding: 15px 0;
+ }
+
+ .lac-notification-links {
+ float: right;
+ padding: 15px 0;
+
+ a {
+ color: @lac-notification-links-color;
+ font-size: 14px;
+ }
+
+ .lac-notification-close-link {
+ &:after {
+ background: url('../Magento_LoginAsCustomerUi/images/close.svg');
+ content: ' ';
+ display: inline-block;
+ height: 12px;
+ margin-left: 5px;
+ vertical-align: middle;
+ width: 12px;
+ }
+ }
+ }
+ }
+}
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
+ .lac-notification {
+ padding: 5px 0;
+
+ .lac-notification-icon {
+ display: none;
+ }
+
+ .lac-notification-text,
+ .lac-notification-links {
+ float: none;
+ padding: 5px 0;
+ text-align: center;
+ }
+ }
+}
diff --git a/app/code/Magento/LoginAsCustomerUi/view/frontend/web/images/close.svg b/app/code/Magento/LoginAsCustomerUi/view/frontend/web/images/close.svg
new file mode 100644
index 0000000000000..0895684d12e63
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerUi/view/frontend/web/images/close.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/app/code/Magento/LoginAsCustomerUi/view/frontend/web/images/magento-icon.svg b/app/code/Magento/LoginAsCustomerUi/view/frontend/web/images/magento-icon.svg
new file mode 100644
index 0000000000000..47e64067795ef
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerUi/view/frontend/web/images/magento-icon.svg
@@ -0,0 +1 @@
+
diff --git a/app/code/Magento/LoginAsCustomerUi/view/frontend/web/js/login.js b/app/code/Magento/LoginAsCustomerUi/view/frontend/web/js/login.js
new file mode 100644
index 0000000000000..ab325bc90cf00
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerUi/view/frontend/web/js/login.js
@@ -0,0 +1,20 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'jquery',
+ 'Magento_Customer/js/customer-data',
+ 'Magento_Customer/js/section-config'
+], function ($, customerData, sectionConfig) {
+
+ 'use strict';
+
+ return function (config) {
+ $('body').trigger('processStart');
+ customerData.reload(sectionConfig.getSectionNames()).done(function () {
+ window.location.href = config.redirectUrl;
+ });
+ };
+});
diff --git a/app/code/Magento/LoginAsCustomerUi/view/frontend/web/js/view/loginAsCustomer.js b/app/code/Magento/LoginAsCustomerUi/view/frontend/web/js/view/loginAsCustomer.js
new file mode 100644
index 0000000000000..7f6cad6ce3f2d
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerUi/view/frontend/web/js/view/loginAsCustomer.js
@@ -0,0 +1,41 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'jquery',
+ 'uiComponent',
+ 'Magento_Customer/js/customer-data',
+ 'mage/translate'
+], function ($, Component, customerData) {
+ 'use strict';
+
+ return Component.extend({
+
+ defaults: {
+ isVisible: false
+ },
+
+ /** @inheritdoc */
+ initialize: function () {
+ this._super();
+
+ this.customer = customerData.get('customer');
+ this.loginAsCustomer = customerData.get('loggedAsCustomer');
+ this.isVisible(this.loginAsCustomer().adminUserId);
+
+ this.notificationText = $.mage.__('You are connected as %1 on %2')
+ .replace('%1', this.customer().fullname)
+ .replace('%2', this.loginAsCustomer().websiteName);
+ },
+
+ /** @inheritdoc */
+ initObservable: function () {
+ this._super()
+ .observe('isVisible');
+
+ return this;
+ }
+ });
+});
diff --git a/app/code/Magento/LoginAsCustomerWebapi/Api/CreateCustomerAccessTokenInterface.php b/app/code/Magento/LoginAsCustomerWebapi/Api/CreateCustomerAccessTokenInterface.php
new file mode 100644
index 0000000000000..52acc695af0cc
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerWebapi/Api/CreateCustomerAccessTokenInterface.php
@@ -0,0 +1,27 @@
+" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/app/code/Magento/LoginAsCustomerWebapi/LICENSE_AFL.txt b/app/code/Magento/LoginAsCustomerWebapi/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerWebapi/LICENSE_AFL.txt
@@ -0,0 +1,48 @@
+
+Academic Free License ("AFL") v. 3.0
+
+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Academic Free License version 3.0
+
+ 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+ 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+ 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+ 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
+
+ 4. to perform the Original Work publicly; and
+
+ 5. to display the Original Work publicly.
+
+ 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+ 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+ 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+ 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+ 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+ 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+ 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+ 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+ 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+ 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+ 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+ 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+ 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+ 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+ 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under 
[
+ '/pub/media/testDirectory/path.jpg',
+ [
+ 2020
+ ]
+ ],
+ 'Relevant path content' => [
+ '/media/testDirectory/path.jpg',
+ [
+ 2020
+ ]
+ ],
+ 'Irrelevant paths in content' => [
+ 'content {{media url="media/non-existing-path.png"}} content',
+ []
+ ],
+ ];
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MediaContent/Model/SaveDeleteContentAssetLinksTest.php b/dev/tests/integration/testsuite/Magento/MediaContent/Model/SaveDeleteContentAssetLinksTest.php
new file mode 100644
index 0000000000000..4244cd66475a0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MediaContent/Model/SaveDeleteContentAssetLinksTest.php
@@ -0,0 +1,105 @@
+saveContentAssetLinks = Bootstrap::getObjectManager()->get(SaveContentAssetLinksInterface::class);
+ $this->getAssetIdsByContentIdentity = Bootstrap::getObjectManager()
+ ->get(GetAssetIdsByContentIdentityInterface::class);
+ $this->getContentByAssetIds = Bootstrap::getObjectManager()->get(GetContentByAssetIdsInterface::class);
+ $this->deleteContentAssetLinks = Bootstrap::getObjectManager()->get(DeleteContentAssetLinksInterface::class);
+ }
+
+ /**
+ * Save asset to content links, retrieve the data, delete assets to content links
+ */
+ public function testAssignRetrieveAndUnassign(): void
+ {
+ $entityType = 'catalog_product';
+ $entityId = 42;
+ $field = 'description';
+ $assetIds = [56, 78];
+
+ $contentIdentity = Bootstrap::getObjectManager()->create(
+ ContentIdentityInterface::class,
+ [
+ 'entityType' => $entityType,
+ 'entityId' => $entityId,
+ 'field' => $field
+ ]
+ );
+
+ $contentAssetLinks = [];
+
+ foreach ($assetIds as $assetId) {
+ $contentAssetLinks[] = Bootstrap::getObjectManager()->create(
+ ContentAssetLinkInterface::class,
+ [
+ 'assetId' => $assetId,
+ 'contentIdentity' => $contentIdentity
+ ]
+ );
+ }
+
+ $this->saveContentAssetLinks->execute($contentAssetLinks);
+ $retrievedAssetIds = $this->getAssetIdsByContentIdentity->execute($contentIdentity);
+ $this->assertEquals($assetIds, $retrievedAssetIds);
+ $retrievedContentIdentities = $this->getContentByAssetIds->execute($assetIds);
+ $this->assertEquals(count($retrievedContentIdentities), 1);
+
+ foreach ($retrievedContentIdentities as $identity) {
+ $this->assertEquals($entityType, $identity->getEntityType());
+ $this->assertEquals($entityId, $identity->getEntityId());
+ $this->assertEquals($field, $identity->getField());
+ }
+
+ $this->deleteContentAssetLinks->execute($contentAssetLinks);
+
+ $this->assertEmpty($this->getContentByAssetIds->execute($assetIds));
+ $this->assertEmpty($this->getAssetIdsByContentIdentity->execute($contentIdentity));
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MediaContent/Model/UpdateContentAssetLinksTest.php b/dev/tests/integration/testsuite/Magento/MediaContent/Model/UpdateContentAssetLinksTest.php
new file mode 100644
index 0000000000000..0a9393c1c3c20
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MediaContent/Model/UpdateContentAssetLinksTest.php
@@ -0,0 +1,73 @@
+updateContentAssetLinks = Bootstrap::getObjectManager()->get(UpdateContentAssetLinksInterface::class);
+ $this->getAssetIdsByContentIdentity = Bootstrap::getObjectManager()
+ ->get(GetAssetIdsByContentIdentityInterface::class);
+ }
+
+ /**
+ * Assing assets to content, retrieve the data, then unassign assets from content
+ *
+ * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
+ */
+ public function testExecute(): void
+ {
+ $entityType = 'catalog_product';
+ $entityId = 2020;
+ $field = 'description';
+ $contentWithoutAsset = '';
+ $contentWithAsset = 'content {{media url="testDirectory/path.jpg"}} content';
+
+ $contentIdentity = Bootstrap::getObjectManager()->create(
+ ContentIdentityInterface::class,
+ [
+ 'entityType' => $entityType,
+ 'entityId' => $entityId,
+ 'field' => $field
+ ]
+ );
+
+ $this->updateContentAssetLinks->execute($contentIdentity, $contentWithoutAsset);
+ $this->assertEmpty($this->getAssetIdsByContentIdentity->execute($contentIdentity));
+
+ $this->updateContentAssetLinks->execute($contentIdentity, $contentWithAsset);
+ $this->assertNotEmpty($this->getAssetIdsByContentIdentity->execute($contentIdentity));
+
+ $this->updateContentAssetLinks->execute($contentIdentity, $contentWithoutAsset);
+ $this->assertEmpty($this->getAssetIdsByContentIdentity->execute($contentIdentity));
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetEntityContentTest.php b/dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetEntityContentTest.php
new file mode 100644
index 0000000000000..b0343c846ee88
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetEntityContentTest.php
@@ -0,0 +1,97 @@
+getContent = $objectManager->get(GetEntityContentsInterface::class);
+ $this->contentIdentityFactory = $objectManager->get(ContentIdentityInterfaceFactory::class);
+ $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+ }
+
+ /**
+ * Test for get content from product in different store views
+ *
+ * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ */
+ public function testProduct(): void
+ {
+ $product = $this->productRepository->get('simple');
+ $contentIdentity = $this->contentIdentityFactory->create(
+ [
+ self::TYPE => self::CONTENT_TYPE,
+ self::FIELD => 'description',
+ self::ENTITY_ID => (string) $product->getEntityId(),
+ ]
+ );
+ $this->assertEquals(
+ ['Description with html tag'],
+ $this->getContent->execute($contentIdentity)
+ );
+ }
+
+ /**
+ * Test for get content from product in different store views
+ *
+ * @magentoDataFixture Magento/Catalog/_files/product_multiwebsite_different_description.php
+ */
+ public function testProductTwoWebsites(): void
+ {
+ $product = $this->productRepository->get('simple-on-two-websites-different-description');
+ $contentIdentity = $this->contentIdentityFactory->create(
+ [
+ self::TYPE => self::CONTENT_TYPE,
+ self::FIELD => 'description',
+ self::ENTITY_ID => (string) $product->getEntityId(),
+ ]
+ );
+ $this->assertEquals(
+ [
+ '