Skip to content

Commit

Permalink
Update method names to refer specifically to body part of the message…
Browse files Browse the repository at this point in the history
… rather than the whole message itself.
  • Loading branch information
kevinsmith committed Mar 24, 2015
1 parent 0fb02ca commit fd9784d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions src/Fetch/Message.php
Expand Up @@ -374,19 +374,19 @@ public function getMessageBody($html = false)
}

/**
* This function returns the plain text version of the email or false if not present.
* This function returns the plain text body of the email or false if not present.
* @return string|bool Returns false if not present
*/
public function getPlainTextMessage()
public function getPlainTextBody()
{
return isset($this->plaintextMessage) ? $this->plaintextMessage : false;
}

/**
* This function returns the HTML version of the email or false if not present.
* This function returns the HTML body of the email or false if not present.
* @return string|bool Returns false if not present
*/
public function getHtmlMessage()
public function getHtmlBody()
{
return isset($this->htmlMessage) ? $this->htmlMessage : false;
}
Expand Down
14 changes: 7 additions & 7 deletions tests/Fetch/Test/MessageTest.php
Expand Up @@ -77,39 +77,39 @@ public function testGetMessageBody()

}

public function testGetPlainTextMessage()
public function testGetPlainTextBody()
{
// easiest way to deal with php encoding issues is simply not to.
$plaintextTest1 = 'f9377a89c9c935463a2b35c92dd61042';
$plaintextTest2 = '0b8fc9b534a1789f1071f996f238a07a';
$plaintextTest3 = 'd41d8cd98f00b204e9800998ecf8427e';

$message = static::getMessage(3);
$messagePlainText = $message->getPlainTextMessage();
$messagePlainText = $message->getPlainTextBody();
$this->assertEquals($plaintextTest1, md5($messagePlainText), 'Message returns as plaintext.');

$message = static::getMessage(4);
$messagePlainText = $message->getPlainTextMessage();
$messagePlainText = $message->getPlainTextBody();
$this->assertEquals($plaintextTest2, md5($messagePlainText), 'Message returns as plaintext.');

$message = static::getMessage(6);
$messagePlainText = $message->getPlainTextMessage();
$messagePlainText = $message->getPlainTextBody();
$this->assertEquals($plaintextTest3, md5($messagePlainText), 'Message does not return as plaintext.');

}

public function testGetHtmlMessage()
public function testGetHtmlBody()
{
// easiest way to deal with php encoding issues is simply not to.
$HtmlTest1 = 'd41d8cd98f00b204e9800998ecf8427e';
$HtmlTest2 = '6a366ddecf080199284146d991d52169';

$message = static::getMessage(3);
$messageHtml = $message->getHtmlMessage();
$messageHtml = $message->getHtmlBody();
$this->assertEquals($HtmlTest1, md5($messageHtml), 'Message does not return as HTML.');

$message = static::getMessage(4);
$messageHtml = $message->getHtmlMessage();
$messageHtml = $message->getHtmlBody();
$this->assertEquals($HtmlTest2, md5($messageHtml), 'Message returns as HTML.');

}
Expand Down

0 comments on commit fd9784d

Please sign in to comment.