Merge pull request #1014 from kawazrepos/remove-icon_emoji

Remove icon emoji
kawazrepos · Dec 23, 2015 · ebc95ff · ebc95ff
2 parents fed04d4 + b061d20
commit ebc95ff
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/kawaz/core/activities/notifiers/slack.py b/src/kawaz/core/activities/notifiers/slack.py
@@ -50,7 +50,7 @@ def __init__(self, url, channel, params={}):
         self.channel = channel
         self.icon_emoji = params.get('icon_emoji', DEFAULT_ICON_EMOJI)
         self.default_username = params.get('username', DEFAULT_USERNAME)
-        self.default_icon_url = params.get('icon_url', '')
+        self.default_icon_url = params.get('icon_url', None)
 
     def send(self, rendered_content):
         if not settings.ACTIVITIES_ENABLE_SLACK_NOTIFICATION:
@@ -62,9 +62,13 @@ def send(self, rendered_content):
             'text': message,
             'channel': self.channel,
             'username': username,
-            'icon_emoji': self.icon_emoji,
-            'icon_url': icon_url
         }
+        # icon_urlがある場合はそちらを優先する
+        if icon_url:
+            params.update({'icon_url': icon_url})
+        else:
+            params.update({'icon_emoji': self.icon_emoji})
+
         payload = {'payload': json.dumps(params)}
         data = urllib.parse.urlencode(payload)
         data = data.encode('utf-8')

diff --git a/src/kawaz/core/activities/tests/test_notifiers/test_slack.py b/src/kawaz/core/activities/tests/test_notifiers/test_slack.py
@@ -14,7 +14,7 @@ def setUp(self):
         self.randomstr = "".join([random.choice(string.ascii_letters)
                                   for _ in range(100)])
 
-    def assert_send(self, rendered_str, message, username='かわずたん', icon_url='http://dummy.kawaz.com/'):
+    def assert_send(self, rendered_str, message, username='かわずたん', icon_url=None, has_icon_url=False):
         endpoint_url = 'https://kawaz.slack.com/dummyauthtoken'
         channel = '#notification'
         icon_emoji = ':frog:'
@@ -25,8 +25,10 @@ def dummy_request(url, data):
             payload = json.loads(query['payload'][0])
             self.assertEqual(url, endpoint_url)
             self.assertEqual(payload['channel'], channel)
-            self.assertEqual(payload['icon_emoji'], icon_emoji)
-            self.assertEqual(payload['icon_url'], icon_url)
+            if has_icon_url:
+                self.assertEqual(payload['icon_url'], icon_url)
+            else:
+                self.assertEqual(payload['icon_emoji'], icon_emoji)
             self.assertEqual(payload['username'], username)
             self.assertEqual(payload['text'], message)
 
@@ -60,7 +62,7 @@ def test_send_with_icon_url_tag(self):
         icon_urlタグが冒頭に含まれてたとき、アイコンが変わる
         """
         message = '\n'.join(('<icon_url=http://example.kawaz.org/icon.jpg>', self.randomstr))
-        self.assert_send(message, self.randomstr, icon_url='http://example.kawaz.org/icon.jpg')
+        self.assert_send(message, self.randomstr, icon_url='http://example.kawaz.org/icon.jpg', has_icon_url=True)
 
     def test_send_with_invalid_tag(self):
         """
@@ -74,7 +76,7 @@ def test_send_with_username_and_icon_url_tags(self):
         正しいタグが冒頭に複数個含まれてたとき、ユーザー名とアイコンが変わる
         """
         message = '\n'.join(('<username=井の中かわず>', '<icon_url=http://example.kawaz.org/icon.jpg>', self.randomstr))
-        self.assert_send(message, self.randomstr, '井の中かわず', 'http://example.kawaz.org/icon.jpg')
+        self.assert_send(message, self.randomstr, '井の中かわず', 'http://example.kawaz.org/icon.jpg', has_icon_url=True)
 
     def test_valid_tag_with_invalid_position(self):
         """