Merge remote-tracking branch 'origin/MC-33071-CE-6' into MC-33071

zakdma · zakdma · commit 4be2cecfdd41 · 2020-04-21T21:30:25.000+03:00
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentAddTrackTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentAddTrackTest.php
@@ -115,7 +115,7 @@ public function testShipmentTrackWithFailedOrderId()
             $exceptionMessage = $errorObj['message'];
         }
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             $exceptionMessage,
             'Could not save the shipment tracking.',
             'SoapFault or CouldNotSaveException does not contain exception message.'

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public function testShipmentTrackWithFailedOrderId()`
`115`	`115`	`$exceptionMessage = $errorObj['message'];`
`116`	`116`	`}`
`117`	`117`
`118`		`- $this->assertContains(`
	`118`	`+ $this->assertStringContainsString(`
`119`	`119`	`$exceptionMessage,`
`120`	`120`	`'Could not save the shipment tracking.',`
`121`	`121`	`'SoapFault or CouldNotSaveException does not contain exception message.'`