Merge branch 'develop' into regex-kwarg

.travis.yml

@@ -1,6 +1,7 @@
+dist: trusty
 sudo: false
 language: python
-python: 3.5
+python: 3.6
 cache:
   directories:
     - $HOME/.cache/pip

README.md

@@ -185,7 +185,7 @@ Besides specifying `DEFAULT_REPLY` in `slackbot_settings.py`, you can also decor
 
 ```python
 @default_reply
-def my_default_hanlder(messsage):
+def my_default_hanlder(message):
     message.reply('...')
 ```
 

setup.py

@@ -33,4 +33,5 @@
                    'Programming Language :: Python :: 2.7',
                    'Programming Language :: Python :: 3',
                    'Programming Language :: Python :: 3.4',
-                   'Programming Language :: Python :: 3.5'])
+                   'Programming Language :: Python :: 3.5',
+                   'Programming Language :: Python :: 3.6'])

slackbot/dispatcher.py

@@ -103,7 +103,7 @@ def _get_bot_name(self):
         return self._client.login_data['self']['name']
 
     def filter_text(self, msg):
-        full_text = msg.get('text', '')
+        full_text = msg.get('text', '') or ''
         channel = msg['channel']
         bot_name = self._get_bot_name()
         bot_id = self._get_bot_id()

slackbot/plugins/upload.py

@@ -6,11 +6,13 @@
 @respond_to(r'upload \<?(.*)\>?')
 def upload(message, url):
     url = url.lstrip('<').rstrip('>')
-    fname = os.path.basename(url)
-    message.reply('uploading {}'.format(fname))
+    message.reply('uploading {}'.format(url))
     if url.startswith('http'):
         with create_tmp_file() as tmpf:
             download_file(url, tmpf)
-            message.channel.upload_file(fname, tmpf, 'downloaded from {}'.format(url))
-    elif url.startswith('/'):
-        message.channel.upload_file(fname, url)
+            message.channel.upload_file(url, tmpf,
+                                        'downloaded from {}'.format(url))
+    elif url == 'slack.png':
+        cwd = os.path.abspath(os.path.dirname(__file__))
+        fname = os.path.join(cwd, '../../tests/functional/slack.png')
+        message.channel.upload_file(url, fname)

tests/functional/driver.py

@@ -223,7 +223,8 @@ def _has_uploaded_file(self, name, start=None, end=None):
     def _has_uploaded_file_rtm(self, name):
         with self._events_lock:
             for event in self.events:
-                if event['type'] == 'file_shared' \
+                if event['type'] == 'message' \
+                   and event.get('subtype') == 'file_share' \
                    and event['file']['name'] == name \
                    and event['file']['user'] == self.testbot_userid:
                     return True

tests/functional/test_functional.py

@@ -82,19 +82,17 @@ def test_bot_default_reply(driver):
     driver.send_direct_message('youdontunderstandthiscommand do you')
     driver.wait_for_bot_direct_message('.*You can ask me.*')
 
-@pytest.mark.skip
 def test_bot_upload_file(driver):
-    png = join(abspath(dirname(__file__)), 'slack.png')
-    driver.send_direct_message('upload %s' % png)
+    driver.send_direct_message('upload slack.png')
     driver.wait_for_bot_direct_message('uploading slack.png')
     driver.wait_for_file_uploaded('slack.png')
 
-@pytest.mark.skip
 def test_bot_upload_file_from_link(driver):
     url = 'https://slack.com/favicon.ico'
     fname = basename(url)
     driver.send_direct_message('upload %s' % url)
-    driver.wait_for_bot_direct_message('uploading %s' % fname)
+    driver.wait_for_bot_direct_message('uploading <%s>' % url)
+    driver.wait_for_file_uploaded(fname)
 
 def test_bot_reply_to_channel_message(driver):
     driver.send_channel_message('hello')

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34,py35
+envlist = py27,py34,py35,py36
 [testenv]
 deps =
     pytest