From 351340a2569f1a9deb93f8f9aa9afea728a1c59f Mon Sep 17 00:00:00 2001 From: nmalevanec Date: Wed, 5 Dec 2018 13:15:28 +0200 Subject: [PATCH] Fix integration test. --- .../testsuite/Magento/Email/Model/Template/FilterTest.php | 8 ++++---- .../testsuite/Magento/Email/Model/TemplateTest.php | 8 ++++---- setup/view/magento/setup/extension-grid.phtml | 3 +++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php index a68b0942ec090..dd55dcc8b47c7 100644 --- a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php +++ b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php @@ -130,22 +130,22 @@ public function layoutDirectiveDataProvider() 'area parameter - omitted' => [ 'adminhtml', 'handle="email_template_test_handle"', - 'Email content for frontend/Magento/default theme', + 'Email content for frontend/Magento/default theme', ], 'area parameter - frontend' => [ 'adminhtml', 'handle="email_template_test_handle" area="frontend"', - 'Email content for frontend/Magento/default theme', + 'Email content for frontend/Magento/default theme', ], 'area parameter - backend' => [ 'frontend', 'handle="email_template_test_handle" area="adminhtml"', - 'Email content for adminhtml/Magento/default theme', + 'Email content for adminhtml/Magento/default theme', ], 'custom parameter' => [ 'frontend', 'handle="email_template_test_handle" template="Magento_Email::sample_email_content_custom.phtml"', - 'Custom Email content for frontend/Magento/default theme', + 'Custom Email content for frontend/Magento/default theme', ], ]; return $result; diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php index a83de07443e95..7789a79794f39 100644 --- a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php +++ b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php @@ -315,25 +315,25 @@ public function templateDirectiveDataProvider() Area::AREA_FRONTEND, TemplateTypesInterface::TYPE_HTML, '{{template config_path="customer/create_account/email_template"}}', - 'customer_create_account_email_template template from Vendor/custom_theme', + 'customer_create_account_email_template template from Vendor/custom_theme', ], 'Template from parent theme - frontend' => [ Area::AREA_FRONTEND, TemplateTypesInterface::TYPE_HTML, '{{template config_path="customer/create_account/email_confirmation_template"}}', - 'customer_create_account_email_confirmation_template template from Vendor/default', + 'customer_create_account_email_confirmation_template template from Vendor/default [ Area::AREA_FRONTEND, TemplateTypesInterface::TYPE_HTML, '{{template config_path="customer/create_account/email_confirmed_template"}}', - 'customer_create_account_email_confirmed_template template from Magento/default', + 'customer_create_account_email_confirmed_template template from Magento/default [ BackendFrontNameResolver::AREA_CODE, TemplateTypesInterface::TYPE_HTML, '{{template config_path="catalog/productalert_cron/error_email_template"}}', - 'catalog_productalert_cron_error_email_template template from Magento/default', + 'catalog_productalert_cron_error_email_template template from Magento/default

{{$state.current.header}}