plugin

1 files changed, 5 insertions, 14 deletions

diff --git a/src/mailman/rest/tests/test_membership.py b/src/mailman/rest/tests/test_membership.py
index e5a2ce283..bb0134ac5 100644
--- a/src/mailman/rest/tests/test_membership.py
+++ b/src/mailman/rest/tests/test_membership.py
@@ -23,7 +23,6 @@ from mailman.app.lifecycle import create_list
 from mailman.config import config
 from mailman.database.transaction import transaction
 from mailman.interfaces.bans import IBanManager
-from mailman.interfaces.mailinglist import SubscriptionPolicy
 from mailman.interfaces.member import DeliveryMode, MemberRole
 from mailman.interfaces.subscriptions import ISubscriptionManager, TokenOwner
 from mailman.interfaces.usermanager import IUserManager
@@ -33,6 +32,8 @@ from mailman.testing.helpers import (
     set_preferred, subscribe, wait_for_webservice)
 from mailman.testing.layers import ConfigLayer, RESTLayer
 from mailman.utilities.datetime import now
+from mailman.workflows.subscription import (
+    ConfirmModerationSubscriptionPolicy, ModerationSubscriptionPolicy)
 from urllib.error import HTTPError
 from zope.component import getUtility
 
@@ -93,7 +94,6 @@ class TestMembership(unittest.TestCase):
                 'subscriber': 'anne@example.com',
                 'pre_verified': True,
                 'pre_confirmed': True,
-                'pre_approved': True,
                 })
         self.assertEqual(cm.exception.code, 409)
         self.assertEqual(cm.exception.reason, 'Member already subscribed')
@@ -108,7 +108,6 @@ class TestMembership(unittest.TestCase):
                 'subscriber': 'anne@example.com',
                 'pre_verified': False,
                 'pre_confirmed': False,
-                'pre_approved': False,
                 })
         self.assertEqual(cm.exception.code, 409)
         self.assertEqual(cm.exception.reason, 'Member already subscribed')
@@ -123,7 +122,6 @@ class TestMembership(unittest.TestCase):
                 'subscriber': '00000000000000000000000000000001',
                 'pre_verified': True,
                 'pre_confirmed': True,
-                'pre_approved': True,
                 })
         self.assertEqual(cm.exception.code, 400)
         self.assertEqual(cm.exception.reason, 'User has no preferred address')
@@ -135,7 +133,6 @@ class TestMembership(unittest.TestCase):
                 'subscriber': '00000000000000000000000000000801',
                 'pre_verified': True,
                 'pre_confirmed': True,
-                'pre_approved': True,
                 })
         self.assertEqual(cm.exception.code, 400)
         self.assertEqual(cm.exception.reason, 'No such user')
@@ -153,7 +150,6 @@ class TestMembership(unittest.TestCase):
                 'subscriber': 'ANNE@example.com',
                 'pre_verified': True,
                 'pre_confirmed': True,
-                'pre_approved': True,
                 })
         self.assertEqual(cm.exception.code, 409)
         self.assertEqual(cm.exception.reason, 'Member already subscribed')
@@ -171,7 +167,6 @@ class TestMembership(unittest.TestCase):
                 'subscriber': 'anne@example.com',
                 'pre_verified': True,
                 'pre_confirmed': True,
-                'pre_approved': True,
                 })
         self.assertEqual(cm.exception.code, 409)
         self.assertEqual(cm.exception.reason, 'Member already subscribed')
@@ -195,7 +190,6 @@ class TestMembership(unittest.TestCase):
             'display_name': 'Hugh Person',
             'pre_verified': True,
             'pre_confirmed': True,
-            'pre_approved': True,
             })
         self.assertEqual(json, None)
         self.assertEqual(response.status_code, 201)
@@ -231,10 +225,10 @@ class TestMembership(unittest.TestCase):
         # to subscribe again.
         registrar = ISubscriptionManager(self._mlist)
         with transaction():
-            self._mlist.subscription_policy = SubscriptionPolicy.moderate
+            self._mlist.subscription_policy = ModerationSubscriptionPolicy
             anne = self._usermanager.create_address('anne@example.com')
             token, token_owner, member = registrar.register(
-                anne, pre_verified=True, pre_confirmed=True)
+                anne, pre_verified=True)
             self.assertEqual(token_owner, TokenOwner.moderator)
             self.assertIsNone(member)
         with self.assertRaises(HTTPError) as cm:
@@ -242,7 +236,6 @@ class TestMembership(unittest.TestCase):
                 'list_id': 'test.example.com',
                 'subscriber': 'anne@example.com',
                 'pre_verified': True,
-                'pre_confirmed': True,
                 })
         self.assertEqual(cm.exception.code, 409)
         self.assertEqual(cm.exception.reason,
@@ -255,7 +248,7 @@ class TestMembership(unittest.TestCase):
         registrar = ISubscriptionManager(self._mlist)
         with transaction():
             self._mlist.subscription_policy = (
-                SubscriptionPolicy.confirm_then_moderate)
+                ConfirmModerationSubscriptionPolicy)
             anne = self._usermanager.create_address('anne@example.com')
             token, token_owner, member = registrar.register(
                 anne, pre_verified=True)
@@ -645,7 +638,6 @@ class TestAPI31Members(unittest.TestCase):
                 'subscriber': '00000000000000000000000000000001',
                 'pre_verified': True,
                 'pre_confirmed': True,
-                'pre_approved': True,
                 })
         self.assertEqual(response.status_code, 201)
         self.assertEqual(
@@ -681,7 +673,6 @@ class TestAPI31Members(unittest.TestCase):
                 'subscriber': '1',
                 'pre_verified': True,
                 'pre_confirmed': True,
-                'pre_approved': True,
                 })
         # This is a bad request because the `subscriber` value isn't something
         # that's known to the system, in API 3.1.  It's not technically a 404