Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix duplicated footer in Magento_Customer emails #27356

Merged

Conversation

ptylek
Copy link
Contributor

@ptylek ptylek commented Mar 19, 2020

Description (*)

Email templates for change email, change email and password, password reset have duplicated Thank you note which is already in the footer:

<td class="footer">
    <p class="closing">{{trans "Thank you, %store_name" store_name=$store.frontend_name}}!</p>
</td>

and footer template is imported.

Fixing this will remove duplicated content in email.

Related Pull Requests

Fixed Issues (if relevant)

Couldn't find any issues, maybe there is some.

Manual testing scenarios (*)

  1. As a logged in user go to User Area - My Account Information section and change password / email.
  2. Go to your email box and check those emails.

Questions or comments

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds are green)

Resolved issues:

  1. resolves [Issue] Fix duplicated footer in Magento_Customer emails #28433: Fix duplicated footer in Magento_Customer emails

@m2-assistant
Copy link

m2-assistant bot commented Mar 19, 2020

Hi @ptylek. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

  • @magento give me test instance - deploy test instance based on PR changes
  • @magento give me 2.4-develop instance - deploy vanilla Magento instance

For more details, please, review the Magento Contributor Guide documentation.

@rogyar rogyar self-assigned this Mar 22, 2020
@rogyar
Copy link
Contributor

rogyar commented Mar 22, 2020

Hi @ptylek. Thank you for your collaboration. We could cover this part with an integration test in a similar way as we do here. However, covering templates not a common case for auto-tests. I believe we can skip it for now.

rogyar
rogyar previously approved these changes Mar 22, 2020
Copy link
Contributor

@rogyar rogyar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Failing tests are not related to the current changes

@rogyar rogyar dismissed their stale review March 22, 2020 10:31

A potential issue spotted

@magento-engcom-team
Copy link
Contributor

Hi @rogyar, thank you for the review.
ENGCOM-7177 has been created to process this Pull Request
✳️ @rogyar, could you please add one of the following labels to the Pull Request?

Label Description
Auto-Tests: Covered All changes in Pull Request is covered by auto-tests
Auto-Tests: Not Covered Changes in Pull Request requires coverage by auto-tests
Auto-Tests: Not Required Changes in Pull Request does not require coverage by auto-tests

@ptylek ptylek changed the title Fix duplicated footer and incorrect greeting in Magento_Customer emails Fix duplicated footer in Magento_Customer emails Apr 4, 2020
@lbajsarowicz
Copy link
Contributor

I would like to cover that with tests, but actually both footers are slightly different and it does not make sense to cover this specific case. The other two cases were covered:

@ptylek ptylek removed their assignment Apr 6, 2020
@ptylek
Copy link
Contributor Author

ptylek commented Apr 18, 2020

@rogyar do you know any update for this PR? As @lbajsarowicz suggested, it does not make sense to cover this specific case.

@VladimirZaets VladimirZaets added the QA: Ready to add to Regression Scope Should be analyzed and added to Regression Testing Scope(if applicable) label May 20, 2020
@VladimirZaets VladimirZaets moved this from Merge in Progress to Extended Testing (optional) in Pull Requests Dashboard May 20, 2020
Copy link
Contributor

@VladimirZaets VladimirZaets left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ptylek . Thanks for collaboration. Due to Magento Definition of Done all code must be covered by tests. In this case, I think it can be covered by an integration test. Can you do it?

@ghost ghost moved this from Extended Testing (optional) to Changes Requested in Pull Requests Dashboard May 21, 2020
@ghost ghost assigned VladimirZaets May 21, 2020
@ptylek
Copy link
Contributor Author

ptylek commented May 21, 2020

Hi @ptylek . Thanks for collaboration. Due to Magento Definition of Done all code must be covered by tests. In this case, I think it can be covered by an integration test. Can you do it?

@VladimirZaets I didn't know how to approach this issue with tests. I asked @lbajsarowicz and he advised

I would like to cover that with tests, but actually both footers are slightly different and it does not make sense to cover this specific case.

If there are any issues, maybe this change can be marked as cleanup.

@VladimirZaets
Copy link
Contributor

@magento create issue

@ghost ghost moved this from Changes Requested to Ready for Testing in Pull Requests Dashboard May 29, 2020
@VladimirZaets VladimirZaets added QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope and removed QA: Ready to add to Regression Scope Should be analyzed and added to Regression Testing Scope(if applicable) labels May 29, 2020
@VladimirZaets VladimirZaets moved this from Ready for Testing to Testing in Progress in Pull Requests Dashboard May 29, 2020
@VladimirZaets VladimirZaets moved this from Testing in Progress to Merge in Progress in Pull Requests Dashboard May 29, 2020
@magento-engcom-team
Copy link
Contributor

Hi @VladimirZaets, thank you for the review.
ENGCOM-7177 has been created to process this Pull Request

@magento-engcom-team magento-engcom-team merged commit c7c0a8c into magento:2.4-develop Jun 5, 2020
@m2-assistant
Copy link

m2-assistant bot commented Jun 5, 2020

Hi @ptylek, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

@ghost ghost moved this from Merge in Progress to Recently Merged in Pull Requests Dashboard Jun 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: Frontend Auto-Tests: Not Required Changes in Pull Request does not require coverage by auto-tests Component: Customer Event: Global-Contribution-Day Partner: creativestyle partners-contribution Pull Request is created by Magento Partner Priority: P3 May be fixed according to the position in the backlog. Progress: accept QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope Release Line: 2.4 Severity: S3 Affects non-critical data or functionality and does not force users to employ a workaround.
Projects
Pull Requests Dashboard
  
Recently Merged
Development

Successfully merging this pull request may close these issues.

[Issue] Fix duplicated footer in Magento_Customer emails
8 participants