Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-04-18 11:34:04 +0300
committerGitHub <noreply@github.com>2020-04-18 11:34:04 +0300
commitad603fd13afaf6bfc80e78c2a141b439a403cbd6 (patch)
treeac50bbfd18da93ef47753c98192fc2e64430a36c
parent148bdabd580d4ff055217649c40dbb3309830267 (diff)
parent2fc35d10e4abf4d54397ff98ae680e3d01699a45 (diff)
Merge pull request #20540 from nextcloud/fix/mail-test
Fix mailer test
-rw-r--r--apps/settings/tests/Mailer/NewUserMailHelperTest.php12
-rw-r--r--tests/data/emails/new-account-email-single-button.html2
2 files changed, 7 insertions, 7 deletions
diff --git a/apps/settings/tests/Mailer/NewUserMailHelperTest.php b/apps/settings/tests/Mailer/NewUserMailHelperTest.php
index 42ffff2de6b..202e1278a85 100644
--- a/apps/settings/tests/Mailer/NewUserMailHelperTest.php
+++ b/apps/settings/tests/Mailer/NewUserMailHelperTest.php
@@ -377,8 +377,8 @@ Set your password: https://example.com/resetPassword/MySuperLongSecureRandomToke
Install Client: https://nextcloud.com/install/#install-clients
---
-TestCloud -
+--
+TestCloud -
This is an automatically sent email, please do not reply.
EOF;
@@ -614,8 +614,8 @@ Go to TestCloud: https://example.com/
Install Client: https://nextcloud.com/install/#install-clients
---
-TestCloud -
+--
+TestCloud -
This is an automatically sent email, please do not reply.
EOF;
@@ -838,8 +838,8 @@ Go to TestCloud: https://example.com/
Install Client: https://nextcloud.com/install/#install-clients
---
-TestCloud -
+--
+TestCloud -
This is an automatically sent email, please do not reply.
EOF;
diff --git a/tests/data/emails/new-account-email-single-button.html b/tests/data/emails/new-account-email-single-button.html
index 279822e21cc..d1ce4a1e857 100644
--- a/tests/data/emails/new-account-email-single-button.html
+++ b/tests/data/emails/new-account-email-single-button.html
@@ -114,7 +114,7 @@
<tr style="padding:0;text-align:left;vertical-align:top">
<th style="Margin:0;color:#0a0a0a;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left">
<center data-parsed="" style="min-width:490px;width:100%">
- <table class="button btn default primary float-center" style="Margin:0;border-collapse:collapse;border-spacing:0;display:inline-block;float:none;margin:0;max-height:40px;padding:0;text-align:center;vertical-align:top;width:auto;background:#0082c9;color:#fefefe;background-color:#0082c9;">
+ <table class="button btn default primary float-center" style="Margin:0;border-collapse:collapse;border-spacing:0;display:inline-block;float:none;margin:0;max-height:60px;padding:0;text-align:center;vertical-align:top;width:auto;background:#0082c9;color:#fefefe;background-color:#0082c9;">
<tr style="padding:0;text-align:left;vertical-align:top">
<td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word">
<table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%">