From 5103a0cbc9648370768244d9f5f58c3c001590d9 Mon Sep 17 00:00:00 2001 From: Oleksandr Miroshnichenko Date: Tue, 2 Jun 2020 17:43:40 -0500 Subject: [PATCH 1/5] PB-582: Fix Page Builder builds --- .../Test/Mftf/Data/TemplateData.xml | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/TemplateData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/TemplateData.xml index da9277bb734..fca97f01ee8 100644 --- a/app/code/Magento/PageBuilder/Test/Mftf/Data/TemplateData.xml +++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/TemplateData.xml @@ -49,7 +49,7 @@ Created - + Role_Page_Builder_Templates_ Role_Page_Builder_Templates_ {{_ENV.MAGENTO_ADMIN_PASSWORD}} @@ -59,14 +59,14 @@ 1 - Magento_Backend::dashboard - Magento_Backend::content - Magento_Backend::content_elements - Magento_Cms::page - Magento_Cms::save + Magento_Backend::dashboard + Magento_Backend::content + Magento_Backend::content_elements + Magento_Cms::page + Magento_Cms::save - + Role_Page_Builder_Templates_ Role_Page_Builder_Templates_ {{_ENV.MAGENTO_ADMIN_PASSWORD}} @@ -76,15 +76,15 @@ 1 - Magento_Backend::dashboard - Magento_Backend::content - Magento_Backend::content_elements - Magento_Cms::page - Magento_Cms::save - Magento_PageBuilder::templates + Magento_Backend::dashboard + Magento_Backend::content + Magento_Backend::content_elements + Magento_Cms::page + Magento_Cms::save + Magento_PageBuilder::templates - + Role_Page_Builder_Save_Templates_ Role_Page_Builder_Save_Templates_ {{_ENV.MAGENTO_ADMIN_PASSWORD}} @@ -94,16 +94,16 @@ 1 - Magento_Backend::dashboard - Magento_Backend::content - Magento_Backend::content_elements - Magento_Cms::page - Magento_Cms::save - Magento_PageBuilder::templates - Magento_PageBuilder::template_save + Magento_Backend::dashboard + Magento_Backend::content + Magento_Backend::content_elements + Magento_Cms::page + Magento_Cms::save + Magento_PageBuilder::templates + Magento_PageBuilder::template_save - + Role_Page_Builder_Apply_Templates_ Role_Page_Builder_Apply_Templates_ {{_ENV.MAGENTO_ADMIN_PASSWORD}} @@ -113,16 +113,16 @@ 1 - Magento_Backend::dashboard - Magento_Backend::content - Magento_Backend::content_elements - Magento_Cms::page - Magento_Cms::save - Magento_PageBuilder::templates - Magento_PageBuilder::template_apply + Magento_Backend::dashboard + Magento_Backend::content + Magento_Backend::content_elements + Magento_Cms::page + Magento_Cms::save + Magento_PageBuilder::templates + Magento_PageBuilder::template_apply - + Role_Page_Builder_Delete_Templates_ Role_Page_Builder_Delete_Templates_ {{_ENV.MAGENTO_ADMIN_PASSWORD}} @@ -132,13 +132,13 @@ 1 - Magento_Backend::dashboard - Magento_Backend::content - Magento_Backend::content_elements - Magento_Cms::page - Magento_Cms::save - Magento_PageBuilder::templates - Magento_PageBuilder::template_delete + Magento_Backend::dashboard + Magento_Backend::content + Magento_Backend::content_elements + Magento_Cms::page + Magento_Cms::save + Magento_PageBuilder::templates + Magento_PageBuilder::template_delete From eb6f1678c7ccee4885f2fa19aca49560831b0582 Mon Sep 17 00:00:00 2001 From: Oleksandr Miroshnichenko Date: Thu, 4 Jun 2020 15:19:26 -0500 Subject: [PATCH 2/5] PB-582: Fix Page Builder builds --- .../PageBuilderApplyTemplatesPermission.xml | 3 +++ .../PageBuilderDeleteTemplatesPermission.xml | 3 +++ .../PageBuilderSaveTemplatesPermission.xml | 3 +++ .../PageBuilderTemplatesPermission.xml | 3 +++ 4 files changed, 12 insertions(+) diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderApplyTemplatesPermission.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderApplyTemplatesPermission.xml index e818163af64..69a36e7b906 100644 --- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderApplyTemplatesPermission.xml +++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderApplyTemplatesPermission.xml @@ -19,6 +19,9 @@ + + + diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderDeleteTemplatesPermission.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderDeleteTemplatesPermission.xml index 5ed993d70ad..23b162fd00c 100644 --- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderDeleteTemplatesPermission.xml +++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderDeleteTemplatesPermission.xml @@ -19,6 +19,9 @@ + + + diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderSaveTemplatesPermission.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderSaveTemplatesPermission.xml index e98668d73dd..d54f4028d46 100644 --- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderSaveTemplatesPermission.xml +++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderSaveTemplatesPermission.xml @@ -19,6 +19,9 @@ + + + diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderTemplatesPermission.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderTemplatesPermission.xml index 9cb9eea5d75..3ac7bb11700 100644 --- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderTemplatesPermission.xml +++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderTemplatesPermission.xml @@ -19,6 +19,9 @@ + + + From d1349cbf2b6135875aa53ee6d32257eccef52831 Mon Sep 17 00:00:00 2001 From: Oleksandr Miroshnichenko Date: Fri, 5 Jun 2020 14:39:52 -0500 Subject: [PATCH 3/5] PB-582: Fix Page Builder builds --- .../PageBuilder/Api/ProductAttributeRepositoryTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/tests/api-functional/testsuite/Magento/PageBuilder/Api/ProductAttributeRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/PageBuilder/Api/ProductAttributeRepositoryTest.php index 1f68f4d3199..395684de7f5 100644 --- a/dev/tests/api-functional/testsuite/Magento/PageBuilder/Api/ProductAttributeRepositoryTest.php +++ b/dev/tests/api-functional/testsuite/Magento/PageBuilder/Api/ProductAttributeRepositoryTest.php @@ -45,10 +45,10 @@ private function createPageBuilderAttribute($attributeCode) "frontend_input" => "textarea", "is_wysiwyg_enabled" => 1, "is_visible_on_front" => true, - "is_searchable" => true, - "is_visible_in_advanced_search" => true, - "is_filterable" => true, - "is_filterable_in_search" => true, + "is_searchable" => false, + "is_visible_in_advanced_search" => false, + "is_filterable" => false, + "is_filterable_in_search" => false, \Magento\Framework\Api\ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY => [ 'is_pagebuilder_enabled' => 1 ] From 2db3950cff2770fc832019681368b37af543c7cf Mon Sep 17 00:00:00 2001 From: Oleksandr Miroshnichenko Date: Tue, 9 Jun 2020 13:21:26 -0500 Subject: [PATCH 4/5] PB-582: Fix Page Builder builds - fix integration test --- .../Adminhtml/Form/Element/ProductConditionsTest.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditionsTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditionsTest.php index a63eeec1949..50e066bb553 100644 --- a/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditionsTest.php +++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditionsTest.php @@ -63,7 +63,10 @@ public function testFormLoadsConditionsFromPost() $responseBody = $this->getResponse()->getBody(); // Assert the description rule is loaded correctly - $this->assertStringContainsString('', $responseBody); + $this->assertMatchesRegularExpression( + '/ + + + + + +