Merge branch 'MAGETWO-44663' of github.corp.magento.com:magento-mpi/magento2ce into MAGETWO-44603

Author: Dell-

app/code/Magento/Braintree/Controller/PayPal/GetButtonData.php

@@ -42,9 +42,12 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
+        $isMiniCart = !$observer->getEvent()->getIsCatalogProduct();
+
         //Don't display shortcut on product view page
         if (!$this->methodPayPal->isActive() ||
-            !$this->paypalConfig->isShortcutCheckoutEnabled()) {
+            !$this->paypalConfig->isShortcutCheckoutEnabled() ||
+            !$isMiniCart) {
             return;
         }
 
@@ -57,7 +60,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             '',
             [
                 'data' => [
-                    Shortcut::MINI_CART_FLAG_KEY => !$observer->getEvent()->getIsCatalogProduct()
+                    Shortcut::MINI_CART_FLAG_KEY => $isMiniCart
                 ]
             ]
         );

app/code/Magento/Braintree/Observer/AddPaypalShortcuts.php

@@ -55,22 +55,20 @@ protected function setUp()
     }
 
     /**
-     * @param bool $isCatalogProduct
-     * @param bool $isInMiniCart
-     *
-     * @dataProvider dataProviderTestAddPaypalShortcuts
+     * @covers \Magento\Braintree\Observer\AddPaypalShortcuts::execute()
      */
-    public function testAddPaypalShortcuts($isCatalogProduct, $isInMiniCart)
+    public function testAddPaypalShortcuts()
     {
         $orPosition = 'before';
+        $isInMiniCart = true;
 
         $containerMock = $this->getMockBuilder('\Magento\Catalog\Block\ShortcutButtons')
             ->disableOriginalConstructor()
             ->getMock();
 
         $event = new \Magento\Framework\DataObject(
             [
-                'is_catalog_product' => $isCatalogProduct,
+                'is_catalog_product' => false,
                 'container' => $containerMock,
                 'or_position' => $orPosition,
             ]
@@ -124,21 +122,48 @@ public function testAddPaypalShortcuts($isCatalogProduct, $isInMiniCart)
     }
 
     /**
-     * @return array
+     * @covers \Magento\Braintree\Observer\AddPaypalShortcuts::execute()
      */
-    public function dataProviderTestAddPaypalShortcuts()
+    public function testAddPaypalShortcutsWithoutMinicart()
     {
-        return [
-            ['isCatalogProduct' => true, 'isInMiniCart' => false],
-            ['isCatalogProduct' => false, 'isInMiniCart' => true],
-        ];
+        $containerMock = $this->getMockBuilder('\Magento\Catalog\Block\ShortcutButtons')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $event = new \Magento\Framework\DataObject(
+            [
+                'is_catalog_product' => true,
+                'container' => $containerMock
+            ]
+        );
+        $observer = new \Magento\Framework\Event\Observer(
+            [
+                'event' => $event,
+            ]
+        );
+        $this->paypalMethodMock->expects(static::once())
+            ->method('isActive')
+            ->willReturn(true);
+        $this->paypalConfigMock->expects(static::once())
+            ->method('isShortcutCheckoutEnabled')
+            ->willReturn(true);
+
+        $containerMock->expects(static::never())
+            ->method('getLayout');
+
+        $this->addPaypalShortcutsObserver->execute($observer);
     }
 
     public function testAddPaypalShortcutsNotActive()
     {
+        $event = new \Magento\Framework\DataObject(
+            [
+                'is_catalog_product' => false,
+            ]
+        );
         $observer = new \Magento\Framework\Event\Observer(
             [
-                'event' => null,
+                'event' => $event,
             ]
         );
 

app/code/Magento/Braintree/Test/Unit/Controller/PayPal/GetButtonDataTest.php

@@ -11,7 +11,6 @@ var config = {
             braintreeForm:              'Magento_Braintree/js/cc-form',
             braintreeEditForm:          'Magento_Braintree/js/cc-edit-form',
             braintreePayPalMinicart:    'Magento_Braintree/js/button/braintree-paypal-minicart',
-            braintreePayPal:            'Magento_Braintree/js/button/braintree-paypal',
             transparent:                'Magento_Payment/transparent'
         }
     }

app/code/Magento/Braintree/Test/Unit/Observer/AddPaypalShortcutsTest.php

@@ -12,7 +12,7 @@ $paymentId = $block->getPaymentMethodNonceId();
 $detailsId = $block->getPaymentDetailsId();
 $isMiniCart = (bool)(int)$block->isInMiniCart();
 
-$widgetName = $isMiniCart ? 'braintreePayPalMinicart' : 'braintreePayPal';
+$widgetName = 'braintreePayPalMinicart';
 
 $config = [
     $widgetName => [