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.

Sign up for GitHub

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

Jump to bottom

mail-template - don't show hyphen if slogan is empty #27595

Merged
merged 3 commits into from
Jun 22, 2021
Merged

mail-template - don't show hyphen if slogan is empty #27595

merged 3 commits into from
Jun 22, 2021

Conversation

szaimen
Copy link
Contributor

@szaimen szaimen commented Jun 22, 2021

Fix #25174
Signed-off-by: szaimen [email protected]

@szaimen szaimen added the 2. developing Work in progress label Jun 22, 2021
@szaimen szaimen added this to the Nextcloud 22 milestone Jun 22, 2021
@szaimen szaimen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 22, 2021
@szaimen
Copy link
Contributor Author

szaimen commented Jun 22, 2021

The test failures are unrelated, afaics.
@nextcloud/server please review

@szaimen szaimen added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jun 22, 2021
@LukasReschke
Copy link
Member

@szaimen I don't think they are all unrelated. Check https://drone.nextcloud.com/nextcloud/server/6463/9/4

-				<p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud - <br>This is an automatically sent email, please do not reply.</p>\n
157 | +				<p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud<br>This is an automatically sent email, please do not reply.</p>\n
158

<br class="Apple-interchange-newline">

@szaimen
Copy link
Contributor Author

szaimen commented Jun 22, 2021

@szaimen I don't think they are all unrelated. Check https://drone.nextcloud.com/nextcloud/server/6463/9/4

-				<p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud - <br>This is an automatically sent email, please do not reply.</p>\n
157 | +				<p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud<br>This is an automatically sent email, please do not reply.</p>\n
158

<br class="Apple-interchange-newline">

Thanks! in which file does this test need to be adjusted?

@szaimen szaimen added 2. developing Work in progress feature: emails needs info and removed 4. to release Ready to be released and/or waiting for tests to finish labels Jun 22, 2021
@LukasReschke
Copy link
Member

Should be the following as per Drone output:

  • /drone/src/apps/settings/tests/Mailer/NewUserMailHelperTest.php:384
  • /drone/src/apps/settings/tests/Mailer/NewUserMailHelperTest.php:835
  • /drone/src/apps/settings/tests/Mailer/NewUserMailHelperTest.php:616

(the drone UI is a bit unintuitive with failures as the errors are only shown at top in the text)

@szaimen
Copy link
Contributor Author

szaimen commented Jun 22, 2021

Thanks! I'll have a look.

@szaimen
Copy link
Contributor Author

szaimen commented Jun 22, 2021

I was able to fix the NewUserMailHelperTest test :)

@szaimen szaimen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 22, 2021
@LukasReschke
Copy link
Member

Error looks indeed unrelated now :)

@LukasReschke LukasReschke merged commit 1c8f5cb into master Jun 22, 2021
@LukasReschke LukasReschke deleted the enh/25174/hide-hyphen-if-slogan-is-empty branch June 22, 2021 15:53
@blizzz blizzz mentioned this pull request Jun 23, 2021
Merged
39 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Pytal Pytal Pytal approved these changes

@artonge artonge artonge approved these changes

@LukasReschke LukasReschke LukasReschke approved these changes

Assignees
No one assigned
Labels
3. to review Waiting for reviews feature: emails needs info
Projects
None yet
Milestone
Nextcloud 22
Development

Successfully merging this pull request may close these issues.

Hyphen is shown after instance name in email footer, even when slogan is undefined or empty
4 participants
@szaimen @LukasReschke @artonge @Pytal