ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed server, rebased on current master

Browse Source
This commit is contained in:
Finn Stutzenstein 2021-01-12 09:50:13 +01:00
parent 0b01b5576b
commit ea180246c7
No known key found for this signature in database
GPG Key ID: 9042F605C6324654
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -28,6 +28,8 @@ server/.venv
/haproxy/ /haproxy/
/docker/keys/ /docker/keys/
/docs/ /docs/
# OS3+-Submodules
/autoupdate/
# Plugin development # Plugin development
openslides_* openslides_*
# Old OS3 stuff # Old OS3 stuff

22
server/tests/integration/assignments/test_polls.py
View File

@ -529,7 +529,7 @@ class CreateAssignmentPoll(TestCase):
reverse("assignmentpoll-list"), reverse("assignmentpoll-list"),
{ {
"title": "test_title_9FP4m2f2k09f4gni2sqq", "title": "test_title_9FP4m2f2k09f4gni2sqq",
"pollmethod": AssignmentPoll.POLLMETHOD_VOTES, "pollmethod": AssignmentPoll.POLLMETHOD_Y,
"type": "named", "type": "named",
"assignment_id": self.assignment.id, "assignment_id": self.assignment.id,
"onehundred_percent_base": AssignmentPoll.PERCENT_BASE_YNA, "onehundred_percent_base": AssignmentPoll.PERCENT_BASE_YNA,
@ -547,7 +547,7 @@ class CreateAssignmentPoll(TestCase):
reverse("assignmentpoll-list"), reverse("assignmentpoll-list"),
{ {
"title": "test_title_9FP4m2f2k09f4gni2sqq", "title": "test_title_9FP4m2f2k09f4gni2sqq",
"pollmethod": AssignmentPoll.POLLMETHOD_VOTES, "pollmethod": AssignmentPoll.POLLMETHOD_Y,
"type": "named", "type": "named",
"assignment_id": self.assignment.id, "assignment_id": self.assignment.id,
"onehundred_percent_base": AssignmentPoll.PERCENT_BASE_YNA, "onehundred_percent_base": AssignmentPoll.PERCENT_BASE_YNA,
@ -1401,7 +1401,7 @@ class VoteAssignmentPollNamedY(VoteAssignmentPollBaseTestClass):
self.assertEqual(option2.abstain, Decimal("0")) self.assertEqual(option2.abstain, Decimal("0"))
def test_global_yes(self): def test_global_yes(self):
self.poll.votes_amount = 2 self.poll.max_votes_amount = 2
self.poll.save() self.poll.save()
self.start_poll() self.start_poll()
response = self.client.post( response = self.client.post(
@ -1429,7 +1429,7 @@ class VoteAssignmentPollNamedY(VoteAssignmentPollBaseTestClass):
self.assertEqual(AssignmentPoll.objects.get().amount_global_yes, None) self.assertEqual(AssignmentPoll.objects.get().amount_global_yes, None)
def test_global_no(self): def test_global_no(self):
self.poll.votes_amount = 2 self.poll.max_votes_amount = 2
self.poll.save() self.poll.save()
self.start_poll() self.start_poll()
response = self.client.post( response = self.client.post(
@ -1457,7 +1457,7 @@ class VoteAssignmentPollNamedY(VoteAssignmentPollBaseTestClass):
self.assertEqual(AssignmentPoll.objects.get().amount_global_no, None) self.assertEqual(AssignmentPoll.objects.get().amount_global_no, None)
def test_global_abstain(self): def test_global_abstain(self):
self.poll.votes_amount = 2 self.poll.max_votes_amount = 2
self.poll.save() self.poll.save()
self.start_poll() self.start_poll()
response = self.client.post( response = self.client.post(
@ -1663,7 +1663,7 @@ class VoteAssignmentPollNamedN(VoteAssignmentPollBaseTestClass):
def setup_for_multiple_votes(self): def setup_for_multiple_votes(self):
self.poll.allow_multiple_votes_per_candidate = True self.poll.allow_multiple_votes_per_candidate = True
self.poll.votes_amount = 3 self.poll.max_votes_amount = 3
self.poll.save() self.poll.save()
self.add_candidate() self.add_candidate()
@ -1729,7 +1729,7 @@ class VoteAssignmentPollNamedN(VoteAssignmentPollBaseTestClass):
self.assertEqual(option2.abstain, Decimal("0")) self.assertEqual(option2.abstain, Decimal("0"))
def test_global_yes(self): def test_global_yes(self):
self.poll.votes_amount = 2 self.poll.max_votes_amount = 2
self.poll.save() self.poll.save()
self.start_poll() self.start_poll()
response = self.client.post( response = self.client.post(
@ -1757,7 +1757,7 @@ class VoteAssignmentPollNamedN(VoteAssignmentPollBaseTestClass):
self.assertEqual(AssignmentPoll.objects.get().amount_global_yes, None) self.assertEqual(AssignmentPoll.objects.get().amount_global_yes, None)
def test_global_no(self): def test_global_no(self):
self.poll.votes_amount = 2 self.poll.max_votes_amount = 2
self.poll.save() self.poll.save()
self.start_poll() self.start_poll()
response = self.client.post( response = self.client.post(
@ -1785,7 +1785,7 @@ class VoteAssignmentPollNamedN(VoteAssignmentPollBaseTestClass):
self.assertEqual(AssignmentPoll.objects.get().amount_global_no, None) self.assertEqual(AssignmentPoll.objects.get().amount_global_no, None)
def test_global_abstain(self): def test_global_abstain(self):
self.poll.votes_amount = 2 self.poll.max_votes_amount = 2
self.poll.save() self.poll.save()
self.start_poll() self.start_poll()
response = self.client.post( response = self.client.post(
@ -2177,7 +2177,7 @@ class VoteAssignmentPollPseudoanonymousY(VoteAssignmentPollBaseTestClass):
def setup_for_multiple_votes(self): def setup_for_multiple_votes(self):
self.poll.allow_multiple_votes_per_candidate = True self.poll.allow_multiple_votes_per_candidate = True
self.poll.votes_amount = 3 self.poll.max_votes_amount = 3
self.poll.save() self.poll.save()
self.add_candidate() self.add_candidate()
@ -2425,7 +2425,7 @@ class VoteAssignmentPollPseudoanonymousN(VoteAssignmentPollBaseTestClass):
def setup_for_multiple_votes(self): def setup_for_multiple_votes(self):
self.poll.allow_multiple_votes_per_candidate = True self.poll.allow_multiple_votes_per_candidate = True
self.poll.votes_amount = 3 self.poll.max_votes_amount = 3
self.poll.save() self.poll.save()
self.add_candidate() self.add_candidate()