fix tests

Author: amancevice

src/slack.py

@@ -19,7 +19,7 @@ def __init__(self, **params):
         self.oauth_install_uri = params.get('oauth_install_uri')
         self.oauth_redirect_uri = params.get('oauth_redirect_uri')
         self.oauth_success_uri = params.get('oauth_success_uri') \
-            or 'slack://channel?team={team_id}&id={channel_id}'
+            or 'slack://app?team={TEAM_ID}&id={APP_ID}'
         self.routes = params.get('routes') or {}
         self.signing_secret = params.get('signing_secret')
         self.signing_version = params.get('signing_version') or 'v0'
@@ -67,9 +67,9 @@ def install(self, event, method):
         team_id = result.get('team', {}).get('id')
         channel_id = result.get('incoming_webhook', {}).get('channel_id')
         location = self.oauth_success_uri.format(
-            APP_ID=app_id,
-            TEAM_ID=team_id,
-            CHANNEL_ID=channel_id,
+            APP_ID=app_id or '',
+            TEAM_ID=team_id or '',
+            CHANNEL_ID=channel_id or '',
         )
 
         return result, location
@@ -80,8 +80,8 @@ def install_url(self):
         if query:
             query += '&'
         query += urlencode({
-            'state': self.state,
-            'redirect_uri': self.oauth_redirect_uri,
+            'state': self.state or '',
+            'redirect_uri': self.oauth_redirect_uri or '',
         })
         return urlunsplit(url + [query, fragment])
 
@@ -99,10 +99,8 @@ def post(self, body, method, **headers):
             ok = resdata['ok']
 
         # Log response & return
-        if ok:
-            logger.info('RESPONSE [%d] %s', res.status, json.dumps(resdata))
-        else:
-            logger.error('RESPONSE [%d] %s', res.status, json.dumps(resdata))
+        log = logger.info if ok else logger.error
+        log('RESPONSE [%d] %s', res.status, json.dumps(resdata))
         return resdata
 
     def post_request(self, body, method, **headers):

tests/index_test.py

@@ -11,6 +11,7 @@ def setup(self):
         index.slack.oauth_install_uri = 'https://example.com/install'
         index.slack.oauth_redirect_uri = 'https://example.com/success'
         index.slack.state = 'state'
+        index.slack.token = 'token'
         index.slack.verify = False
 
         index.events.publish = mock.MagicMock()
@@ -40,7 +41,10 @@ def test_get_install(self):
             'headers': {
                 'content-type': 'application/json; charset=utf-8',
                 'content-length': '0',
-                'location': 'https://example.com/install?state=state',
+                'location': (
+                    'https://example.com/install?state=state&'
+                    'redirect_uri=https%3A%2F%2Fexample.com%2Fsuccess'
+                ),
             }
         }
         assert ret == exp
@@ -109,7 +113,10 @@ def test_head_install(self):
             'headers': {
                 'content-type': 'application/json; charset=utf-8',
                 'content-length': '0',
-                'location': 'https://example.com/install?state=state',
+                'location': (
+                    'https://example.com/install?state=state&'
+                    'redirect_uri=https%3A%2F%2Fexample.com%2Fsuccess'
+                ),
             }
         }
         assert ret == exp
@@ -244,4 +251,5 @@ def test_post(self):
         index.slack.post.assert_called_once_with(
             {'text': 'FIZZ'},
             'api/chat.postMessage',
+            authorization='Bearer token'
         )

tests/logger_test.py

@@ -25,11 +25,11 @@ def setup(self):
             '-'
         ),
     ])
-    def test_attach(self, event, context, name, awsRequestId):
+    def test_bind(self, event, context, name, awsRequestId):
         logger = getLogger(name, stream=self.stream)
         logger.setLevel('DEBUG')
 
-        @logger.attach
+        @logger.bind
         def handler(event=None, context=None):
             logger.warning('TEST')
             return {'ok': True}

tests/slack_test.py

@@ -35,10 +35,10 @@ def test_handle_not_found(self):
     @mock.patch('src.slack.Slack.post')
     def test_install(self, mock_post):
         res = {
-            'incoming_webhook': {'channel_id': 'C0123456789'},
+            'app_id': 'A0123456789',
             'team': {'id': 'T0123456789'},
         }
-        loc = 'slack://channel?team=T0123456789&id=C0123456789'
+        loc = 'slack://app?team=T0123456789&id=A0123456789'
         mock_post.return_value = res
         event = {
             'queryStringParameters': {
@@ -72,15 +72,7 @@ def test_install_err(self, event, redir):
         if redir:
             self.subject.oauth_error_uri = redir
             ret = self.subject.install(HttpEvent(event), '<oauth-method>')
-            exp = {
-                'statusCode': 302,
-                'body': None,
-                'headers': {
-                    'content-length': '0',
-                    'content-type': 'application/json; charset=utf-8',
-                    'location': redir
-                }
-            }
+            exp = (None, redir)
             assert ret == exp
         else:
             with pytest.raises(Exception):
@@ -90,12 +82,12 @@ def test_install_err(self, event, redir):
         (
             'state-1',
             'https://example.com/install',
-            'https://example.com/install?state=state-1',
+            'https://example.com/install?state=state-1&redirect_uri='
         ),
         (
             'state-2',
             'https://example.com/install?fizz=buzz',
-            'https://example.com/install?fizz=buzz&state=state-2',
+            'https://example.com/install?fizz=buzz&state=state-2&redirect_uri='
         ),
     ])
     def test_install_url(self, state, oauth_install_uri, exp):
@@ -117,7 +109,6 @@ def test_post(self):
                 'url': 'https://slack.com/api/chat.postMessage',
                 'data': b'{"test": "FIZZ"}',
                 'headers': {
-                    'authorization': 'Bearer <token>',
                     'content-type': 'application/json; charset=utf-8',
                 },
             },
@@ -130,7 +121,6 @@ def test_post(self):
                 'url': 'https://slack.com/api/files.upload',
                 'data': b'test=FIZZ',
                 'headers': {
-                    'authorization': 'Bearer <token>',
                     'content-type': 'application/x-www-form-urlencoded',
                 },
             },