Merge branch 'develop' of github.com:magento-folks/magento2ce into bugfix

Author: omiroshnichenko

.travis.yml

@@ -7,6 +7,9 @@ addons:
     - mysql-client-core-5.6
     - mysql-client-5.6
     - postfix
+  firefox: "46.0"
+  hosts:
+      - magento2.travis
 language: php
 php:
   - 7.0
@@ -16,19 +19,26 @@ env:
     - COMPOSER_BIN_DIR=~/bin
     - INTEGRATION_SETS=3
     - NODE_JS_VERSION=6
+    - MAGENTO_HOST_NAME="magento2.travis"
   matrix:
     - TEST_SUITE=unit
     - TEST_SUITE=integration INTEGRATION_INDEX=1
     - TEST_SUITE=integration INTEGRATION_INDEX=2
     - TEST_SUITE=integration INTEGRATION_INDEX=3
     - TEST_SUITE=static
     - TEST_SUITE=js
+    - TEST_SUITE=functional ACCEPTANCE_INDEX=1
+    - TEST_SUITE=functional ACCEPTANCE_INDEX=2
 matrix:
   exclude:
     - php: 7.0
       env: TEST_SUITE=static
     - php: 7.0
       env: TEST_SUITE=js
+    - php: 7.0
+      env: TEST_SUITE=functional ACCEPTANCE_INDEX=1
+    - php: 7.0
+      env: TEST_SUITE=functional ACCEPTANCE_INDEX=2
 cache:
   apt: true
   directories:

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js

@@ -36,6 +36,8 @@ define(
                 braintreeDeviceData: null,
                 paymentMethodNonce: null,
                 lastBillingAddress: null,
+                ccCode: null,
+                ccMessageContainer: null,
                 validatorManager: validatorManager,
                 code: 'braintree',
 
@@ -138,9 +140,39 @@ define(
                     return;
                 }
 
+                this.restoreMessageContainer();
+                this.restoreCode();
+
+                /**
+                 * Define onReady callback
+                 */
+                braintree.onReady = function () {};
                 this.initBraintree();
             },
 
+            /**
+             * Restore original message container for cc-form component
+             */
+            restoreMessageContainer: function () {
+                this.messageContainer = this.ccMessageContainer;
+            },
+
+            /**
+             * Restore original code for cc-form component
+             */
+            restoreCode: function () {
+                this.code = this.ccCode;
+            },
+
+            /** @inheritdoc */
+            initChildren: function () {
+                this._super();
+                this.ccMessageContainer = this.messageContainer;
+                this.ccCode = this.code;
+
+                return this;
+            },
+
             /**
              * Init config
              */

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/vault.js

@@ -52,7 +52,7 @@ define([
             var self = this;
 
             /**
-             * Define already callback
+             * Define onReady callback
              */
             Braintree.onReady = function () {
                 self.getPaymentMethodNonce();
@@ -78,6 +78,7 @@ define([
                         formComponent.setPaymentMethodNonce(response.paymentMethodNonce);
                         formComponent.additionalData['public_hash'] = self.publicHash;
                         formComponent.code = self.code;
+                        formComponent.messageContainer = self.messageContainer;
                         formComponent.placeOrder();
                     });
                 })

app/code/Magento/Braintree/view/frontend/web/template/payment/form.html

@@ -139,9 +139,12 @@
                 <button class="action primary checkout"
                         type="submit"
                         data-bind="
-                        click: placeOrderClick,
-                        attr: {title: $t('Place Order')}
-                ">
+                            click: placeOrderClick,
+                            attr: {title: $t('Place Order')},
+                            css: {disabled: !isPlaceOrderActionAllowed()},
+                            enable: isActive()
+                        "
+                        disabled>
                     <span data-bind="i18n: 'Place Order'"></span>
                 </button>
             </div>

app/code/Magento/Bundle/Model/Product/SaveHandler.php

@@ -66,8 +66,8 @@ public function execute($entity, $arguments = [])
             $options = $bundleProductOptions ?: [];
             foreach ($options as $option) {
                 $this->optionRepository->save($entity, $option);
-                $entity->setCopyFromView(false);
             }
+            $entity->setCopyFromView(false);
         }
         return $entity;
     }

app/code/Magento/Cms/Block/Page.php

