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,7 +26,7 @@ class Button extends Template implements ShortcutInterface
 
     const BUTTON_ELEMENT_INDEX = 'button_id';
 
-    const BUTTON_ELEMENT_CLASS_NAME = 'button_class';
+    const LINK_DATA_ACTION = 'link_data_action';
 
     const CART_BUTTON_ELEMENT_INDEX = 'add_to_cart_selector';
 
@@ -137,9 +137,9 @@ public function getContainerId()
     /**
      * @return string
      */
-    public function getButtonClassName()
+    public function getLinkAction()
     {
-        return $this->getData(self::BUTTON_ELEMENT_CLASS_NAME);
+        return $this->getData(self::LINK_DATA_ACTION);
     }
 
     /**

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

@@ -92,7 +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>
+                <item name="link_data_action" xsi:type="string">paypal-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

@@ -11,19 +11,19 @@ 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()
+        'id' => $block->escapeHtml($block->getContainerId()),
+        'linkDataAction' => $block->escapeHtml($block->getLinkAction()),
+        'paypalButton' => $block->escapeHtml(Button::PAYPAL_BUTTON_ID),
+        'addToCartSelector' => $block->escapeHtml($block->getAddToCartSelector())
     ]
 ];
 
 ?>
 <div data-mage-init='<?php /* @noEscape */ echo json_encode($config); ?>'
-     class="paypal checkout paypal-logo <?php /* @noEscape */ echo $block->getContainerId(); ?>-container">
-    <a class="<?php /* @noEscape */ echo $block->getButtonClassName(); ?>" href="#">
+     class="paypal checkout paypal-logo <?php echo $block->escapeHtml($block->getContainerId()); ?>-container">
+    <a data-action="<?php echo $block->escapeHtml($block->getLinkAction()); ?>" href="#">
         <img class="paypal-button-hidden"
-             src="<?php /* @noEscape */ echo $block->getImageUrl() ?>"
+             src="<?php echo $block->escapeHtml($block->getImageUrl()); ?>"
              alt="Check out with PayPal" />
     </a>
 </div>

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

@@ -5,13 +5,11 @@
 define(
     [
         'uiComponent',
-        'Magento_Checkout/js/model/quote',
         'jquery',
         'domReady!'
     ],
     function (
         Component,
-        quote,
         $
     ) {
         return Component.extend({
@@ -31,25 +29,12 @@ define(
              * @returns {Object}
              */
             initEvents: function () {
-
-                $('.' + this.paypalButtonClass).off('click.' + this.id)
+                $('a[data-action="' + this.linkDataAction + '"]').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/design/frontend/Magento/blank/Magento_Paypal/web/css/source/module/_paypal-button.less

@@ -53,8 +53,4 @@
             &: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,8 +49,4 @@
             &:extend(.abs-action-button-as-link all);
         }
     }
-
-    .paypal-express-in-context-checkout {
-        display: none;
-    }
 }

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php

@@ -68,7 +68,7 @@ class View extends AbstractConfigureBlock
      *
      * @var string
      */
-    protected $inContextPaypalCheckout = '#paypal-express-in-context-mini-cart';
+    protected $inContextPaypalCheckout = 'ul.checkout-methods-items a[data-action="paypal-in-context-checkout"]';
 
     /**
      * Product name element.

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

@@ -62,7 +62,7 @@ class Cart extends Block
      *
      * @var string
      */
-    protected $inContextPaypalCheckoutButton = 'ul.checkout-methods-items a.paypal-express-in-context-checkout';
+    protected $inContextPaypalCheckoutButton = 'ul.checkout-methods-items a[data-action="paypal-express-in-context-checkout"]';
 
     /**
      * Locator value for "Check out with Braintree PayPal" button.