Merge remote-tracking branch 'chaika/MC-19798' into Chaika-2019-09-12-CE

Author: veloraven

app/code/Magento/Sales/Cron/CleanExpiredQuotes.php

@@ -57,7 +57,6 @@ public function execute()
 
             $quotes->addFieldToFilter('store_id', $storeId);
             $quotes->addFieldToFilter('updated_at', ['to' => date("Y-m-d", time() - $lifetime)]);
-            $quotes->addFieldToFilter('is_active', 0);
 
             foreach ($this->getExpireQuotesAdditionalFilterFields() as $field => $condition) {
                 $quotes->addFieldToFilter($field, $condition);

app/code/Magento/Sales/Test/Unit/Cron/CleanExpiredQuotesTest.php

@@ -59,7 +59,7 @@ public function testExecute($lifetimes, $additionalFilterFields)
         $this->quoteFactoryMock->expects($this->exactly(count($lifetimes)))
             ->method('create')
             ->will($this->returnValue($quotesMock));
-        $quotesMock->expects($this->exactly((3 + count($additionalFilterFields)) * count($lifetimes)))
+        $quotesMock->expects($this->exactly((2 + count($additionalFilterFields)) * count($lifetimes)))
             ->method('addFieldToFilter');
         if (!empty($lifetimes)) {
             $quotesMock->expects($this->exactly(count($lifetimes)))