From ae4c2893a218461099d01071faf64ede78f9bc40 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 12 Apr 2017 12:34:42 -0500 Subject: [PATCH] Fix unit tests Signed-off-by: Morris Jobke --- .../Settings/Mailer/NewUserMailHelperTest.php | 20 ++++++++++--------- ...-account-email-custom-text-alternative.txt | 3 ++- .../data/emails/new-account-email-custom.txt | 3 ++- .../new-account-email-single-button.txt | 3 ++- tests/data/emails/new-account-email.txt | 3 ++- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/tests/Settings/Mailer/NewUserMailHelperTest.php b/tests/Settings/Mailer/NewUserMailHelperTest.php index ef9dae8766..707abe9588 100644 --- a/tests/Settings/Mailer/NewUserMailHelperTest.php +++ b/tests/Settings/Mailer/NewUserMailHelperTest.php @@ -144,7 +144,7 @@ class NewUserMailHelperTest extends TestCase { ->method('getUID') ->willReturn('john'); $this->defaults - ->expects($this->at(0)) + ->expects($this->any()) ->method('getName') ->willReturn('TestCloud'); @@ -174,7 +174,7 @@ class NewUserMailHelperTest extends TestCase {
- +
@@ -227,7 +227,7 @@ class NewUserMailHelperTest extends TestCase { @@ -324,7 +324,7 @@ class NewUserMailHelperTest extends TestCase {
-

You have now an account, you can add, protect, and share your data.

+

You have now an TestCloud account, you can add, protect, and share your data.
-

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

+

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

@@ -340,15 +340,16 @@ EOF; $expectedTextBody = <<
- +
@@ -579,7 +580,8 @@ Your username is: john Go to TestCloud: https://example.com/ Install Client: https://nextcloud.com/install/#install-clients --- + +-- TestCloud - This is an automatically generated email, please do not reply. EOF; diff --git a/tests/data/emails/new-account-email-custom-text-alternative.txt b/tests/data/emails/new-account-email-custom-text-alternative.txt index bcbc663217..9f02563edf 100644 --- a/tests/data/emails/new-account-email-custom-text-alternative.txt +++ b/tests/data/emails/new-account-email-custom-text-alternative.txt @@ -7,5 +7,6 @@ Your username is: abc Set your password - text: https://example.org/resetPassword/123 Install Client - text: https://nextcloud.com/install/#install-clients --- + +-- TestCloud - A safe home for your data diff --git a/tests/data/emails/new-account-email-custom.txt b/tests/data/emails/new-account-email-custom.txt index 962128980e..e849c73d94 100644 --- a/tests/data/emails/new-account-email-custom.txt +++ b/tests/data/emails/new-account-email-custom.txt @@ -7,5 +7,6 @@ Your username is: abc Set your password: https://example.org/resetPassword/123 Install Client: https://nextcloud.com/install/#install-clients --- + +-- TestCloud - A safe home for your data diff --git a/tests/data/emails/new-account-email-single-button.txt b/tests/data/emails/new-account-email-single-button.txt index b93321f8c9..5595496140 100644 --- a/tests/data/emails/new-account-email-single-button.txt +++ b/tests/data/emails/new-account-email-single-button.txt @@ -5,5 +5,6 @@ You have now an Nextcloud account, you can add, protect, and share your data. Your username is: abc Set your password: https://example.org/resetPassword/123 --- + +-- TestCloud - A safe home for your data diff --git a/tests/data/emails/new-account-email.txt b/tests/data/emails/new-account-email.txt index 6732d806d7..e01268b562 100644 --- a/tests/data/emails/new-account-email.txt +++ b/tests/data/emails/new-account-email.txt @@ -7,6 +7,7 @@ Your username is: abc Set your password: https://example.org/resetPassword/123 Install Client: https://nextcloud.com/install/#install-clients --- + +-- TestCloud - A safe home for your data This is an automatically generated email, please do not reply. \ No newline at end of file