Merge remote-tracking branch 'upstream/2.3-develop' into MAGETWO-92931-Html-entity-breadcrumb

Author: Joan He

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

@@ -7,6 +7,7 @@
 define([
     'jquery',
     'underscore',
+    'mage/utils/wrapper',
     'Magento_Checkout/js/view/payment/default',
     'Magento_Braintree/js/view/payment/adapter',
     'Magento_Checkout/js/model/quote',
@@ -18,6 +19,7 @@ define([
 ], function (
     $,
     _,
+    wrapper,
     Component,
     Braintree,
     quote,
@@ -218,8 +220,9 @@ define([
 
         /**
          * Re-init PayPal Auth Flow
+         * @param {Function} callback - Optional callback
          */
-        reInitPayPal: function () {
+        reInitPayPal: function (callback) {
             if (Braintree.checkout) {
                 Braintree.checkout.teardown(function () {
                     Braintree.checkout = null;
@@ -228,6 +231,18 @@ define([
 
             this.disableButton();
             this.clientConfig.paypal.amount = this.grandTotalAmount;
+            this.clientConfig.paypal.shippingAddressOverride = this.getShippingAddress();
+
+            if (callback) {
+                this.clientConfig.onReady = wrapper.wrap(
+                    this.clientConfig.onReady,
+                    function (original, checkout) {
+                        this.clientConfig.onReady = original;
+                        original(checkout);
+                        callback();
+                    }.bind(this)
+                );
+            }
 
             Braintree.setConfig(this.clientConfig);
             Braintree.setup();
@@ -403,15 +418,19 @@ define([
          * Triggers when customer click "Continue to PayPal" button
          */
         payWithPayPal: function () {
-            if (additionalValidators.validate()) {
+            this.reInitPayPal(function () {
+                if (!additionalValidators.validate()) {
+                    return;
+                }
+
                 try {
                     Braintree.checkout.paypal.initAuthFlow();
                 } catch (e) {
                     this.messageContainer.addErrorMessage({
                         message: $t('Payment ' + this.getTitle() + ' can\'t be initialized.')
                     });
                 }
-            }
+            }.bind(this));
         },
 
         /**

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

@@ -12,7 +12,7 @@
                data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()" />
         <label class="label" data-bind="attr: {'for': getCode()}">
             <!-- PayPal Logo -->
-            <img data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark')}, title: $t('Acceptance Mark')}"
+            <img data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark'), title: $t('Acceptance Mark')}"
                  class="payment-icon"/>
             <!-- PayPal Logo -->
             <span text="getTitle()"></span>

app/code/Magento/Cron/Console/Command/CronCommand.php

@@ -10,10 +10,12 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputOption;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ObjectManagerFactory;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManager;
 use Magento\Cron\Observer\ProcessCronQueueObserver;
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Shell\ComplexParameter;
 
@@ -35,13 +37,24 @@ class CronCommand extends Command
     private $objectManagerFactory;
 
     /**
-     * Constructor
+     * Application deployment configuration
      *
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
      * @param ObjectManagerFactory $objectManagerFactory
+     * @param DeploymentConfig $deploymentConfig Application deployment configuration
      */
-    public function __construct(ObjectManagerFactory $objectManagerFactory)
-    {
+    public function __construct(
+        ObjectManagerFactory $objectManagerFactory,
+        DeploymentConfig $deploymentConfig = null
+    ) {
         $this->objectManagerFactory = $objectManagerFactory;
+        $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(
+            DeploymentConfig::class
+        );
         parent::__construct();
     }
 
@@ -71,10 +84,16 @@ protected function configure()
     }
 
     /**
+     * Runs cron jobs if cron is not disabled in Magento configurations
+     *
      * {@inheritdoc}
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        if (!$this->deploymentConfig->get('cron/enabled', 1)) {
+            $output->writeln('<info>' . 'Cron is disabled. Jobs were not run.' . '</info>');
+            return;
+        }
         $omParams = $_SERVER;
         $omParams[StoreManager::PARAM_RUN_CODE] = 'admin';
         $omParams[Store::CUSTOM_ENTRY_POINT_PARAM] = true;

app/code/Magento/Cron/Test/Unit/Console/Command/CronCommandTest.php

@@ -6,19 +6,74 @@
 namespace Magento\Cron\Test\Unit\Console\Command;
 
 use Magento\Cron\Console\Command\CronCommand;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManagerFactory;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Symfony\Component\Console\Tester\CommandTester;
 
 class CronCommandTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var ObjectManagerFactory|MockObject
+     */
+    private $objectManagerFactory;
+
+    /**
+     * @var DeploymentConfig|MockObject
+     */
+    private $deploymentConfigMock;
+
+    protected function setUp()
+    {
+        $this->objectManagerFactory = $this->createMock(ObjectManagerFactory::class);
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+    }
+
+    /**
+     * Test command with disables cron
+     *
+     * @return void
+     */
+    public function testExecuteWithDisabledCrons()
+    {
+        $this->objectManagerFactory->expects($this->never())
+            ->method('create');
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('get')
+            ->with('cron/enabled', 1)
+            ->willReturn(0);
+        $commandTester = new CommandTester(
+            new CronCommand($this->objectManagerFactory, $this->deploymentConfigMock)
+        );
+        $commandTester->execute([]);
+        $expectedMsg = 'Cron is disabled. Jobs were not run.' . PHP_EOL;
+        $this->assertEquals($expectedMsg, $commandTester->getDisplay());
+    }
+
+    /**
+     * Test command with enabled cron
+     *
+     * @return void
+     */
     public function testExecute()
     {
-        $objectManagerFactory = $this->createMock(\Magento\Framework\App\ObjectManagerFactory::class);
         $objectManager = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
         $cron = $this->createMock(\Magento\Framework\App\Cron::class);
-        $objectManager->expects($this->once())->method('create')->willReturn($cron);
-        $cron->expects($this->once())->method('launch');
-        $objectManagerFactory->expects($this->once())->method('create')->willReturn($objectManager);
-        $commandTester = new CommandTester(new CronCommand($objectManagerFactory));
+        $objectManager->expects($this->once())
+            ->method('create')
+            ->willReturn($cron);
+        $cron->expects($this->once())
+            ->method('launch');
+        $this->objectManagerFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($objectManager);
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('get')
+            ->with('cron/enabled', 1)
+            ->willReturn(1);
+        $commandTester = new CommandTester(
+            new CronCommand($this->objectManagerFactory, $this->deploymentConfigMock)
+        );
         $commandTester->execute([]);
         $expectedMsg = 'Ran jobs by schedule.' . PHP_EOL;
         $this->assertEquals($expectedMsg, $commandTester->getDisplay());

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

@@ -27,7 +27,24 @@ define([
                     })
                 },
                 'Magento_Braintree/js/view/payment/adapter': {
+                    config: {},
+
+                    /** Stub */
+                    onReady: function () {},
+
+                    /** Stub */
+                    setConfig: function (config) {
+                        this.config = config;
+                    },
+
+                    /** Stub */
+                    setup: function () {
+                        this.config.onReady(this.checkout);
+                    },
+
                     checkout: {
+                        /** Stub */
+                        teardown: function () {},
                         paypal: {
                             /** Stub */
                             initAuthFlow: function () {}