summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-04-18 17:09:25 -0500
committerMorris Jobke <hey@morrisjobke.de>2017-04-19 15:46:41 -0500
commit16c4755e03f2a79437418a732cb8a6cfb5178cf9 (patch)
treef44d220f06e497be12d9e91c07ec8e32f3c72ec6 /tests
parent01c9d00e1d6f5c558cade0689283fea953b3f581 (diff)
downloadnextcloud-server-16c4755e03f2a79437418a732cb8a6cfb5178cf9.tar.gz
nextcloud-server-16c4755e03f2a79437418a732cb8a6cfb5178cf9.zip
Rename renderHTML to renderHtml
* fixes #4383 * improves consistency Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'tests')
-rw-r--r--tests/Core/Controller/LostControllerTest.php6
-rw-r--r--tests/Settings/Mailer/NewUserMailHelperTest.php6
-rw-r--r--tests/lib/Mail/EMailTemplateTest.php8
3 files changed, 10 insertions, 10 deletions
diff --git a/tests/Core/Controller/LostControllerTest.php b/tests/Core/Controller/LostControllerTest.php
index ab3f022c971..d7d9094c485 100644
--- a/tests/Core/Controller/LostControllerTest.php
+++ b/tests/Core/Controller/LostControllerTest.php
@@ -329,7 +329,7 @@ class LostControllerTest extends \Test\TestCase {
->with(['lostpassword-noreply@localhost' => null]);
$emailTemplate = $this->createMock(IEMailTemplate::class);
$emailTemplate->expects($this->any())
- ->method('renderHTML')
+ ->method('renderHtml')
->willReturn('HTML body');
$emailTemplate->expects($this->any())
->method('renderText')
@@ -416,7 +416,7 @@ class LostControllerTest extends \Test\TestCase {
->with(['lostpassword-noreply@localhost' => null]);
$emailTemplate = $this->createMock(IEMailTemplate::class);
$emailTemplate->expects($this->any())
- ->method('renderHTML')
+ ->method('renderHtml')
->willReturn('HTML body');
$emailTemplate->expects($this->any())
->method('renderText')
@@ -497,7 +497,7 @@ class LostControllerTest extends \Test\TestCase {
->with(['lostpassword-noreply@localhost' => null]);
$emailTemplate = $this->createMock(IEMailTemplate::class);
$emailTemplate->expects($this->any())
- ->method('renderHTML')
+ ->method('renderHtml')
->willReturn('HTML body');
$emailTemplate->expects($this->any())
->method('renderText')
diff --git a/tests/Settings/Mailer/NewUserMailHelperTest.php b/tests/Settings/Mailer/NewUserMailHelperTest.php
index 7cf6c635360..fee47625cfd 100644
--- a/tests/Settings/Mailer/NewUserMailHelperTest.php
+++ b/tests/Settings/Mailer/NewUserMailHelperTest.php
@@ -354,7 +354,7 @@ This is an automatically sent email, please do not reply.
EOF;
$result = $this->newUserMailHelper->generateTemplate($user, true);
- $this->assertEquals($expectedHtmlBody, $result->renderHTML());
+ $this->assertEquals($expectedHtmlBody, $result->renderHtml());
$this->assertEquals($expectedTextBody, $result->renderText());
$this->assertSame('OC\Mail\EMailTemplate', get_class($result));
}
@@ -587,7 +587,7 @@ This is an automatically sent email, please do not reply.
EOF;
$result = $this->newUserMailHelper->generateTemplate($user, false);
- $this->assertEquals($expectedHtmlBody, $result->renderHTML());
+ $this->assertEquals($expectedHtmlBody, $result->renderHtml());
$this->assertEquals($expectedTextBody, $result->renderText());
$this->assertSame('OC\Mail\EMailTemplate', get_class($result));
}
@@ -621,7 +621,7 @@ EOF;
$message
->expects($this->at(2))
->method('setHtmlBody')
- ->with($emailTemplate->renderHTML());
+ ->with($emailTemplate->renderHtml());
$message
->expects($this->at(3))
->method('setPlainBody')
diff --git a/tests/lib/Mail/EMailTemplateTest.php b/tests/lib/Mail/EMailTemplateTest.php
index 450c007149c..08af56453ab 100644
--- a/tests/lib/Mail/EMailTemplateTest.php
+++ b/tests/lib/Mail/EMailTemplateTest.php
@@ -85,7 +85,7 @@ class EMailTemplateTest extends TestCase {
);
$expectedHTML = file_get_contents(\OC::$SERVERROOT . '/tests/data/emails/new-account-email.html');
- $this->assertSame($expectedHTML, $this->emailTemplate->renderHTML());
+ $this->assertSame($expectedHTML, $this->emailTemplate->renderHtml());
$expectedTXT = file_get_contents(\OC::$SERVERROOT . '/tests/data/emails/new-account-email.txt');
$this->assertSame($expectedTXT, $this->emailTemplate->renderText());
}
@@ -124,7 +124,7 @@ class EMailTemplateTest extends TestCase {
$this->emailTemplate->addFooter();
$expectedHTML = file_get_contents(\OC::$SERVERROOT . '/tests/data/emails/new-account-email-custom.html');
- $this->assertSame($expectedHTML, $this->emailTemplate->renderHTML());
+ $this->assertSame($expectedHTML, $this->emailTemplate->renderHtml());
$expectedTXT = file_get_contents(\OC::$SERVERROOT . '/tests/data/emails/new-account-email-custom.txt');
$this->assertSame($expectedTXT, $this->emailTemplate->renderText());
}
@@ -163,7 +163,7 @@ class EMailTemplateTest extends TestCase {
$this->emailTemplate->addFooter();
$expectedHTML = file_get_contents(\OC::$SERVERROOT . '/tests/data/emails/new-account-email-single-button.html');
- $this->assertSame($expectedHTML, $this->emailTemplate->renderHTML());
+ $this->assertSame($expectedHTML, $this->emailTemplate->renderHtml());
$expectedTXT = file_get_contents(\OC::$SERVERROOT . '/tests/data/emails/new-account-email-single-button.txt');
$this->assertSame($expectedTXT, $this->emailTemplate->renderText());
}
@@ -205,7 +205,7 @@ class EMailTemplateTest extends TestCase {
$this->emailTemplate->addFooter();
$expectedHTML = file_get_contents(\OC::$SERVERROOT . '/tests/data/emails/new-account-email-custom.html');
- $this->assertSame($expectedHTML, $this->emailTemplate->renderHTML());
+ $this->assertSame($expectedHTML, $this->emailTemplate->renderHtml());
$expectedTXT = file_get_contents(\OC::$SERVERROOT . '/tests/data/emails/new-account-email-custom-text-alternative.txt');
$this->assertSame($expectedTXT, $this->emailTemplate->renderText());
}