MC-4116: Update slider to use new background images logic

anthoula · anthoula · commit 1f90e22ffaef · 2018-10-10T13:44:54.000-05:00
- revert new keys and changes to TreeConverterTest
- fix integration tests
diff --git a/app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Driver.php b/app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Driver.php
@@ -89,6 +89,7 @@ public function render(array $itemData, array $additionalData = []) : string
             'data-href' => $eavData['link_url'] ?? '',
             'data-target' => isset($eavData['target_blank']) && $eavData['target_blank'] ? '_blank' : '',
         ];
+
         $imageAttributes = [
             'data-element' => 'wrapper',
             'data-background-images' => '{\&quot;'
@@ -98,7 +99,7 @@ public function render(array $itemData, array $additionalData = []) : string
                 . '}}\&quot;,\&quot;'
                 . 'mobile_image\&quot;:\&quot;'
                 . '{{media url=wysiwyg'
-                . $eavData['mobile_image']
+                . $eavData['image']
                 . '}}\&quot;}',
             'style' => 'min-height: 300px; background-size: auto; '
                 . 'background-repeat: no-repeat; background-attachment: scroll;'
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Setup/DataConverter/TreeConverterTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Setup/DataConverter/TreeConverterTest.php
@@ -971,10 +971,9 @@ public function convertDataProvider()
                         [
                             'entity_id' => 1,
                             'css_classes' => 'one two',
-                            'image' => '/m/a/magento1.png',
+                            'image' => '/m/a/magento.png',
                             'link_url' => 'http://domain.com/',
                             'link_text' => 'Link Text',
-                            'mobile_image' => '/m/a/magento2.png',
                             'target_blank' => '0'
                         ]
                     ]
@@ -1006,7 +1005,6 @@ public function convertDataProvider()
                             'css_classes' => 'one two',
                             'image' => '/m/a/magento1.png',
                             'link_url' => 'http://domain.com/',
