Merge remote-tracking branch 'origin/MAGETWO-69213-braintree-reorder' into Borg-PR-11-29

Author: pdohogne-magento

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/Customer/view/frontend/web/js/model/customer-addresses.js

@@ -15,7 +15,7 @@ define(
         return {
             getAddressItems: function() {
                 var items = [];
-                if (isLoggedIn) {
+                if (isLoggedIn()) {
                     var customerData = window.customerData;
                     if (Object.keys(customerData).length) {
                         $.each(customerData.addresses, function (key, item) {

dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js

@@ -0,0 +1,69 @@
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'jquery',
+    'squire',
+    'ko',
+    'Magento_Ui/js/model/messages'
+], function ($, Squire, ko, Messages) {
+    'use strict';
+
+    describe('Magento_Braintree/js/view/payment/method-renderer/cc-form', function () {
+        var injector = new Squire(),
+            mocks = {
+                'Magento_Checkout/js/model/quote': {
+                    billingAddress: ko.observable(),
+                    shippingAddress: ko.observable(),
+                    paymentMethod: ko.observable(),
+                    totals: ko.observable({})
+                },
+                'Magento_Braintree/js/view/payment/validator-handler': jasmine.createSpyObj(
+                    'validator-handler',
+                    ['initialize']
+                ),
+                'Magento_Braintree/js/view/payment/adapter':  jasmine.createSpyObj(
+                    'adapter',
+                    ['setup', 'setConfig']
+                )
+            },
+            braintreeCcForm;
+
+        beforeAll(function (done) {
+            window.checkoutConfig = {
+                quoteData: {},
+                payment: {
+                    braintree: {
+                        hasFraudProtection: true
+                    }
+                }
+            };
+            injector.mock(mocks);
+            injector.require(['Magento_Braintree/js/view/payment/method-renderer/cc-form'], function (Constr) {
+                    braintreeCcForm = new Constr({
+                        provider: 'provName',
+                        name: 'test',
+                        index: 'test'
+                    });
+
+                    done();
+                });
+        });
+
+        it('Check if payment code and message container are restored after onActiveChange call.', function () {
+            var expectedMessageContainer = braintreeCcForm.messageContainer,
+                expectedCode = braintreeCcForm.code;
+
+            braintreeCcForm.code = 'braintree-vault';
+            braintreeCcForm.messageContainer = new Messages();
+
+            braintreeCcForm.onActiveChange(true);
+
+            expect(braintreeCcForm.getCode()).toEqual(expectedCode);
+            expect(braintreeCcForm.messageContainer).toEqual(expectedMessageContainer);
+        });
+    });
+});