diff options
| -rw-r--r-- | src/mailman/app/tests/test_subscriptions.py | 18 | ||||
| -rw-r--r-- | src/mailman/chains/hold.py | 2 | ||||
| -rw-r--r-- | src/mailman/core/docs/chains.rst | 11 | ||||
| -rw-r--r-- | src/mailman/templates/en/postauth.txt | 7 |
4 files changed, 13 insertions, 25 deletions
diff --git a/src/mailman/app/tests/test_subscriptions.py b/src/mailman/app/tests/test_subscriptions.py index 42984c77c..732266ac3 100644 --- a/src/mailman/app/tests/test_subscriptions.py +++ b/src/mailman/app/tests/test_subscriptions.py @@ -18,23 +18,18 @@ """Tests for the subscription service.""" __all__ = [ - 'TestJoin', 'TestSubscriptionWorkflow', ] -import uuid import unittest from mailman.app.lifecycle import create_list from mailman.app.subscriptions import SubscriptionWorkflow -from mailman.interfaces.address import InvalidEmailAddressError from mailman.interfaces.bans import IBanManager -from mailman.interfaces.member import ( - MemberRole, MembershipIsBannedError, MissingPreferredAddressError) +from mailman.interfaces.member import MembershipIsBannedError from mailman.interfaces.pending import IPendings -from mailman.interfaces.subscriptions import ( - ISubscriptionService, MissingUserError, TokenOwner) +from mailman.interfaces.subscriptions import TokenOwner from mailman.testing.helpers import LogFileMark, get_queue_messages from mailman.testing.layers import ConfigLayer from mailman.interfaces.mailinglist import SubscriptionPolicy @@ -418,11 +413,10 @@ class TestSubscriptionWorkflow(unittest.TestCase): pre_confirmed=True) # Consume the entire state machine. list(workflow) - line = mark.readline() - self.assertEqual( - line[29:-1], - 'test@example.com: held subscription request from anne@example.com' - ) + self.assertIn( + 'test@example.com: held subscription request from anne@example.com', + mark.readline() + ) def test_get_moderator_approval_notifies_moderators(self): # When the subscription is held for moderator approval, and the list diff --git a/src/mailman/chains/hold.py b/src/mailman/chains/hold.py index ee1762442..3773aa3e5 100644 --- a/src/mailman/chains/hold.py +++ b/src/mailman/chains/hold.py @@ -158,7 +158,7 @@ class HoldChain(TerminalChainBase): listname = mlist.fqdn_listname, subject = original_subject, sender = msg.sender, - reason = 'XXX', #reason, + reason = 'N/A', #reason, confirmurl = '{0}/{1}'.format(mlist.script_url('confirm'), token), admindb_url = mlist.script_url('admindb'), ) diff --git a/src/mailman/core/docs/chains.rst b/src/mailman/core/docs/chains.rst index a79999de0..328d0b624 100644 --- a/src/mailman/core/docs/chains.rst +++ b/src/mailman/core/docs/chains.rst @@ -132,13 +132,10 @@ This one is addressed to the list moderators. List: test@example.com From: aperson@example.com Subject: My first post - Reason: XXX + Reason: N/A <BLANKLINE> - At your convenience, visit: - <BLANKLINE> - http://lists.example.com/admindb/test@example.com - <BLANKLINE> - to approve or deny the request. + At your convenience, visit your dashboard to approve or deny the + request. <BLANKLINE> ... Content-Type: message/rfc822 @@ -189,7 +186,7 @@ This message is addressed to the sender of the message. <BLANKLINE> The reason it is being held: <BLANKLINE> - XXX + N/A <BLANKLINE> Either the message will get posted to the list, or you will receive notification of the moderator's decision. If you would like to cancel diff --git a/src/mailman/templates/en/postauth.txt b/src/mailman/templates/en/postauth.txt index fce85f52f..472ed32b4 100644 --- a/src/mailman/templates/en/postauth.txt +++ b/src/mailman/templates/en/postauth.txt @@ -6,8 +6,5 @@ following mailing list posting: Subject: $subject Reason: $reason -At your convenience, visit: - - $admindb_url - -to approve or deny the request. +At your convenience, visit your dashboard to approve or deny the +request. |