From b730333de3fd8d098bf3c6e6fc453bee736a9256 Mon Sep 17 00:00:00 2001 From: sosokker Date: Thu, 14 Sep 2023 21:47:12 +0700 Subject: [PATCH 1/5] Add Vote View Test and Recode it a bit + Seperate test Change Model a bit and migrate back Update Login, Signup UI a bit --- polls/migrations/0011_remove_vote_question.py | 17 ++ polls/migrations/0012_vote_question.py | 19 ++ polls/migrations/0013_alter_vote_question.py | 19 ++ polls/models.py | 8 +- polls/templates/polls/base.html | 4 - polls/templates/polls/index.html | 9 +- polls/templates/registration/login.html | 2 +- polls/templates/registration/signup.html | 2 +- polls/tests.py | 224 ------------------ polls/tests/__init__.py | 0 polls/tests/base.py | 14 ++ polls/tests/test_detail_views.py | 43 ++++ polls/tests/test_index_views.py | 77 ++++++ polls/tests/test_question_model.py | 105 ++++++++ polls/tests/test_vote_views.py | 86 +++++++ polls/views.py | 52 ++-- 16 files changed, 422 insertions(+), 259 deletions(-) create mode 100644 polls/migrations/0011_remove_vote_question.py create mode 100644 polls/migrations/0012_vote_question.py create mode 100644 polls/migrations/0013_alter_vote_question.py delete mode 100644 polls/tests.py create mode 100644 polls/tests/__init__.py create mode 100644 polls/tests/base.py create mode 100644 polls/tests/test_detail_views.py create mode 100644 polls/tests/test_index_views.py create mode 100644 polls/tests/test_question_model.py create mode 100644 polls/tests/test_vote_views.py diff --git a/polls/migrations/0011_remove_vote_question.py b/polls/migrations/0011_remove_vote_question.py new file mode 100644 index 0000000..ab6c9e9 --- /dev/null +++ b/polls/migrations/0011_remove_vote_question.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.4 on 2023-09-14 12:47 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('polls', '0010_sentimentvote'), + ] + + operations = [ + migrations.RemoveField( + model_name='vote', + name='question', + ), + ] diff --git a/polls/migrations/0012_vote_question.py b/polls/migrations/0012_vote_question.py new file mode 100644 index 0000000..4b4c620 --- /dev/null +++ b/polls/migrations/0012_vote_question.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.4 on 2023-09-14 13:15 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('polls', '0011_remove_vote_question'), + ] + + operations = [ + migrations.AddField( + model_name='vote', + name='question', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='polls.question'), + ), + ] diff --git a/polls/migrations/0013_alter_vote_question.py b/polls/migrations/0013_alter_vote_question.py new file mode 100644 index 0000000..9bb9277 --- /dev/null +++ b/polls/migrations/0013_alter_vote_question.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.4 on 2023-09-14 13:15 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('polls', '0012_vote_question'), + ] + + operations = [ + migrations.AlterField( + model_name='vote', + name='question', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='polls.question'), + ), + ] diff --git a/polls/models.py b/polls/models.py index a9c0508..10be79f 100644 --- a/polls/models.py +++ b/polls/models.py @@ -172,8 +172,8 @@ class Question(models.Model): vote.update(vote_types=True) self.save() else: - return 'already_upvoted' - return 'ok' + return False + return True def downvote(self, user): @@ -187,8 +187,8 @@ class Question(models.Model): vote.update(vote_types=False) self.save() else: - return 'already_downvoted' - return 'ok' + return False + return True class Choice(models.Model): diff --git a/polls/templates/polls/base.html b/polls/templates/polls/base.html index fc6124b..fa30709 100644 --- a/polls/templates/polls/base.html +++ b/polls/templates/polls/base.html @@ -6,10 +6,6 @@ - diff --git a/polls/templates/polls/index.html b/polls/templates/polls/index.html index d870900..fb8fdb2 100644 --- a/polls/templates/polls/index.html +++ b/polls/templates/polls/index.html @@ -3,8 +3,13 @@