updated core to 7.73
This commit is contained in:
@@ -38,7 +38,7 @@ class MailTestCase extends DrupalWebTestCase implements MailSystemInterface {
|
||||
$message = drupal_mail('simpletest', 'mail_test', 'testing@example.com', $language);
|
||||
|
||||
// Assert whether the message was sent through the send function.
|
||||
$this->assertEqual(self::$sent_message['to'], 'testing@example.com', t('Pluggable mail system is extendable.'));
|
||||
$this->assertEqual(self::$sent_message['to'], 'testing@example.com', 'Pluggable mail system is extendable.');
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -267,6 +267,31 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase {
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that drupal_wrap_mail() removes trailing whitespace before newlines.
|
||||
*/
|
||||
function testDrupalHtmltoTextRemoveTrailingWhitespace() {
|
||||
$text = "Hi there! \nHerp Derp";
|
||||
$mail_lines = explode("\n", drupal_wrap_mail($text));
|
||||
$this->assertNotEqual(" ", substr($mail_lines[0], -1), 'Trailing whitespace removed.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests drupal_wrap_mail() retains whitespace from Usenet style signatures.
|
||||
*
|
||||
* RFC 3676 says, "This is a special case; an (optionally quoted or quoted and
|
||||
* stuffed) line consisting of DASH DASH SP is neither fixed nor flowed."
|
||||
*/
|
||||
function testDrupalHtmltoTextUsenetSignature() {
|
||||
$text = "Hi there!\n-- \nHerp Derp";
|
||||
$mail_lines = explode("\n", drupal_wrap_mail($text));
|
||||
$this->assertEqual("-- ", $mail_lines[1], 'Trailing whitespace not removed for dash-dash-space signatures.');
|
||||
|
||||
$text = "Hi there!\n-- \nHerp Derp";
|
||||
$mail_lines = explode("\n", drupal_wrap_mail($text));
|
||||
$this->assertEqual("--", $mail_lines[1], 'Trailing whitespace removed for incorrect dash-dash-space signatures.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that whitespace is collapsed.
|
||||
*/
|
||||
@@ -416,7 +441,7 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase {
|
||||
* <CRLF> is 1000 characters."
|
||||
*/
|
||||
function testVeryLongLineWrap() {
|
||||
$input = 'Drupal<br /><p>' . str_repeat('x', 2100) . '</><br />Drupal';
|
||||
$input = 'Drupal<br /><p>' . str_repeat('x', 2100) . '</p><br />Drupal';
|
||||
$output = drupal_html_to_text($input);
|
||||
// This awkward construct comes from includes/mail.inc lines 8-13.
|
||||
$eol = variable_get('mail_line_endings', MAIL_LINE_ENDINGS);
|
||||
@@ -430,7 +455,6 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase {
|
||||
$maximum_line_length = max($maximum_line_length, strlen($line . $eol));
|
||||
}
|
||||
$verbose = 'Maximum line length found was ' . $maximum_line_length . ' octets.';
|
||||
// @todo This should assert that $maximum_line_length <= 1000.
|
||||
$this->pass($verbose);
|
||||
$this->assertTrue($maximum_line_length <= 1000, $verbose);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user