Skip to content

Commit 03932b5

Browse files
Usik2203Usik2203
authored
Merge branch '2.4-develop' into add-AdminDeleteTaxRateActionGroup
2 parents caaf469 + 1c9ba3e commit 03932b5

File tree

83 files changed

+576
-344
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+576
-344
lines changed

‎app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
1111

1212
/**
13-
* Class AdvancedPricing
13+
* Import advanced pricing class
1414
*
1515
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
1616
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -19,43 +19,27 @@
1919
class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
2020
{
2121
const VALUE_ALL_GROUPS = 'ALL GROUPS';
22-
2322
const VALUE_ALL_WEBSITES = 'All Websites';
24-
2523
const COL_SKU = 'sku';
26-
2724
const COL_TIER_PRICE_WEBSITE = 'tier_price_website';
28-
2925
const COL_TIER_PRICE_CUSTOMER_GROUP = 'tier_price_customer_group';
30-
3126
const COL_TIER_PRICE_QTY = 'tier_price_qty';
32-
3327
const COL_TIER_PRICE = 'tier_price';
34-
3528
const COL_TIER_PRICE_PERCENTAGE_VALUE = 'percentage_value';
36-
3729
const COL_TIER_PRICE_TYPE = 'tier_price_value_type';
38-
3930
const TIER_PRICE_TYPE_FIXED = 'Fixed';
40-
4131
const TIER_PRICE_TYPE_PERCENT = 'Discount';
42-
4332
const TABLE_TIER_PRICE = 'catalog_product_entity_tier_price';
44-
4533
const DEFAULT_ALL_GROUPS_GROUPED_PRICE_VALUE = '0';
46-
4734
const ENTITY_TYPE_CODE = 'advanced_pricing';
48-
4935
const VALIDATOR_MAIN = 'validator';
50-
5136
const VALIDATOR_WEBSITE = 'validator_website';
5237

5338
/**
5439
* @deprecated
5540
* @see VALIDATOR_TIER_PRICE
5641
*/
5742
private const VALIDATOR_TEAR_PRICE = 'validator_tier_price';
58-
5943
private const VALIDATOR_TIER_PRICE = 'validator_tier_price';
6044

6145
/**
@@ -176,10 +160,8 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
176160
* @param \Magento\Framework\Json\Helper\Data $jsonHelper
177161
* @param \Magento\ImportExport\Helper\Data $importExportData
178162
* @param \Magento\ImportExport\Model\ResourceModel\Import\Data $importData
179-
* @param \Magento\Eav\Model\Config $config
180163
* @param \Magento\Framework\App\ResourceConnection $resource
181164
* @param \Magento\ImportExport\Model\ResourceModel\Helper $resourceHelper
182-
* @param \Magento\Framework\Stdlib\StringUtils $string
183165
* @param ProcessingErrorAggregatorInterface $errorAggregator
184166
* @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
185167
* @param \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory $resourceFactory
@@ -197,10 +179,8 @@ public function __construct(
197179
\Magento\Framework\Json\Helper\Data $jsonHelper,
198180
\Magento\ImportExport\Helper\Data $importExportData,
199181
\Magento\ImportExport\Model\ResourceModel\Import\Data $importData,
200-
\Magento\Eav\Model\Config $config,
201182
\Magento\Framework\App\ResourceConnection $resource,
202183
\Magento\ImportExport\Model\ResourceModel\Helper $resourceHelper,
203-
\Magento\Framework\Stdlib\StringUtils $string,
204184
ProcessingErrorAggregatorInterface $errorAggregator,
205185
\Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
206186
\Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory $resourceFactory,

‎app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as RowValidatorInterface;
1717
use Magento\CatalogImportExport\Model\Import\Product\StoreResolver;
1818
use Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory as ResourceFactory;
19-
use Magento\Eav\Model\Config;
2019
use Magento\Eav\Model\Entity\Type;
2120
use Magento\Framework\App\ResourceConnection;
2221
use Magento\Framework\DB\Adapter\AdapterInterface;
@@ -26,7 +25,6 @@
2625
use Magento\Framework\Json\Helper\Data;
2726
use Magento\Framework\Stdlib\DateTime\DateTime;
2827
use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
29-
use Magento\Framework\Stdlib\StringUtils;
3028
use Magento\ImportExport\Model\Import;
3129
use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
3230
use Magento\ImportExport\Model\ResourceModel\Helper;
@@ -99,11 +97,6 @@ class AdvancedPricingTest extends AbstractImportTestCase
9997
*/
10098
protected $dataSourceModel;
10199

102-
/**
103-
* @var Config
104-
*/
105-
protected $eavConfig;
106-
107100
/**
108101
* @var TimezoneInterface|MockObject
109102
*/
@@ -139,11 +132,6 @@ class AdvancedPricingTest extends AbstractImportTestCase
139132
*/
140133
protected $advancedPricing;
141134

