Merge remote-tracking branch 'trigger/MC-41654' into MC-41701

Author: xmav

app/code/Magento/Paypal/Block/PayLater/Banner.php

@@ -68,30 +68,27 @@ protected function _toHtml(): string
      */
     public function getJsLayout()
     {
-        $jsLayout = [
+        $jsComponent = $this->jsLayout['components']['payLater']['component'] ?? 'Magento_Paypal/js/view/paylater';
+
+        //Extend block component config with defaults
+        $componentConfig = $this->jsLayout['components']['payLater']['config'] ?? [];
+        $defaultConfig = ['sdkUrl' => $this->getPayPalSdkUrl()];
+        $config = array_replace($defaultConfig, $componentConfig);
+
+        //Extend block component attributes with defaults
+        $componentAttributes = $this->jsLayout['components']['payLater']['config']['attributes'] ?? [];
+        $config['attributes'] = array_replace($this->getStyleAttributesConfig(), $componentAttributes);
+        $config['attributes']['data-pp-placement'] = $this->placement;
+
+        $this->jsLayout = [
             'components' => [
                 'payLater' => [
-                    'component' =>
-                        $this->jsLayout['components']['payLater']['component'] ?? 'Magento_Paypal/js/view/paylater',
-                    'config' => [
-                        'sdkUrl' => $this->getPayPalSdkUrl(),
-                    ]
+                    'component' => $jsComponent,
+                    'config' => $config
                 ]
             ]
         ];
 
-        //Merge config
-        $config = $this->jsLayout['components']['payLater']['config'] ?? [];
-        $config = array_replace($jsLayout['components']['payLater']['config'], $config);
-
-        //Merge attributes
-        $attributes = $this->jsLayout['components']['payLater']['config']['attributes'] ?? [];
-        $config['attributes'] = array_replace($this->getStyleAttributesConfig(), $attributes);
-        $config['attributes']['data-pp-placement'] = $this->placement;
-        $jsLayout['components']['payLater']['config'] = $config;
-
-        $this->jsLayout = $jsLayout;
-
         return parent::getJsLayout();
     }
 

dev/tests/integration/testsuite/Magento/Paypal/Block/PayLater/BannerTest.php

@@ -35,6 +35,7 @@ public function testGetJsLayout($systemConfig, $blockConfig, $expectedConfig)
 
         $jsConfig = json_decode($block->getJsLayout(), true);
         $this->assertArrayHasKey('config', $jsConfig['components']['payLater']);
+        $this->assertArrayHasKey('component', $jsConfig['components']['payLater']);
 
         $optionsConfig = $jsConfig['components']['payLater']['config'];
         $this->assertEquals($expectedConfig, array_intersect_key($optionsConfig, $expectedConfig));
@@ -120,17 +121,66 @@ public function getJsLayoutDataProvider()
 
     /**
      * @magentoAppArea frontend
+     * @dataProvider sdkUrlDataProvider
      * @covers \Magento\Paypal\Block\PayLater\Banner::getJsLayout()
      * @covers \Magento\Paypal\Block\PayLater\Banner::getPayPalSdkUrl()
      */
-    public function testSdkUrl()
+    public function testSdkUrl($blockConfig, $expectedUrl)
     {
         $layout = Bootstrap::getObjectManager()->get(LayoutInterface::class);
-        $block = $layout->createBlock(Banner::class, '', []);
+        $block = $layout->createBlock(Banner::class, '', ['data' => $blockConfig]);
 
         $jsConfig = json_decode($block->getJsLayout(), true);
         $this->assertArrayHasKey('config', $jsConfig['components']['payLater']);
         $this->assertArrayHasKey('sdkUrl', $jsConfig['components']['payLater']['config']);
+        $this->assertStringContainsString($expectedUrl, $jsConfig['components']['payLater']['config']['sdkUrl']);
+    }
+
+    public function sdkUrlDataProvider()
+    {
+        return [
+            [
+                'blockConfig' => [
+                    'jsLayout' => [
+                        'components' => [
+                            'payLater' => [
+                                'config' => [
+                                ]
+                            ]
+                        ]
+                    ]
+                ],
+                'expectedUrl' => 'paypal.com/sdk'
+            ],
+            [
+                'blockConfig' => [
+                    'jsLayout' => [
+                        'components' => [
+                            'payLater' => [
+                                'config' => [
+                                    'attributes' => ['test1' => 'value1']
+                                ]
+                            ]
+                        ]
+                    ]
+                ],
+                'expectedUrl' => 'paypal.com/sdk'
+            ],
+            [
+                'blockConfig' => [
+                    'jsLayout' => [
+                        'components' => [
+                            'payLater' => [
+                                'config' => [
+                                    'sdkUrl' => 'http://mock.url'
+                                ]
+                            ]
+                        ]
+                    ]
+                ],
+                'expectedUrl' => 'mock.url'
+            ]
+        ];
     }
 
     /**