-                            'mobile_image' => '/m/a/magento2.png',
                             'target_blank' => '1',
                         ]
                     ]
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/banner.html b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/banner.html
@@ -1 +1 @@
-<div data-element="main" data-role="row" data-appearance="contained"><div data-element="inner"><div data-element="main" data-role="banner" data-appearance="poster" data-show-button="always" data-show-overlay="never" class="one two" style="background-size: auto; background-repeat: no-repeat; background-attachment: scroll; border: 1px none; border-radius: 0px; margin: 2px 3px 4px 1px;"><div data-element="link" data-href="http://domain.com/"><div data-element="wrapper" data-background-images="{\&quot;desktop_image\&quot;:\&quot;{{media url=wysiwyg/m/a/magento1.png}}\&quot;,\&quot;mobile_image\&quot;:\&quot;{{media url=wysiwyg/m/a/magento2.png}}\&quot;}" style="min-height: 300px; background-size: auto; background-repeat: no-repeat; background-attachment: scroll; text-align: left;" class="pagebuilder-banner-wrapper"><div data-element="overlay" class="pagebuilder-poster-overlay" data-overlay-color="transparent" style="background-color: transparent; min-height: 300px; padding: 6px 7px 8px 5px;"><div class="pagebuilder-poster-content"><div data-element="content"></div><button data-element="button" class="pagebuilder-banner-button pagebuilder-button-primary" style="visibility: visible; opacity: 1;">Link Text</button></div></div></div><div data-element="overlay" class="pagebuilder-poster-overlay" data-overlay-color="transparent" style="background-color: transparent; min-height: 300px; padding: 6px 7px 8px 5px;"><div class="pagebuilder-poster-content"><div data-element="content"></div><button data-element="button" class="pagebuilder-banner-button pagebuilder-button-primary" style="visibility: visible; opacity: 1;">Link Text</button></div></div></div></div></div></div></div>
+<div data-element="main" data-role="row" data-appearance="contained"><div data-element="inner"><div data-element="main" data-role="banner" data-appearance="poster" data-show-button="always" data-show-overlay="never" class="one two" style="background-size: auto; background-repeat: no-repeat; background-attachment: scroll; border: 1px none; border-radius: 0px; margin: 2px 3px 4px 1px;"><div data-element="link" data-href="http://domain.com/"><div data-element="wrapper" data-background-images="{\&quot;desktop_image\&quot;:\&quot;{{media url=wysiwyg/m/a/magento.png}}\&quot;,\&quot;mobile_image\&quot;:\&quot;{{media url=wysiwyg/m/a/magento.png}}\&quot;}" style="min-height: 300px; background-size: auto; background-repeat: no-repeat; background-attachment: scroll; text-align: left;" class="pagebuilder-banner-wrapper"><div data-element="overlay" class="pagebuilder-poster-overlay" data-overlay-color="transparent" style="background-color: transparent; min-height: 300px; padding: 6px 7px 8px 5px;"><div class="pagebuilder-poster-content"><div data-element="content"></div><button data-element="button" class="pagebuilder-banner-button pagebuilder-button-primary" style="visibility: visible; opacity: 1;">Link Text</button></div></div></div><div data-element="overlay" class="pagebuilder-poster-overlay" data-overlay-color="transparent" style="background-color: transparent; min-height: 300px; padding: 6px 7px 8px 5px;"><div class="pagebuilder-poster-content"><div data-element="content"></div><button data-element="button" class="pagebuilder-banner-button pagebuilder-button-primary" style="visibility: visible; opacity: 1;">Link Text</button></div></div></div></div></div></div></div>
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/banner_mobile_image.html b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/banner_mobile_image.html
@@ -1 +1 @@
-<div data-element="main" data-role="row" data-appearance="contained"><div data-element="inner"><div data-element="main" data-role="banner" data-appearance="poster" data-show-button="never" data-show-overlay="never" class="one two" style="background-size: auto; background-repeat: no-repeat; background-attachment: scroll; border: 1px none; border-radius: 0px; margin: 0px;"><div data-element="link" data-href="http://domain.com/"><div data-element="wrapper" data-background-images="{\&quot;desktop_image\&quot;:\&quot;{{media url=wysiwyg/m/a/magento1.png}}\&quot;,\&quot;mobile_image\&quot;:\&quot;{{media url=wysiwyg/m/a/magento2.png}}\&quot;}" style="min-height: 300px; background-size: auto; background-repeat: no-repeat; background-attachment: scroll;" class="pagebuilder-banner-wrapper"><div data-element="overlay" class="pagebuilder-poster-overlay" data-overlay-color="transparent" style="background-color: transparent; min-height: 300px; padding: 40px;"><div class="pagebuilder-poster-content"><div data-element="content"></div></div></div></div><div data-element="overlay" class="pagebuilder-poster-overlay" data-overlay-color="transparent" style="background-color: transparent; min-height: 300px; padding: 40px;"><div class="pagebuilder-poster-content"><div data-element="content"></div></div></div></div></div></div></div></div>
+<div data-element="main" data-role="row" data-appearance="contained"><div data-element="inner"><div data-element="main" data-role="banner" data-appearance="poster" data-show-button="never" data-show-overlay="never" class="one two" style="background-size: auto; background-repeat: no-repeat; background-attachment: scroll; border: 1px none; border-radius: 0px; margin: 0px;"><div data-element="link" data-href="http://domain.com/"><div data-element="wrapper" data-background-images="{\&quot;desktop_image\&quot;:\&quot;{{media url=wysiwyg/m/a/magento1.png}}\&quot;,\&quot;mobile_image\&quot;:\&quot;{{media url=wysiwyg/m/a/magento1.png}}\&quot;}" style="min-height: 300px; background-size: auto; background-repeat: no-repeat; background-attachment: scroll;" class="pagebuilder-banner-wrapper"><div data-element="overlay" class="pagebuilder-poster-overlay" data-overlay-color="transparent" style="background-color: transparent; min-height: 300px; padding: 40px;"><div class="pagebuilder-poster-content"><div data-element="content"></div></div></div></div><div data-element="overlay" class="pagebuilder-poster-overlay" data-overlay-color="transparent" style="background-color: transparent; min-height: 300px; padding: 40px;"><div class="pagebuilder-poster-content"><div data-element="content"></div></div></div></div></div></div></div></div>
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/banner_new_window.html b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/banner_new_window.html
@@ -1 +1 @@
-<div data-element="main" data-role="row" data-appearance="contained"><div data-element="inner"><div data-element="main" data-role="banner" data-appearance="poster" data-show-button="never" data-show-overlay="never" class="one two" style="background-size: auto; background-repeat: no-repeat; background-attachment: scroll; border: 1px none; border-radius: 0px; margin: 0px;"><div data-element="link" data-href="http://domain.com/" data-target="_blank"><div data-element="wrapper" data-background-images="{\&quot;desktop_image\&quot;:\&quot;{{media url=wysiwyg/m/a/magento1.png}}\&quot;,\&quot;mobile_image\&quot;:\&quot;{{media url=wysiwyg/m/a/magento2.png}}\&quot;}" style="min-height: 300px; background-size: auto; background-repeat: no-repeat; background-attachment: scroll;" class="pagebuilder-banner-wrapper"><div data-element="overlay" class="pagebuilder-poster-overlay" data-overlay-color="transparent" style="background-color: transparent; min-height: 300px; padding: 40px;"><div class="pagebuilder-poster-content"><div data-element="content"></div></div></div></div><div data-element="overlay" class="pagebuilder-poster-overlay" data-overlay-color="transparent" style="background-color: transparent; min-height: 300px; padding: 40px;"><div class="pagebuilder-poster-content"><div data-element="content"></div></div></div></div></div></div></div></div>
+<div data-element="main" data-role="row" data-appearance="contained"><div data-element="inner"><div data-element="main" data-role="banner" data-appearance="poster" data-show-button="never" data-show-overlay="never" class="one two" style="background-size: auto; background-repeat: no-repeat; background-attachment: scroll; border: 1px none; border-radius: 0px; margin: 0px;"><div data-element="link" data-href="http://domain.com/" data-target="_blank"><div data-element="wrapper" data-background-images="{\&quot;desktop_image\&quot;:\&quot;{{media url=wysiwyg/m/a/magento1.png}}\&quot;,\&quot;mobile_image\&quot;:\&quot;{{media url=wysiwyg/m/a/magento1.png}}\&quot;}" style="min-height: 300px; background-size: auto; background-repeat: no-repeat; background-attachment: scroll;" class="pagebuilder-banner-wrapper"><div data-element="overlay" class="pagebuilder-poster-overlay" data-overlay-color="transparent" style="background-color: transparent; min-height: 300px; padding: 40px;"><div class="pagebuilder-poster-content"><div data-element="content"></div></div></div></div><div data-element="overlay" class="pagebuilder-poster-overlay" data-overlay-color="transparent" style="background-color: transparent; min-height: 300px; padding: 40px;"><div class="pagebuilder-poster-content"><div data-element="content"></div></div></div></div></div></div></div></div>

