Merge remote-tracking branch 'origin/MAGETWO-86780' into PANDA-FIXES-2.2

Author: RuslanKostiv1

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

@@ -13,6 +13,23 @@
  */
 class ShippingMethodManagementTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @magentoDataFixture Magento/SalesRule/_files/cart_rule_100_percent_off.php
+     * @magentoDataFixture Magento/Sales/_files/quote_with_customer.php
+     * @return void
+     *
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testRateAppliedToShipping()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        /** @var \Magento\Quote\Api\CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $objectManager->create(\Magento\Quote\Api\CartRepositoryInterface::class);
+        $customerQuote = $quoteRepository->getForCustomer(1);
+        $this->assertEquals(0, $customerQuote->getBaseGrandTotal());
+    }
+
     /**
      * @magentoConfigFixture current_store carriers/tablerate/active 1
      * @magentoConfigFixture current_store carriers/tablerate/condition_name package_qty

dev/tests/integration/testsuite/Magento/Sales/_files/quote.php

@@ -53,7 +53,10 @@
 $quote->getPayment()->setMethod('checkmo');
 $quote->setIsMultiShipping('1');
 $quote->collectTotals();
-$quote->save();
+
+$quoteRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Quote\Api\CartRepositoryInterface::class);
+$quoteRepository->save($quote);
 
 /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
 $quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()

dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_100_percent_off.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+/** @var \Magento\SalesRule\Model\Rule $salesRule */
+$salesRule = $objectManager->create(\Magento\SalesRule\Model\Rule::class);
+$salesRule->setData(
+    [
+        'name' => '100% Off for all orders',
+        'is_active' => 1,
+        'customer_group_ids' => [\Magento\Customer\Model\GroupManagement::NOT_LOGGED_IN_ID],
+        'coupon_type' => \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON,
+        'conditions' => [],
+        'simple_action' => 'by_percent',
+        'discount_amount' => 100,
+        'discount_step' => 0,
+        'stop_rules_processing' => 1,
+        'website_ids' => [
+            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+                \Magento\Store\Model\StoreManagerInterface::class
+            )->getWebsite()->getId()
+        ],
+        'discount_qty' => 0,
+        'apply_to_shipping' => 1,
+        'simple_free_shipping' => 1,
+    ]
+);
+$salesRule->save();
+$registry->unregister('Magento/SalesRule/_files/cart_rule_100_percent_off');
+$registry->register('Magento/SalesRule/_files/cart_rule_100_percent_off', $salesRule->getRuleId());

dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_100_percent_off_rollback.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+/** @var Magento\SalesRule\Model\Rule $rule */
+$rule = $registry->registry('cart_rule_100_percent_off');
+if ($rule) {
+    $rule->delete();
+}