@@ -126,16 +126,26 @@ protected function _prepareLayout()
      */
     protected function _addBreadcrumbs(\Magento\Cms\Model\Page $page)
     {
+        $homePageIdentifier = $this->_scopeConfig->getValue(
+            'web/default/cms_home_page',
+            ScopeInterface::SCOPE_STORE
+        );
+        $homePageDelimiterPosition = strrpos($homePageIdentifier, '|');
+        if ($homePageDelimiterPosition) {
+            $homePageIdentifier = substr($homePageIdentifier, 0, $homePageDelimiterPosition);
+        }
+        $noRouteIdentifier = $this->_scopeConfig->getValue(
+            'web/default/cms_no_route',
+            ScopeInterface::SCOPE_STORE
+        );
+        $noRouteDelimiterPosition = strrpos($noRouteIdentifier, '|');
+        if ($noRouteDelimiterPosition) {
+            $noRouteIdentifier = substr($noRouteIdentifier, 0, $noRouteDelimiterPosition);
+        }
         if ($this->_scopeConfig->getValue('web/default/show_cms_breadcrumbs', ScopeInterface::SCOPE_STORE)
             && ($breadcrumbsBlock = $this->getLayout()->getBlock('breadcrumbs'))
-            && $page->getIdentifier() !== $this->_scopeConfig->getValue(
-                'web/default/cms_home_page',
-                ScopeInterface::SCOPE_STORE
-            )
-            && $page->getIdentifier() !== $this->_scopeConfig->getValue(
-                'web/default/cms_no_route',
-                ScopeInterface::SCOPE_STORE
-            )
+            && $page->getIdentifier() !== $homePageIdentifier
+            && $page->getIdentifier() !== $noRouteIdentifier
         ) {
             $breadcrumbsBlock->addCrumb(
                 'home',

app/code/Magento/Cookie/Helper/Cookie.php

@@ -70,11 +70,22 @@ public function __construct(
     public function isUserNotAllowSaveCookie()
     {
         $acceptedSaveCookiesWebsites = $this->_getAcceptedSaveCookiesWebsites();
+        return $this->isCookieRestrictionModeEnabled() &&
+            empty($acceptedSaveCookiesWebsites[$this->_website->getId()]);
+    }
+
+    /**
+     * Check if cookie restriction mode is enabled for this store
+     *
+     * @return bool
+     */
+    public function isCookieRestrictionModeEnabled()
+    {
         return $this->scopeConfig->getValue(
             self::XML_PATH_COOKIE_RESTRICTION,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->_currentStore
-        ) && empty($acceptedSaveCookiesWebsites[$this->_website->getId()]);
+        );
     }
 
     /**

app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml

@@ -8,7 +8,7 @@
 
 /** @var \Magento\Cookie\Block\Html\Notices $block */
 ?>
-<?php if ($this->helper(\Magento\Cookie\Helper\Cookie::class)->isUserNotAllowSaveCookie()): ?>
+<?php if ($this->helper(\Magento\Cookie\Helper\Cookie::class)->isCookieRestrictionModeEnabled()): ?>
     <div role="alertdialog"
          tabindex="-1"
          class="message global cookie"

app/code/Magento/Cookie/view/frontend/web/js/notices.js

@@ -24,7 +24,7 @@ define([
             $(this.options.cookieAllowButtonSelector).on('click', $.proxy(function () {
                 var cookieExpires = new Date(new Date().getTime() + this.options.cookieLifetime * 1000);
 
-                $.mage.cookies.set(this.options.cookieName, this.options.cookieValue, {
+                $.mage.cookies.set(this.options.cookieName, JSON.stringify(this.options.cookieValue), {
                     expires: cookieExpires
                 });
 

app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml

@@ -56,7 +56,7 @@ if ($product->isSaleable()) {
         $data = ['addToCart' => [
             'origin'=> 'msrp',
             'popupId' => '#' . $popupId,
-            'productName' => $product->getName(),
+            'productName' => $block->escapeJs($block->escapeHtml($product->getName())),
             'productId' => $productId,
             'productIdInput' => 'input[type="hidden"][name="product"]',
             'realPrice' => $block->getRealPriceHtml(),
@@ -80,7 +80,7 @@ if ($product->isSaleable()) {
     <a href="javascript:void(0);"
        id="<?php /* @escapeNotVerified */ echo($popupId);?>"
        class="action map-show-info"
-       data-mage-init='<?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($data)?>'><?php /* @escapeNotVerified */ echo __('Click for price'); ?>
+       data-mage-init='<?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($data)?>'><?php /* @escapeNotVerified */ echo __('Click for price'); ?>
     </a>
 <?php else: ?>
     <span class="msrp-message">