Merge branch 'FearlessKiwis-MAGETWO-51577-downloadable_configurable_product_functional_tests' into develop

Author: cpartica

app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php

@@ -281,9 +281,6 @@ public function getColumnHtml(\Magento\Framework\DataObject $item, $column, $fie
             case 'price-original':
                 $html = $this->displayPriceAttribute('original_price');
                 break;
-            case 'price':
-                $html = $this->displayPriceAttribute('price');
-                break;
             case 'tax-amount':
                 $html = $this->displayPriceAttribute('tax_amount');
                 break;

dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php

@@ -117,6 +117,7 @@ public function save()
      */
     public function delete()
     {
+        $this->waitBeforeClick();
         $this->_rootElement->find($this->deleteButton)->click();
     }
 
@@ -139,6 +140,6 @@ public function checkDeleteButton()
     protected function waitBeforeClick()
     {
         time_nanosleep(0, 600000000);
-        usleep(500000);
+        usleep(1000000);
     }
 }

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/TaxCalculationTest.xml

@@ -14,7 +14,7 @@
             <data name="customer/dataset" xsi:type="string">johndoe_unique</data>
             <data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
             <data name="catalogRule" xsi:type="string">-</data>
-            <data name="configData" xsi:type="string">display_excluding_including_tax</data>
+            <data name="configData" xsi:type="string">total_cat_excl_ship_incl_after_disc_on_excl, display_excluding_including_tax</data>
             <data name="qty" xsi:type="string">3</data>
             <data name="prices/category_price_excl_tax" xsi:type="string">1.00</data>
             <data name="prices/category_price_incl_tax" xsi:type="string">1.10</data>

dev/tests/functional/tests/app/Magento/SalesRule/Test/TestStep/CreateSalesRuleStep.php

@@ -57,6 +57,7 @@ public function __construct(FixtureFactory $fixtureFactory, DeleteAllSalesRuleSt
      */
     public function run()
     {
+        $this->deleteAllSalesRule->run();
         $result['salesRule'] = null;
         if ($this->salesRule !== null) {
             $salesRule = $this->fixtureFactory->createByCode(

dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php

@@ -93,6 +93,7 @@ public function processAssert(
         $this->orderInvoiceNew = $orderInvoiceNew;
         $this->orderCreditMemoNew = $orderCreditMemoNew;
         $orderIndex->open();
+        $this->waitBeforeClick();
         $orderIndex->getSalesOrderGrid()->openFirstRow();
         //Check prices on order page
         $actualPrices = [];
@@ -222,4 +223,15 @@ public function toString()
     {
         return 'Prices on backend after order creation is correct.';
     }
+
+    /**
+     * Wait for User before click
+     *
+     * @return void
+     */
+    protected function waitBeforeClick()
+    {
+        time_nanosleep(0, 600000000);
+        usleep(1000000);
+    }
 }

dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php

@@ -57,6 +57,7 @@ public function __construct(FixtureFactory $fixtureFactory, DeleteAllTaxRulesSte
      */
     public function run()
     {
+        $this->deleteAllTaxRule->run();
         $result['taxRule'] = null;
         if ($this->taxRule !== null) {
             $taxRuleDataSets = explode(',', $this->taxRule);