|
@@ -40,13 +40,19 @@ class ApplicationServiceTestCase(unittest.TestCase):
|
|
|
)
|
|
|
|
|
|
self.store = Mock()
|
|
|
+ self.store.get_aliases_for_room = simple_async_mock([])
|
|
|
+ self.store.get_users_in_room = simple_async_mock([])
|
|
|
|
|
|
@defer.inlineCallbacks
|
|
|
def test_regex_user_id_prefix_match(self):
|
|
|
self.service.namespaces[ApplicationService.NS_USERS].append(_regex("@irc_.*"))
|
|
|
self.event.sender = "@irc_foobar:matrix.org"
|
|
|
self.assertTrue(
|
|
|
- (yield defer.ensureDeferred(self.service.is_interested(self.event)))
|
|
|
+ (
|
|
|
+ yield defer.ensureDeferred(
|
|
|
+ self.service.is_interested(self.event, self.store)
|
|
|
+ )
|
|
|
+ )
|
|
|
)
|
|
|
|
|
|
@defer.inlineCallbacks
|
|
@@ -54,7 +60,11 @@ class ApplicationServiceTestCase(unittest.TestCase):
|
|
|
self.service.namespaces[ApplicationService.NS_USERS].append(_regex("@irc_.*"))
|
|
|
self.event.sender = "@someone_else:matrix.org"
|
|
|
self.assertFalse(
|
|
|
- (yield defer.ensureDeferred(self.service.is_interested(self.event)))
|
|
|
+ (
|
|
|
+ yield defer.ensureDeferred(
|
|
|
+ self.service.is_interested(self.event, self.store)
|
|
|
+ )
|
|
|
+ )
|
|
|
)
|
|
|
|
|
|
@defer.inlineCallbacks
|
|
@@ -64,7 +74,11 @@ class ApplicationServiceTestCase(unittest.TestCase):
|
|
|
self.event.type = "m.room.member"
|
|
|
self.event.state_key = "@irc_foobar:matrix.org"
|
|
|
self.assertTrue(
|
|
|
- (yield defer.ensureDeferred(self.service.is_interested(self.event)))
|
|
|
+ (
|
|
|
+ yield defer.ensureDeferred(
|
|
|
+ self.service.is_interested(self.event, self.store)
|
|
|
+ )
|
|
|
+ )
|
|
|
)
|
|
|
|
|
|
@defer.inlineCallbacks
|
|
@@ -74,7 +88,11 @@ class ApplicationServiceTestCase(unittest.TestCase):
|
|
|
)
|
|
|
self.event.room_id = "!some_prefixs0m3th1nGsome_suffix:matrix.org"
|
|
|
self.assertTrue(
|
|
|
- (yield defer.ensureDeferred(self.service.is_interested(self.event)))
|
|
|
+ (
|
|
|
+ yield defer.ensureDeferred(
|
|
|
+ self.service.is_interested(self.event, self.store)
|
|
|
+ )
|
|
|
+ )
|
|
|
)
|
|
|
|
|
|
@defer.inlineCallbacks
|
|
@@ -84,7 +102,11 @@ class ApplicationServiceTestCase(unittest.TestCase):
|
|
|
)
|
|
|
self.event.room_id = "!XqBunHwQIXUiqCaoxq:matrix.org"
|
|
|
self.assertFalse(
|
|
|
- (yield defer.ensureDeferred(self.service.is_interested(self.event)))
|
|
|
+ (
|
|
|
+ yield defer.ensureDeferred(
|
|
|
+ self.service.is_interested(self.event, self.store)
|
|
|
+ )
|
|
|
+ )
|
|
|
)
|
|
|
|
|
|
@defer.inlineCallbacks
|
|
@@ -183,7 +205,11 @@ class ApplicationServiceTestCase(unittest.TestCase):
|
|
|
self.event.content = {"membership": "invite"}
|
|
|
self.event.state_key = self.service.sender
|
|
|
self.assertTrue(
|
|
|
- (yield defer.ensureDeferred(self.service.is_interested(self.event)))
|
|
|
+ (
|
|
|
+ yield defer.ensureDeferred(
|
|
|
+ self.service.is_interested(self.event, self.store)
|
|
|
+ )
|
|
|
+ )
|
|
|
)
|
|
|
|
|
|
@defer.inlineCallbacks
|