Skip to content

Commit ab0c0b5

Browse files
authored
Merge pull request #8500 from magento-gl/Hammer_Platform_Health_Scope_28082023
Hammer platform health scope 28082023
2 parents 0e33b80 + 99de5ac commit ab0c0b5

File tree

78 files changed

+22224
-22183
lines changed

Some content is hidden

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

78 files changed

+22224
-22183
lines changed

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCategorySidebarMobileMenuTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<click selector="{{StorefrontHeaderSection.mobileMenuToggle}}" stepKey="openSideMenu"/>
4343
<waitForElementClickable selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createParentCategory.name$$)}}" stepKey="waitForCategoryMenuClickable" />
4444
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createParentCategory.name$$)}}" stepKey="expandCategoryMenu"/>
45+
<waitForPageLoad stepKey="waitForSearchResult"/>
4546

4647
<!-- Assert the category expanded successfully -->
4748
<actionGroup ref="StorefrontAssertCategoryNameIsShownInMenuActionGroup" stepKey="verifySubCatMenuItemIsVisibleInTheSidebar">
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\CatalogSearch\Observer;
9+
10+
use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
11+
use Magento\Framework\Event\Observer;
12+
use Magento\Framework\Event\ObserverInterface;
13+
14+
class ToolbarMemorizerObserver implements ObserverInterface
15+
{
16+
/**
17+
* @var ToolbarMemorizer
18+
*/
19+
private $toolbarMemorizer;
20+
21+
/**
22+
* ToolbarMemoriserObserver constructor.
23+
* @param ToolbarMemorizer $toolbarMemorizer
24+
*/
25+
public function __construct(ToolbarMemorizer $toolbarMemorizer)
26+
{
27+
$this->toolbarMemorizer = $toolbarMemorizer;
28+
}
29+
30+
/**
31+
* Save toolbar parameters in catalog session
32+
*
33+
* @param Observer $observer
34+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
35+
*/
36+
public function execute(Observer $observer): void
37+
{
38+
$this->toolbarMemorizer->memorizeParams();
39+
}
40+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
9+
<event name="controller_action_predispatch_catalogsearch_advanced_result">
10+
<observer name="catalog_sort_param_memorization" instance="Magento\CatalogSearch\Observer\ToolbarMemorizerObserver"/>
11+
</event>
12+
<event name="controller_action_predispatch_catalogsearch_result_index">
13+
<observer name="catalog_sort_param_memorization" instance="Magento\CatalogSearch\Observer\ToolbarMemorizerObserver"/>
14+
</event>
15+
</config>

app/code/Magento/Cms/Test/Mftf/ActionGroup/DeleteImageFromStorageActionGroup.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<arguments>
1616
<argument name="Image"/>
1717
</arguments>
18-
18+
1919
<waitForElementVisible selector="{{MediaGallerySection.imageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="waitForInitialImages"/>
2020
<grabMultiple selector="{{MediaGallerySection.imageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="initialImages"/>
2121
<waitForElementVisible selector="{{MediaGallerySection.lastImageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="waitForLastImage"/>
22-
<click selector="{{MediaGallerySection.lastImageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="selectImage"/>
22+
<conditionalClick selector="{{MediaGallerySection.lastImageOrImageCopy(Image.fileName, Image.extension)}}" dependentSelector="{{MediaGallerySection.DeleteSelectedBtn}}" visible="false" stepKey="selectImage"/>
2323
<waitForElementVisible selector="{{MediaGallerySection.DeleteSelectedBtn}}" stepKey="waitForDeleteBtn"/>
2424
<click selector="{{MediaGallerySection.DeleteSelectedBtn}}" stepKey="clickDeleteSelected"/>
2525
<waitForPageLoad stepKey="waitForPageLoad1"/>
@@ -28,7 +28,7 @@
2828
<waitForPageLoad stepKey="waitForPageLoad2"/>
2929
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
3030
<grabMultiple selector="{{MediaGallerySection.imageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="newImages"/>
31-
31+
3232
<assertLessThan stepKey="assertLessImages">
3333
<expectedResult type="variable">initialImages</expectedResult>
3434
<actualResult type="variable">newImages</actualResult>

app/code/Magento/Customer/Test/Unit/Model/StoreSwitcher/RedirectDataPostprocessorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function testProcessShouldNotLoginCustomerIfNotRegisteredInTargetStore():
118118

119119
public function testProcessShouldThrowExceptionIfCustomerDoesNotExist(): void
120120
{
121-
$this->expectErrorMessage('Something went wrong.');
121+
$this->expectExceptionMessage('Something went wrong.');
122122
$data = ['customer_id' => 1];
123123
$this->session->expects($this->never())
124124
->method('setCustomerDataAsLoggedIn');
@@ -127,7 +127,7 @@ public function testProcessShouldThrowExceptionIfCustomerDoesNotExist(): void
127127

128128
public function testProcessShouldThrowExceptionIfAnErrorOccur(): void
129129
{
130-
$this->expectErrorMessage('Something went wrong.');
130+
$this->expectExceptionMessage('Something went wrong.');
131131
$data = ['customer_id' => 2];
132132
$this->session->expects($this->never())
133133
->method('setCustomerDataAsLoggedIn');

app/code/Magento/MediaGalleryUi/Test/Mftf/Test/UserDeletesFolderFromMediaGalleryTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@
5959
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="unselectFoldersToVerifyDeleteFolderButtonStatus">
6060
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
6161
</actionGroup>
62+
<waitForPageLoad stepKey="waitForSearchResult" time="10"/>
63+
<conditionalClick selector="{{AdminMediaGalleryFolderSection.clearFilterFolderName}}" dependentSelector="{{AdminMediaGalleryFolderSection.clearFilterFolderName}}" visible="true" stepKey="clearAllFiltersIfAny"/>
6264
<seeElement selector="{{AdminMediaGalleryFolderSection.disabledDeleteFolderButton}}" stepKey="DeleteFolderButtonIsDisabled"/>
6365

6466
<!-- Step4.2 Delete Folder is enabled post selecting folder -->
@@ -72,6 +74,7 @@
7274
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="deselectWysiwygFolder">
7375
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
7476
</actionGroup>
77+
<conditionalClick selector="{{AdminMediaGalleryFolderSection.clearFilterFolderName}}" dependentSelector="{{AdminMediaGalleryFolderSection.clearFilterFolderName}}" visible="true" stepKey="clearAllFiltersIfAny2"/>
7578
<seeElement selector="{{AdminMediaGalleryFolderSection.disabledDeleteFolderButton}}" stepKey="DeleteFolderButtonIsNowDisabledAgain"/>
7679

7780
<!-- Step5 Select folder to delete -->

app/code/Magento/ProductAlert/Test/Unit/Model/ObserverTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function testGetWebsitesThrowsException(): void
8585
{
8686
$message = 'get website exception';
8787
$this->expectException(\Exception::class);
88-
$this->expectErrorMessage($message);
88+
$this->expectExceptionMessage($message);
8989

9090
$this->scopeConfigMock->method('isSetFlag')->willReturn(false);
9191
$this->storeManagerMock->method('getWebsites')
@@ -103,7 +103,7 @@ public function testProcessPriceThrowsException(): void
103103
{
104104
$message = 'create collection exception';
105105
$this->expectException(\Exception::class);
106-
$this->expectErrorMessage($message);
106+
$this->expectExceptionMessage($message);
107107

108108
$groupMock = $this->createMock(\Magento\Store\Model\Group::class);
109109
$storeMock = $this->createMock(Store::class);
@@ -131,7 +131,7 @@ public function testProcessStockThrowsException(): void
131131
{
132132
$message = 'create collection exception';
133133
$this->expectException(\Exception::class);
134-
$this->expectErrorMessage($message);
134+
$this->expectExceptionMessage($message);
135135

136136
$groupMock = $this->createMock(\Magento\Store\Model\Group::class);
137137
$storeMock = $this->createMock(Store::class);

app/code/Magento/Sales/Test/Mftf/Test/AdminUnassignCustomOrderStatusTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555

5656
<!--Click unassign and verify AssertOrderStatusSuccessUnassignMessage-->
5757
<click selector="{{AdminOrderStatusGridSection.unassign}}" stepKey="clickUnassign"/>
58-
<waitForText selector="{{AdminMessagesSection.success}}" userInput="You have unassigned the order status." stepKey="seeAssertOrderStatusSuccessUnassignMessage"/>
58+
<waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessageVisible" />
59+
<waitForText selector="{{AdminMessagesSection.success}}" time="30" userInput="You have unassigned the order status." stepKey="seeAssertOrderStatusSuccessUnassignMessage"/>
5960

6061
<!--Verify the order status grid page shows the updated order status and verify AssertOrderStatusInGrid-->
6162
<actionGroup ref="AssertOrderStatusExistsInGrid" stepKey="seeAssertOrderStatusInGrid">

app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
*/
2323
class TaxTest extends TestCase
2424
{
25+
/**
26+
* @var float
27+
*/
28+
private const EPSILON = 0.0000000001;
29+
2530
/**
2631
* @var Tax
2732
*/
@@ -118,13 +123,13 @@ function ($price, $type) use (&$roundingDelta) {
118123

119124
//verify invoice data
120125
foreach ($expectedResults['creditmemo_data'] as $key => $value) {
121-
$this->assertEquals($value, $this->creditmemo->getData($key));
126+
$this->assertEqualsWithDelta($value, $this->creditmemo->getData($key), self::EPSILON);
122127
}
123128
//verify invoice item data
124129
foreach ($expectedResults['creditmemo_items'] as $itemKey => $itemData) {
125130
$creditmemoItem = $creditmemoItems[$itemKey];
126131
foreach ($itemData as $key => $value) {
127-
$this->assertEquals($value, $creditmemoItem->getData($key));
132+
$this->assertEqualsWithDelta($value, $creditmemoItem->getData($key), self::EPSILON);
128133
}
129134
}
130135
}

app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Total/TaxTest.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717

1818
class TaxTest extends TestCase
1919
{
20+
/**
21+
* @var float
22+
*/
23+
private const EPSILON = 0.0000000001;
24+
2025
/**
2126
* @var Tax
2227
*/
@@ -115,13 +120,13 @@ public function testCollect($orderData, $invoiceData, $expectedResults)
115120

116121
//verify invoice data
117122
foreach ($expectedResults['invoice_data'] as $key => $value) {
118-
$this->assertEquals($value, $this->invoice->getData($key));
123+
$this->assertEqualsWithDelta($value, $this->invoice->getData($key), self::EPSILON);
119124
}
120125
//verify invoice item data
121126
foreach ($expectedResults['invoice_items'] as $itemKey => $itemData) {
122127
$invoiceItem = $invoiceItems[$itemKey];
123128
foreach ($itemData as $key => $value) {
124-
$this->assertEquals($value, $invoiceItem->getData($key));
129+
$this->assertEqualsWithDelta($value, $invoiceItem->getData($key), self::EPSILON);
125130
}
126131
}
127132
}

0 commit comments

Comments
 (0)