Merge remote-tracking branch 'origin/MAGETWO-62629' into 2.0.15-develop-pr14

Author: zakdma

app/code/Magento/GiftMessage/view/frontend/web/js/model/gift-message.js

@@ -78,7 +78,7 @@ define(['uiElement', 'underscore', 'mage/url'],
                 },
                 afterSubmit: function() {
                     window.location.href = url.build('checkout/cart/updatePost')
-                        + '?form_key=' + window.giftOptionsConfig.giftMessage.formKey
+                        + '?form_key=' + window.checkoutConfig.formKey
                         + '&cart[]';
                 },
                 getSubmitParams: function(remove) {

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

@@ -78,6 +78,13 @@ class Cart extends Block
      */
     protected $deleteItemButton = 'a.action.action-delete';
 
+    /**
+     * Cart item class name.
+     *
+     * @var string
+     */
+    protected $cartItemClass = \Magento\Checkout\Test\Block\Cart\CartItem::class;
+
     /**
      * Get Shopping Cart item.
      *
@@ -98,7 +105,7 @@ public function getCartItem(FixtureInterface $product)
                 Locator::SELECTOR_XPATH
             );
             $cartItem = $this->blockFactory->create(
-                'Magento\Checkout\Test\Block\Cart\CartItem',
+                $this->cartItemClass,
                 ['element' => $cartItemBlock]
             );
         }