]> WPIA git - motion.git/blobdiff - tests/test_motion.py
Merge branch 'admin_cleanup' into 'master'
[motion.git] / tests / test_motion.py
index 0bee29420e123a31029dcc6922b3d1c9103a71d7..b1ec4335b59fdb04154bb4bccccea2174ae40d76 100644 (file)
@@ -1,90 +1,6 @@
-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 '<p>'+motiontext+'</p></p>\n    <p>\nYes <span class=\"badge badge-pill badge-secondary\">'+str(yes)+'</span><br>'\
-            + '\nNo <span class=\"badge badge-pill badge-secondary\">'+str(no)+'</span><br>'\
-            + '\nAbstain <span class=\"badge badge-pill badge-secondary\">'+str(abstain)+'</span>'
-
-    # 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
+from motion import app
 
 # no specific rights required
 class GeneralTests(BasicTest):
@@ -107,41 +23,39 @@ class GeneralTests(BasicTest):
     def test_basic_results_data(self):
         result = self.app.get('/', environ_base={'USER_ROLES': user}, follow_redirects=True)
         testtext= '<div class="motion card" id="motion-3">\n  <div class="motion-title card-heading alert-warning">'\
-            + '\n    <span class=\"title-text\">Motion C</span> (Canceled)\n    <span class=\"motion-type\">group1</span>'\
+            + '\n    <span class="title-text">Motion C</span> (Canceled)\n    <span class="motion-type">group1</span>'\
             + '\n    <div># g1.20200402.003'\
             + '\n    <a class="btn btn-primary" href="/motion/g1.20200402.003" role="button">Result</a>'\
-            + '\n    </div>'\
-            + '\n    <div class=\"date\">\n      <div>Proposed: 2020-04-02 21:47:24 (UTC) by User A</div>'\
-            + '\n      <div>Canceled: 2020-04-03 21:48:24 (UTC) by User A</div></div>\n  </div>'\
-            + '\n  <div class=\"card-body\">\n    <p><p>A third motion</p></p>'\
-            + '\n    <p>\nYes <span class=\"badge badge-pill badge-secondary\">1</span><br>'\
-            + '\nNo <span class=\"badge badge-pill badge-secondary\">0</span><br>'\
-            + '\nAbstain <span class=\"badge badge-pill badge-secondary\">0</span><br>\n    </p>'\
-            + '\n    <p>Cancelation reason: Entered with wrong text</p>\n  </div>\n</div>'
+            + '\n    </div>\n    <div class="date">'\
+            + '\n      <div>Proposed: 2020-04-02 21:47:24 (UTC) by User A</div>'\
+            + '\n      <div>Canceled: 2020-04-03 21:48:24 (UTC) by User A</div>\n     </div>\n  </div>'\
+            + '\n  <div class="card-body">\n    <p><p>A third motion</p></p>'\
+            + '\n    <p>\nYes <span class="badge badge-pill badge-secondary">1</span><br>'\
+            + '\nNo <span class="badge badge-pill badge-secondary">0</span><br>'\
+            + '\nAbstain <span class="badge badge-pill badge-secondary">0</span><br>\n    </p>'\
+            + '\n    <p>Cancelation reason: Entered with wrong text</p>\n  </div>\n</div>\n'
         self.assertIn(str.encode(testtext), result.data)
         testtext= '<div class="motion card" id="motion-2">\n  <div class="motion-title card-heading alert-danger">'\
-            + '\n    <span class=\"title-text\">Motion B</span> (Finished)\n    <span class=\"motion-type\">group1</span>'\
+            + '\n    <span class="title-text">Motion B</span> (Finished)\n    <span class="motion-type">group1</span>'\
             + '\n    <div># g1.20200402.002'\
             + '\n    <a class="btn btn-primary" href="/motion/g1.20200402.002" role="button">Result</a>'\
