From f87b033c4ef50f5dc3a20e28083339cf2bab29d8 Mon Sep 17 00:00:00 2001
From: INOPIAE '+motiontext+'
\nYes '+str(yes)+'
'\
+ + '\nNo '+str(no)+'
'\
+ + '\nAbstain '+str(abstain)+''
+
+ # functions to clear database
+ def db_clear(self):
+ with postgresql.open(app.config.get("DATABASE"), user=app.config.get("USER"), password=app.config.get("PASSWORD")) as db:
+ with app.open_resource('sql/schema.sql', mode='r') as f:
+ db.execute(f.read())
+
+ def db_sampledata(self):
+ with postgresql.open(app.config.get("DATABASE"), user=app.config.get("USER"), password=app.config.get("PASSWORD")) as db:
+ with app.open_resource('sql/sample_data.sql', mode='r') as f:
+ db.execute(f.read())
diff --git a/tests/test_motion.py b/tests/test_motion.py
index 0399df0..8634d2c 100644
--- a/tests/test_motion.py
+++ b/tests/test_motion.py
@@ -1,90 +1,5 @@
-import motion
-import unittest
-import postgresql
-from unittest import TestCase
-from motion import app
from datetime import datetime
-
-app.config.update(
- DEBUGUSER = {},
- GROUP_PREFIX = {'127.0.0.1:5000': {'group1': 'g1', 'group2': 'g2'}},
- DURATION = {'127.0.0.1:5000':[3, 7, 14]},
- SERVER_NAME = '127.0.0.1:5000',
- MAX_PROXY=2
-)
-
-app.config['TESTING'] = True
-app.config['DEBUG'] = False
-
-
-class BasicTest(TestCase):
-
- def init_test(self):
- self.app = app.test_client()
- self.assertEqual(app.debug, False)
-
- # reset database
- self.db_clear()
-
- # functions to manipulate motions
- def createVote(self, user, motion, vote, voter):
- return self.app.post(
- '/motion/' + motion + '/vote/' + str(voter),
- environ_base={'USER_ROLES': user},
- data=dict(vote=vote)
- )
-
-
- def createMotion(self, user, motiontitle, motioncontent, days, category):
- return self.app.post(
- '/motion',
- environ_base={'USER_ROLES': user},
- data=dict(title=motiontitle, content=motioncontent, days=days, category=category)
- )
-
- def cancelMotion(self, user, motion, reason):
- return self.app.post(
- '/motion/' + motion +'/cancel',
- environ_base={'USER_ROLES': user},
- data=dict(reason=reason)
- )
-
- def finishMotion(self, user, motion):
- return self.app.post(
- '/motion/' + motion +'/finish',
- environ_base={'USER_ROLES': user}
- )
-
- def addProxy(self, user, voter, proxy):
- return self.app.post(
- '/proxy/add',
- environ_base={'USER_ROLES': user},
- data=dict(voter=voter, proxy=proxy)
- )
-
- def revokeProxy(self, user, id):
- return self.app.post(
- '/proxy/revoke',
- environ_base={'USER_ROLES': user},
- data=dict(id=id)
- )
-
- def buildResultText(self, motiontext, yes, no, abstain):
- return '
'+motiontext+'
\n\nYes '+str(yes)+'
'\
- + '\nNo '+str(no)+'
'\
- + '\nAbstain '+str(abstain)+''
-
- # functions to clear database
- def db_clear(self):
- with postgresql.open(app.config.get("DATABASE"), user=app.config.get("USER"), password=app.config.get("PASSWORD")) as db:
- with app.open_resource('sql/schema.sql', mode='r') as f:
- db.execute(f.read())
-
- def db_sampledata(self):
- with postgresql.open(app.config.get("DATABASE"), user=app.config.get("USER"), password=app.config.get("PASSWORD")) as db:
- with app.open_resource('sql/sample_data.sql', mode='r') as f:
- db.execute(f.read())
-
+from .test_basics import BasicTest
# no specific rights required
class GeneralTests(BasicTest):
diff --git a/tests/test_user_api.py b/tests/test_user_api.py
new file mode 100644
index 0000000..2051bc2
--- /dev/null
+++ b/tests/test_user_api.py
@@ -0,0 +1,37 @@
+from .test_basics import BasicTest
+import click
+import motion
+import postgresql
+
+from click.testing import CliRunner
+from motion import create_user
+from motion import app
+
+def db_select(self, sql, parameter):
+ with postgresql.open(app.config.get("DATABASE"), user=app.config.get("USER"), password=app.config.get("PASSWORD")) as db:
+ rv = db.prepare(sql)(parameter)
+ return rv
+
+class GeneralTests(BasicTest):
+
+ def setUp(self):
+ self.init_test()
+
+ def tearDown(self):
+ pass
+
+
+
+ def test_create_user(self):
+ user = 'John Doe'
+ runner = CliRunner()
+ result = runner.invoke(create_user, [user])
+ assert result.exit_code == 0
+ self.assertIn("User 'John Doe' inserted.", result.output)
+
+ rv = db_select(self,"SELECT email FROM voter WHERE lower(email)=lower($1)", user)
+ self.assertIn(user, rv[0].get("email"))
+
+ result = runner.invoke(create_user, [user])
+ assert result.exit_code == 0
+ self.assertIn("User 'John Doe' already exists.", result.output)
--
2.39.2