mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-07 04:11:53 +00:00
Refactor email tests
This commit is contained in:
parent
928d1ccd73
commit
8182a1cfb5
@ -15,6 +15,7 @@
|
|||||||
|
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
import attr
|
||||||
import pkg_resources
|
import pkg_resources
|
||||||
|
|
||||||
from twisted.internet.defer import Deferred
|
from twisted.internet.defer import Deferred
|
||||||
@ -30,6 +31,13 @@ except Exception:
|
|||||||
load_jinja2_templates = None
|
load_jinja2_templates = None
|
||||||
|
|
||||||
|
|
||||||
|
@attr.s
|
||||||
|
class _User(object):
|
||||||
|
"Helper wrapper for user ID and access token"
|
||||||
|
id = attr.ib()
|
||||||
|
token = attr.ib()
|
||||||
|
|
||||||
|
|
||||||
class EmailPusherTests(HomeserverTestCase):
|
class EmailPusherTests(HomeserverTestCase):
|
||||||
|
|
||||||
skip = "No Jinja installed" if not load_jinja2_templates else None
|
skip = "No Jinja installed" if not load_jinja2_templates else None
|
||||||
@ -77,25 +85,32 @@ class EmailPusherTests(HomeserverTestCase):
|
|||||||
|
|
||||||
return hs
|
return hs
|
||||||
|
|
||||||
def test_sends_email(self):
|
def prepare(self, reactor, clock, hs):
|
||||||
|
|
||||||
# Register the user who gets notified
|
# Register the user who gets notified
|
||||||
user_id = self.register_user("user", "pass")
|
self.user_id = self.register_user("user", "pass")
|
||||||
access_token = self.login("user", "pass")
|
self.access_token = self.login("user", "pass")
|
||||||
|
|
||||||
# Register the user who sends the message
|
# Register other users
|
||||||
other_user_id = self.register_user("otheruser", "pass")
|
self.others = [
|
||||||
other_access_token = self.login("otheruser", "pass")
|
_User(
|
||||||
|
id=self.register_user("otheruser1", "pass"),
|
||||||
|
token=self.login("otheruser1", "pass"),
|
||||||
|
),
|
||||||
|
_User(
|
||||||
|
id=self.register_user("otheruser2", "pass"),
|
||||||
|
token=self.login("otheruser2", "pass"),
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
||||||
# Register the pusher
|
# Register the pusher
|
||||||
user_tuple = self.get_success(
|
user_tuple = self.get_success(
|
||||||
self.hs.get_datastore().get_user_by_access_token(access_token)
|
self.hs.get_datastore().get_user_by_access_token(self.access_token)
|
||||||
)
|
)
|
||||||
token_id = user_tuple["token_id"]
|
token_id = user_tuple["token_id"]
|
||||||
|
|
||||||
self.get_success(
|
self.get_success(
|
||||||
self.hs.get_pusherpool().add_pusher(
|
self.hs.get_pusherpool().add_pusher(
|
||||||
user_id=user_id,
|
user_id=self.user_id,
|
||||||
access_token=token_id,
|
access_token=token_id,
|
||||||
kind="email",
|
kind="email",
|
||||||
app_id="m.email",
|
app_id="m.email",
|
||||||
@ -107,22 +122,27 @@ class EmailPusherTests(HomeserverTestCase):
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
# Create a room
|
def test_simple_sends_email(self):
|
||||||
room = self.helper.create_room_as(user_id, tok=access_token)
|
# Create a simple room with two users
|
||||||
|
room = self.helper.create_room_as(self.user_id, tok=self.access_token)
|
||||||
# Invite the other person
|
self.helper.invite(
|
||||||
self.helper.invite(room=room, src=user_id, tok=access_token, targ=other_user_id)
|
room=room, src=self.user_id, tok=self.access_token, targ=self.others[0].id,
|
||||||
|
)
|
||||||
# The other user joins
|
self.helper.join(room=room, user=self.others[0].id, tok=self.others[0].token)
|
||||||
self.helper.join(room=room, user=other_user_id, tok=other_access_token)
|
|
||||||
|
|
||||||
# The other user sends some messages
|
# The other user sends some messages
|
||||||
self.helper.send(room, body="Hi!", tok=other_access_token)
|
self.helper.send(room, body="Hi!", tok=self.others[0].token)
|
||||||
self.helper.send(room, body="There!", tok=other_access_token)
|
self.helper.send(room, body="There!", tok=self.others[0].token)
|
||||||
|
|
||||||
|
# We should get emailed about that message
|
||||||
|
self._check_for_mail()
|
||||||
|
|
||||||
|
def _check_for_mail(self):
|
||||||
|
"Check that the user receives an email notification"
|
||||||
|
|
||||||
# Get the stream ordering before it gets sent
|
# Get the stream ordering before it gets sent
|
||||||
pushers = self.get_success(
|
pushers = self.get_success(
|
||||||
self.hs.get_datastore().get_pushers_by(dict(user_name=user_id))
|
self.hs.get_datastore().get_pushers_by(dict(user_name=self.user_id))
|
||||||
)
|
)
|
||||||
self.assertEqual(len(pushers), 1)
|
self.assertEqual(len(pushers), 1)
|
||||||
last_stream_ordering = pushers[0]["last_stream_ordering"]
|
last_stream_ordering = pushers[0]["last_stream_ordering"]
|
||||||
@ -132,7 +152,7 @@ class EmailPusherTests(HomeserverTestCase):
|
|||||||
|
|
||||||
# It hasn't succeeded yet, so the stream ordering shouldn't have moved
|
# It hasn't succeeded yet, so the stream ordering shouldn't have moved
|
||||||
pushers = self.get_success(
|
pushers = self.get_success(
|
||||||
self.hs.get_datastore().get_pushers_by(dict(user_name=user_id))
|
self.hs.get_datastore().get_pushers_by(dict(user_name=self.user_id))
|
||||||
)
|
)
|
||||||
self.assertEqual(len(pushers), 1)
|
self.assertEqual(len(pushers), 1)
|
||||||
self.assertEqual(last_stream_ordering, pushers[0]["last_stream_ordering"])
|
self.assertEqual(last_stream_ordering, pushers[0]["last_stream_ordering"])
|
||||||
@ -149,7 +169,7 @@ class EmailPusherTests(HomeserverTestCase):
|
|||||||
|
|
||||||
# The stream ordering has increased
|
# The stream ordering has increased
|
||||||
pushers = self.get_success(
|
pushers = self.get_success(
|
||||||
self.hs.get_datastore().get_pushers_by(dict(user_name=user_id))
|
self.hs.get_datastore().get_pushers_by(dict(user_name=self.user_id))
|
||||||
)
|
)
|
||||||
self.assertEqual(len(pushers), 1)
|
self.assertEqual(len(pushers), 1)
|
||||||
self.assertTrue(pushers[0]["last_stream_ordering"] > last_stream_ordering)
|
self.assertTrue(pushers[0]["last_stream_ordering"] > last_stream_ordering)
|
||||||
|
Loading…
Reference in New Issue
Block a user