Browse Source

fix regression in other test

Rafał Pitoń 8 years ago
parent
commit
247f02eb0f

+ 8 - 2
misago/threads/migrations/0001_initial.py

@@ -284,15 +284,21 @@ class Migration(migrations.Migration):
             name='PollVote',
             name='PollVote',
             fields=[
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('voter_name', models.CharField(max_length=255)),
+                ('voter_name', models.CharField(max_length=255, db_index=True)),
                 ('voter_slug', models.CharField(max_length=255)),
                 ('voter_slug', models.CharField(max_length=255)),
                 ('voter_ip', models.GenericIPAddressField()),
                 ('voter_ip', models.GenericIPAddressField()),
                 ('voted_on', models.DateTimeField(default=django.utils.timezone.now)),
                 ('voted_on', models.DateTimeField(default=django.utils.timezone.now)),
-                ('choice_hash', models.CharField(max_length=12, db_index=True)),
+                ('choice_hash', models.CharField(max_length=12)),
                 ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='misago_categories.Category')),
                 ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='misago_categories.Category')),
                 ('poll', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='misago_threads.Poll')),
                 ('poll', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='misago_threads.Poll')),
                 ('thread', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='misago_threads.Thread')),
                 ('thread', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='misago_threads.Thread')),
                 ('voter', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
                 ('voter', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
             ],
             ],
         ),
         ),
+        migrations.AlterIndexTogether(
+            name='pollvote',
+            index_together=set([
+                ('poll', 'voter_name'),
+            ]),
+        ),
     ]
     ]

+ 5 - 0
misago/threads/models/pollvote.py

@@ -18,3 +18,8 @@ class PollVote(models.Model):
     voter_ip = models.GenericIPAddressField()
     voter_ip = models.GenericIPAddressField()
     voted_on = models.DateTimeField(default=timezone.now)
     voted_on = models.DateTimeField(default=timezone.now)
     choice_hash = models.CharField(max_length=12, db_index=True)
     choice_hash = models.CharField(max_length=12, db_index=True)
+
+    class Meta:
+        index_together = [
+            ['poll', 'voter_name'],
+        ]

+ 1 - 2
misago/threads/tests/test_thread_poll_api.py

@@ -84,8 +84,7 @@ class ThreadPollApiTestCase(AuthenticatedUserTestCase):
                 }
                 }
             ],
             ],
             allowed_choices=2,
             allowed_choices=2,
-            votes=4,
-            is_public=True
+            votes=4
         )
         )
 
 
         # one user voted for Alpha choice
         # one user voted for Alpha choice

+ 3 - 0
misago/threads/tests/test_thread_pollvotes_api.py

@@ -11,6 +11,9 @@ class ThreadGetVotesTests(ThreadPollApiTestCase):
 
 
         self.mock_poll()
         self.mock_poll()
 
 
+        self.poll.is_public = True
+        self.poll.save()
+
         self.api_link = reverse('misago:api:thread-poll-votes', kwargs={
         self.api_link = reverse('misago:api:thread-poll-votes', kwargs={
             'thread_pk': self.thread.pk,
             'thread_pk': self.thread.pk,
             'pk': self.poll.pk
             'pk': self.poll.pk