Skip to content

Commit 0fdec6e

Browse files
slavvkaslavvka
authored
ENGCOM-6691: 25162 fixed wrong format link #26455 
2 parents 9aaa225 + cb24061 commit 0fdec6e

File tree

8 files changed

+94
-1
lines changed

8 files changed

+94
-1
lines changed

‎app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,10 @@ public function execute()
172172
$message = $this->getSuccessMessage((int)$subscriber->getSubscriberStatus());
173173
$this->messageManager->addSuccessMessage($message);
174174
} catch (LocalizedException $e) {
175-
$this->messageManager->addErrorMessage($e->getMessage());
175+
$this->messageManager->addComplexErrorMessage(
176+
'localizedSubscriptionErrorMessage',
177+
['message' => $e->getMessage()]
178+
);
176179
} catch (\Exception $e) {
177180
$this->messageManager->addExceptionMessage($e, __('Something went wrong with the subscription.'));
178181
}

‎app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewSubscriberActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="StorefrontCreateNewSubscriberActionGroup">
12+
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
13+
<submitForm selector="{{BasicFrontendNewsletterFormSection.subscribeForm}}"
14+
parameterArray="['email' => '{{_defaultNewsletter.senderEmail}}']"
15+
button="{{BasicFrontendNewsletterFormSection.subscribeButton}}" stepKey="submitForm"/>
16+
<waitForPageLoad stepKey="waitForPageLoad"/>
17+
<waitForElementVisible stepKey="waitForErrorAppears" selector="{{StorefrontMessagesSection.error}}"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Newsletter/Test/Mftf/Page/AdminNewsletterConfigPage.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
10+
<page name="AdminNewsletterConfigPage" url="admin/system_config/edit/section/newsletter/" area="admin" module="Magento_Newsletter">
11+
<section name="AdminNewsletterConfigPageSubscriptionOptionsSection"/>
12+
</page>
13+
</pages>

‎app/code/Magento/Newsletter/Test/Mftf/Section/AdminNewsletterConfigPageSubscriptionOptionsSection.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
<section name="AdminNewsletterConfigPageSubscriptionOptionsSection">
11+
<element name="allowGuestSubscription" type="checkbox" selector="input[name='groups[subscription][fields][allow_guest_subscribe][inherit]']" timeout="30"/>
12+
<element name="guestSubscription" type="select" selector="#newsletter_subscription_allow_guest_subscribe" timeout="30"/>
13+
</section>
14+
</sections>

‎app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
<section name="BasicFrontendNewsletterFormSection">
11+
<element name="newsletterEmail" type="input" selector="#newsletter"/>
12+
<element name="subscribeButton" type="button" selector=".subscribe" timeout="30"/>
13+
<element name="subscribeForm" type="input" selector="#newsletter-validate-detail" timeout="30"/>
14+
</section>
1015
<section name="BasicFieldNewsletterSection">
1116
<element name="templateName" type="input" selector="#code"/>
1217
<element name="templateSubject" type="input" selector="#subject"/>

‎app/code/Magento/Newsletter/Test/Mftf/Test/VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest">
12+
<before>
13+
<magentoCLI command="config:set newsletter/subscription/allow_guest_subscribe 0"
14+
stepKey="setConfigGuestSubscriptionDisable"/>
15+
</before>
16+
<actionGroup ref="StorefrontCreateNewSubscriberActionGroup" stepKey="createSubscriber"/>
17+
</test>
18+
</tests>

‎app/code/Magento/Newsletter/etc/frontend/di.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,16 @@
1313
</argument>
1414
</arguments>
1515
</type>
16+
<type name="Magento\Framework\View\Element\Message\MessageConfigurationsPool">
17+
<arguments>
18+
<argument name="configurationsMap" xsi:type="array">
19+
<item name="localizedSubscriptionErrorMessage" xsi:type="array">
20+
<item name="renderer" xsi:type="const">\Magento\Framework\View\Element\Message\Renderer\BlockRenderer::CODE</item>
21+
<item name="data" xsi:type="array">
22+
<item name="template" xsi:type="string">Magento_Newsletter::messages/localizedSubscriptionErrorMessage.phtml</item>
23+
</item>
24+
</item>
25+
</argument>
26+
</arguments>
27+
</type>
1628
</config>

‎app/code/Magento/Newsletter/view/frontend/templates/messages/localizedSubscriptionErrorMessage.phtml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
/** @var \Magento\Framework\View\Element\Template $block */
8+
?>
9+
<?= $block->escapeHtml(__($block->getData('message')), ['a']); ?>

0 commit comments

Comments
 (0)