MAGETWO-67106: Unstable Automated test Magento\Paypal\Test\TestCase\InContextExpressCheckoutFromShoppingCartTest failed on variation InContextExpressCheckoutFromShoppingCartTestVariation1

Author: iivashchenko

app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php

@@ -26,6 +26,8 @@ class Button extends Template implements ShortcutInterface
 
     const BUTTON_ELEMENT_INDEX = 'button_id';
 
+    const BUTTON_ELEMENT_CLASS_NAME = 'button_class';
+
     const CART_BUTTON_ELEMENT_INDEX = 'add_to_cart_selector';
 
     /**
@@ -132,6 +134,14 @@ public function getContainerId()
         return $this->getData(self::BUTTON_ELEMENT_INDEX);
     }
 
+    /**
+     * @return string
+     */
+    public function getButtonClassName()
+    {
+        return $this->getData(self::BUTTON_ELEMENT_CLASS_NAME);
+    }
+
     /**
      * @return string
      */

app/code/Magento/Paypal/etc/frontend/di.xml

@@ -92,6 +92,7 @@
                 <item name="template" xsi:type="string">Magento_Paypal::express/in-context/shortcut/button.phtml</item>
                 <item name="alias" xsi:type="string">paypal.express-in-context.mini-cart</item>
                 <item name="button_id" xsi:type="string">paypal-express-in-context-mini-cart</item>
+                <item name="button_class" xsi:type="string">paypal-express-in-context-checkout</item>
             </argument>
             <argument name="payment" xsi:type="object">Magento\Paypal\Model\Express</argument>
         </arguments>

app/code/Magento/Paypal/view/frontend/templates/express/in-context/shortcut/button.phtml

@@ -12,6 +12,7 @@ use Magento\Paypal\Block\Express\InContext\Minicart\Button;
 $config = [
     'Magento_Paypal/js/in-context/button' => [
         'id' => $block->getContainerId(),
+        'paypalButtonClass' => $block->getButtonClassName(),
         'paypalButton' => Button::PAYPAL_BUTTON_ID,
         'addToCartSelector' => $block->getAddToCartSelector()
     ]
@@ -20,7 +21,7 @@ $config = [
 ?>
 <div data-mage-init='<?php /* @noEscape */ echo json_encode($config); ?>'
      class="paypal checkout paypal-logo <?php /* @noEscape */ echo $block->getContainerId(); ?>-container">
-    <a id="<?php /* @noEscape */ echo $block->getContainerId(); ?>" href="#">
+    <a class="<?php /* @noEscape */ echo $block->getButtonClassName(); ?>" href="#">
         <img class="paypal-button-hidden"
              src="<?php /* @noEscape */ echo $block->getImageUrl() ?>"
              alt="Check out with PayPal" />

app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js

@@ -5,15 +5,15 @@
 define(
     [
         'uiComponent',
+        'Magento_Checkout/js/model/quote',
         'jquery',
         'domReady!'
     ],
     function (
         Component,
+        quote,
         $
     ) {
-        'use strict';
-
         return Component.extend({
 
             defaults: {},
@@ -31,12 +31,25 @@ define(
              * @returns {Object}
              */
             initEvents: function () {
-                $('#' + this.id).off('click.' + this.id)
+
+                $('.' + this.paypalButtonClass).off('click.' + this.id)
                     .on('click.' + this.id, this.click.bind(this));
 
+                quote.totals.subscribe(function (newValue) {
+                    // TODO: check for value
+                    this.showLink();
+                }, this);
+
                 return this;
             },
 
+            /**
+             * Display PayPal in-context checkout link
+             */
+            showLink: function() {
+                $('.' + this.paypalButtonClass).show();
+            },
+
             /**
              * @param {Object} event
              * @returns void

app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout.js

@@ -25,6 +25,8 @@ define(
             defaults: {
                 clientConfig: {
 
+                    inited: false,
+
                     /**
                      * @param {Object} event
                      */
@@ -33,7 +35,12 @@ define(
 
                         event.preventDefault();
 
-                        paypalExpressCheckout.checkout.initXO();
+                        if (!this.clientConfig.inited) {
+                            paypalExpressCheckout.checkout.initXO();
+                            this.clientConfig.inited = true;
+                        } else {
+                            paypalExpressCheckout.checkout.closeFlow();
+                        }
 
                         $.get(
                             this.path,
@@ -52,11 +59,11 @@ define(
                             }
                         ).fail(
                             function () {
-                                $('body').trigger('processStop');
                                 paypalExpressCheckout.checkout.closeFlow();
                             }
                         ).always(
                             function () {
+                                $('body').trigger('processStop');
                                 customerData.invalidate(['cart']);
                             }
                         );

app/design/frontend/Magento/blank/Magento_Paypal/web/css/source/module/_paypal-button.less

@@ -53,4 +53,8 @@
             &:extend(.abs-action-button-as-link all);
         }
     }
+
+    .paypal-express-in-context-checkout {
+        display: none;
+    }
 }

app/design/frontend/Magento/luma/Magento_Paypal/web/css/source/module/_paypal-button.less

@@ -49,4 +49,8 @@
             &:extend(.abs-action-button-as-link all);
         }
     }
+
+    .paypal-express-in-context-checkout {
+        display: none;
+    }
 }

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php

@@ -62,7 +62,7 @@ class Cart extends Block
      *
      * @var string
      */
-    protected $inContextPaypalCheckoutButton = '#paypal-express-in-context-mini-cart';
+    protected $inContextPaypalCheckoutButton = 'ul.checkout-methods-items a.paypal-express-in-context-checkout';
 
     /**
      * Locator value for "Check out with Braintree PayPal" button.
@@ -184,6 +184,7 @@ public function paypalCheckout()
      */
     public function inContextPaypalCheckout()
     {
+        $this->waitForCheckoutButton();
         $this->_rootElement->find($this->inContextPaypalCheckoutButton)->click();
         $this->browser->selectWindow();
         $this->waitForFormLoaded();
@@ -262,4 +263,16 @@ public function waitCartContainerLoading()
     {
         $this->waitForElementVisible($this->cartContainer);
     }
+
+    /**
+     * Wait until in-context checkout button is visible.
+     *
+     * @return void
+     */
+    public function waitForCheckoutButton()
+    {
+        $this->waitForElementVisible($this->inContextPaypalCheckoutButton);
+    }
+
+
 }