-            + '\n    </div>'\
-            + '\n    <div class=\"date\">\n      <div>Proposed: 2020-04-02 21:41:26 (UTC) by User A</div>'\
-            + '\n      <div>Votes until: 2020-04-04 21:41:26 (UTC)</div></div>\n  </div>'\
-            + '\n  <div class=\"card-body\">\n    <p><p>A second motion</p></p>'\
-            + '\n    <p>\nYes <span class=\"badge badge-pill badge-secondary\">1</span><br>'\
-            + '\nNo <span class=\"badge badge-pill badge-secondary\">2</span><br>'\
-            + '\nAbstain <span class=\"badge badge-pill badge-secondary\">0</span><br>\n    </p>\n  </div>\n</div>\n'
-        self.assertIn(str.encode(testtext), result.data)
-        testtext= '<div class=\"motion card\" id=\"motion-1\">\n  <div class=\"motion-title card-heading alert-success\">'\
-            + '\n    <span class=\"title-text\">Motion A</span> (Finished)\n    <span class=\"motion-type\">group1</span>'\
+            + '\n    </div>\n    <div class="date">\n      <div>Proposed: 2020-04-02 21:41:26 (UTC) by User A</div>'\
+            + '\n      <div>Votes until: 2020-04-04 21:41:26 (UTC)</div>\n     </div>\n  </div>'\
+            + '\n  <div class="card-body">\n    <p><p>A second motion</p></p>\n    <p>'\
+            + '\nYes <span class="badge badge-pill badge-secondary">1</span><br>'\
+            + '\nNo <span class="badge badge-pill badge-secondary">2</span><br>'\
+            + '\nAbstain <span class="badge badge-pill badge-secondary">0</span><br>\n    </p>\n  </div>\n</div>\n'
+        self.assertIn(str.encode(testtext), result.data)
+        testtext= '<div class="motion card" id="motion-1">\n  <div class="motion-title card-heading alert-success">'\
+            + '\n    <span class="title-text">Motion A</span> (Finished)\n    <span class="motion-type">group1</span>'\
             + '\n    <div># g1.20200402.001'\
             + '\n    <a class="btn btn-primary" href="/motion/g1.20200402.001" role="button">Result</a>'\
-            + '\n    </div>'\
-            + '\n    <div class=\"date">\n      <div>Proposed: 2020-04-02 21:40:33 (UTC) by User A</div>'\
-            + '\n      <div>Votes until: 2020-04-02 21:40:33 (UTC)</div></div>\n  </div>'\
-            + '\n  <div class=\"card-body\">\n    <p><p>My special motion</p></p>'\
-            + '\n    <p>\nYes <span class=\"badge badge-pill badge-secondary\">2</span><br>'\
-            + '\nNo <span class=\"badge badge-pill badge-secondary\">1</span><br>'\
-            + '\nAbstain <span class=\"badge badge-pill badge-secondary\">0</span><br>\n    </p>\n  </div>\n</div>\n</div>'
+            + '\n    </div>\n    <div class="date">\n      <div>Proposed: 2020-04-02 21:40:33 (UTC) by User A</div>'\
+            + '\n      <div>Votes until: 2020-04-02 21:40:33 (UTC)</div>\n     </div>\n  </div>'\
+            + '\n  <div class="card-body">\n    <p><p>My special motion</p></p>\n    <p>'\
+            + '\nYes <span class="badge badge-pill badge-secondary">2</span><br>'\
+            + '\nNo <span class="badge badge-pill badge-secondary">1</span><br>'\
+            + '\nAbstain <span class="badge badge-pill badge-secondary">0</span><br>\n    </p>\n  </div>\n</div>\n'
         self.assertIn(str.encode(testtext), result.data)
         testtext= 'Proxy management'
         self.assertNotIn(str.encode(testtext), result.data)
@@ -236,11 +150,11 @@ class VoterTests(BasicTest):
         result = self.app.get('/', environ_base={'USER_ROLES': user})
         resulttext=self.buildResultText('A fourth motion', 1, 0, 0)
         result = self.app.get('/motion/' + motion, environ_base={'USER_ROLES': user}, follow_redirects=True)
-        testtext= 'class=\"btn btn-success\" name=\"vote\" value="yes" id="vote-yes">yes</button>'
+        testtext= 'class=\"btn btn-success\" name=\"vote\" value="yes" id="vote-yes">Yes</button>'
         self.assertIn(str.encode(testtext), result.data)
