Merge pull request #50 from magento-lynx/MC-39923

MC-39923 Stabilize Integration Tests (PageBuilder)

Author: svera

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

@@ -64,7 +64,7 @@ public function testDescription(): void
         $this->block = $this->layout->createBlock(View::class);
         $this->block->setTemplate('Magento_PageBuilder::catalog/category/view/description.phtml');
 
-        $this->assertContains('data-appearance="contained"', $this->block->toHtml());
+        $this->assertStringContainsString('data-appearance="contained"', $this->block->toHtml());
     }
 
     /**

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

@@ -26,13 +26,13 @@ public function testFormLoadsEmptyFormUsingParams()
         $this->dispatch('backend/pagebuilder/form/element_productconditions_child');
         $responseBody = $this->getResponse()->getBody();
         // Assert form is associated correctly
-        $this->assertContains('data-form-part="test_namespace"', $responseBody);
+        $this->assertStringContainsString('data-form-part="test_namespace"', $responseBody);
         // Assert the form object is propagated
-        $this->assertContains('form/myobject', $responseBody);
+        $this->assertStringContainsString('form/myobject', $responseBody);
         // Assert id is used
-        $this->assertContains('name="parameters[conditions][1--3][type]"', $responseBody);
+        $this->assertStringContainsString('name="parameters[conditions][1--3][type]"', $responseBody);
         // Assert type is used
-        $this->assertContains('value="Magento\CatalogWidget\Model\Rule\Condition\Product"', $responseBody);
+        $this->assertStringContainsString('value="Magento\CatalogWidget\Model\Rule\Condition\Product"', $responseBody);
     }
 
     public function testFormLoadsCustomPrefix()
@@ -53,8 +53,8 @@ public function testFormLoadsCustomPrefix()
         $responseBody = $this->getResponse()->getBody();
 
         // Assert the form object is propagated
-        $this->assertContains('form/myobject', $responseBody);
+        $this->assertStringContainsString('form/myobject', $responseBody);
         // Assert id is used
-        $this->assertContains('name="parameters[myprefix][1--3][type]"', $responseBody);
+        $this->assertStringContainsString('name="parameters[myprefix][1--3][type]"', $responseBody);
     }
 }

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

@@ -23,9 +23,9 @@ public function testFormLoadsEmptyFormUsingParams()
         $this->dispatch('backend/pagebuilder/form/element_productconditions');
         $responseBody = $this->getResponse()->getBody();
         // Assert form is associated correctly
-        $this->assertContains('data-form-part="test_namespace"', $responseBody);
+        $this->assertStringContainsString('data-form-part="test_namespace"', $responseBody);
         // Assert correct conditions are loaded
-        $this->assertContains(\Magento\CatalogWidget\Model\Rule\Condition\Combine::class, $responseBody);
+        $this->assertStringContainsString(\Magento\CatalogWidget\Model\Rule\Condition\Combine::class, $responseBody);
     }
 
     public function testFormLoadsConditionsFromPost()
@@ -63,19 +63,19 @@ public function testFormLoadsConditionsFromPost()
         $responseBody = $this->getResponse()->getBody();
 
         // Assert the description rule is loaded correctly
-        $this->assertContains('<option value="{}" selected="selected">contains</option>', $responseBody);
+        $this->assertStringContainsString('<option value="{}" selected="selected">contains</option>', $responseBody);
         $expected = 'data-ui-id="editable-0-text-parameters-conditions-1-1-value"' .
             '  value="foo" data-form-part="test_namespace"';
-        $this->assertContains($expected, $responseBody);
+        $this->assertStringContainsString($expected, $responseBody);
 
         // Assert the combine form has form-part
         $expected = 'name="parameters[conditions][1--2][value]" data-form-part="test_namespace"';
-        $this->assertContains($expected, $responseBody);
+        $this->assertStringContainsString($expected, $responseBody);
 
         // Assert the combine condition has the correct child value and form-part
         $expected = 'data-ui-id="editable-0-text-parameters-conditions-1-2-1-value"' .
             '  value="123" data-form-part="test_namespace"';
-        $this->assertContains($expected, $responseBody);
+        $this->assertStringContainsString($expected, $responseBody);
     }
 
     public function testFormLoadsProperPrefix()
@@ -115,6 +115,6 @@ public function testFormLoadsProperPrefix()
 
         // Assert the combine form has form-part
         $expected = 'name="parameters[myprefix][1--2][value]"';
-        $this->assertContains($expected, $responseBody);
+        $this->assertStringContainsString($expected, $responseBody);
     }
 }

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

@@ -173,6 +173,6 @@ public function testSaveAction()
         $this->assertEquals('Automated Template', $template->getName());
         $this->assertEquals('<div data-content-type="row"></div>', $template->getTemplate());
         $this->assertEquals('any', $template->getCreatedFor());
-        $this->assertContains('.template-manager/automatedtemplate', $template->getPreviewImage());
+        $this->assertStringContainsString('.template-manager/automatedtemplate', $template->getPreviewImage());
     }
 }

dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ContentType/ReaderTest.php

@@ -36,11 +36,9 @@ protected function setUp(): void
         );
     }
 
-    /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     */
     public function testPartial()
     {
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
         $file = file_get_contents(__DIR__ . '/../../../_files/content_type/type3_content_type2.xml');
         $this->fileResolverMock->expects($this->once())
             ->method('get')

dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/MenuSection/ReaderTest.php

@@ -36,11 +36,9 @@ protected function setUp(): void
         );
     }
 
-    /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     */
     public function testPartial()
     {
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
         $file = file_get_contents(__DIR__ . '/../../../_files/content_type/menu_section3.xml');
         $this->fileResolverMock->expects($this->once())
             ->method('get')

dev/tests/integration/testsuite/Magento/PageBuilder/Model/Filter/TemplateTest.php

@@ -30,8 +30,8 @@ protected function setUp(): void
     public function testFilterFor(string $results, bool $contains, string $value)
     {
         $contains ?
-            self::assertContains($results, $this->templateFilter->filter($value)) :
-            self::assertNotContains($results, $this->templateFilter->filter($value));
+            self::assertStringContainsString($results, $this->templateFilter->filter($value)) :
+            self::assertStringNotContainsString($results, $this->templateFilter->filter($value));
     }
 
     /**

dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlockTest.php

@@ -31,9 +31,9 @@ public function testRender()
         ]);
         $this->assertArrayHasKey('content', $result);
         $content = $result['content'];
-        $this->assertNotContains('<script>', $content);
-        $this->assertContains('<p>Custom variable: "HTML Value".</p>', $content);
-        $this->assertNotContains('<html>', $content);
-        $this->assertNotContains('<!DOCTYPE', $content);
+        $this->assertStringNotContainsString('<script>', $content);
+        $this->assertStringContainsString('<p>Custom variable: "HTML Value".</p>', $content);
+        $this->assertStringNotContainsString('<html>', $content);
+        $this->assertStringNotContainsString('<!DOCTYPE', $content);
     }
 }