X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Ftest_motion.py;h=b4ba9070980806a21c41f958626e50128c2364fe;hb=f3cf764d5e9ab3f2fa1327dc5db02de90fd91434;hp=0bee29420e123a31029dcc6922b3d1c9103a71d7;hpb=4af338e33108c609381f4c60b6cc12b50da7f107;p=motion.git
diff --git a/tests/test_motion.py b/tests/test_motion.py
index 0bee294..b4ba907 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 tests.test_basics import BasicTest
# no specific rights required
class GeneralTests(BasicTest):
@@ -107,41 +22,39 @@ class GeneralTests(BasicTest):
def test_basic_results_data(self):
result = self.app.get('/', environ_base={'USER_ROLES': user}, follow_redirects=True)
testtext= '
\n
'\
- + '\n
Motion C (Canceled)\n
group1'\
+ + '\n
Motion C (Canceled)\n
group1'\
+ '\n
# g1.20200402.003'\
+ '\n
Result'\
- + '\n
'\
- + '\n
\n
Proposed: 2020-04-02 21:47:24 (UTC) by User A
'\
- + '\n
Canceled: 2020-04-03 21:48:24 (UTC) by User A
\n
'\
- + '\n
\n
A third motion
'\
- + '\n
\nYes 1
'\
- + '\nNo 0
'\
- + '\nAbstain 0
\n
'\
- + '\n
Cancelation reason: Entered with wrong text
\n
\n
'\
+ + '\n
Proposed: 2020-04-02 21:47:24 (UTC) by User A
'\
+ + '\n
Canceled: 2020-04-03 21:48:24 (UTC) by User A
\n
\n
A third motion
'\
+ + '\n
\nYes 1
'\
+ + '\nNo 0
'\
+ + '\nAbstain 0
\n
'\
+ + '\n
Cancelation reason: Entered with wrong text
\n
\n
'\
- + '\n
Motion B (Finished)\n
group1'\
+ + '\n
Motion B (Finished)\n
group1'\
+ '\n
# g1.20200402.002'\
+ '\n
Result'\
- + '\n
'\
- + '\n
\n
Proposed: 2020-04-02 21:41:26 (UTC) by User A
'\
- + '\n
Votes until: 2020-04-04 21:41:26 (UTC)
\n
'\
- + '\n
\n
A second motion
'\
- + '\n
\nYes 1
'\
- + '\nNo 2
'\
- + '\nAbstain 0
\n
\n
\n
\n
'\
- + '\n Motion A (Finished)\n group1'\
+ + '\n
\n
\n
Proposed: 2020-04-02 21:41:26 (UTC) by User A
'\
+ + '\n
Votes until: 2020-04-04 21:41:26 (UTC)
\n
\n
\n
A second motion
\n
'\
+ + '\nYes 1
'\
+ + '\nNo 2
'\
+ + '\nAbstain 0
\n
\n
\n
'\
+ + '\n
Motion A (Finished)\n
group1'\
+ '\n
# g1.20200402.001'\
+ '\n
Result'\
- + '\n
'\
- + '\n
\n
Proposed: 2020-04-02 21:40:33 (UTC) by User A
'\
- + '\n
Votes until: 2020-04-02 21:40:33 (UTC)
\n
'\
- + '\n
\n
My special motion
'\
- + '\n
\nYes 2
'\
- + '\nNo 1
'\
- + '\nAbstain 0
\n
\n
\n
\n
Proposed: 2020-04-02 21:40:33 (UTC) by User A
'\
+ + '\n
Votes until: 2020-04-02 21:40:33 (UTC)
\n
\n
My special motion
\n
'\
+ + '\nYes 2
'\
+ + '\nNo 1
'\
+ + '\nAbstain 0
\n
\n
Proposed: 2020-04-02 21:41:26 (UTC) by User A
\n Votes until: 2020-04-04 21:41:26 (UTC)
'\
- + '\n \n \n'\
+ testtext= 'Proposed: 2020-04-02 21:41:26 (UTC) by User A
\n Votes until: 2020-04-04 21:41:26 (UTC)
'\
+ + '\n \n \n \n'\
+ '\nBack'
self.assertIn(str.encode(testtext), result.data)
@@ -795,15 +708,15 @@ class ProxyVoteTests(BasicTest):
result = self.app.get('/motion/' + motion, environ_base={'USER_ROLES': user}, follow_redirects=True)
# own vote without change
testtext= ''
+ + '\n'\
+ + '\n'\
+ + '\n'
self.assertIn(str.encode(testtext), result.data)
# proxy vote with change
testtext= '\n'
+ + '\n'\
+ + '\n'\
+ + '\n\n'
self.assertIn(str.encode(testtext), result.data)
# User B view
@@ -811,9 +724,9 @@ class ProxyVoteTests(BasicTest):
# own vote without change
testtext= 'My vote
\nGiven by testuser\n'\
+ ''
+ + '\n'\
+ + '\n'\
+ + '\n'
self.assertIn(str.encode(testtext), result.data)
# change vote
@@ -822,9 +735,9 @@ class ProxyVoteTests(BasicTest):
result = self.app.get('/motion/' + motion, environ_base={'USER_ROLES': user}, follow_redirects=True)
testtext= '\n'
+ + '\n'\
+ + '\n'\
+ + '\n\n'
self.assertIn(str.encode(testtext), result.data)
def test_proxy_vote_no_proxy(self):