MTA-561: Re-factor Tests for Onepage Checkout with Online Shipping Carrier

Roman Liukshyn · Roman Liukshyn · commit bd8629d84924 · 2015-03-24T17:52:27.000+02:00
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml
@@ -20,4 +20,18 @@
         <step name="selectPaymentMethod" module="Magento_Checkout" next="placeOrder"/>
         <step name="placeOrder" module="Magento_Checkout"/>
     </scenario>
+
+    <scenario name="OnePageCheckoutWithOnlineShippingMethodsTest" firstStep="setupConfiguration">
+        <step name="setupConfiguration" module="Magento_Core" next="createProducts"/>
+        <step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart"/>
+        <step name="addProductsToTheCart" module="Magento_Checkout" next="estimateShippingAndTax"/>
+        <step name="estimateShippingAndTax" module="Magento_Checkout" next="proceedToCheckout"/>
+        <step name="proceedToCheckout" module="Magento_Checkout" next="createCustomer"/>
+        <step name="createCustomer" module="Magento_Customer" next="selectCheckoutMethod"/>
+        <step name="selectCheckoutMethod" module="Magento_Checkout" next="fillBillingInformation"/>
+        <step name="fillBillingInformation" module="Magento_Checkout" next="fillShippingMethod"/>
+        <step name="fillShippingMethod" module="Magento_Checkout" next="selectPaymentMethod"/>
+        <step name="selectPaymentMethod" module="Magento_Checkout" next="placeOrder"/>
+        <step name="placeOrder" module="Magento_Checkout"/>
+    </scenario>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/Curl.php b/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/Curl.php
@@ -80,21 +80,24 @@ protected function prepareConfigPath(array $input)
         $path = explode('/', $input['path']);
         foreach ($path as $position => $subPath) {
             if ($position === 0) {
-                $resultArray.= $subPath;
+                $resultArray .= $subPath;
                 continue;
             } elseif ($position === (count($path) - 1)) {
-                $resultArray.= '[fields]';
+                $resultArray .= '[fields]';
             } else {
-                $resultArray.= '[groups]';
+                $resultArray .= '[groups]';
             }
-            $resultArray.= '[' . $subPath .']';
+            $resultArray .= '[' . $subPath . ']';
         }
-        $resultArray.= '[value]';
+        $resultArray .= '[value]';
         if (is_array($input['value'])) {
-            $resultArray.= '[' . key($input['value']) . ']';
-            $resultArray.= '=' . current($input['value']);
+            $values = [];
+            foreach ($input['value'] as $key => $value) {
+                $values[] = $resultArray . "[$key]=$value";
+            }
+            $resultArray = implode('&', $values);
         } else {
-            $resultArray.= '=' . $input['value'];
+            $resultArray .= '=' . $input['value'];
         }
         return $resultArray;
     }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php
@@ -48,7 +48,7 @@ protected function assert(OrderInjectable $order, OrderIndex $orderIndex, $statu
         ];
         $errorMessage = implode(', ', $filter);
         \PHPUnit_Framework_Assert::assertTrue(
-            $orderIndex->getSalesOrderGrid()->isRowVisible($filter),
+            $orderIndex->getSalesOrderGrid()->isRowVisible(array_filter($filter)),
             'Order with following data \'' . $errorMessage . '\' is absent in Orders grid.'
         );
     }
diff --git a/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml
@@ -19,7 +19,7 @@
             <field path="carriers/ups/password" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_UPS_PASSWORD</field>
             <field path="carriers/ups/username" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_UPS_USERNAME</field>
             <field path="carriers/ups/mode_xml" scope="carriers" scope_id="1" label="Development" xsi:type="string">0</field>
-            <field path="carriers/ups/gateway_url" scope="carriers" scope_id="1" label="" xsi:type="string">https://wwwcie.ups.com/ups.app/xml/Rate</field>
+            <field path="carriers/ups/gateway_xml_url" scope="carriers" scope_id="1" label="" xsi:type="string">https://wwwcie.ups.com/ups.app/xml/Rate</field>
             <field path="carriers/ups/origin_shipment" scope="carriers" scope_id="1" label="" xsi:type="string">Shipments Originating in United States</field>
             <field path="carriers/ups/access_license_number" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_UPS_ACCESS_LICENSE_NUMBER</field>
             <field path="carriers/ups/negotiated_active" scope="carriers" scope_id="1" label="No" xsi:type="string">0</field>

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ protected function assert(OrderInjectable $order, OrderIndex $orderIndex, $statu`
`48`	`48`	`];`
`49`	`49`	`$errorMessage = implode(', ', $filter);`
`50`	`50`	`\PHPUnit_Framework_Assert::assertTrue(`
`51`		`- $orderIndex->getSalesOrderGrid()->isRowVisible($filter),`
	`51`	`+ $orderIndex->getSalesOrderGrid()->isRowVisible(array_filter($filter)),`
`52`	`52`	`'Order with following data \'' . $errorMessage . '\' is absent in Orders grid.'`
`53`	`53`	`);`
`54`	`54`	`}`