Skip to content

Commit 8f9f568

Browse files
eug123eug123
authored
Merge pull request #56 from magento-commerce/1.3-develop-phpunit9
MC-38769: PHPUnit 9 support for PHP 2.3.x
2 parents 847aca6 + 81d686a commit 8f9f568

File tree

23 files changed

+45
-49
lines changed

23 files changed

+45
-49
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<conditionalClick stepKey="expandAdvancedContentTools" selector="{{ContentManagementSection.PageBuilderOptions}}" dependentSelector="{{ContentManagementSection.CheckIfPageBuilderTabExpanded}}" visible="true"/>
5353
<waitForElementVisible selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" stepKey="waitForGoogleMapsAPIKeyInputField"/>
5454
<fillField selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" userInput="{{apiKey}}" stepKey="inputAPIKey"/>
55-
<pressKey selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" parameterArray="[\WebDriverKeys::ENTER]" stepKey="pressKey"/>
55+
<pressKey selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressKey"/>
5656
<click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/>
5757
<waitForPageLoad stepKey="waitForPageLoad3"/>
5858
</actionGroup>
@@ -63,7 +63,7 @@
6363
<comment userInput="inputGoogleMapsAPIKey" stepKey="comment"/>
6464
<waitForElementVisible selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" stepKey="waitForGoogleMapsAPIKeyInputField"/>
6565
<fillField selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" userInput="{{apiKey}}" stepKey="inputAPIKey"/>
66-
<pressKey selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" parameterArray="[\WebDriverKeys::ENTER]" stepKey="pressKey"/>
66+
<pressKey selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressKey"/>
6767
</actionGroup>
6868
<actionGroup name="clickAndValidateGoogleMapsAPIKeyTestKeyButton">
6969
<arguments>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
<see userInput="Row" selector="{{PageBuilderPanel.searchResults}}" stepKey="validateRowAppears"/>
220220
<dontSee userInput="Column" selector="{{PageBuilderPanel.searchResults}}" stepKey="validateColumnDoesNotAppear"/>
221221
<comment userInput="Clear input field using backspace to show all content types on Pagebuilder panel" stepKey="commentDeleteSearch"/>
222-
<pressKey selector="{{PageBuilderPanel.searchPanel}}" parameterArray="[\WebDriverKeys::BACKSPACE]" stepKey="enterSearchInput"/>
222+
<pressKey selector="{{PageBuilderPanel.searchPanel}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::BACKSPACE]" stepKey="enterSearchInput"/>
223223
<dontSee userInput="r" selector="{{PageBuilderPanel.searchPanel}}" stepKey="validateInputClearedAfterRemoveCharacters"/>
224224
<scrollTo selector="{{CmsNewPagePageActionsSection.contentSectionName}}" stepKey="scrollToTopOfStage"/>
225225
<actionGroup ref="validateMenuSectionsAndContentTypes" stepKey="validateMenuSectionsAndContentTypesAfterClearField"/>

‎app/code/Magento/PageBuilder/Test/Unit/Model/Catalog/SortingTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class SortingTest extends TestCase
3333
/**
3434
* @inheritdoc
3535
*/
36-
protected function setUp()
36+
protected function setUp(): void
3737
{
3838
$this->objectManager = new ObjectManager($this);
3939
$this->sortingFactoryMock = $this->createMock(Factory::class);

‎app/code/Magento/PageBuilder/Test/Unit/Model/Filter/TemplateTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class TemplateTest extends TestCase
3535
/**
3636
* @inheritDoc
3737
*/
38-
protected function setUp()
38+
protected function setUp(): void
3939
{
4040
parent::setUp();
4141
$this->logger = $this->createMock(LoggerInterface::class);

‎dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Category/ViewTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ViewTest extends TestCase
4040
/**
4141
* @inheritdoc
4242
*/
43-
protected function setUp()
43+
protected function setUp(): void
4444
{
4545
$this->objectManager = Bootstrap::getObjectManager();
4646
$this->categoryRepository = $this->objectManager->create(CategoryRepositoryInterface::class);
@@ -64,7 +64,7 @@ public function testDescription(): void
6464
$this->block = $this->layout->createBlock(View::class);
6565
$this->block->setTemplate('Magento_PageBuilder::catalog/category/view/description.phtml');
6666

67-
$this->assertContains('data-appearance="contained"', $this->block->toHtml());
67+
$this->assertStringContainsString('data-appearance="contained"', $this->block->toHtml());
6868
}
6969

7070
/**

‎dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/UploadTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class UploadTest extends TestCase
4848
/**
4949
* @inheritdoc
5050
*/
51-
protected function setUp()
51+
protected function setUp(): void
5252
{
5353
$this->objectManager = ObjectManager::getInstance();
5454

@@ -77,7 +77,7 @@ protected function setUp()
7777
/**
7878
* @inheritdoc
7979
*/
80-
protected function tearDown()
80+
protected function tearDown(): void
8181
{
8282
$_FILES = [];
8383
}

‎dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions/ChildTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ public function testFormLoadsEmptyFormUsingParams()
2626
$this->dispatch('backend/pagebuilder/form/element_productconditions_child');
2727
$responseBody = $this->getResponse()->getBody();
2828
// Assert form is associated correctly
29-
$this->assertContains('data-form-part="test_namespace"', $responseBody);
29+
$this->assertStringContainsString('data-form-part="test_namespace"', $responseBody);
3030
// Assert the form object is propagated
31-
$this->assertContains('form/myobject', $responseBody);
31+
$this->assertStringContainsString('form/myobject', $responseBody);
3232
// Assert id is used
33-
$this->assertContains('name="parameters[conditions][1--3][type]"', $responseBody);
33+
$this->assertStringContainsString('name="parameters[conditions][1--3][type]"', $responseBody);
3434
// Assert type is used
35-
$this->assertContains('value="Magento\CatalogWidget\Model\Rule\Condition\Product"', $responseBody);
35+
$this->assertStringContainsString('value="Magento\CatalogWidget\Model\Rule\Condition\Product"', $responseBody);
3636
}
3737

3838
public function testFormLoadsCustomPrefix()
@@ -53,8 +53,8 @@ public function testFormLoadsCustomPrefix()
5353
$responseBody = $this->getResponse()->getBody();
5454

5555
// Assert the form object is propagated
56-
$this->assertContains('form/myobject', $responseBody);
56+
$this->assertStringContainsString('form/myobject', $responseBody);
5757
// Assert id is used
58-
$this->assertContains('name="parameters[myprefix][1--3][type]"', $responseBody);
58+
$this->assertStringContainsString('name="parameters[myprefix][1--3][type]"', $responseBody);
5959
}
6060
}

