MC-3025: Updat/test data migration

Michael Yu · Michael Yu · commit 009ba9023bc9 · 2018-07-06T18:31:05.000-05:00
- Fixed button item renderer and tests
diff --git a/app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/ButtonItem.php b/app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/ButtonItem.php
@@ -70,7 +70,7 @@ public function render(array $itemData, array $additionalData = []) : string
         $rootElementHtml .= '><a data-element="link" href="'
             . ($eavData['link_url'] ?? '') . '"'
             . $buttonStyleAttribute
-            . ' class="pagebuilder-button-primary"><span>'
+            . ' class="pagebuilder-button-primary"><span data-element="link_text">'
             . ($eavData['link_text'] ?? '')
             . '</span></a></div>';
 
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/buttons.html b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/buttons.html
@@ -1 +1 @@
-<div data-element="main" data-role="row" data-appearance="default"><div data-element="main" data-role="buttons" data-appearance="inline" class="one two" style="display: inline-block; text-align: left; margin: 2px 3px 4px 1px; padding: 6px 7px 8px 5px;"><div data-element="main" data-role="button-item" data-appearance="default" style="display: inline-block;" class="three four"><a data-element="link" href="http://domain.com/" style="text-align: right; margin: 0px 2px 0px 1px; padding: 3px 0px 4px 0px;" class="pagebuilder-button-primary"><span>Domain.com</span></a></div></div></div>
+<div data-element="main" data-role="row" data-appearance="default"><div data-element="main" data-role="buttons" data-appearance="inline" class="one two" style="display: inline-block; text-align: left; margin: 2px 3px 4px 1px; padding: 6px 7px 8px 5px;"><div data-element="main" data-role="button-item" data-appearance="default" style="display: inline-block;" class="three four"><a data-element="link" href="http://domain.com/" style="text-align: right; margin: 0px 2px 0px 1px; padding: 3px 0px 4px 0px;" class="pagebuilder-button-primary"><span data-element="link_text">Domain.com</span></a></div></div></div>
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/buttons_no_link_text.html b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/buttons_no_link_text.html
@@ -1 +1 @@
-<div data-element="main" data-role="row" data-appearance="default"><div data-element="main" data-role="buttons" data-appearance="inline" style="display: inline-block; text-align: left; margin: 2px 3px 4px 1px; padding: 6px 7px 8px 5px;"><div data-element="main" data-role="button-item" data-appearance="default" style="display: inline-block;"><a data-element="link" href="http://domain.com/" style="text-align: right; margin: 0px 2px 0px 1px; padding: 3px 0px 4px 0px;" class="pagebuilder-button-primary"><span></span></a></div></div></div>
+<div data-element="main" data-role="row" data-appearance="default"><div data-element="main" data-role="buttons" data-appearance="inline" style="display: inline-block; text-align: left; margin: 2px 3px 4px 1px; padding: 6px 7px 8px 5px;"><div data-element="main" data-role="button-item" data-appearance="default" style="display: inline-block;"><a data-element="link" href="http://domain.com/" style="text-align: right; margin: 0px 2px 0px 1px; padding: 3px 0px 4px 0px;" class="pagebuilder-button-primary"><span data-element="link_text"></span></a></div></div></div>
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/buttons_no_link_url.html b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/buttons_no_link_url.html
@@ -1 +1 @@
-<div data-element="main" data-role="row" data-appearance="default"><div data-element="main" data-role="buttons" data-appearance="inline" style="display: inline-block; text-align: left; margin: 2px 3px 4px 1px; padding: 6px 7px 8px 5px;"><div data-element="main" data-role="button-item" data-appearance="default" style="display: inline-block;"><a data-element="link" href="" style="text-align: right; margin: 0px 2px 0px 1px; padding: 3px 0px 4px 0px;" class="pagebuilder-button-primary"><span>Domain.com</span></a></div></div></div>
+<div data-element="main" data-role="row" data-appearance="default"><div data-element="main" data-role="buttons" data-appearance="inline" style="display: inline-block; text-align: left; margin: 2px 3px 4px 1px; padding: 6px 7px 8px 5px;"><div data-element="main" data-role="button-item" data-appearance="default" style="display: inline-block;"><a data-element="link" href="" style="text-align: right; margin: 0px 2px 0px 1px; padding: 3px 0px 4px 0px;" class="pagebuilder-button-primary"><span data-element="link_text">Domain.com</span></a></div></div></div>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-<div data-element="main" data-role="row" data-appearance="default"><div data-element="main" data-role="buttons" data-appearance="inline" class="one two" style="display: inline-block; text-align: left; margin: 2px 3px 4px 1px; padding: 6px 7px 8px 5px;"><div data-element="main" data-role="button-item" data-appearance="default" style="display: inline-block;" class="three four"><a data-element="link" href="http://domain.com/" style="text-align: right; margin: 0px 2px 0px 1px; padding: 3px 0px 4px 0px;" class="pagebuilder-button-primary"><span>Domain.com</span></a></div></div></div>
	`1`	+<div data-element="main" data-role="row" data-appearance="default"><div data-element="main" data-role="buttons" data-appearance="inline" class="one two" style="display: inline-block; text-align: left; margin: 2px 3px 4px 1px; padding: 6px 7px 8px 5px;"><div data-element="main" data-role="button-item" data-appearance="default" style="display: inline-block;" class="three four"><a data-element="link" href="http://domain.com/" style="text-align: right; margin: 0px 2px 0px 1px; padding: 3px 0px 4px 0px;" class="pagebuilder-button-primary"><span data-element="link_text">Domain.com</span></a></div></div></div>