Original file line number	Diff line number	Diff line change
`@@ -971,10 +971,9 @@ public function convertDataProvider()`
`971`	`971`	`[`
`972`	`972`	`'entity_id' => 1,`
`973`	`973`	`'css_classes' => 'one two',`
`974`		`- 'image' => '/m/a/magento1.png',`
	`974`	`+ 'image' => '/m/a/magento.png',`
`975`	`975`	`'link_url' => 'http://domain.com/',`
`976`	`976`	`'link_text' => 'Link Text',`
`977`		`- 'mobile_image' => '/m/a/magento2.png',`
`978`	`977`	`'target_blank' => '0'`
`979`	`978`	`]`
`980`	`979`	`]`
`@@ -1006,7 +1005,6 @@ public function convertDataProvider()`
`1006`	`1005`	`'css_classes' => 'one two',`
`1007`	`1006`	`'image' => '/m/a/magento1.png',`
`1008`	`1007`	`'link_url' => 'http://domain.com/',`
`1009`		`- 'mobile_image' => '/m/a/magento2.png',`
`1010`	`1008`	`'target_blank' => '1',`
`1011`	`1009`	`]`
`1012`	`1010`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-<div data-element="main" data-role="row" data-appearance="contained"><div data-element="inner"><div data-element="main" data-role="banner" data-appearance="poster" data-show-button="always" data-show-overlay="never" class="one two" style="background-size: auto; background-repeat: no-repeat; background-attachment: scroll; border: 1px none; border-radius: 0px; margin: 2px 3px 4px 1px;"><div data-element="link" data-href="http://domain.com/"><div data-element="wrapper" data-background-images="{\"desktop_image\":\"{{media url=wysiwyg/m/a/magento1.png}}\",\"mobile_image\":\"{{media url=wysiwyg/m/a/magento2.png}}\"}" style="min-height: 300px; background-size: auto; background-repeat: no-repeat; background-attachment: scroll; text-align: left;" class="pagebuilder-banner-wrapper"><div data-element="overlay" class="pagebuilder-poster-overlay" data-overlay-color="transparent" style="background-color: transparent; min-height: 300px; padding: 6px 7px 8px 5px;"><div class="pagebuilder-poster-content"><div data-element="content"></div><button data-element="button" class="pagebuilder-banner-button pagebuilder-button-primary" style="visibility: visible; opacity: 1;">Link Text</button></div></div></div><div data-element="overlay" class="pagebuilder-poster-overlay" data-overlay-color="transparent" style="background-color: transparent; min-height: 300px; padding: 6px 7px 8px 5px;"><div class="pagebuilder-poster-content"><div data-element="content"></div><button data-element="button" class="pagebuilder-banner-button pagebuilder-button-primary" style="visibility: visible; opacity: 1;">Link Text</button></div></div></div></div></div></div></div>
	`1`	+<div data-element="main" data-role="row" data-appearance="contained"><div data-element="inner"><div data-element="main" data-role="banner" data-appearance="poster" data-show-button="always" data-show-overlay="never" class="one two" style="background-size: auto; background-repeat: no-repeat; background-attachment: scroll; border: 1px none; border-radius: 0px; margin: 2px 3px 4px 1px;"><div data-element="link" data-href="http://domain.com/"><div data-element="wrapper" data-background-images="{\"desktop_image\":\"{{media url=wysiwyg/m/a/magento.png}}\",\"mobile_image\":\"{{media url=wysiwyg/m/a/magento.png}}\"}" style="min-height: 300px; background-size: auto; background-repeat: no-repeat; background-attachment: scroll; text-align: left;" class="pagebuilder-banner-wrapper"><div data-element="overlay" class="pagebuilder-poster-overlay" data-overlay-color="transparent" style="background-color: transparent; min-height: 300px; padding: 6px 7px 8px 5px;"><div class="pagebuilder-poster-content"><div data-element="content"></div><button data-element="button" class="pagebuilder-banner-button pagebuilder-button-primary" style="visibility: visible; opacity: 1;">Link Text</button></div></div></div><div data-element="overlay" class="pagebuilder-poster-overlay" data-overlay-color="transparent" style="background-color: transparent; min-height: 300px; padding: 6px 7px 8px 5px;"><div class="pagebuilder-poster-content"><div data-element="content"></div><button data-element="button" class="pagebuilder-banner-button pagebuilder-button-primary" style="visibility: visible; opacity: 1;">Link Text</button></div></div></div></div></div></div></div>