diff --git a/.travis.yml b/.travis.yml index 3234b1c..a188469 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: python python: + - "3.5" + - "3.4" - "3.3" - "2.7" - "2.6" @@ -13,6 +15,14 @@ matrix: env: FLASK=0.9 - python: "3.3" env: FLASK=0.8.1 + - python: "3.4" + env: FLASK=0.9 + - python: "3.4" + env: FLASK=0.8.1 + - python: "3.5" + env: FLASK=0.9 + - python: "3.5" + env: FLASK=0.8.1 install: - pip install flask==$FLASK coverage --use-mirrors - pip install -e . --use-mirrors @@ -21,3 +31,4 @@ script: notifications: email: - christoph.heer@googlemail.com + - jonathan.como@gmail.com diff --git a/setup.py b/setup.py index 91ad2aa..6ee7e8d 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ ] if sys.version_info[0] < 3: - tests_require.append('twill==0.9') + tests_require.append('twill==0.9.1') if sys.version_info < (2, 6): tests_require.append('simplejson') diff --git a/tests/__init__.py b/tests/__init__.py index 3865848..373aba9 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -2,17 +2,22 @@ from flask_testing import is_twill_available -from .test_utils import TestSetup, TestSetupFailure, TestClientUtils, TestLiveServer, TestTeardownGraceful from .test_twill import TestTwill, TestTwillDeprecated +from .test_utils import TestSetup, TestSetupFailure, TestClientUtils, \ + TestLiveServer, TestTeardownGraceful, TestRenderTemplates, \ + TestNotRenderTemplates, TestRestoreTheRealRender def suite(): suite = unittest.TestSuite() suite.addTest(unittest.makeSuite(TestSetup)) suite.addTest(unittest.makeSuite(TestSetupFailure)) - suite.addTest(unittest.makeSuite(TestTeardownGraceful)) suite.addTest(unittest.makeSuite(TestClientUtils)) suite.addTest(unittest.makeSuite(TestLiveServer)) + suite.addTest(unittest.makeSuite(TestTeardownGraceful)) + suite.addTest(unittest.makeSuite(TestRenderTemplates)) + suite.addTest(unittest.makeSuite(TestNotRenderTemplates)) + suite.addTest(unittest.makeSuite(TestRestoreTheRealRender)) if is_twill_available: suite.addTest(unittest.makeSuite(TestTwill)) suite.addTest(unittest.makeSuite(TestTwillDeprecated)) diff --git a/tests/test_utils.py b/tests/test_utils.py index 1b81c80..c26ea12 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -171,7 +171,7 @@ def create_app(self): def test_assert_not_process_the_template(self): response = self.client.get("/template/") - assert "" == response.data + assert len(response.data) == 0 def test_assert_template_rendered_signal_sent(self): self.client.get("/template/") @@ -189,7 +189,7 @@ def create_app(self): def test_assert_not_process_the_template(self): response = self.client.get("/template/") - assert "" != response.data + assert len(response.data) > 0 class TestRestoreTheRealRender(TestCase): @@ -206,4 +206,4 @@ def test_assert_the_real_render_template_is_restored(self): response = self.client.get("/template/") - assert "" != response.data + assert len(response.data) > 0