Patch for ticket #1216. Move the values that were in the sendmail config file and store them as gallery module variables. Requires a version number bump to 37.

This commit is contained in:
Tim Almdal
2010-08-31 20:45:09 -07:00
parent 438cea231d
commit e09c6dbd5e
5 changed files with 35 additions and 41 deletions
+10 -6
View File
@@ -23,9 +23,10 @@ class Sendmail_Test extends Gallery_Unit_Test_Case {
}
public function sendmail_test() {
$domain = Input::instance()->server("HTTP_HOST");
$expected = "To: receiver@someemail.com\r\n" .
"From: from@gallery3.com\n" .
"Reply-To: public@gallery3.com\r\n" .
"Reply-To: public@$domain\r\n" .
"Subject: Test Email Unit test\r\n\r\n" .
"The mail message body";
$result = Sendmail_For_Test::factory()
@@ -45,8 +46,9 @@ class Sendmail_Test extends Gallery_Unit_Test_Case {
}
public function sendmail_reply_to_test() {
$domain = Input::instance()->server("HTTP_HOST");
$expected = "To: receiver@someemail.com\r\n" .
"From: from@gallery3.com\n" .
"From: admin@$domain\n" .
"Reply-To: reply-to@gallery3.com\r\n" .
"Subject: Test Email Unit test\r\n\r\n" .
"The mail message body";
@@ -61,9 +63,10 @@ class Sendmail_Test extends Gallery_Unit_Test_Case {
}
public function sendmail_html_message_test() {
$domain = Input::instance()->server("HTTP_HOST");
$expected = "To: receiver@someemail.com\r\n" .
"From: from@gallery3.com\n" .
"Reply-To: public@gallery3.com\n" .
"From: admin@$domain\n" .
"Reply-To: public@$domain\n" .
"MIME-Version: 1.0\n" .
"Content-Type: text/html; charset=UTF-8\r\n" .
"Subject: Test Email Unit test\r\n\r\n" .
@@ -80,9 +83,10 @@ class Sendmail_Test extends Gallery_Unit_Test_Case {
}
public function sendmail_wrapped_message_test() {
$domain = Input::instance()->server("HTTP_HOST");
$expected = "To: receiver@someemail.com\r\n" .
"From: from@gallery3.com\n" .
"Reply-To: public@gallery3.com\r\n" .
"From: admin@$domain\n" .
"Reply-To: public@$domain\r\n" .
"Subject: Test Email Unit test\r\n\r\n" .
"This is a long message that needs to go\n" .
"over forty characters If we get lucky we\n" .