Item14563: Fix password unit tests

The email address names are quoted by some versions of Perl Email::Address Also, an email address has to be set to test the email functions. Revert accidental changes to WebStatistcs.
foswiki · Mar 6, 2018 · cf182b6 · cf182b6
1 parent d48cfbe
commit cf182b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/PasswordManagementPlugin/test/unit/PasswordManagementPlugin/PasswordManagementResetTests.pm b/PasswordManagementPlugin/test/unit/PasswordManagementPlugin/PasswordManagementResetTests.pm
@@ -56,6 +56,7 @@ sub loadExtraConfig {
     my ( $this, $context, @args ) = @_;
     $this->SUPER::loadExtraConfig( $context, @args );
     $Foswiki::cfg{EnableEmail} = 1;
+    $Foswiki::cfg{WebMasterEmail} = 'dummyaddr@foswiki.org';
 
     return;
 }
@@ -111,7 +112,7 @@ sub test_resetPasswordOkay {
     $this->assert_equals( 1, scalar(@FoswikiFnTestCase::mails) );
     my $mess = $FoswikiFnTestCase::mails[0];
     $this->assert_matches(
-        qr/$Foswiki::cfg{WebMasterName} <$Foswiki::cfg{WebMasterEmail}>/,
+        qr/"?$Foswiki::cfg{WebMasterName}"? <$Foswiki::cfg{WebMasterEmail}>/,
         $mess->header('From') );
     $this->assert_matches( qr/.*\bwhite\@example.com/, $mess->header('To') );
 
@@ -230,7 +231,7 @@ sub test_resetPasswordByEmail {
 
     my $mess = $FoswikiFnTestCase::mails[0];
     $this->assert_matches(
-        qr/$Foswiki::cfg{WebMasterName} <$Foswiki::cfg{WebMasterEmail}>/,
+        qr/"?$Foswiki::cfg{WebMasterName}"? <$Foswiki::cfg{WebMasterEmail}>/,
         $mess->header('From') );
     $this->assert_matches( qr/.*\bwhite\@example.com/, $mess->header('To') );
 
@@ -378,7 +379,7 @@ sub test_resetPasswordMultipleUsers {
 
     my $mess = $FoswikiFnTestCase::mails[0];
     $this->assert_matches(
-        qr/$Foswiki::cfg{WebMasterName} <$Foswiki::cfg{WebMasterEmail}>/,
+        qr/"?$Foswiki::cfg{WebMasterName}"? <$Foswiki::cfg{WebMasterEmail}>/,
         $mess->header('From') );
     $this->assert_matches( qr/.*\bwhite\@example.com/, $mess->header('To') );
 

diff --git a/core/data/TestCases/WebStatistics.txt b/core/data/TestCases/WebStatistics.txt
@@ -1,10 +1,9 @@
-%META:TOPICINFO{author="scum" comment="" date="1519012307" format="1.1" reprev="2" version="2"}%
+%META:TOPICINFO{author="scum" comment="" date="1520313953" format="1.1" reprev="2" version="2"}%
 %META:TOPICPARENT{name="WebHome"}%
 ---++ Statistics for <nop>%WEB% Web
 
 | *Month:* | *Topic <br /> views:* | *Topic <br /> saves:* | *File <br /> uploads:* | *Most popular <br /> topic views:* | *Top contributors for <br /> topic save and uploads:* |
 | <!--statDate--> | <!--statViews--> | <!--statSaves--> | <!--statUploads--> | <!--statTopViews--> | <!--statTopContributors--> |
-| Feb 2018 |  24 |  0 |  0 | &nbsp;&nbsp;1 [[TestCaseAutoSearchOrder]]<br />&nbsp;&nbsp;1 [[TestCaseAutoIncludes]]<br />&nbsp;&nbsp;1 [[TestCaseAutoFormattedSearch]]<br />&nbsp;&nbsp;1 [[TestCaseAutoUnexpandedTagsInSearchResults]]<br />&nbsp;&nbsp;1 [[TestCaseAutoInOutPre]]<br />&nbsp;&nbsp;1 [[TestCaseAutoInterwikiPlugin]]<br />&nbsp;&nbsp;1 [[TestCaseAutoIncludeAttachment]]<br />&nbsp;&nbsp;1 [[TestCaseAutoSearch]]<br />&nbsp;&nbsp;1 [[TestCaseAutoInternalTags]]<br />&nbsp;&nbsp;1 [[TestCaseAutoIncludeSubWebTopic]]<br />&nbsp;&nbsp;1 [[TestCaseAutoNestedVerbatim]] |  |
 
 *Notes:*
    * Do not edit this topic, it is updated automatically. (You can also [[%SCRIPTURL{"statistics"}%/%WEB%][force]] an update)