-        testtext= 'class=\"btn btn-primary\" name=\"vote\" value=\"no\" id=\"vote-no\">no</button>'
+        testtext= 'class=\"btn btn-primary\" name=\"vote\" value=\"no\" id=\"vote-no\">No</button>'
         self.assertIn(str.encode(testtext), result.data)
-        testtext= 'class=\"btn btn-primary\" name=\"vote\" value=\"abstain\" id=\"vote-abstain\">abstain</button>'
+        testtext= 'class=\"btn btn-primary\" name=\"vote\" value=\"abstain\" id=\"vote-abstain\">Abstain</button>'
         self.assertIn(str.encode(testtext), result.data)
 
     def test_vote_no(self):
@@ -251,11 +165,11 @@ class VoterTests(BasicTest):
         resulttext=self.buildResultText('A fourth motion', 0, 1, 0)
         self.assertIn(str.encode(resulttext), result.data)
         result = self.app.get('/motion/' + motion, environ_base={'USER_ROLES': user}, follow_redirects=True)
-        testtext= 'class="btn btn-primary" name="vote\" value=\"yes\" id=\"vote-yes\">yes</button>'
+        testtext= 'class="btn btn-primary" name="vote\" value=\"yes\" id=\"vote-yes\">Yes</button>'
         self.assertIn(str.encode(testtext), result.data)
-        testtext= 'class=\"btn btn-success\" name=\"vote\" value=\"no\" id=\"vote-no\">no</button>'
+        testtext= 'class=\"btn btn-success\" name=\"vote\" value=\"no\" id=\"vote-no\">No</button>'
         self.assertIn(str.encode(testtext), result.data)
-        testtext= 'class=\"btn btn-primary\" name=\"vote\" value=\"abstain\" id=\"vote-abstain\">abstain</button>'
+        testtext= 'class=\"btn btn-primary\" name=\"vote\" value=\"abstain\" id=\"vote-abstain\">Abstain</button>'
         self.assertIn(str.encode(testtext), result.data)
 
     def test_vote_abstain(self):
@@ -266,11 +180,11 @@ class VoterTests(BasicTest):
         resulttext=self.buildResultText('A fourth motion', 0, 0, 1)
         self.assertIn(str.encode(resulttext), result.data)
         result = self.app.get('/motion/' + motion, environ_base={'USER_ROLES': user}, follow_redirects=True)
-        testtext= 'class=\"btn btn-primary\" name=\"vote\" value=\"yes\" id=\"vote-yes\">yes</button>'
+        testtext= 'class=\"btn btn-primary\" name=\"vote\" value=\"yes\" id=\"vote-yes\">Yes</button>'
         self.assertIn(str.encode(testtext), result.data)
-        testtext= 'class=\"btn btn-primary\" name=\"vote\" value=\"no\" id=\"vote-no\">no</button>'
+        testtext= 'class=\"btn btn-primary\" name=\"vote\" value=\"no\" id=\"vote-no\">No</button>'
         self.assertIn(str.encode(testtext), result.data)
-        testtext= 'class=\"btn btn-success\" name=\"vote\" value=\"abstain\" id=\"vote-abstain\">abstain</button>'
+        testtext= 'class=\"btn btn-success\" name=\"vote\" value=\"abstain\" id=\"vote-abstain\">Abstain</button>'
         self.assertIn(str.encode(testtext), result.data)
 
     def test_vote_change(self):
@@ -347,8 +261,8 @@ class VoterTests(BasicTest):
     def test_see_old_vote(self):
         motion='g1.20200402.002'
         result = self.app.get('/motion/' + motion, environ_base={'USER_ROLES': user}, follow_redirects=True)
-        testtext= '<div>Proposed: 2020-04-02 21:41:26 (UTC) by User A</div>\n      <div>Votes until: 2020-04-04 21:41:26 (UTC)</div></div>'\
-            + '\n  </div>\n  <div class="card-body">\n    <p><p>A second motion</p></p>\n  </div>\n</div>'\
+        testtext= '<div>Proposed: 2020-04-02 21:41:26 (UTC) by User A</div>\n      <div>Votes until: 2020-04-04 21:41:26 (UTC)</div>'\
+            + '\n     </div>\n  </div>\n  <div class="card-body">\n    <p><p>A second motion</p></p>\n  </div>\n</div>'\
             + '\n<a href="/?start=2#motion-2" class="btn btn-primary">Back</a>'
         self.assertIn(str.encode(testtext), result.data)
 
