From c8824cb2e5b95aa0d7a78297d29ea1af6915a9c3 Mon Sep 17 00:00:00 2001 From: "neiljp (Neil Pilgrim)" Date: Sun, 10 Dec 2017 13:28:18 -0800 Subject: [PATCH] bots: Simplify test_link_shortener.py. --- .../link_shortener/test_link_shortener.py | 55 ++++++------------- 1 file changed, 17 insertions(+), 38 deletions(-) diff --git a/zulip_bots/zulip_bots/bots/link_shortener/test_link_shortener.py b/zulip_bots/zulip_bots/bots/link_shortener/test_link_shortener.py index fcff3ba..8cf7a5e 100644 --- a/zulip_bots/zulip_bots/bots/link_shortener/test_link_shortener.py +++ b/zulip_bots/zulip_bots/bots/link_shortener/test_link_shortener.py @@ -1,55 +1,34 @@ -#!/usr/bin/env python +from zulip_bots.test_lib import StubBotTestCase -from zulip_bots.test_lib import BotTestCase - -class TestLinkShortenerBot(BotTestCase): +class TestLinkShortenerBot(StubBotTestCase): bot_name = "link_shortener" + def _test(self, message, response): + with self.mock_config_info({'key': 'qwertyuiop'}): + self.verify_reply(message, response) + def test_bot(self): - MESSAGE = 'Shorten https://www.github.com/zulip/zulip please.' - RESPONSE = 'https://www.github.com/zulip/zulip: https://goo.gl/6uoWKb' + message = 'Shorten https://www.github.com/zulip/zulip please.' + response = 'https://www.github.com/zulip/zulip: https://goo.gl/6uoWKb' - with self.mock_config_info({'key': 'qwertyuiop'}), \ - self.mock_http_conversation('test_normal'): - self.initialize_bot() - - self.assert_bot_response( - message = {'content': MESSAGE}, - response = {'content': RESPONSE}, - expected_method='send_reply' - ) + with self.mock_http_conversation('test_normal'): + self._test(message, response) def test_bot_empty(self): - MESSAGE = 'Shorten nothing please.' - RESPONSE = 'No links found. Send "help" to see usage instructions.' + message = 'Shorten nothing please.' + response = 'No links found. Send "help" to see usage instructions.' # No `mock_http_conversation` is necessary because the bot will # recognize that no links are in the message and won't make any HTTP # requests. - with self.mock_config_info({'key': 'qwertyuiop'}): - self.initialize_bot() - - self.assert_bot_response( - message = {'content': MESSAGE}, - response = {'content': RESPONSE}, - expected_method='send_reply' - ) + self._test(message, response) def test_bot_help(self): - MESSAGE = 'help' - RESPONSE = ( - 'Mention the link shortener bot in a conversation and then enter ' - 'any URLs you want to shorten in the body of the message.' - ) + message = 'help' + response = ('Mention the link shortener bot in a conversation and then ' + 'enter any URLs you want to shorten in the body of the message.') # No `mock_http_conversation` is necessary because the bot will # recognize that the message is 'help' and won't make any HTTP # requests. - with self.mock_config_info({'key': 'qwertyuiop'}): - self.initialize_bot() - - self.assert_bot_response( - message = {'content': MESSAGE}, - response = {'content': RESPONSE}, - expected_method='send_reply' - ) + self._test(message, response)