Merge branch 'ddonnini-checkout-cart-link' of github.com:ddonnini/magento2 into github_pr

ishakhsuvarov · ishakhsuvarov · commit 332ff62bd289 · 2016-06-15T10:32:47.000+03:00
diff --git a/app/code/Magento/Checkout/Block/Cart/Link.php b/app/code/Magento/Checkout/Block/Cart/Link.php
@@ -65,7 +65,7 @@ public function getHref()
      */
     protected function _toHtml()
     {
-        if ($this->_moduleManager->isOutputEnabled('Magento_Checkout')) {
+        if (!$this->_moduleManager->isOutputEnabled('Magento_Checkout')) {
             return '';
         }
         return parent::_toHtml();
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/LinkTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/LinkTest.php
@@ -57,7 +57,7 @@ public function testToHtml()
         )->with(
             'Magento_Checkout'
         )->will(
-            $this->returnValue(true)
+            $this->returnValue(false)
         );
         $this->assertSame('', $block->toHtml());
     }

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function getHref()`
`65`	`65`	`*/`
`66`	`66`	`protected function _toHtml()`
`67`	`67`	`{`
`68`		`- if ($this->_moduleManager->isOutputEnabled('Magento_Checkout')) {`
	`68`	`+ if (!$this->_moduleManager->isOutputEnabled('Magento_Checkout')) {`
`69`	`69`	`return '';`
`70`	`70`	`}`
`71`	`71`	`return parent::_toHtml();`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function testToHtml()`
`57`	`57`	`)->with(`
`58`	`58`	`'Magento_Checkout'`
`59`	`59`	`)->will(`
`60`		`- $this->returnValue(true)`
	`60`	`+ $this->returnValue(false)`
`61`	`61`	`);`
`62`	`62`	`$this->assertSame('', $block->toHtml());`
`63`	`63`	`}`