@@ -487,6 +401,19 @@ class CreateMotionTests(BasicTest):
         self.assertEqual(response.status_code, 403)
         self.assertIn(str.encode('Forbidden'), response.data)
 
+    def test_SeeCancelMotion(self):
+        self.db_sampledata()
+
+        motion='g1.20200402.004'
+        result = self.app.get('/motion/' + motion, environ_base={'USER_ROLES': user}, follow_redirects=True)
+        testtext= '<button type="submit" class="btn btn-danger" name="cancel" value="cancel" id="cancel">Cancel</button>'
+        self.assertIn(str.encode(testtext), result.data)
+
+        motion='g1.20200402.004'
+        result = self.app.get('/motion/' + motion, environ_base={'USER_ROLES': 'testuser/vote:*'}, follow_redirects=True)
+        testtext= '<button type="submit" class="btn btn-danger" name="cancel" value="cancel" id="cancel">Cancel</button>'
+        self.assertNotIn(str.encode(testtext), result.data)
+
     def test_cancelMotion(self):
         self.db_sampledata()
 
@@ -519,6 +446,19 @@ class CreateMotionTests(BasicTest):
         self.assertEqual(response.status_code, 403)
         self.assertIn(str.encode('Error, motion was canceled'), response.data)
 
+    def test_SeeFinishMotion(self):
+        self.db_sampledata()
+
+        motion='g1.20200402.004'
+        result = self.app.get('/motion/' + motion, environ_base={'USER_ROLES': user}, follow_redirects=True)
+        testtext= '<button type="submit" class="btn btn-danger" name="finish" value="finish" id="finish">Finish</button>'
+        self.assertIn(str.encode(testtext), result.data)
+
+        motion='g1.20200402.004'
+        result = self.app.get('/motion/' + motion, environ_base={'USER_ROLES': 'testuser/vote:*'}, follow_redirects=True)
+        testtext= '<button type="submit" class="btn btn-danger" name="finish" value="finish" id="finish">Finish</button>'
+        self.assertNotIn(str.encode(testtext), result.data)
+
     def test_finishMotion(self):
         self.db_sampledata()
 
@@ -538,6 +478,24 @@ class CreateMotionTests(BasicTest):
         self.assertEqual(response.status_code, 403)
         self.assertIn(str.encode('Error, out of time'), response.data)
 
+    def test_createMotionWait(self):
+        # test no limit given
+        self.db_sampledata()
+        title='My Motion'
+        content='My body'
+        response = self.createMotion(user, title, content, '3', 'group1')
+        self.assertEqual(response.status_code, 302)
+
+        # test different host
+        app.config.update(MOTION_WAIT_MINUTES={'127.0.0.1:5001':1})
+        response = self.createMotion(user, title, content, '3', 'group1')
+        self.assertEqual(response.status_code, 302)
+
+        # test 3 minutes
+        app.config.update(MOTION_WAIT_MINUTES={'127.0.0.1:5000':3})
+        response = self.createMotion(user, title, content, '3', 'group1')
+        self.assertIn(str.encode('Error, time between last motion to short. The current setting is 3 minute(s).'), response.data)
+
 class AuditMotionTests(BasicTest):
 
     def setUp(self):
@@ -557,313 +515,6 @@ class AuditMotionTests(BasicTest):
             + '\n    <div>User C: no</div>\n  </div>\n</div>\n<a href="/?start=2#motion-2" class="btn btn-primary">Back</a>'
         self.assertIn(str.encode(testtext), result.data)
 
