Skip to content

Commit

Permalink
Fix integration test.
Browse files Browse the repository at this point in the history
  • Loading branch information
nmalevanec authored and DanielRuf committed Dec 8, 2018
1 parent f441c4e commit 351340a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -130,22 +130,22 @@ public function layoutDirectiveDataProvider()
'area parameter - omitted' => [
'adminhtml',
'handle="email_template_test_handle"',
'<b>Email content for frontend/Magento/default theme</b>',
'<strong>Email content for frontend/Magento/default theme</strong>',
],
'area parameter - frontend' => [
'adminhtml',
'handle="email_template_test_handle" area="frontend"',
'<b>Email content for frontend/Magento/default theme</b>',
'<strong>Email content for frontend/Magento/default theme</strong>',
],
'area parameter - backend' => [
'frontend',
'handle="email_template_test_handle" area="adminhtml"',
'<b>Email content for adminhtml/Magento/default theme</b>',
'<strong>Email content for adminhtml/Magento/default theme</strong>',
],
'custom parameter' => [
'frontend',
'handle="email_template_test_handle" template="Magento_Email::sample_email_content_custom.phtml"',
'<b>Custom Email content for frontend/Magento/default theme</b>',
'<strong>Custom Email content for frontend/Magento/default theme</strong>',
],
];
return $result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -315,25 +315,25 @@ public function templateDirectiveDataProvider()
Area::AREA_FRONTEND,
TemplateTypesInterface::TYPE_HTML,
'{{template config_path="customer/create_account/email_template"}}',
'<b>customer_create_account_email_template template from Vendor/custom_theme</b>',
'<strong>customer_create_account_email_template template from Vendor/custom_theme</strong>',
],
'Template from parent theme - frontend' => [
Area::AREA_FRONTEND,
TemplateTypesInterface::TYPE_HTML,
'{{template config_path="customer/create_account/email_confirmation_template"}}',
'<b>customer_create_account_email_confirmation_template template from Vendor/default</b>',
'<strong>customer_create_account_email_confirmation_template template from Vendor/default</strong',
],
'Template from grandparent theme - frontend' => [
Area::AREA_FRONTEND,
TemplateTypesInterface::TYPE_HTML,
'{{template config_path="customer/create_account/email_confirmed_template"}}',
'<b>customer_create_account_email_confirmed_template template from Magento/default</b>',
'<strong>customer_create_account_email_confirmed_template template from Magento/default</strong',
],
'Template from grandparent theme - adminhtml' => [
BackendFrontNameResolver::AREA_CODE,
TemplateTypesInterface::TYPE_HTML,
'{{template config_path="catalog/productalert_cron/error_email_template"}}',
'<b>catalog_productalert_cron_error_email_template template from Magento/default</b>',
'<strong>catalog_productalert_cron_error_email_template template from Magento/default</strong',
null,
null,
true,
Expand Down
3 changes: 3 additions & 0 deletions setup/view/magento/setup/extension-grid.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

// @codingStandardsIgnoreFile

?>
<h2 class="page-title">{{$state.current.header}}</h2>

Expand Down

0 comments on commit 351340a

Please sign in to comment.