Merge branch 'finish' into 'master'

fix: missing finish button, some unit tests

See merge request felixdoerre/motion!24

diff --git a/requirements.txt b/requirements.txt
index f66050e1c8e1a193686ecc99910e6ccd50735394..17abe88225e72aed9be46d795a7647ed2b281c31 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,11 @@
 click==6.7
-Flask==0.12.2
+Flask==1.1.2
 Flask-Babel==1.0.0
 itsdangerous==0.24
-Jinja2==2.10
+Jinja2==2.11.2
 MarkupSafe==1.0
 py-postgresql==1.2.1
-Werkzeug==0.12.2
+Werkzeug==1.0.1
 Flask-Markdown==0.3
 xmlrunner>=1.7.7
 flask-language==0.1.0

diff --git a/tests/test_user_api.py b/tests/test_user_api.py
index 665961eb9d0f74157494066d1c56ca8206e59eec..1bec464131e1e34529c11e1ce81e9d643e9ce6d6 100644 (file)
--- a/tests/test_user_api.py
+++ b/tests/test_user_api.py
@@ -24,7 +24,7 @@ class GeneralTests(BasicTest):
 
     def test_create_user(self):
         user = 'John Doe'
-        runner = CliRunner()
+        runner = app.test_cli_runner()
         result = runner.invoke(create_user, [user])
         assert result.exit_code == 0
         self.assertIn("User 'John Doe' inserted.", result.output)