Merge pull request #6592 from magento-lynx/MC-39901

Stabilize Web-API tests

Author: svera

composer.json

@@ -93,7 +93,7 @@
         "pdepend/pdepend": "~2.7.1",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "@stable",
-        "phpstan/phpstan": "^0.12.2",
+        "phpstan/phpstan": ">=0.12.3 <=0.12.23",
         "phpunit/phpunit": "^9",
         "sebastian/phpcpd": "~5.0.0",
         "squizlabs/php_codesniffer": "~3.5.4"

composer.lock

@@ -258,10 +258,10 @@ public static function getFixture($key)
      *
      * @param \Magento\Framework\Model\AbstractModel $model
      * @param bool $secure
-     * @return \Magento\TestFramework\TestCase\WebapiAbstract
+     * @return void
      * //phpcs:disable
      */
-    public static function callModelDelete($model, $secure = false)
+    public static function callModelDelete($model, $secure = false) : void
     {
         //phpcs:enable
         if ($model instanceof \Magento\Framework\Model\AbstractModel && $model->getId()) {
@@ -592,7 +592,7 @@ protected function checkSoapFault(
         $expectedWrappedErrors = [],
         $traceString = null
     ) {
-        $this->assertContains($expectedMessage, $soapFault->getMessage(), "Fault message is invalid.");
+        $this->assertStringContainsString($expectedMessage, $soapFault->getMessage(), "Fault message is invalid.");
 
         $errorDetailsNode = 'GenericFault';
         $errorDetails = isset($soapFault->detail->$errorDetailsNode) ? $soapFault->detail->$errorDetailsNode : null;
@@ -611,7 +611,7 @@ protected function checkSoapFault(
                 ->getMode();
             if ($mode == \Magento\Framework\App\State::MODE_DEVELOPER) {
                 /** Developer mode changes tested behavior and it cannot properly be tested for now */
-                $this->assertContains(
+                $this->assertStringContainsString(
                     $traceString,
                     $errorDetails->$traceNode,
                     'Trace Information is incorrect.'

dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php

@@ -18,8 +18,8 @@
     <testsuites>
         <testsuite name="Magento REST web API functional tests">
             <directory>testsuite</directory>
-            <exclude>testsuite/Magento/GraphQl</exclude>
             <directory>../../../app/code/*/*/Test/Api</directory>
+            <exclude>testsuite/Magento/GraphQl</exclude>
         </testsuite>
     </testsuites>
 

dev/tests/api-functional/phpunit_rest.xml.dist

@@ -67,7 +67,7 @@ public function testGetAll()
             try {
                 $this->_webApiCall($serviceInfo);
             } catch (\Exception $e) {
-                $this->assertContains(
+                $this->assertStringContainsString(
                     'Operation allowed only in HTTPS',
                     $e->getMessage()
                 );

dev/tests/api-functional/testsuite/Magento/Analytics/Api/LinkProviderTest.php

@@ -185,7 +185,7 @@ public function testCreateThrowsExceptionIfAttributeSetWithGivenNameAlreadyExist
             $this->_webApiCall($this->createServiceInfo, $arguments);
             $this->fail("Expected exception");
         } catch (\SoapFault $e) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "SoapFault does not contain expected message."

dev/tests/api-functional/testsuite/Magento/Catalog/Api/AttributeSetManagementTest.php

@@ -39,7 +39,7 @@ public function testInfoNoSuchEntityException()
         try {
             $this->getAssignedProducts(-1);
         } catch (\Exception $e) {
-            $this->assertContains('No such entity with %fieldName = %fieldValue', $e->getMessage());
+            $this->assertStringContainsString('No such entity with %fieldName = %fieldValue', $e->getMessage());
         }
     }
 

dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryLinkManagementTest.php

@@ -89,7 +89,7 @@ public function testInfoNoSuchEntityException()
         try {
             $this->getInfoCategory(-1);
         } catch (\Exception $e) {
-            $this->assertContains('No such entity with %fieldName = %fieldValue', $e->getMessage());
+            $this->assertStringContainsString('No such entity with %fieldName = %fieldValue', $e->getMessage());
         }
     }
 
@@ -168,7 +168,7 @@ public function testDeleteNoSuchEntityException()
         try {
             $this->deleteCategory(-1);
         } catch (\Exception $e) {
-            $this->assertContains('No such entity with %fieldName = %fieldValue', $e->getMessage());
+            $this->assertStringContainsString('No such entity with %fieldName = %fieldValue', $e->getMessage());
         }
     }
 

dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php

@@ -63,7 +63,7 @@ public function testAssignAttributeWrongAttributeSet()
             $this->_webApiCall($this->getAssignServiceInfo(), $payload);
             $this->fail("Expected exception");
         } catch (\SoapFault $e) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "SoapFault does not contain expected message."
@@ -86,7 +86,7 @@ public function testAssignAttributeWrongAttributeGroup()
             $this->_webApiCall($this->getAssignServiceInfo(), $payload);
             $this->fail("Expected exception");
         } catch (\SoapFault $e) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "SoapFault does not contain expected message."
@@ -110,7 +110,7 @@ public function testAssignAttributeWrongAttribute()
             $this->_webApiCall($this->getAssignServiceInfo(), $payload);
             $this->fail("Expected exception");
         } catch (\SoapFault $e) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "SoapFault does not contain expected message."

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeManagementTest.php

@@ -362,7 +362,7 @@ public function testDeleteNoSuchEntityException()
             $this->_webApiCall($serviceInfo, ['attributeCode' => $attributeCode]);
             $this->fail("Expected exception");
         } catch (\SoapFault $e) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "SoapFault does not contain expected message."