142-
/**
143-
* @var StringUtils
144-
*/
145-
protected $stringObject;
146-
147135
/**
148136
* @var ProcessingErrorAggregatorInterface
149137
*/
@@ -165,10 +153,8 @@ protected function setUp(): void
165153
);
166154
$this->resource->method('getConnection')->willReturn($this->connection);
167155
$this->dataSourceModel = $this->createMock(\Magento\ImportExport\Model\ResourceModel\Import\Data::class);
168-
$this->eavConfig = $this->createMock(Config::class);
169156
$entityType = $this->createMock(Type::class);
170157
$entityType->method('getEntityTypeId')->willReturn('');
171-
$this->eavConfig->method('getEntityType')->willReturn($entityType);
172158
$this->resourceFactory = $this->getMockBuilder(
173159
\Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory::class
174160
)
@@ -193,7 +179,6 @@ protected function setUp(): void
193179
$this->tierPriceValidator = $this->createMock(
194180
TierPrice::class
195181
);
196-
$this->stringObject = $this->createMock(StringUtils::class);
197182
$this->errorAggregator = $this->getErrorAggregatorObject();
198183
$this->dateTime = $this->getMockBuilder(DateTime::class)
199184
->disableOriginalConstructor()
@@ -1070,10 +1055,8 @@ private function getAdvancedPricingMock($methods = [])
10701055
$this->jsonHelper,
10711056
$this->importExportData,
10721057
$this->dataSourceModel,
1073-
$this->eavConfig,
10741058
$this->resource,
10751059
$this->resourceHelper,
1076-
$this->stringObject,
10771060
$this->errorAggregator,
10781061
$this->dateTime,
10791062
$this->resourceFactory,

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@
7676
<argument name="tags" value=""/>
7777
</actionGroup>
7878
<!--Open Index Management Page -->
79-
<amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
80-
<waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
79+
<actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="openIndexManagementPage"/>
8180
<see stepKey="seeIndexStatus" selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
8281
<!--Verify Category In Store Front-->
8382
<amOnPage url="/$$createCategory.name$$.html" stepKey="openCategoryPage1"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@
7676
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
7777
<argument name="tags" value=""/>
7878
</actionGroup>
79-
<!--Open Index Management Page -->
80-
<amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
81-
<waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
79+
<actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="openIndexManagementPage"/>
8280
<see stepKey="seeIndexStatus" selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
8381
<!--Verify Category In Store Front-->
8482
<amOnPage url="/$$createCategory.name$$.html" stepKey="openCategoryPage1"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,7 @@
7777
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
7878
<argument name="tags" value=""/>
7979
</actionGroup>
80-
<!--Open Index Management Page -->
81-
<amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
82-
<waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
80+
<actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="openIndexManagementPage"/>
8381
<see stepKey="seeIndexStatus" selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
8482
<!--Verify Category In Store Front-->
8583
<amOnPage url="/$$category.name$$.html" stepKey="openCategoryPage1"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
<createData entity="_defaultCategory" stepKey="createSecondCategory"/>
2626

2727
<!-- Switch "Category Product" and "Product Category" indexers to "Update by Schedule" mode -->
28-
<amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="onIndexManagement"/>
29-
<waitForPageLoad stepKey="waitForManagementPage"/>
28+
<actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="onIndexManagement"/>
3029

3130
<actionGroup ref="AdminSwitchIndexerToActionModeActionGroup" stepKey="switchCategoryProduct">
3231
<argument name="indexerValue" value="catalog_category_product"/>
@@ -38,8 +37,7 @@
3837

3938
<after>
4039
<!-- Switch "Category Product" and "Product Category" indexers to "Update by Save" mode -->
41-
<amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="onIndexManagement"/>
42-
<waitForPageLoad stepKey="waitForManagementPage"/>
40+
<actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="onIndexManagement"/>
4341

4442
<actionGroup ref="AdminSwitchIndexerToActionModeActionGroup" stepKey="switchCategoryProduct">
4543
<argument name="indexerValue" value="catalog_category_product"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,7 @@
8989
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
9090
<argument name="tags" value=""/>
9191
</actionGroup>
92-
<!--Open Index Management Page -->
93-
<amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
94-
<waitForPageLoad stepKey="waitForIndexPageToLoad"/>
92+
<actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="openIndexManagementPage"/>
9593
<see stepKey="seeCategoryIndexStatus" selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
9694
<!--Verify Product In Store Front-->
9795
<amOnPage url="$$createSimpleProduct.name$$.html" stepKey="goToStorefrontPage"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@
7171
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
7272
<argument name="tags" value=""/>
7373
</actionGroup>
74-
<!--Open Index Management Page -->
75-
<amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
76-
<waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
74+
<actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="openIndexManagementPage"/>
7775
<see stepKey="seeIndexStatus" selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
7876
<!--Verify Category In Store Front-->
7977
<amOnPage url="/$$createCategory.name$$.html" stepKey="openCategoryPage1"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@
7676
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
7777
<argument name="tags" value=""/>
7878
</actionGroup>
79-
<!--Open Index Management Page -->
80-
<amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
81-
<waitForPageLoad stepKey="waitForIndexPageToLoad"/>
79+
<actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="openIndexManagementPage"/>
8280
<see stepKey="seeIndexStatus" selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="READY"/>
8381
<!--Verify Category In Store Front-->
8482
<amOnPage url="{{SimpleSubCategory.name}}.html" stepKey="goToStorefrontPage"/>

