MAGETWO-31159: Varnish coverage increase

- fix tests

Author: Michail Slabko

app/code/Magento/Checkout/Block/Cart/ValidationMessages.php

@@ -69,14 +69,14 @@ public function validateMinimunAmount()
         if (!$this->cartHelper->getQuote()->validateMinimumAmount()) {
             $warning = $this->_scopeConfig->getValue(
                 'sales/minimum_order/description',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             if (!$warning) {
                 $currencyCode = $this->_storeManager->getStore()->getCurrentCurrencyCode();
                 $minimumAmount = $this->currency->getCurrency($currencyCode)->toCurrency(
                     $this->_scopeConfig->getValue(
                         'sales/minimum_order/amount',
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                     )
                 );
                 $warning = __('Minimum order amount is %1', $minimumAmount);

dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php

@@ -29,7 +29,7 @@ class AssertCustomerDefaultAddresses extends AbstractConstraint
     public function processAssert(CustomerAccountIndex $customerAccountIndex, Address $address)
     {
         $customerAccountIndex->getAccountMenuBlock()->openMenuItem('Account Dashboard');
-        sleep(3);
+        sleep(6);
         $defaultBillingAddress = explode(
             "\n",
             $customerAccountIndex->getDashboardAddress()->getDefaultBillingAddressText()

dev/tests/unit/testsuite/Magento/Wishlist/Controller/Index/AddTest.php

@@ -255,7 +255,7 @@ public function testExecuteWithoutProductId()
             ->method('getParams')
             ->will($this->returnValue([]));
 
-        $om = $this->getMock('Magento\Framework\App\ObjectManager', null, [], '', false );
+        $om = $this->getMock('Magento\Framework\App\ObjectManager', null, [], '', false);
         $response = $this->getMock('Magento\Framework\App\Response\Http', null, [], '', false);
         $eventManager = $this->getMock('Magento\Framework\Event\Manager', null, [], '', false);
         $url = $this->getMock('Magento\Framework\Url', null, [], '', false);
@@ -350,9 +350,9 @@ public function testExecuteWithProductIdAndWithoutProduct()
             ->method('getParams')
             ->will($this->returnValue(['product' => 2]));
 
-        $om = $this->getMock('Magento\Framework\App\ObjectManager', null, [], '', false );
+        $om = $this->getMock('Magento\Framework\App\ObjectManager', null, [], '', false);
         $response = $this->getMock('Magento\Framework\App\Response\Http', null, [], '', false);
-        $eventManager = $this->getMock('Magento\Framework\Event\Manager', null, [], '', false );
+        $eventManager = $this->getMock('Magento\Framework\Event\Manager', null, [], '', false);
         $url = $this->getMock('Magento\Framework\Url', null, [], '', false);
         $actionFlag = $this->getMock('Magento\Framework\App\ActionFlag', null, [], '', false);
         $redirect = $this->getMock('\Magento\Store\App\Response\Redirect', ['redirect'], [], '', false);
@@ -460,9 +460,9 @@ public function testExecuteWithProductAndCantAddProductToWishlist()
             ->method('getParams')
             ->will($this->returnValue(['product' => 2]));
 
-        $om = $this->getMock('Magento\Framework\App\ObjectManager', null, [], '', false );
+        $om = $this->getMock('Magento\Framework\App\ObjectManager', null, [], '', false);
         $response = $this->getMock('Magento\Framework\App\Response\Http', null, [], '', false);
-        $eventManager = $this->getMock('Magento\Framework\Event\Manager', null, [], '', false );
+        $eventManager = $this->getMock('Magento\Framework\Event\Manager', null, [], '', false);
         $url = $this->getMock('Magento\Framework\Url', null, [], '', false);
         $actionFlag = $this->getMock('Magento\Framework\App\ActionFlag', null, [], '', false);
         $redirect = $this->getMock('\Magento\Store\App\Response\Redirect', ['redirect'], [], '', false);
@@ -589,7 +589,7 @@ public function testExecuteProductAddedToWishlistAfterObjectManagerThrowExceptio
             ->will($this->returnValue($product));
 
         $exception = new \Exception('Exception');
-        $wishListItem  = new \stdClass();
+        $wishListItem = new \stdClass();
 
         $wishlist = $this->getMock('Magento\Wishlist\Model\Wishlist', ['addNewItem', 'save', 'getId'], [], '', false);
         $wishlist
@@ -649,8 +649,8 @@ public function testExecuteProductAddedToWishlistAfterObjectManagerThrowExceptio
             ->method('critical')
             ->with($exception)
             ->will($this->returnValue(true));
-        
-        $om = $this->getMock('Magento\Framework\App\ObjectManager', ['get'], [], '', false );
+
+        $om = $this->getMock('Magento\Framework\App\ObjectManager', ['get'], [], '', false);
         $om
             ->expects($this->at(0))
             ->method('get')
@@ -671,9 +671,9 @@ public function testExecuteProductAddedToWishlistAfterObjectManagerThrowExceptio
             ->method('get')
             ->with('Psr\Log\LoggerInterface')
             ->will($this->returnValue($logger));
-        
+
         $response = $this->getMock('Magento\Framework\App\Response\Http', null, [], '', false);
-        $eventManager = $this->getMock('Magento\Framework\Event\Manager', ['dispatch'], [], '', false );
+        $eventManager = $this->getMock('Magento\Framework\Event\Manager', ['dispatch'], [], '', false);
         $eventManager
             ->expects($this->once())
             ->method('dispatch')