-class ProxyManagementTests(BasicTest):
-
-    def setUp(self):
-        self.init_test()
-        global user
-        user='testuser/proxyadmin:*'
-        self.db_sampledata()
-
-    def tearDown(self):
-        pass
-
-    def test_see_proxy(self):
-        result = self.app.get('proxy', environ_base={'USER_ROLES': user}, follow_redirects=True)
-        testtext= 'div class="container">\n<form action="/proxy/add" method="POST">'
-        self.assertIn(str.encode(testtext), result.data)
-        testtext= 'proxy granted to:'
-        self.assertNotIn(str.encode(testtext), result.data)
-        testtext= 'holds proxy of:'
-        self.assertNotIn(str.encode(testtext), result.data)
-        testtext= '<select class="float form-control" name="voter">\n        '\
-            + '<option>User A</option>\n        <option>User B</option>\n        '\
-            + '<option>User C</option>\n        '\
-            + '<option>testuser</option>\n      '\
-            + '</select>\n'
-        self.assertIn(str.encode(testtext), result.data)
-        testtext= '<select class="float form-control" name="proxy">\n          '\
-            + '<option>User A</option>\n          '\
-            + '<option>User B</option>\n          '\
-            + '<option>User C</option>\n          '\
-            + '<option>testuser</option>\n      '\
-            + '</select>\n'
-        self.assertIn(str.encode(testtext), result.data)
-        testtext= '<table>\n      '\
-            + '<thead>\n        '\
-            + '<th>Voter</th>\n        <th>Proxy</th>\n        <th></th>\n      </thead>\n    '\
-            + '</table>\n'
-        self.assertIn(str.encode(testtext), result.data)
-        testtext= '<a class="nav-link" href="/proxy">Proxy management</a>'
-        self.assertIn(str.encode(testtext), result.data)
-
-    def test_add_proxy(self):
-        voter=''
-        proxy=''
-        response = self.addProxy(user, voter, proxy)
-        self.assertEqual(response.status_code, 400)
-        self.assertIn(str.encode('Error, voter equals proxy.'), response.data)
-
-        voter='User A'
-        response = self.addProxy(user, voter, proxy)
-        self.assertEqual(response.status_code, 400)
-        self.assertIn(str.encode('Error, proxy not found.'), response.data)
-
-        voter='User Z'
-        response = self.addProxy(user, voter, proxy)
-        self.assertEqual(response.status_code, 400)
-        self.assertIn(str.encode('Error, voter not found.'), response.data)
-
-        voter=''
-        proxy='User B'
-        response = self.addProxy(user, voter, proxy)
-        self.assertEqual(response.status_code, 400)
-        self.assertIn(str.encode('Error, voter not found.'), response.data)
-
-        voter='User B'
-        proxy='User B'
-        response = self.addProxy(user, voter, proxy)
-        self.assertEqual(response.status_code, 400)
-        self.assertIn(str.encode('Error, voter equals proxy.'), response.data)
-
-        voter='User A'
-        proxy='User B'
-        response = self.addProxy(user, voter, proxy)
-        self.assertEqual(response.status_code, 302)
-        result = self.app.get('proxy', environ_base={'USER_ROLES': user}, follow_redirects=True)
-        testtext= '<form action="/proxy/revoke" method="POST">'
-        self.assertIn(str.encode(testtext), result.data)
-        testtext= '<table>\n      '\
-            + '<thead>\n        '\
-            + '<th>Voter</th>\n        '\
-            + '<th>Proxy</th>\n        <th></th>\n      </thead>\n      '\
-            + '<tr>\n        <td>User A</td>\n        <td>User B</td>\n        '\
-            + '<td><button type="submit" class="btn btn-danger" name="id" value="1">Revoke</button></td>\n      '\
-            + '</tr>\n    </table>\n'
-        self.assertIn(str.encode(testtext), result.data)
-
-        response = self.addProxy(user, voter, proxy)
-        self.assertEqual(response.status_code, 400)
-        self.assertIn(str.encode('Error, proxy allready given.'), response.data)
-
-        voter='User A'
-        proxy='User C'
-        response = self.addProxy(user, voter, proxy)
-        self.assertEqual(response.status_code, 400)
-        self.assertIn(str.encode('Error, proxy allready given.'), response.data)
-
-        voter='User C'
-        proxy='User B'
-        response = self.addProxy(user, voter, proxy)
-        self.assertEqual(response.status_code, 302)
-        result = self.app.get('proxy', environ_base={'USER_ROLES': user}, follow_redirects=True)
-        testtext= '<table>\n      '\
-            + '<thead>\n        '\
-            + '<th>Voter</th>\n        '\
-            + '<th>Proxy</th>\n        <th></th>\n      </thead>\n      '\
-            + '<tr>\n        <td>User A</td>\n        <td>User B</td>\n        '\
-            + '<td><button type="submit" class="btn btn-danger" name="id" value="1">Revoke</button></td>\n      </tr>\n      '\
-            + '<tr>\n        <td>User C</td>\n        <td>User B</td>\n        '\
-            + '<td><button type="submit" class="btn btn-danger" name="id" value="2">Revoke</button></td>\n      '\
-            + '</tr>\n    </table>\n'
-        self.assertIn(str.encode(testtext), result.data)
-        testtext= 'proxy granted to:'
-        self.assertNotIn(str.encode(testtext), result.data)
-        testtext= 'holds proxy of:'
-        self.assertNotIn(str.encode(testtext), result.data)
-
-        voter='testuser'
-        proxy='User B'
-        response = self.addProxy(user, voter, proxy)
-        self.assertEqual(response.status_code, 400)
-        self.assertIn(str.encode('Error, Max proxy for \'User B\' reached.'), response.data)
-        
-        voter='testuser'
-        proxy='User A'
-        response = self.addProxy(user, voter, proxy)
-        self.assertEqual(response.status_code, 302)
-        result = self.app.get('proxy', environ_base={'USER_ROLES': user}, follow_redirects=True)
-        testtext= '<table>\n      '\
-            + '<thead>\n        '\
-            + '<th>Voter</th>\n        <th>Proxy</th>\n        <th></th>\n      </thead>\n      '\
-            + '<tr>\n        <td>testuser</td>\n        <td>User A</td>\n        '\
-            + '<td><button type="submit" class="btn btn-danger" name="id" value="3">Revoke</button></td>\n      </tr>\n      '\
-            + '<tr>\n        <td>User A</td>\n        <td>User B</td>\n        '\
-            + '<td><button type="submit" class="btn btn-danger" name="id" value="1">Revoke</button></td>\n      </tr>\n      '\
-            + '<tr>\n        <td>User C</td>\n        <td>User B</td>\n        '\
-            + '<td><button type="submit" class="btn btn-danger" name="id" value="2">Revoke</button></td>\n      '\
-            + '</tr>\n    </table>\n'
-        self.assertIn(str.encode(testtext), result.data)
-        testtext= 'proxy granted to: User A\n'
-        self.assertIn(str.encode(testtext), result.data)
-        testtext= 'holds proxy of:'
-        self.assertNotIn(str.encode(testtext), result.data)
-
-        voter='User B'
-        proxy='testuser'
-        response = self.addProxy(user, voter, proxy)
-        self.assertEqual(response.status_code, 302)
-        result = self.app.get('proxy', environ_base={'USER_ROLES': user}, follow_redirects=True)
-        testtext= '<table>\n      '\
-            + '<thead>\n        '\
-            + '<th>Voter</th>\n        <th>Proxy</th>\n        <th></th>\n      </thead>\n      '\
-            + '<tr>\n        <td>testuser</td>\n        <td>User A</td>\n        '\
-            + '<td><button type="submit" class="btn btn-danger" name="id" value="3">Revoke</button></td>\n      </tr>\n      '\
-            + '<tr>\n        <td>User A</td>\n        <td>User B</td>\n        '\
-            + '<td><button type="submit" class="btn btn-danger" name="id" value="1">Revoke</button></td>\n      </tr>\n      '\
-            + '<tr>\n        <td>User B</td>\n        <td>testuser</td>\n        '\
-            + '<td><button type="submit" class="btn btn-danger" name="id" value="4">Revoke</button></td>\n      </tr>\n      '\
-            + '<tr>\n        <td>User C</td>\n        <td>User B</td>\n        '\
-            + '<td><button type="submit" class="btn btn-danger" name="id" value="2">Revoke</button></td>\n      '\
-            + '</tr>\n    </table>\n'
-        self.assertIn(str.encode(testtext), result.data)
-        testtext= 'proxy granted to: User A\n'
-        self.assertIn(str.encode(testtext), result.data)
-        testtext= 'holds proxy of: User B\n'
-        self.assertIn(str.encode(testtext), result.data)
-
-        response = self.revokeProxy(user, userid)
-        self.assertEqual(response.status_code, 302)
-        result = self.app.get('proxy', environ_base={'USER_ROLES': user}, follow_redirects=True)
-        testtext= '<table>\n      '\
-            + '<thead>\n        '\
-            + '<th>Voter</th>\n        <th>Proxy</th>\n        <th></th>\n      </thead>\n      '\
-            + '<tr>\n        <td>testuser</td>\n        <td>User A</td>\n        '\
-            + '<td><button type="submit" class="btn btn-danger" name="id" value="3">Revoke</button></td>\n      </tr>\n      '\
-            + '<tr>\n        <td>User A</td>\n        <td>User B</td>\n        '\
-            + '<td><button type="submit" class="btn btn-danger" name="id" value="1">Revoke</button></td>\n      </tr>\n      '\
-            + '<tr>\n        <td>User C</td>\n        <td>User B</td>\n        '\
-            + '<td><button type="submit" class="btn btn-danger" name="id" value="2">Revoke</button></td>\n      '\
-            + '</tr>\n    </table>\n'
-        self.assertIn(str.encode(testtext), result.data)
-        testtext= 'proxy granted to: User A\n'
-        self.assertIn(str.encode(testtext), result.data)
-        testtext= 'holds proxy of:'
-        self.assertNotIn(str.encode(testtext), result.data)
-
-        response = self.revokeProxy(user, 3)
-        self.assertEqual(response.status_code, 302)
-        result = self.app.get('proxy', environ_base={'USER_ROLES': user}, follow_redirects=True)
-        testtext= '<table>\n      '\
-            + '<thead>\n        '\
-            + '<th>Voter</th>\n        <th>Proxy</th>\n        <th></th>\n      </thead>\n      '\
-            + '<tr>\n        <td>User A</td>\n        <td>User B</td>\n        '\
-            + '<td><button type="submit" class="btn btn-danger" name="id" value="1">Revoke</button></td>\n      </tr>\n      '\
-            + '<tr>\n        <td>User C</td>\n        <td>User B</td>\n        '\
-            + '<td><button type="submit" class="btn btn-danger" name="id" value="2">Revoke</button></td>\n      '\
-            + '</tr>\n    </table>\n'
-        self.assertIn(str.encode(testtext), result.data)
-        testtext= 'proxy granted to:'
-        self.assertNotIn(str.encode(testtext), result.data)
-        testtext= 'holds proxy of:'
-        self.assertNotIn(str.encode(testtext), result.data)
-
-        result = self.app.post('proxy/revokeall', environ_base={'USER_ROLES': user}, follow_redirects=True)
-        self.assertEqual(response.status_code, 302)
-        result = self.app.get('proxy', environ_base={'USER_ROLES': user}, follow_redirects=True)
-        testtext= '<table>\n      '\
-            + '<thead>\n        '\
-            + '<th>Voter</th>\n        <th>Proxy</th>\n        <th></th>\n      </thead>\n    '\
-            + '</table>\n'
-        self.assertIn(str.encode(testtext), result.data)
-
-class ProxyVoteTests(BasicTest):
-
-    def setUp(self):
-        self.init_test()
-        global user
-        user='testuser/vote:* proxyadmin:*'
-        self.db_sampledata()
-
-    def tearDown(self):
-        pass
-
-    def test_proxy_vote(self):
-        voter='testuser'
-        proxy='User B'
-        proxyid=2
-        proxyuser='User B/vote:*'
-
-        response = self.addProxy(user, proxy, voter)
-        self.assertEqual(response.status_code, 302)
-
-        motion='g1.20200402.004'
-        response = self.createVote(user, motion, 'yes', proxyid)
-        self.assertEqual(response.status_code, 302)
-
-        # testuser view
-        result = self.app.get('/motion/' + motion, environ_base={'USER_ROLES': user}, follow_redirects=True)
-        # own vote without change
-        testtext= '<form action="/motion/g1.20200402.004/vote/4" method="POST">\n'\
-            + '<button type="submit" class="btn btn-primary" name="vote" value="yes" id="vote-yes">yes</button>\n'\
-            + '<button type="submit" class="btn btn-primary" name="vote" value="no" id="vote-no">no</button>\n'\
-            + '<button type="submit" class="btn btn-primary" name="vote" value="abstain" id="vote-abstain">abstain</button>\n</form>'
-        self.assertIn(str.encode(testtext), result.data)
-        # proxy vote with change
-        testtext= '<form action="/motion/g1.20200402.004/vote/2" method="POST">\n'\
-            + '<button type="submit" class="btn btn-success" name="vote" value="yes" id="vote-yes">yes</button>\n'\
-            + '<button type="submit" class="btn btn-primary" name="vote" value="no" id="vote-no">no</button>\n'\
-            + '<button type="submit" class="btn btn-primary" name="vote" value="abstain" id="vote-abstain">abstain</button>\n</form>\n'
-        self.assertIn(str.encode(testtext), result.data)
-        
-        # User B view
-        result = self.app.get('/motion/' + motion, environ_base={'USER_ROLES': proxyuser}, follow_redirects=True)
-        # own vote without change
-        testtext= '<h3>My vote</h3>\nGiven by testuser\n'\
-            + '<form action="/motion/g1.20200402.004/vote/2" method="POST">\n'\
-            + '<button type="submit" class="btn btn-success" name="vote" value="yes" id="vote-yes">yes</button>\n'\
-            + '<button type="submit" class="btn btn-primary" name="vote" value="no" id="vote-no">no</button>\n'\
-            + '<button type="submit" class="btn btn-primary" name="vote" value="abstain" id="vote-abstain">abstain</button>\n</form>'
-        self.assertIn(str.encode(testtext), result.data)
-        
-        # change vote
-        response = self.createVote(user, motion, 'no', proxyid)
-        self.assertEqual(response.status_code, 302)
-
-        result = self.app.get('/motion/' + motion, environ_base={'USER_ROLES': user}, follow_redirects=True)
-        testtext= '<form action="/motion/g1.20200402.004/vote/2" method="POST">\n'\
-            + '<button type="submit" class="btn btn-primary" name="vote" value="yes" id="vote-yes">yes</button>\n'\
-            + '<button type="submit" class="btn btn-success" name="vote" value="no" id="vote-no">no</button>\n'\
-            + '<button type="submit" class="btn btn-primary" name="vote" value="abstain" id="vote-abstain">abstain</button>\n</form>\n'
-        self.assertIn(str.encode(testtext), result.data)
-
-    def test_proxy_vote_no_proxy(self):
-        voter='testuser'
-        proxy='User B'
-        # wrong proxy id
-        proxyid=3
-
-        response = self.addProxy(user, proxy, voter)
-        self.assertEqual(response.status_code, 302)
-
-        motion='g1.20200402.004'
-        response = self.createVote(user, motion, 'yes', proxyid)
-        self.assertEqual(response.status_code, 400)
-        self.assertIn(str.encode('Error, proxy not found'), response.data)
-        
-        # non existing id
-        proxyid=10000
-
-        motion='g1.20200402.004'
-        response = self.createVote(user, motion, 'yes', proxyid)
-        self.assertEqual(response.status_code, 400)
-        self.assertIn(str.encode('Error, proxy not found'), response.data)
-
-    def test_proxy_vote_no_voter(self):
-        voter='User A'
-        proxy='User B'
-        proxyid=2
-
-        response = self.addProxy(user, proxy, voter)
-        self.assertEqual(response.status_code, 302)
-
-        user1='testuser1/'
-        motion='g1.20200402.004'
-        response = self.createVote(user1, motion, 'yes', proxyid)
-        self.assertEqual(response.status_code, 403)
-        self.assertIn(str.encode('Forbidden'), response.data)
-
-
 
 if __name__ == "__main__":
     unittest.main()