paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 12:33:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Simplify how we use base_url.

Browse Source 
Before this change, we instantiated base_url into a superclass
of subclasses that returned base_url into a dictionary that
gets returned to our caller.

Now we just pull base_url out of service when we need to make
the REST call.
This commit is contained in:
Steve Howell
2018-10-10 22:24:55 +00:00
committed by Tim Abbott
parent b89a94f730
commit 16eff75e49
4 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/tests/test_outgoing_webhook_interfaces.py
View File

@@ -22,7 +22,6 @@ class TestGenericOutgoingWebhookService(ZulipTestCase):
}
self.bot_user = get_user("outgoing-webhook@zulip.com", get_realm("zulip"))
self.handler = GenericOutgoingWebhookService(service_name='test-service',
base_url='http://example.domain.com',
token='abcdef',
user_profile=self.bot_user)
@@ -65,7 +64,6 @@ class TestGenericOutgoingWebhookService(ZulipTestCase):
request_data = json.loads(request_data)
self.assertEqual(request_data['data'], "@**test**")
self.assertEqual(request_data['token'], "abcdef")
self.assertEqual(rest_operation['base_url'], "http://example.domain.com")
self.assertEqual(rest_operation['method'], "POST")
self.assertEqual(request_data['message'], self.event['message'])
@@ -123,15 +121,13 @@ class TestSlackOutgoingWebhookService(ZulipTestCase):
}
}
self.handler = SlackOutgoingWebhookService(base_url='http://example.domain.com',
token="abcdef",
self.handler = SlackOutgoingWebhookService(token="abcdef",
user_profile=None,
service_name='test-service')
def test_process_event_stream_message(self) -> None:
rest_operation, request_data = self.handler.process_event(self.stream_message_event)
self.assertEqual(rest_operation['base_url'], 'http://example.domain.com')
self.assertEqual(rest_operation['method'], 'POST')
self.assertEqual(request_data[0][1], "abcdef") # token
self.assertEqual(request_data[1][1], "zulip") # team_id