devhttps
diff --git a/‎.travis.yml‎
Lines changed: 2 additions & 1 deletion b/‎.travis.yml‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎CHANGES‎ ‎CHANGES.rst‎CHANGES renamed to CHANGES.rst b/‎CHANGES‎ ‎CHANGES.rst‎CHANGES renamed to CHANGES.rst
diff --git a/‎Makefile‎
Lines changed: 7 additions & 5 deletions b/‎Makefile‎
Lines changed: 7 additions & 5 deletions
diff --git a/‎docs-requirements.txt‎ ‎docs/docs-requirements.txt‎docs-requirements.txt renamed to docs/docs-requirements.txt b/‎docs-requirements.txt‎ ‎docs/docs-requirements.txt‎docs-requirements.txt renamed to docs/docs-requirements.txt
diff --git a/‎telegram_test.py‎
Lines changed: 0 additions & 30 deletions b/‎telegram_test.py‎
Lines changed: 0 additions & 30 deletions
diff --git a/‎tests/telegram.mp3‎ ‎tests/data/telegram.mp3‎tests/telegram.mp3 renamed to tests/data/telegram.mp3 b/‎tests/telegram.mp3‎ ‎tests/data/telegram.mp3‎tests/telegram.mp3 renamed to tests/data/telegram.mp3
diff --git a/‎tests/telegram.mp4‎ ‎tests/data/telegram.mp4‎tests/telegram.mp4 renamed to tests/data/telegram.mp4 b/‎tests/telegram.mp4‎ ‎tests/data/telegram.mp4‎tests/telegram.mp4 renamed to tests/data/telegram.mp4
diff --git a/‎tests/telegram.ogg‎ ‎tests/data/telegram.ogg‎tests/telegram.ogg renamed to tests/data/telegram.ogg b/‎tests/telegram.ogg‎ ‎tests/data/telegram.ogg‎tests/telegram.ogg renamed to tests/data/telegram.ogg
diff --git a/‎tests/telegram.png‎ ‎tests/data/telegram.png‎tests/telegram.png renamed to tests/data/telegram.png b/‎tests/telegram.png‎ ‎tests/data/telegram.png‎tests/telegram.png renamed to tests/data/telegram.png
diff --git a/‎tests/test_bot.py‎
Lines changed: 9 additions & 5 deletions b/‎tests/test_bot.py‎
Lines changed: 9 additions & 5 deletions
@@ -4,9 +4,10 @@ python:
   - "2.7"
   - "3.3"
   - "3.4"
+  - "nightly"
 install:
   - pip install coveralls
 script:
-  coverage run telegram_test.py
+  coverage run make test
 after_success:
   coveralls
@@ -1,7 +1,4 @@
-help:
-	@echo "  clean		remove unwanted stuff"
-	@echo "  lint		check style with flake8"
-	@echo "  test		run tests"
+.PHONY: clean test lint help
 
 clean:
 	rm -fr build
@@ -14,4 +11,9 @@ lint:
 	flake8 --doctests --max-complexity 10 telegram
 
 test:
-	python telegram_test.py
+	@- $(foreach TEST, $(wildcard tests/test_*.py), python $(TEST))
+
+help:
+	@echo "  clean		remove unwanted stuff"
+	@echo "  lint		check style with flake8"
+	@echo "  test		run tests"
@@ -19,6 +19,8 @@
 
 
 import os
+import sys
+sys.path.append('.')
 import json
 import telegram
 import unittest
@@ -80,7 +82,7 @@ def testForwardMessage(self):
     def testSendPhoto(self):
         '''Test the telegram.Bot sendPhoto method'''
         print('Testing sendPhoto - File')
-        message = self._bot.sendPhoto(photo=open('tests/telegram.png', 'rb'),
+        message = self._bot.sendPhoto(photo=open('tests/data/telegram.png', 'rb'),
                                       caption='testSendPhoto',
                                       chat_id=12173560)
         self.assertTrue(self.is_json(message.to_json()))
@@ -122,7 +124,7 @@ def testSendGIFURLPhoto(self):
     def testSendAudio(self):
         '''Test the telegram.Bot sendAudio method'''
         print('Testing sendAudio - File')
-        message = self._bot.sendAudio(audio=open('tests/telegram.mp3', 'rb'),
+        message = self._bot.sendAudio(audio=open('tests/data/telegram.mp3', 'rb'),
                                       chat_id=12173560,
                                       performer='Leandro Toledo',
                                       title='Teste')
@@ -144,7 +146,7 @@ def testResendAudio(self):
     def testSendVoice(self):
         '''Test the telegram.Bot sendVoice method'''
         print('Testing sendVoice - File')
-        message = self._bot.sendVoice(voice=open('tests/telegram.ogg', 'rb'),
+        message = self._bot.sendVoice(voice=open('tests/data/telegram.ogg', 'rb'),
                                       chat_id=12173560)
         self.assertTrue(self.is_json(message.to_json()))
         self.assertEqual(9199, message.voice.file_size)
@@ -160,7 +162,7 @@ def testResendVoice(self):
     def testSendDocument(self):
         '''Test the telegram.Bot sendDocument method'''
         print('Testing sendDocument - File')
-        message = self._bot.sendDocument(document=open('tests/telegram.png', 'rb'),
+        message = self._bot.sendDocument(document=open('tests/data/telegram.png', 'rb'),
                                          chat_id=12173560)
         self.assertTrue(self.is_json(message.to_json()))
         self.assertEqual(12948, message.document.file_size)
@@ -184,7 +186,7 @@ def testResendDocument(self):
     def testSendVideo(self):
         '''Test the telegram.Bot sendVideo method'''
         print('Testing sendVideo - File')
-        message = self._bot.sendVideo(video=open('tests/telegram.mp4', 'rb'),
+        message = self._bot.sendVideo(video=open('tests/data/telegram.mp4', 'rb'),
                                       caption='testSendVideo',
                                       chat_id=12173560)
         self.assertTrue(self.is_json(message.to_json()))
@@ -229,3 +231,5 @@ def testGetUserProfilePhotos(self):
         upf = self._bot.getUserProfilePhotos(user_id=12173560)
         self.assertTrue(self.is_json(upf.to_json()))
         self.assertEqual(6547, upf.photos[0][0].file_size)
+
+unittest.main()