Merge branch 'MAGETWO-67106' into MPI-Bugfixes

Author: YevSent

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 LINK_DATA_ACTION = 'link_data_action';
+
     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 getLinkAction()
+    {
+        return $this->getData(self::LINK_DATA_ACTION);
+    }
+
     /**
      * @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="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,18 +11,19 @@ use Magento\Paypal\Block\Express\InContext\Minicart\Button;
  */
 $config = [
     'Magento_Paypal/js/in-context/button' => [
-        'id' => $block->getContainerId(),
-        '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 id="<?php /* @noEscape */ echo $block->getContainerId(); ?>" 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

@@ -12,8 +12,6 @@ define(
         Component,
         $
     ) {
-        'use strict';
-
         return Component.extend({
 
             defaults: {},
@@ -31,7 +29,7 @@ define(
              * @returns {Object}
              */
             initEvents: function () {
-                $('#' + this.id).off('click.' + this.id)
+                $('a[data-action="' + this.linkDataAction + '"]').off('click.' + this.id)
                     .on('click.' + this.id, this.click.bind(this));
 
                 return this;

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

@@ -25,6 +25,8 @@ define(
             defaults: {
                 clientConfig: {
 
+                    checkoutInited: false,
+
                     /**
                      * @param {Object} event
                      */
@@ -33,7 +35,12 @@ define(
 
                         event.preventDefault();
 
-                        paypalExpressCheckout.checkout.initXO();
+                        if (!this.clientConfig.checkoutInited) {
+                            paypalExpressCheckout.checkout.initXO();
+                            this.clientConfig.checkoutInited = 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']);
                             }
                         );

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 = '#paypal-express-in-context-mini-cart';
+    protected $inContextPaypalCheckoutButton = 'ul.checkout-methods-items a[data-action="paypal-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,14 @@ public function waitCartContainerLoading()
     {
         $this->waitForElementVisible($this->cartContainer);
     }
+
+    /**
+     * Wait until in-context checkout button is visible.
+     *
+     * @return void
+     */
+    public function waitForCheckoutButton()
+    {
+        $this->waitForElementVisible($this->inContextPaypalCheckoutButton);
+    }
 }

dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/in-context/express-checkout.test.js

@@ -0,0 +1,92 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'squire',
+    'jquery'
+], function (Squire, $) {
+    'use strict';
+
+    describe('Magento_Paypal/js/in-context/express-checkout', function () {
+
+        var model,
+            event,
+            paypalExpressCheckout,
+            injector = new Squire(),
+            mocks = {
+                'paypalInContextExpressCheckout': {
+                    checkout: jasmine.createSpyObj('checkout',
+                        ['setup', 'initXO', 'startFlow', 'closeFlow']
+                    )
+                }
+            };
+
+        /**
+         * Run before each test method
+         *
+         * @return void
+         */
+        beforeEach(function (done) {
+            event = {
+                /** Stub */
+                preventDefault: jasmine.createSpy('preventDefault')
+            };
+
+            injector.mock(mocks);
+
+            injector.require([
+                'paypalInContextExpressCheckout',
+                'Magento_Paypal/js/in-context/express-checkout'], function (PayPal, Constr) {
+                    paypalExpressCheckout = PayPal;
+                    model = new Constr();
+
+                    done();
+                });
+        });
+
+        describe('clientConfig.click method', function () {
+
+            it('Check for properties defined ', function () {
+                expect(model.hasOwnProperty('clientConfig')).toBeDefined();
+                expect(model.clientConfig.hasOwnProperty('click')).toBeDefined();
+                expect(model.clientConfig.hasOwnProperty('checkoutInited')).toBeDefined();
+            });
+
+            it('Check properties type', function () {
+                expect(typeof model.clientConfig.checkoutInited).toEqual('boolean');
+                expect(typeof model.clientConfig.click).toEqual('function');
+            });
+
+            it('Check properties value', function () {
+                expect(model.clientConfig.checkoutInited).toEqual(false);
+            });
+
+            it('Check call "click" method', function () {
+
+                spyOn(jQuery.fn, 'trigger');
+                spyOn(jQuery, 'get').and.callFake(function () {
+                    var d = $.Deferred();
+
+                    d.resolve({
+                        'url': true
+                    });
+
+                    return d.promise();
+                });
+
+                model.clientConfig.click(event);
+
+                expect(event.preventDefault).toHaveBeenCalled();
+                expect(paypalExpressCheckout.checkout.initXO).toHaveBeenCalled();
+                expect(model.clientConfig.checkoutInited).toEqual(true);
+                expect(jQuery.get).toHaveBeenCalled();
+                expect(jQuery('body').trigger).toHaveBeenCalledWith(
+                    jasmine.arrayContaining(['processStart'], ['processStop'])
+                );
+            });
+        });
+    });
+});