Skip to content

Commit 62f7d75

Browse files
committed
MAGETWO-63215: FedEx Shipment Tracking fails for valid tracking number
- Updated functional test
1 parent 87436e0 commit 62f7d75

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/TrackingShipmentForPlacedOrderTest.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
1414
<data name="checkoutMethod" xsi:type="string">login</data>
1515
<data name="shipping/shipping_service" xsi:type="string">Federal Express</data>
16-
<data name="shipping/shipping_method" xsi:type="string">Ground</data>
17-
<data name="cart/data/shipping_method" xsi:type="string">Ground</data>
16+
<data name="shipping/shipping_method" xsi:type="string">Smart Post</data>
17+
<data name="cart/data/shipping_method" xsi:type="string">Smart Post</data>
1818
<data name="payment/method" xsi:type="string">checkmo</data>
1919
<data name="configData" xsi:type="string">checkmo, fedex, shipping_origin_US_CA</data>
2020
<data name="trackingData" xsi:type="array">
@@ -23,11 +23,7 @@
2323
<item name="tracking_number" xsi:type="string">449044304137821</item>
2424
</data>
2525
<data name="resultTrackingData" xsi:type="array">
26-
<item name="status" xsi:type="string">Shipment information sent to FedEx</item>
2726
<item name="number" xsi:type="string">449044304137821</item>
28-
<item name="service_type" xsi:type="string">FedEx Home Delivery</item>
29-
<item name="events/date" xsi:type="string">Dec 30, 2013</item>
30-
<item name="events/time" xsi:type="string">6:24 PM</item>
3127
</data>
3228
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
3329
<constraint name="Magento\Shipping\Test\Constraint\AssertTrackingDetailsIsPresent" />

dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertTrackingDetailsIsPresent.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,15 @@ public function processAssert(
6363

6464
$body = $browser->find($this->mainContainer)->getText();
6565
foreach ($resultTrackingData as $value) {
66-
\PHPUnit_Framework_Assert::assertContains($value, $body, 'The "' . $value . '" is not present in popup.');
66+
\PHPUnit_Framework_Assert::assertContains(
67+
$value,
68+
$body,
69+
'The "' . $value . '" is not present in Shipping Tracking popup.'
70+
);
6771
}
68-
69-
$browser->find($selector)->click();
72+
$popupWindow = $browser->getCurrentWindow();
7073
$browser->selectWindow($mainWindow);
74+
$browser->closeWindow($popupWindow);
7175
}
7276

7377
/**

dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/TrackingShipmentForPlacedOrderTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Shipping\Test\TestCase\TrackingShipmentForPlacedOrderTest" summary="Create shipment for order.">
10-
<variation name="TrackingShipmentForPlacedOrderTestVariation1" summary="Creating shipment for order placed." ticketId="MAGETWO-65163">
10+
<variation name="TrackingShipmentForPlacedOrderTestVariation1" summary="Creating shipment for order placed within Flat Rate." ticketId="MAGETWO-65163">
1111
<data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
1212
<data name="customer/dataset" xsi:type="string">default</data>
1313
<data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
@@ -25,7 +25,7 @@
2525
<data name="resultTrackingData" xsi:type="array">
2626
<item name="number" xsi:type="string">0123456789</item>
2727
</data>
28-
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
28+
<data name="tag" xsi:type="string">severity:S1</data>
2929
<constraint name="Magento\Shipping\Test\Constraint\AssertTrackingDetailsIsPresent" />
3030
</variation>
3131
</testCase>

0 commit comments

Comments
 (0)