MAGETWO-59249: [Backport] - [GitHub] Free shipping rule with table shipping method breaks checkout #6346 - for 2.0

Author: DianaRusin

dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates.php

@@ -5,6 +5,7 @@
  */
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Framework\App\ResourceConnection $resource */
 $resource = $objectManager->get(\Magento\Framework\App\ResourceConnection::class);
 $connection = $resource->getConnection();
 $resourceModel = $objectManager->create(\Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate::class);
@@ -19,9 +20,4 @@
     'price' => 10,
     'cost' => 10,
 ];
-$connection->query(
-    "INSERT INTO {$entityTable} (`website_id`,  `dest_country_id`, `dest_region_id`, `dest_zip`, `condition_name`,"
-    . "`condition_value`, `price`, `cost`) VALUES (:website_id,  :dest_country_id, :dest_region_id, :dest_zip,"
-    . " :condition_name, :condition_value, :price, :cost);",
-    $data
-);
+$connection->insert($entityTable, $data);

dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_rollback.php

@@ -5,8 +5,9 @@
  */
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Framework\App\ResourceConnection $resource */
 $resource = $objectManager->get(\Magento\Framework\App\ResourceConnection::class);
 $connection = $resource->getConnection();
 $resourceModel = $objectManager->create(\Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate::class);
 $entityTable = $resourceModel->getTable('shipping_tablerate');
-$connection->query("DELETE FROM {$entityTable};");
+$connection->delete($entityTable);

dev/tests/integration/testsuite/Magento/Quote/Model/ShippingMethodManagementTest.php

@@ -19,6 +19,7 @@ class ShippingMethodManagementTest extends \PHPUnit_Framework_TestCase
      * @magentoDataFixture Magento/SalesRule/_files/cart_rule_free_shipping.php
      * @magentoDataFixture Magento/Sales/_files/quote.php
      * @magentoDataFixture Magento/OfflineShipping/_files/tablerates.php
+     * @return void
      */
     public function testEstimateByAddressWithCartPriceRule()
     {
@@ -32,6 +33,7 @@ public function testEstimateByAddressWithCartPriceRule()
      * @magentoConfigFixture current_store carriers/tablerate/condition_name package_qty
      * @magentoDataFixture Magento/Sales/_files/quote.php
      * @magentoDataFixture Magento/OfflineShipping/_files/tablerates.php
+     * @return void
      */
     public function testEstimateByAddress()
     {