diff --git a/apps/settings/tests/Mailer/NewUserMailHelperTest.php b/apps/settings/tests/Mailer/NewUserMailHelperTest.php index 74fc1f7a7f54a..3744173f53209 100644 --- a/apps/settings/tests/Mailer/NewUserMailHelperTest.php +++ b/apps/settings/tests/Mailer/NewUserMailHelperTest.php @@ -180,30 +180,30 @@ public function testGenerateTemplateWithPasswordResetToken() { $expectedHtmlBody = << - + - + - + - +
-
-
+
+
-
- +
+ -
+ -
+
@@ -219,14 +219,14 @@ public function testGenerateTemplateWithPasswordResetToken() {
- +
  
- @@ -234,32 +234,25 @@ public function testGenerateTemplateWithPasswordResetToken() {
-

Welcome aboard

+ 		+

Welcome aboard
- +
  
-
- +
+ -
- - - - - - -
 
+
- @@ -268,13 +261,13 @@ public function testGenerateTemplateWithPasswordResetToken() {
+ - - +
-

Welcome to your TestCloud account, you can add, protect, and share your data.

+ 		+

Welcome to your TestCloud account, you can add, protect, and share your data.
- @@ -283,25 +276,25 @@ public function testGenerateTemplateWithPasswordResetToken() {
+ - - +
-

Your username is: john

+ 		+

Your username is: john
- +
  
- @@ -339,22 +332,22 @@ public function testGenerateTemplateWithPasswordResetToken() {
+ - - +
+
-
+ -
- Set your password + + Set your password
@@ -310,11 +303,11 @@ public function testGenerateTemplateWithPasswordResetToken() {
-
+ -
- Install Client + + Install Client
@@ -323,7 +316,7 @@ public function testGenerateTemplateWithPasswordResetToken() {
- +
  
- @@ -366,6 +359,7 @@ public function testGenerateTemplateWithPasswordResetToken() {
                                                           
+ EOF; $expectedTextBody = << - + - + - + -
+
- +
  
-

TestCloud -
This is an automatically sent email, please do not reply.

+

TestCloud -
This is an automatically sent email, please do not reply.
+
-
-
+
+
-
- +
+ -
+ -
+
@@ -456,14 +450,14 @@ public function testGenerateTemplateWithoutPasswordResetToken() {
- +
  
- @@ -471,32 +465,25 @@ public function testGenerateTemplateWithoutPasswordResetToken() {
-

Welcome aboard John Doe

+ 		+

Welcome aboard John Doe
- +
  
-
- +
+ -
- - - - - - -
 
+
- @@ -505,13 +492,13 @@ public function testGenerateTemplateWithoutPasswordResetToken() {
+ - - +
-

Welcome to your TestCloud account, you can add, protect, and share your data.

+ 		+

Welcome to your TestCloud account, you can add, protect, and share your data.
- @@ -520,25 +507,25 @@ public function testGenerateTemplateWithoutPasswordResetToken() {
+ - - +
-

Your username is: john

+ 		+

Your username is: john
- +
  
- @@ -576,22 +563,22 @@ public function testGenerateTemplateWithoutPasswordResetToken() {
+ - - +
+
-
+ -
- Go to TestCloud + + Go to TestCloud
@@ -547,11 +534,11 @@ public function testGenerateTemplateWithoutPasswordResetToken() {
-
+ -
- Install Client + + Install Client
@@ -560,7 +547,7 @@ public function testGenerateTemplateWithoutPasswordResetToken() {
- +
  
- @@ -603,6 +590,7 @@ public function testGenerateTemplateWithoutPasswordResetToken() {
                                                           
+ EOF; $expectedTextBody = << - + - + - + -
+
- +
  
-

TestCloud -
This is an automatically sent email, please do not reply.

+

TestCloud -
This is an automatically sent email, please do not reply.
+
-
-
+
+
-
- +
+ -
+ -
+
@@ -697,14 +685,14 @@ public function testGenerateTemplateWithoutUserId() {
- +
  
- @@ -712,32 +700,25 @@ public function testGenerateTemplateWithoutUserId() {
-

Welcome aboard John Doe

+ 		+

Welcome aboard John Doe
- +
  
-
- +
+ -
- - - - - - -
 
+
- @@ -746,25 +727,25 @@ public function testGenerateTemplateWithoutUserId() {
+ - - +
-

Welcome to your TestCloud account, you can add, protect, and share your data.

+ 		+

Welcome to your TestCloud account, you can add, protect, and share your data.
- +
  
- @@ -802,22 +783,22 @@ public function testGenerateTemplateWithoutUserId() {
+ - - +
+
-
+ -
- Go to TestCloud + + Go to TestCloud
@@ -773,11 +754,11 @@ public function testGenerateTemplateWithoutUserId() {
-
+ -
- Install Client + + Install Client
@@ -786,7 +767,7 @@ public function testGenerateTemplateWithoutUserId() {
- +
  
- @@ -829,6 +810,7 @@ public function testGenerateTemplateWithoutUserId() {
                                                           
+ EOF; $expectedTextBody = << - + - + - + -
+
- +
  
-

TestCloud -
This is an automatically sent email, please do not reply.

+

TestCloud -
This is an automatically sent email, please do not reply.
+
-
+
EOF; @@ -103,20 +103,21 @@ class EMailTemplate implements IEMailTemplate {
                                                           
+ EOF; protected $header = << + -
- +
+ - -
+ -
+
@@ -132,7 +133,7 @@ class EMailTemplate implements IEMailTemplate {
- +
  
@@ -142,8 +143,8 @@ class EMailTemplate implements IEMailTemplate { - @@ -151,7 +152,7 @@ class EMailTemplate implements IEMailTemplate {
-

%s

+ 		+

%s
- +
  
@@ -160,31 +161,24 @@ class EMailTemplate implements IEMailTemplate { protected $bodyBegin = <<
- +
+ - - @@ -198,19 +192,19 @@ class EMailTemplate implements IEMailTemplate {
- - - - - - -
 
+ 		EOF; protected $bodyText = <<
+ - - +
-

%s

+ 		+

%s
-
+ EOF; protected $listItem = << - - - + EOF; @@ -226,25 +220,25 @@ class EMailTemplate implements IEMailTemplate {
-

%s

+ 		+

%s

 -

%s

+ 		+

%s
- +
  
- @@ -279,25 +273,25 @@ class EMailTemplate implements IEMailTemplate {
+ - - +
+
-
+ -
- %7\$s + + %7\$s
@@ -253,11 +247,11 @@ class EMailTemplate implements IEMailTemplate {
-
+ -
- %9\$s + + %9\$s
@@ -266,7 +260,7 @@ class EMailTemplate implements IEMailTemplate {
- +
  
- @@ -330,22 +324,22 @@ class EMailTemplate implements IEMailTemplate {
+ - - +
+
-
+ -
- %7\$s + + %7\$s
@@ -306,7 +300,7 @@ class EMailTemplate implements IEMailTemplate {
- +
  
- diff --git a/tests/data/emails/new-account-email-custom.html b/tests/data/emails/new-account-email-custom.html index 9165a581d487c..ec88e309cf867 100644 --- a/tests/data/emails/new-account-email-custom.html +++ b/tests/data/emails/new-account-email-custom.html @@ -1,28 +1,28 @@ - + - + - + -
+
- +
  
-

%s

+

%s
+
-
-
+
+
-
- +
+ -
+ -
+
@@ -38,14 +38,14 @@
- +
  
- @@ -53,32 +53,25 @@

- +
-

Welcome aboard

+ 		+

Welcome aboard
  
-
- +
+ -
- - - - - - -
 
+
- @@ -87,13 +80,13 @@

- @@ -102,25 +95,25 @@

- +
+ - - +
-

Welcome to your Nextcloud account, you can add, protect, and share your data.

+ 		+

Welcome to your Nextcloud account, you can add, protect, and share your data.
+ - - +
-

Your username is: abc

+ 		+

Your username is: abc
  
-
+ - @@ -158,22 +151,22 @@

- +
+
- -
+ -
- Set your password + + Set your password
@@ -129,11 +122,11 @@

+ -
- Install Client + + Install Client
@@ -142,7 +135,7 @@

+

  
- @@ -184,4 +177,4 @@

                                                            - \ No newline at end of file + diff --git a/tests/data/emails/new-account-email-single-button.html b/tests/data/emails/new-account-email-single-button.html index d1ce4a1e85730..13e0c036c3e45 100644 --- a/tests/data/emails/new-account-email-single-button.html +++ b/tests/data/emails/new-account-email-single-button.html @@ -1,28 +1,28 @@ - + - + - + -

+
- +
  
-

TestCloud - A safe home for your data

+

TestCloud - A safe home for your data
+
-
-
+
+
-
- +
+ -
+ -
+
@@ -38,14 +38,14 @@
- +
  
- @@ -53,32 +53,25 @@

- +
-

Welcome aboard

+ 		+

Welcome aboard
  
-
- +
+ -
- - - - - - -
 
+
- @@ -87,13 +80,13 @@

- @@ -102,25 +95,25 @@

- +
+ - - +
-

Welcome to your Nextcloud account, you can add, protect, and share your data.

+ 		+

Welcome to your Nextcloud account, you can add, protect, and share your data.
+ - - +
-

Your username is: abc

+ 		+

Your username is: abc
  
-
+ - @@ -145,22 +138,22 @@

- +
+
-
+ -
- Set your password + + Set your password
@@ -129,7 +122,7 @@

+

  
- @@ -171,4 +164,4 @@

                                                            - \ No newline at end of file + diff --git a/tests/data/emails/new-account-email.html b/tests/data/emails/new-account-email.html index 82bea5275184d..84ee18479e4ca 100644 --- a/tests/data/emails/new-account-email.html +++ b/tests/data/emails/new-account-email.html @@ -1,28 +1,28 @@ - + - + - + -

+
- +
  
-

TestCloud - A safe home for your data

+

TestCloud - A safe home for your data
+
-
-
+
+
-
- +
+ -
+ -
+
@@ -38,14 +38,14 @@
- +
  
- @@ -53,32 +53,25 @@

- +
-

Welcome aboard

+ 		+

Welcome aboard
  
-
- +
+ -
- - - - - - -
 
+
- @@ -87,13 +80,13 @@

- @@ -102,25 +95,25 @@

- +
+ - - +
-

Welcome to your Nextcloud account, you can add, protect, and share your data.

+ 		+

Welcome to your Nextcloud account, you can add, protect, and share your data.
+ - - +
-

Your username is: abc

+ 		+

Your username is: abc
  
-
+ - @@ -158,22 +151,22 @@

- +
+
- -
+ -
- Set your password + + Set your password
@@ -129,11 +122,11 @@

+ -
- Install Client + + Install Client
@@ -142,7 +135,7 @@

+

  
- @@ -184,4 +177,4 @@

                                                            - \ No newline at end of file +

+
- +
  
-

TestCloud - A safe home for your data
This is an automatically sent email, please do not reply.

+

TestCloud - A safe home for your data
This is an automatically sent email, please do not reply.