MAGETWO-63215: FedEx Shipment Tracking fails for valid tracking number

YevSent · YevSent · commit 87436e059101 · 2017-02-24T15:51:49.000+02:00
- Updated functional tests
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertTrackingDetailsIsPresent.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertTrackingDetailsIsPresent.php
@@ -63,7 +63,7 @@ public function processAssert(
 
         $body = $browser->find($this->mainContainer)->getText();
         foreach ($resultTrackingData as $value) {
-            \PHPUnit_Framework_Assert::assertContains($value, $body);
+            \PHPUnit_Framework_Assert::assertContains($value, $body, 'The "' . $value . '" is not present in popup.');
         }
 
         $browser->find($selector)->click();
@@ -75,6 +75,6 @@ public function processAssert(
      */
     public function toString()
     {
-        return 'Shipment tracking data is present in the popup window';
+        return 'Shipment tracking data is present in the popup window.';
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/TrackingShipmentForPlacedOrderTest.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/TrackingShipmentForPlacedOrderTest.php
@@ -29,7 +29,7 @@
  * 15. Perform all asserts.
  *
  * @group Shipping
- * @ZephyrId MAGETWO-58158
+ * @ZephyrId MAGETWO-65163, MAGETWO-58158
  */
 class TrackingShipmentForPlacedOrderTest extends Scenario
 {
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/TrackingShipmentForPlacedOrderTest.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/TrackingShipmentForPlacedOrderTest.xml
@@ -7,7 +7,7 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Shipping\Test\TestCase\TrackingShipmentForPlacedOrderTest" summary="Create shipment for order.">
-        <variation name="TrackingShipmentForPlacedOrderTestVariation1" summary="Creating shipment for order placed." ticketId="MAGETWO-58158">
+        <variation name="TrackingShipmentForPlacedOrderTestVariation1" summary="Creating shipment for order placed." ticketId="MAGETWO-65163">
             <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function processAssert(`
`63`	`63`
`64`	`64`	`$body = $browser->find($this->mainContainer)->getText();`
`65`	`65`	`foreach ($resultTrackingData as $value) {`
`66`		`- \PHPUnit_Framework_Assert::assertContains($value, $body);`
	`66`	`+ \PHPUnit_Framework_Assert::assertContains($value, $body, 'The "' . $value . '" is not present in popup.');`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`$browser->find($selector)->click();`
`@@ -75,6 +75,6 @@ public function processAssert(`
`75`	`75`	`*/`
`76`	`76`	`public function toString()`
`77`	`77`	`{`
`78`		`- return 'Shipment tracking data is present in the popup window';`
	`78`	`+ return 'Shipment tracking data is present in the popup window.';`
`79`	`79`	`}`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`* 15. Perform all asserts.`
`30`	`30`	`*`
`31`	`31`	`* @group Shipping`
`32`		`- * @ZephyrId MAGETWO-58158`
	`32`	`+ * @ZephyrId MAGETWO-65163, MAGETWO-58158`
`33`	`33`	`*/`
`34`	`34`	`class TrackingShipmentForPlacedOrderTest extends Scenario`
`35`	`35`	`{`