‎dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditionsTest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ public function testFormLoadsEmptyFormUsingParams()
2323
$this->dispatch('backend/pagebuilder/form/element_productconditions');
2424
$responseBody = $this->getResponse()->getBody();
2525
// Assert form is associated correctly
26-
$this->assertContains('data-form-part="test_namespace"', $responseBody);
26+
$this->assertStringContainsString('data-form-part="test_namespace"', $responseBody);
2727
// Assert correct conditions are loaded
28-
$this->assertContains(\Magento\CatalogWidget\Model\Rule\Condition\Combine::class, $responseBody);
28+
$this->assertStringContainsString(\Magento\CatalogWidget\Model\Rule\Condition\Combine::class, $responseBody);
2929
}
3030

3131
public function testFormLoadsConditionsFromPost()
@@ -63,19 +63,19 @@ public function testFormLoadsConditionsFromPost()
6363
$responseBody = $this->getResponse()->getBody();
6464

6565
// Assert the description rule is loaded correctly
66-
$this->assertContains('<option value="{}" selected="selected">contains</option>', $responseBody);
66+
$this->assertStringContainsString('<option value="{}" selected="selected">contains</option>', $responseBody);
6767
$expected = 'data-ui-id="editable-0-text-parameters-conditions-1-1-value"' .
6868
' value="foo" data-form-part="test_namespace"';
69-
$this->assertContains($expected, $responseBody);
69+
$this->assertStringContainsString($expected, $responseBody);
7070

7171
// Assert the combine form has form-part
7272
$expected = 'name="parameters[conditions][1--2][value]" data-form-part="test_namespace"';
73-
$this->assertContains($expected, $responseBody);
73+
$this->assertStringContainsString($expected, $responseBody);
7474

7575
// Assert the combine condition has the correct child value and form-part
7676
$expected = 'data-ui-id="editable-0-text-parameters-conditions-1-2-1-value"' .
7777
' value="123" data-form-part="test_namespace"';
78-
$this->assertContains($expected, $responseBody);
78+
$this->assertStringContainsString($expected, $responseBody);
7979
}
8080

8181
public function testFormLoadsProperPrefix()
@@ -115,6 +115,6 @@ public function testFormLoadsProperPrefix()
115115

116116
// Assert the combine form has form-part
117117
$expected = 'name="parameters[myprefix][1--2][value]"';
118-
$this->assertContains($expected, $responseBody);
118+
$this->assertStringContainsString($expected, $responseBody);
119119
}
120120
}

‎dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/DeleteTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class DeleteTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
4444
/**
4545
* @inheritDoc
4646
*/
47-
protected function setUp()
47+
protected function setUp(): void
4848
{
4949
parent::setUp();
5050
$this->objectManager = Bootstrap::getObjectManager();

‎dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/SaveTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
7474
/**
7575
* @inheritDoc
7676
*/
77-
protected function setUp()
77+
protected function setUp(): void
7878
{
7979
parent::setUp();
8080
$this->objectManager = Bootstrap::getObjectManager();
@@ -173,6 +173,6 @@ public function testSaveAction()
173173
$this->assertEquals('Automated Template', $template->getName());
174174
$this->assertEquals('<div data-content-type="row"></div>', $template->getTemplate());
175175
$this->assertEquals('any', $template->getCreatedFor());
176-
$this->assertContains('.template-manager/automatedtemplate', $template->getPreviewImage());
176+
$this->assertStringContainsString('.template-manager/automatedtemplate', $template->getPreviewImage());
177177
}
178178
}

0 commit comments

Comments
 (0)