‎app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminOpenCatalogSearchTermIndexPageActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminOpenCatalogSearchTermIndexPageActionGroup">
12+
<annotations>
13+
<description>Open catalog search term index page.</description>
14+
</annotations>
15+
16+
<amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openCatalogSearchTermIndexPage"/>
17+
<waitForPageLoad stepKey="waitForPageLoad"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontUpdateSearchTermEntityTest.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
<deleteData createDataKey="createCategory1" stepKey="deleteCategory1"/>
4040

4141
<!-- Delete all search terms -->
42-
<amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
43-
<waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
42+
<actionGroup ref="AdminOpenCatalogSearchTermIndexPageActionGroup" stepKey="openAdminCatalogSearchTermIndexPage"/>
4443
<comment userInput="Delete all search terms" stepKey="deleteAllSearchTermsComment"/>
4544
<actionGroup ref="AdminDeleteAllSearchTermsActionGroup" stepKey="deleteAllSearchTerms"/>
4645

@@ -53,8 +52,7 @@
5352

5453
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
5554

56-
<amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage1"/>
57-
<waitForPageLoad stepKey="waitForPageLoad1"/>
55+
<actionGroup ref="AdminOpenCatalogSearchTermIndexPageActionGroup" stepKey="openAdminCatalogSearchTermIndexPage1"/>
5856

5957
<actionGroup ref="AdminSearchTermFilterBySearchQueryActionGroup" stepKey="filterByFirstSearchQuery1">
6058
<argument name="searchQuery" value="$$createProduct1.name$$"/>
@@ -67,8 +65,7 @@
6765
<argument name="searchTerm" value="UpdatedSearchTermData1"/>
6866
</actionGroup>
6967

70-
<amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage2"/>
71-
<waitForPageLoad stepKey="waitForPageLoad3"/>
68+
<actionGroup ref="AdminOpenCatalogSearchTermIndexPageActionGroup" stepKey="openAdminCatalogSearchTermIndexPage2"/>
7269

7370
<actionGroup ref="AdminSearchTermFilterBySearchQueryActionGroup" stepKey="filterByFirstSearchQuery2">
7471
<argument name="searchQuery" value="{{UpdatedSearchTermData1.query_text}}"/>

‎app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ protected function _construct()
102102
'type' => 'button'
103103
],
104104
0,
105-
0,
105+
100,
106106
'header'
107107
);
108108
}

‎app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

78
namespace Magento\Customer\Observer;
89

@@ -17,6 +18,7 @@
1718
use Magento\Framework\App\State as AppState;
1819
use Magento\Framework\DataObject;
1920
use Magento\Framework\Escaper;
21+
use Magento\Framework\Event\Observer;
2022
use Magento\Framework\Event\ObserverInterface;
2123
use Magento\Framework\Message\ManagerInterface;
2224
use Magento\Framework\Registry;
@@ -25,6 +27,7 @@
2527
/**
2628
* Customer Observer Model
2729
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
30+
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
2831
*/
2932
class AfterAddressSaveObserver implements ObserverInterface
3033
{
@@ -114,11 +117,11 @@ public function __construct(
114117
/**
115118
* Address after save event handler
116119
*
117-
* @param \Magento\Framework\Event\Observer $observer
120+
* @param Observer $observer
118121
* @return void
119122
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
120123
*/
121-
public function execute(\Magento\Framework\Event\Observer $observer)
124+
public function execute(Observer $observer)
122125
{
123126
/** @var $customerAddress Address */
124127
$customerAddress = $observer->getCustomerAddress();
@@ -280,7 +283,7 @@ protected function addInvalidMessage($customerAddress)
280283
$message[] = (string)__('You will be charged tax.');
281284
}
282285

283-
$this->messageManager->addError(implode(' ', $message));
286+
$this->messageManager->addErrorMessage(implode(' ', $message));
284287

285288
return $this;
286289
}
@@ -307,7 +310,7 @@ protected function addErrorMessage($customerAddress)
307310
$email = $this->scopeConfig->getValue('trans_email/ident_support/email', ScopeInterface::SCOPE_STORE);
308311
$message[] = (string)__('If you believe this is an error, please contact us at %1', $email);
309312

310-
$this->messageManager->addError(implode(' ', $message));
313+
$this->messageManager->addErrorMessage(implode(' ', $message));
311314

312315
return $this;
313316
}

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerLogoutSuccessPageActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AssertStorefrontCustomerLogoutSuccessPageActionGroup">
12+
<annotations>
13+
<description>Assert on the Storefront Customer Logout Success Page page.</description>
14+
</annotations>
15+
16+
<seeInCurrentUrl url="{{StorefrontCustomerLogoutSuccessPage.url}}" stepKey="seeOnSignInPage"/>
17+
</actionGroup>
18+
</actionGroups>

0 commit comments

Comments
 (0)