You've solved {{num_questions_answered}} question{{ num_questions_answered|pluralize }} in the last month!
diff --git a/codewof/templates/users/user_detail.html b/codewof/templates/users/user_detail.html
new file mode 100644
index 000000000..14941231c
--- /dev/null
+++ b/codewof/templates/users/user_detail.html
@@ -0,0 +1,48 @@
+{% extends "base.html" %}
+{% load static %}
+
+{% block title %}User: {{ user.get_full_name }}{% endblock %}
+
+{% block content %}
+
+
+
+
+
{{ user.get_full_name }}
+
+
Date joined: {{ user.date_joined }}
+
Points earned: {{user.profile.points}}
+
Achievements:
+
+ {% for badge in all_badges %}
+ {% if badge in user.profile.earned_badges.all %}
+
+
{{badge.display_name}}
+ {% else %}
+
{{badge.display_name}}
+ {% endif %}
+
+ {% endfor %}
+
+
+
+
+
+{% endblock content %}
diff --git a/codewof/tests/codewof_test_data_generator.py b/codewof/tests/codewof_test_data_generator.py
new file mode 100644
index 000000000..a16e8c89f
--- /dev/null
+++ b/codewof/tests/codewof_test_data_generator.py
@@ -0,0 +1,133 @@
+"""Class to generate test data required for testing codewof system."""
+
+from django.contrib.auth import get_user_model
+from django.core import management
+import datetime
+
+from programming.models import (
+ Question,
+ Attempt,
+ Badge,
+ QuestionTypeProgram,
+ QuestionTypeFunction,
+ QuestionTypeParsons,
+ QuestionTypeDebugging,
+)
+
+from users.models import UserType
+
+User = get_user_model()
+
+
+def generate_questions():
+ """Generate questions for use in codeWOF tests. Questions contain minimum information and complexity."""
+ Question.objects.create(slug="question-1", title='Test', question_text='Hello')
+
+ QuestionTypeProgram.objects.create(
+ slug="program-question-1",
+ title='Test',
+ question_text='Hello',
+ solution="question_answer"
+ )
+
+ QuestionTypeFunction.objects.create(
+ slug="function-question-1",
+ title='Test',
+ question_text='Hello',
+ solution="question_answer"
+ )
+
+ QuestionTypeParsons.objects.create(
+ slug="parsons-question-1",
+ title='Test',
+ question_text='Hello',
+ solution="question_answer",
+ lines="These are\nthe lines"
+ )
+
+ QuestionTypeDebugging.objects.create(
+ slug="debugging-question-1",
+ title='Test',
+ question_text='Hello',
+ solution="question_answer",
+ initial_code=''
+ )
+
+
+def generate_users(user):
+ """Generate users for codeWOF tests. Creates two basic users for unit tests."""
+ management.call_command("load_user_types")
+ user_john = User.objects.create_user(
+ id=1,
+ username='john',
+ first_name='John',
+ last_name='Doe',
+ email='john@uclive.ac.nz',
+ password='onion',
+ user_type=UserType.objects.get(slug='student')
+ )
+ user_john.save()
+
+ user_sally = User.objects.create_user(
+ id=2,
+ username='sally',
+ first_name='Sally',
+ last_name='Jones',
+ email='sally@uclive.ac.nz',
+ password='onion',
+ user_type=UserType.objects.get(slug='other')
+ )
+ user_sally.save()
+
+
+def generate_badges():
+ """Create badges for codeWOF tests. Badges created for each main current badge category."""
+ Badge.objects.create(
+ id_name='questions-solved-1',
+ display_name='Solved one question',
+ description='first',
+ badge_tier=1,
+ )
+ Badge.objects.create(
+ id_name='create-account',
+ display_name='Account created',
+ description='test',
+ badge_tier=0,
+ )
+ Badge.objects.create(
+ id_name='attempts-made-5',
+ display_name='Five attempts made',
+ description='test',
+ badge_tier=2
+ )
+ Badge.objects.create(
+ id_name='attempts-made-1',
+ display_name='One attempt made',
+ description='test',
+ badge_tier=1,
+ parent=Badge.objects.get(id_name='attempts-made-5')
+ )
+ Badge.objects.create(
+ id_name='consecutive-days-2',
+ display_name='Two consecutive days',
+ description='test',
+ badge_tier=1,
+ )
+
+
+def generate_attempts():
+ """
+ Generate attempts for codeWOF tests.
+
+ Attempts are generated for user 1 and question 1, with attempts created to cover consecutive days, failed attempts,
+ and passed attempts. These attempts cover the main requirements to gain all test badges.
+ """
+ user = User.objects.get(id=1)
+ question = Question.objects.get(slug='question-1')
+ Attempt.objects.create(profile=user.profile, question=question, passed_tests=True)
+ Attempt.objects.create(profile=user.profile, question=question, passed_tests=False)
+ Attempt.objects.create(profile=user.profile, question=question, passed_tests=False)
+ Attempt.objects.create(profile=user.profile, question=question, passed_tests=True,
+ datetime=datetime.date(2019, 9, 9))
+ Attempt.objects.create(profile=user.profile, question=question, passed_tests=True,
+ datetime=datetime.date(2019, 9, 10))
diff --git a/codewof/tests/features/badges.feature b/codewof/tests/features/badges.feature
new file mode 100644
index 000000000..71fa92bd2
--- /dev/null
+++ b/codewof/tests/features/badges.feature
@@ -0,0 +1,27 @@
+Feature: Badges
+
+#check badge on creation
+Scenario: User profile is created
+ Given a user with ID 1 exists
+ When their account is created
+ Then their profile has 1 badge
+
+Scenario: User profile earns badge for one attempt
+ Given a user with ID 1 exists
+ And they have not earned the badge for one attempt
+ When the user attempts the "Print CodeWOF" question without solving it
+ Then the user earns a badge for one attempt made
+
+Scenario: User profile earns badge for one question solved
+ Given a user with ID 1 exists
+ And they have not earned the badge for solving one question
+ When the user solves the "Print CodeWOF" question
+ Then the user earns a badge for one question solved
+
+Scenario: User profile earns two badges on first question
+ Given a user with ID 1 exists
+ And they have not earned the badge for solving one question
+ And they have not attempted the "Print CodeWOF" question
+ And they have not earned the badge for one attempt
+ When the user solves the "Print CodeWOF" question
+ Then the user earns the one question solved badge and the one attempt made badge
diff --git a/codewof/tests/features/points.feature b/codewof/tests/features/points.feature
new file mode 100644
index 000000000..8d2bea989
--- /dev/null
+++ b/codewof/tests/features/points.feature
@@ -0,0 +1,55 @@
+Feature: Points
+
+#Test initial points are zero
+Scenario: User profile is created
+ Given a user with ID 1 is logged in
+ When their account is created
+ Then their profile's points are equal to 0
+
+#Test bonus point for first correct login
+Scenario: User solves a question on first attempt
+ Given a user with ID 1 is logged in
+ And their profile points are 0
+ And they have not attempted the "Print CodeWOF" question
+ When they solve the "Print CodeWOF" question
+ Then the user's points equal 12
+
+#Test for question that has previously been attempted
+Scenario: User solves an attempted question
+ Given a user with ID 1 is logged in
+ And their profile points are 0
+ And they have attempted the "Print CodeWOF" question
+ When they solve the "Print CodeWOF" question
+ Then the user's points equal 10
+
+#Test for question that has been attempted but not solved
+Scenario: User attempts a question
+ Given a user with ID 1 is logged in
+ And their profile points are 0
+ When they attempt the "Print CodeWOF" question without solving it
+ Then the user's points equal 0
+
+#Test for question that has previously been solved
+Scenario: User attempts a question
+ Given a user with ID 1 is logged in
+ And their profile points are 10
+ And they have already solved the "Print CodeWOF" question
+ When they solve the "Print CodeWOF" question
+ Then the user's points equal 10
+
+#Test for points earned with first attempt badge
+Scenario: User earns badge for one attempt
+ Given a user with ID 1 is logged in
+ And their profile points are 0
+ And they have not earned the badge for attempting one question
+ When they attempt the "Print CodeWOF" question
+ Then the user's points equal 10
+
+ #Test for points earned with five attempts badge
+ Scenario: User earns badge for five attempts
+ Given a user with ID 1 is logged in
+ And their profile points are 10
+ And they have not earned the badge for attempting five questions
+ And they have made 4 attempts in total
+ When they attempt the "Print CodeWOF" question
+ Then the user's points equal 30
diff --git a/codewof/tests/programming/factories.py b/codewof/tests/programming/factories.py
index b942ec40a..e103fcc09 100644
--- a/codewof/tests/programming/factories.py
+++ b/codewof/tests/programming/factories.py
@@ -8,6 +8,7 @@
post_generation,
)
from programming.models import Question, Profile, Attempt
+from django.utils import timezone
# shuffle the quesitons so it doesn't appear as 1, 2, 3, 4...
question_list = list(Question.objects.all())
@@ -18,7 +19,7 @@ class AttemptFactory(DjangoModelFactory):
"""Factory for generating attempts."""
profile = Iterator(Profile.objects.all())
- datetime = Faker('iso8601')
+ datetime = Faker('date_time', tzinfo=timezone.get_current_timezone())
question = Iterator(question_list)
user_code = Faker('paragraph', nb_sentences=5)
diff --git a/codewof/tests/programming/test_codewof_utils.py b/codewof/tests/programming/test_codewof_utils.py
new file mode 100644
index 000000000..42935dc74
--- /dev/null
+++ b/codewof/tests/programming/test_codewof_utils.py
@@ -0,0 +1,169 @@
+from django.test import TestCase
+from django.contrib.auth import get_user_model
+
+from programming.models import (
+ Question,
+ Attempt,
+ Badge,
+ Earned,
+)
+from codewof.tests.codewof_test_data_generator import (
+ generate_users,
+ generate_badges,
+ generate_questions,
+ generate_attempts,
+)
+from programming.codewof_utils import (
+ add_points,
+ backdate_points,
+ backdate_points_and_badges,
+ calculate_badge_points,
+ check_badge_conditions,
+ get_days_consecutively_answered,
+ get_questions_answered_in_past_month,
+ POINTS_BADGE,
+ POINTS_SOLUTION,
+ POINTS_BONUS,
+)
+from codewof.tests.conftest import user
+
+User = get_user_model()
+
+
+class TestCodewofUtils(TestCase):
+ @classmethod
+ def setUpTestData(cls):
+ # never modify this object in tests - read only
+ generate_users(user)
+ generate_questions()
+ generate_badges()
+
+ def test_add_points_first_attempt_correct(self):
+ user = User.objects.get(id=1)
+ question = Question.objects.get(id=1)
+ attempt = Attempt.objects.create(
+ profile=user.profile,
+ question=question,
+ passed_tests=True
+ )
+ points_before = user.profile.points
+ points_after = add_points(question, user.profile, attempt)
+ self.assertEqual(points_after - points_before, POINTS_SOLUTION + POINTS_BONUS)
+
+ def test_add_points_first_attempt_incorrect(self):
+ user = User.objects.get(id=1)
+ question = Question.objects.get(id=1)
+ attempt_1 = Attempt.objects.create(
+ profile=user.profile,
+ question=question,
+ passed_tests=False
+ )
+ points_before = user.profile.points
+ points_after = add_points(question, user.profile, attempt_1)
+ self.assertEqual(points_after - points_before, 0)
+
+ attempt_2 = Attempt.objects.create(
+ profile=user.profile,
+ question=question,
+ passed_tests=True
+ )
+ points_before = user.profile.points
+ points_after = add_points(question, user.profile, attempt_2)
+ self.assertEqual(points_after - points_before, POINTS_SOLUTION)
+
+ def test_calculate_badge_points_tier_0(self):
+ user = User.objects.get(id=1)
+ badge = Badge.objects.get(id_name="create-account")
+ badges = [badge]
+
+ points_before = user.profile.points
+ calculate_badge_points(user, badges)
+ self.assertEqual(user.profile.points - points_before, badge.badge_tier * POINTS_BADGE)
+
+ def test_calculate_badge_points_tier_1(self):
+ user = User.objects.get(id=1)
+ badge = Badge.objects.get(id_name="questions-solved-1")
+ badges = [badge]
+
+ points_before = user.profile.points
+ calculate_badge_points(user, badges)
+ self.assertEqual(user.profile.points - points_before, badge.badge_tier * POINTS_BADGE)
+
+ def test_calculate_badge_points_tier_2(self):
+ user = User.objects.get(id=1)
+ badge = Badge.objects.get(id_name="attempts-made-5")
+ badges = [badge]
+
+ points_before = user.profile.points
+ calculate_badge_points(user, badges)
+ self.assertEqual(user.profile.points - points_before, badge.badge_tier * POINTS_BADGE)
+
+ def test_check_badge_conditions(self):
+ generate_attempts()
+ user = User.objects.get(id=1)
+ self.assertEqual(user.profile.earned_badges.count(), 0)
+ check_badge_conditions(user)
+ earned_badges = user.profile.earned_badges
+ self.assertTrue(earned_badges.filter(id_name='create-account').exists())
+ self.assertTrue(earned_badges.filter(id_name='attempts-made-1').exists())
+ self.assertTrue(earned_badges.filter(id_name='attempts-made-5').exists())
+ self.assertTrue(earned_badges.filter(id_name='questions-solved-1').exists())
+ self.assertTrue(earned_badges.filter(id_name='consecutive-days-2').exists())
+
+ def test_get_days_consecutively_answered(self):
+ generate_attempts()
+ user = User.objects.get(id=1)
+ streak = get_days_consecutively_answered(user)
+ self.assertEqual(streak, 2)
+
+ def test_get_questions_answered_in_past_month(self):
+ generate_attempts()
+ user = User.objects.get(id=1)
+ num_solved = get_questions_answered_in_past_month(user)
+ self.assertEqual(num_solved, 1)
+
+ def test_backdate_points_correct_second_attempt(self):
+ user = User.objects.get(id=2)
+ question = Question.objects.get(slug='question-1')
+ Attempt.objects.create(profile=user.profile, question=question, passed_tests=False)
+ Attempt.objects.create(profile=user.profile, question=question, passed_tests=True)
+ profile = backdate_points(user.profile)
+ self.assertEqual(profile.points, 10)
+
+ def test_backdate_points_correct_multiple_attempts(self):
+ user = User.objects.get(id=2)
+ question = Question.objects.get(slug='question-1')
+ Attempt.objects.create(profile=user.profile, question=question, passed_tests=True)
+ Attempt.objects.create(profile=user.profile, question=question, passed_tests=True)
+ profile = backdate_points(user.profile)
+ self.assertEqual(profile.points, 12)
+
+ def test_backdate_points_and_badges_too_many_points(self):
+ generate_attempts()
+ user = User.objects.get(id=1)
+ user.profile.points = 1000
+ backdate_points_and_badges()
+ self.assertEqual(User.objects.get(id=1).profile.points, 62)
+
+ def test_backdate_points_and_badges_run_twice(self):
+ generate_attempts()
+ user = User.objects.get(id=1)
+ user.profile.points = 1000
+ backdate_points_and_badges()
+ backdate_points_and_badges()
+ self.assertEqual(User.objects.get(id=1).profile.points, 62)
+ earned_badges = User.objects.get(id=1).profile.earned_badges
+ self.assertEqual(len(earned_badges.filter(id_name='create-account')), 1)
+ self.assertEqual(len(earned_badges.filter(id_name='attempts-made-1')), 1)
+ self.assertEqual(len(earned_badges.filter(id_name='attempts-made-5')), 1)
+ self.assertEqual(len(earned_badges.filter(id_name='questions-solved-1')), 1)
+ self.assertEqual(len(earned_badges.filter(id_name='consecutive-days-2')), 1)
+
+ def test_backdate_points_and_badges_badge_earnt_no_longer_meets_requirements(self):
+ user = User.objects.get(id=2)
+ badge = Badge.objects.get(id_name='attempts-made-5')
+ Earned.objects.create(profile=user.profile, badge=badge)
+ backdate_points_and_badges()
+ self.assertTrue(
+ User.objects.get(id=2).profile.earned_badges.filter(id_name='attempts-made-5').exists()
+ )
diff --git a/codewof/tests/programming/test_models.py b/codewof/tests/programming/test_models.py
index 99568fbfd..2441a1083 100644
--- a/codewof/tests/programming/test_models.py
+++ b/codewof/tests/programming/test_models.py
@@ -1,153 +1,454 @@
-# from django.test import TestCase
-# from django.core.exceptions import ValidationError
-# from django.db.utils import IntegrityError
-# from django.contrib.auth.models import User
-
-# from questions.models import Token, Badge, Profile, Question, Programming, ProgrammingFunction, Buggy, BuggyFunction
-
-
-# class TokenModelTests(TestCase):
-# @classmethod
-# def setUpTestData(cls):
-# Token.objects.create(name='sphere', token='abc')
-
-# def test_name_unique(self):
-# with self.assertRaises(IntegrityError):
-# Token.objects.create(name='sphere', token='def')
-
-# class BadgeModelTests(TestCase):
-# @classmethod
-# def setUpTestData(cls):
-# Badge.objects.create(id_name='solve-40', display_name='first', description='first')
-
-# def test_id_name_unique(self):
-# with self.assertRaises(IntegrityError):
-# Badge.objects.create(id_name='solve-40', display_name='second', description='second')
-
-# class ProfileModelTests(TestCase):
+from django.test import TestCase
+from django.core.exceptions import ValidationError
+from django.db.utils import IntegrityError
+from django.contrib.auth import get_user_model
+from programming.codewof_utils import check_badge_conditions
+from programming.models import (
+ Token,
+ Badge,
+ Question,
+ Earned,
+ Attempt,
+ QuestionTypeProgram,
+ QuestionTypeFunction,
+ QuestionTypeParsons,
+ QuestionTypeDebugging,
+)
+
+from codewof.tests.codewof_test_data_generator import (
+ generate_users,
+ generate_badges,
+ generate_questions,
+ generate_attempts,
+)
+from codewof.tests.conftest import user
+
+User = get_user_model()
+
+
+class ProfileModelTests(TestCase):
+ @classmethod
+ def setUpTestData(cls):
+ # never modify this object in tests - read only
+ generate_users(user)
+ generate_questions()
+ generate_badges()
+
+ def test_profile_starts_with_no_points(self):
+ user = User.objects.get(id=1)
+ points = user.profile.points
+ self.assertEqual(points, 0)
+
+ def test_profile_starts_with_create_account_badge(self):
+ user = User.objects.get(id=1)
+ check_badge_conditions(user)
+ badge = Badge.objects.get(id_name="create-account")
+ earned = Earned.objects.filter(profile=user.profile, badge=badge)
+ self.assertEqual(len(earned), 1)
+
+ def test_attempted_questions(self):
+ user = User.objects.get(id=1)
+ generate_attempts()
+ attempted_questions = Attempt.objects.filter(profile=user.profile)
+ # generate_attempts in codewof_utils will generate 5 attempts for user 1
+ self.assertEqual(len(attempted_questions), 5)
+
+ def test_profile_starts_on_easiest_goal_level(self):
+ user = User.objects.get(id=1)
+ goal = user.profile.goal
+ self.assertEqual(goal, 1)
+
+ def test_set_goal_to_4(self):
+ user = User.objects.get(id=2)
+ user.profile.goal = 4
+ user.profile.full_clean()
+ user.profile.save()
+ double_check_user = User.objects.get(id=2)
+ self.assertEqual(double_check_user.profile.goal, 4)
+
+ def test_cannot_set_goal_less_than_1(self):
+ user = User.objects.get(id=2)
+ with self.assertRaises(ValidationError):
+ user.profile.goal = 0
+ user.profile.full_clean()
+ user.profile.save()
+ double_check_user = User.objects.get(id=2)
+ self.assertEqual(double_check_user.profile.goal, 1)
+
+ def test_cannot_set_goal_greater_than_7(self):
+ user = User.objects.get(id=2)
+ with self.assertRaises(ValidationError):
+ user.profile.goal = 8
+ user.profile.full_clean()
+ user.profile.save()
+ double_check_user = User.objects.get(id=2)
+ self.assertEqual(double_check_user.profile.goal, 1)
+
+ def test_str_representation(self):
+ user = User.objects.get(id=1)
+ self.assertEqual(str(user.profile), '{} {}'.format(user.first_name, user.last_name))
+
+
+class BadgeModelTests(TestCase):
+ @classmethod
+ def setUpTestData(cls):
+ # never modify this object in tests - read only
+ generate_users(user)
+ generate_badges()
+
+ def test_id_name_unique(self):
+ with self.assertRaises(IntegrityError):
+ Badge.objects.create(
+ id_name='questions-solved-1',
+ display_name='second',
+ description='second'
+ )
+
+ def test_badge_tier_zero_default(self):
+ badge = Badge.objects.create(
+ id_name='badge_name',
+ display_name='Dummy Badge',
+ description='A badge for testing'
+ )
+ self.assertEqual(badge.badge_tier, 0)
+
+ def test_str_representation(self):
+ badge = Badge.objects.get(id_name='questions-solved-1')
+ self.assertEqual(str(badge), badge.display_name)
+
+ def test_parent_badge(self):
+ badge = Badge.objects.get(id_name='attempts-made-1')
+ parent_id = badge.parent.id_name
+ self.assertEqual(parent_id, 'attempts-made-5')
+
+ def test_new_user_awards_create_account(self):
+ user = User.objects.get(pk=1)
+ check_badge_conditions(user)
+ badge = Badge.objects.get(id_name="create-account")
+ earned = Earned.objects.filter(profile=user.profile, badge=badge)
+ self.assertEqual(len(earned), 1)
+
+ # def test_doesnt_award_twice_create_account(self):
+ # user = User.objects.get(pk=1)
+ # badge = Badge.objects.get(id_name="create-account")
+ # Earned.objects.create(profile=user.profile, badge=badge)
+ # check_badge_conditions(user)
+
+ # earned = Earned.objects.filter(profile=user.profile, badge=badge)
+ # self.assertEqual(len(earned), 1)
+
+ # def test_adding_unknown_badge_doesnt_break(self):
+ # Badge.objects.create(id_name="notrealbadge", display_name="test", description="test")
+ # user = User.objects.get(pk=1)
+ # check_badge_conditions(user)
+
+ def test_award_solve_1_on_correct_attempt(self):
+ user = User.objects.get(pk=1)
+ question = Question.objects.create(title="Test question", question_text="Print hello world")
+ Attempt.objects.create(profile=user.profile, question=question, passed_tests=True, user_code='')
+
+ check_badge_conditions(user)
+ badge = Badge.objects.get(id_name="questions-solved-1")
+ earned = Earned.objects.filter(profile=user.profile, badge=badge)
+ self.assertEqual(len(earned), 1)
+
+ def test_not_award_solve_1_on_incorrect_attempt(self):
+ user = User.objects.get(pk=1)
+ question = Question.objects.create(title="Test question", question_text="Print hello world")
+ Attempt.objects.create(profile=user.profile, question=question, passed_tests=False, user_code='')
+
+ check_badge_conditions(user)
+ badge = Badge.objects.get(id_name="questions-solved-1")
+ earned = Earned.objects.filter(profile=user.profile, badge=badge)
+ self.assertEqual(len(earned), 0)
+
+# def test_no_award_consecutive_login_2(self):
+# user = User.objects.get(pk=1)
+# login_day = LoginDay.objects.create(profile=user.profile)
+# yesterday = datetime.datetime.now() - datetime.timedelta(days=1)
+# LoginDay.objects.select_for_update().filter(pk=2).update(day=yesterday.date())
+
+# check_badge_conditions(user)
+# badge = Badge.objects.get(id_name="login-3")
+# earned = Earned.objects.filter(profile=user.profile, badge=badge)
+# self.assertEquals(len(earned), 0)
+
+# def test_award_consecutive_login_3(self):
+# user = User.objects.get(pk=1)
+# LoginDay.objects.create(profile=user.profile)
+# yesterday = datetime.datetime.now() - datetime.timedelta(days=1)
+# LoginDay.objects.select_for_update().filter(pk=2).update(day=yesterday.date())
+
+# LoginDay.objects.create(profile=user.profile)
+# day_before_yesterday = datetime.datetime.now() - datetime.timedelta(days=2)
+# LoginDay.objects.select_for_update().filter(pk=3).update(day=day_before_yesterday.date())
+
+# check_badge_conditions(user)
+# badge = Badge.objects.get(id_name="login-3")
+# earned = Earned.objects.filter(profile=user.profile, badge=badge)
+# self.assertEquals(len(earned), 1)
+
+# def test_award_consecutive_login_3_from_last_week(self):
+# user = User.objects.get(pk=1)
+# LoginDay.objects.create(profile=user.profile)
+# last_week3 = datetime.datetime.now() - datetime.timedelta(days=1, weeks=1)
+# LoginDay.objects.select_for_update().filter(pk=2).update(day=last_week3.date())
+
+# LoginDay.objects.create(profile=user.profile)
+# last_week2 = datetime.datetime.now() - datetime.timedelta(days=2, weeks=1)
+# LoginDay.objects.select_for_update().filter(pk=3).update(day=last_week2.date())
+
+# LoginDay.objects.create(profile=user.profile)
+# last_week1 = datetime.datetime.now() - datetime.timedelta(days=3, weeks=1)
+# LoginDay.objects.select_for_update().filter(pk=4).update(day=last_week1.date())
+
+# check_badge_conditions(user)
+# badge = Badge.objects.get(id_name="login-3")
+# earned = Earned.objects.filter(profile=user.profile, badge=badge)
+# self.assertEquals(len(earned), 1)
+
+# def test_award_consecutive_login_3_from_last_week_5(self):
+# user = User.objects.get(pk=1)
+# LoginDay.objects.create(profile=user.profile)
+# last_week3 = datetime.datetime.now() - datetime.timedelta(days=1, weeks=1)
+# LoginDay.objects.select_for_update().filter(pk=2).update(day=last_week3.date())
+
+# LoginDay.objects.create(profile=user.profile)
+# last_week2 = datetime.datetime.now() - datetime.timedelta(days=2, weeks=1)
+# LoginDay.objects.select_for_update().filter(pk=3).update(day=last_week2.date())
+
+# LoginDay.objects.create(profile=user.profile)
+# last_week1 = datetime.datetime.now() - datetime.timedelta(days=3, weeks=1)
+# LoginDay.objects.select_for_update().filter(pk=4).update(day=last_week1.date())
+
+# LoginDay.objects.create(profile=user.profile)
+# last_week4 = datetime.datetime.now() - datetime.timedelta(days=4, weeks=1)
+# LoginDay.objects.select_for_update().filter(pk=5).update(day=last_week4.date())
+
+# LoginDay.objects.create(profile=user.profile)
+# last_week5 = datetime.datetime.now() - datetime.timedelta(days=5, weeks=1)
+# LoginDay.objects.select_for_update().filter(pk=6).update(day=last_week5.date())
+
+# check_badge_conditions(user)
+# badge = Badge.objects.get(id_name="login-3")
+# earned = Earned.objects.filter(profile=user.profile, badge=badge)
+# self.assertEquals(len(earned), 1)
+
+# def test_no_award_consecutive_login_2_from_last_week(self):
+# user = User.objects.get(pk=1)
+# LoginDay.objects.create(profile=user.profile)
+# last_week3 = datetime.datetime.now() - datetime.timedelta(days=1, weeks=1)
+# LoginDay.objects.select_for_update().filter(pk=2).update(day=last_week3.date())
+
+# LoginDay.objects.create(profile=user.profile)
+# last_week2 = datetime.datetime.now() - datetime.timedelta(days=2, weeks=1)
+# LoginDay.objects.select_for_update().filter(pk=3).update(day=last_week2.date())
+
+# check_badge_conditions(user)
+# badge = Badge.objects.get(id_name="login-3")
+# earned = Earned.objects.filter(profile=user.profile, badge=badge)
+# self.assertEquals(len(earned), 0)
+
+
+class EarnedModelTests(TestCase):
+ @classmethod
+ def setUpTestData(cls):
+ generate_users(user)
+ generate_questions()
+ generate_badges()
+ generate_attempts()
+ # award badges
+
+ def test_questions_solved_1_earnt(self):
+ user = User.objects.get(id=1)
+ check_badge_conditions(user)
+ badge = Badge.objects.get(id_name="questions-solved-1")
+ qs1_earned = Earned.objects.filter(profile=user.profile, badge=badge)
+ self.assertEqual(len(qs1_earned), 1)
+
+ def test_create_account_earnt(self):
+ user = User.objects.get(id=1)
+ check_badge_conditions(user)
+ badge = Badge.objects.get(id_name="create-account")
+ create_acc_earned = Earned.objects.filter(profile=user.profile, badge=badge)
+ self.assertEqual(len(create_acc_earned), 1)
+
+ def test_attempts_made_5_earnt(self):
+ user = User.objects.get(id=1)
+ check_badge_conditions(user)
+ badge = Badge.objects.get(id_name="attempts-made-5")
+ attempts_5_earned = Earned.objects.filter(profile=user.profile, badge=badge)
+ self.assertEqual(len(attempts_5_earned), 1)
+
+ def test_attempts_made_1_earnt(self):
+ user = User.objects.get(id=1)
+ check_badge_conditions(user)
+ badge = Badge.objects.get(id_name="attempts-made-1")
+ attempts1_earned = Earned.objects.filter(profile=user.profile, badge=badge)
+ self.assertEqual(len(attempts1_earned), 1)
+
+ def test_consecutive_days_2_earnt(self):
+ user = User.objects.get(id=1)
+ check_badge_conditions(user)
+ badge = Badge.objects.get(id_name="consecutive-days-2")
+ consec_days_earned = Earned.objects.filter(profile=user.profile, badge=badge)
+ self.assertEqual(len(consec_days_earned), 1)
+
+
+class TokenModelTests(TestCase):
+ @classmethod
+ def setUpTestData(cls):
+ Token.objects.create(name='sphere', token='abc')
+
+ def test_name_unique(self):
+ with self.assertRaises(IntegrityError):
+ Token.objects.create(name='sphere', token='def')
+
+ def test_str_representation(self):
+ token = Token.objects.get(name='sphere')
+ self.assertEqual(str(token), 'sphere')
+
+
+class QuestionModelTests(TestCase):
+ @classmethod
+ def setUpTestData(cls):
+ # never modify this object in tests - read only
+ generate_questions()
+
+ def test_question_slug_unique(self):
+ with self.assertRaises(IntegrityError):
+ Question.objects.create(
+ slug='question-1',
+ title='duplicate',
+ question_text=''
+ )
+
+ def test_get_absolute_url(self):
+ question = Question.objects.get(slug='question-1')
+ url = question.get_absolute_url()
+ self.assertEqual('/questions/{}/'.format(question.id), url)
+
+ def test_str_representation(self):
+ question = Question.objects.get(slug='question-1')
+ self.assertEqual(str(question), question.title)
+
+ def test_instance_of_question(self):
+ question = Question.objects.get_subclass(slug='question-1')
+ self.assertTrue(isinstance(question, Question))
+
+
+class QuestionTypeProgramModelTests(TestCase):
+ @classmethod
+ def setUpTestData(cls):
+ # never modify this object in tests - read only
+ generate_questions()
+
+ def test_question_type_program_instance(self):
+ program_question = Question.objects.get_subclass(slug="program-question-1")
+ self.assertTrue(isinstance(program_question, QuestionTypeProgram))
+
+ def test_question_type_program_verbose_name(self):
+ program_question = Question.objects.get_subclass(slug="program-question-1")
+ self.assertEqual(program_question._meta.verbose_name, 'Program Question')
+
+ def test_question_type_program_verbose_name_plural(self):
+ program_question = Question.objects.get_subclass(slug="program-question-1")
+ self.assertEqual(program_question._meta.verbose_name_plural, 'Program Questions')
+
+ def test_str_representation(self):
+ program_question = Question.objects.get_subclass(slug="program-question-1")
+ self.assertEqual(
+ str(program_question),
+ '{}: {}'.format(program_question.QUESTION_TYPE, program_question.title)
+ )
+
+
+class QuestionTypeFunctionModelTests(TestCase):
+ @classmethod
+ def setUpTestData(cls):
+ # never modify this object in tests - read only
+ generate_questions()
+
+ def test_question_type_function_instance(self):
+ function_question = Question.objects.get_subclass(slug="function-question-1")
+ self.assertTrue(isinstance(function_question, QuestionTypeFunction))
+
+ def test_question_type_function_verbose_name(self):
+ function_question = Question.objects.get_subclass(slug="function-question-1")
+ self.assertEqual(function_question._meta.verbose_name, 'Function Question')
+
+ def test_question_type_function_verbose_name_plural(self):
+ function_question = Question.objects.get_subclass(slug="function-question-1")
+ self.assertEqual(function_question._meta.verbose_name_plural, 'Function Questions')
+
+ def test_str_representation(self):
+ function_question = Question.objects.get_subclass(slug="function-question-1")
+ self.assertEqual(
+ str(function_question),
+ '{}: {}'.format(function_question.QUESTION_TYPE, function_question.title)
+ )
+
+
+class QuestionTypeParsonsModelTests(TestCase):
+ @classmethod
+ def setUpTestData(cls):
+ # never modify this object in tests - read only
+ generate_questions()
+
+ def test_question_type_parsons_instance(self):
+ parsons_question = Question.objects.get_subclass(slug="parsons-question-1")
+ self.assertTrue(isinstance(parsons_question, QuestionTypeParsons))
+
+ def test_question_type_parsons_verbose_name(self):
+ parsons_question = Question.objects.get_subclass(slug="parsons-question-1")
+ self.assertEqual(parsons_question._meta.verbose_name, 'Parsons Problem Question')
+
+ def test_str_representation(self):
+ parsons_question = Question.objects.get_subclass(slug="parsons-question-1")
+ self.assertEqual(
+ str(parsons_question),
+ '{}: {}'.format(parsons_question.QUESTION_TYPE, parsons_question.title)
+ )
+
+ def test_lines_as_list(self):
+ parsons_question = Question.objects.get_subclass(slug="parsons-question-1")
+ lines_list = list(parsons_question.lines.split('\n'))
+ shuffled_lines = parsons_question.lines_as_list()
+ self.assertEqual(sorted(shuffled_lines), sorted(lines_list))
+
+
+class QuestionTypeDebuggingModelTests(TestCase):
+ @classmethod
+ def setUpTestData(cls):
+ # never modify this object in tests - read only
+ generate_questions()
+
+ def test_question_type_debugging_instance(self):
+ debugging_question = Question.objects.get_subclass(slug="debugging-question-1")
+ self.assertTrue(isinstance(debugging_question, QuestionTypeDebugging))
+
+ def test_question_type_function_verbose_name(self):
+ debugging_question = Question.objects.get_subclass(slug="debugging-question-1")
+ self.assertEqual(debugging_question._meta.verbose_name, 'Debugging Problem Question')
+
+ def test_str_representation(self):
+ debugging_question = Question.objects.get_subclass(slug="debugging-question-1")
+ self.assertEqual(
+ str(debugging_question),
+ '{}: {}'.format(debugging_question.QUESTION_TYPE, debugging_question.title)
+ )
+
+ def test_read_only_lines_top_default(self):
+ debugging_question = Question.objects.get_subclass(slug="debugging-question-1")
+ self.assertEqual(debugging_question.read_only_lines_top, 0)
+
+ def test_read_only_lines_bottom_default(self):
+ debugging_question = Question.objects.get_subclass(slug="debugging-question-1")
+ self.assertEqual(debugging_question.read_only_lines_bottom, 0)
+
+
+# class TestCaseModelTests(TestCase):
# @classmethod
# def setUpTestData(cls):
# # never modify this object in tests - read only
-# User.objects.create_user(username='john', email='john@uclive.ac.nz', password='onion')
-
-# def setUp(self):
-# # editable version
-# User.objects.create_user(username='sally', email='sally@uclive.ac.nz', password='onion')
-
-# def test_profile_starts_with_no_points(self):
-# user = User.objects.get(id=1)
-# points = user.profile.points
-# self.assertEquals(points, 0)
-
-# def test_profile_starts_on_easiest_goal_level(self):
-# user = User.objects.get(id=1)
-# goal = user.profile.goal
-# self.assertEquals(goal, 1)
-
-# def test_set_goal_to_4(self):
-# user = User.objects.get(id=2)
-# user.profile.goal = 4
-# user.profile.full_clean()
-# user.profile.save()
-# double_check_user = User.objects.get(id=2)
-# self.assertEquals(double_check_user.profile.goal, 4)
-
-# def test_cannot_set_goal_less_than_1(self):
-# user = User.objects.get(id=2)
-# with self.assertRaises(ValidationError):
-# user.profile.goal = 0
-# user.profile.full_clean()
-# user.profile.save()
-# double_check_user = User.objects.get(id=2)
-# self.assertEquals(double_check_user.profile.goal, 1)
-
-# def test_cannot_set_goal_greater_than_7(self):
-# user = User.objects.get(id=2)
-# with self.assertRaises(ValidationError):
-# user.profile.goal = 8
-# user.profile.full_clean()
-# user.profile.save()
-# double_check_user = User.objects.get(id=2)
-# self.assertEquals(double_check_user.profile.goal, 1)
-
-# class QuestionModelTests(TestCase):
-# @classmethod
-# def setUpTestData(cls):
-# # never modify this object in tests - read only
-# Question.objects.create(title='Test', question_text='Hello')
-
-# def setUp(self):
-# pass
-
-# def test_question_text_label(self):
-# question = Question.objects.get(id=1)
-# field_label = question._meta.get_field('question_text').verbose_name
-# self.assertEquals(field_label, 'question text')
-
-# def test_solution_label(self):
-# question = Question.objects.get(id=1)
-# field_label = question._meta.get_field('solution').verbose_name
-# self.assertEquals(field_label, 'solution')
-
-# def test_str_question_is_title(self):
-# question = Question.objects.get(id=1)
-# self.assertEquals(str(question), question.title)
-
-# class ProgrammingFunctionModelTests(TestCase):
-# @classmethod
-# def setUpTestData(cls):
-# ProgrammingFunction.objects.create(title='Hello', question_text="Hello", function_name="hello")
-
-# def test_instance_of_question(self):
-# question = Question.objects.get_subclass(id=1)
-# self.assertTrue(isinstance(question, Question))
-
-# def test_instance_of_programming(self):
-# question = Question.objects.get_subclass(id=1)
-# self.assertTrue(isinstance(question, Programming))
-
-# def test_instance_of_programmingfunction(self):
-# question = Question.objects.get_subclass(id=1)
-# self.assertTrue(isinstance(question, ProgrammingFunction))
-
-# def test_not_instance_of_buggy(self):
-# question = Question.objects.get_subclass(id=1)
-# self.assertFalse(isinstance(question, Buggy))
-
-# def test_not_instance_of_buggyfunction(self):
-# question = Question.objects.get_subclass(id=1)
-# self.assertFalse(isinstance(question, BuggyFunction))
-
-# def test_str_question_is_title(self):
-# question = Question.objects.get(id=1)
-# self.assertEquals(str(question), question.title)
-
-
-# class BuggyModelTests(TestCase):
-# @classmethod
-# def setUpTestData(cls):
-# Buggy.objects.create(title='Hello', question_text="Hello", buggy_program="hello")
-
-# def test_instance_of_question(self):
-# question = Question.objects.get_subclass(id=1)
-# self.assertTrue(isinstance(question, Question))
-
-# def test_not_instance_of_programming(self):
-# question = Question.objects.get_subclass(id=1)
-# self.assertFalse(isinstance(question, Programming))
-
-# def test_not_instance_of_programmingfunction(self):
-# question = Question.objects.get_subclass(id=1)
-# self.assertFalse(isinstance(question, ProgrammingFunction))
-
-# def test_instance_of_buggy(self):
-# question = Question.objects.get_subclass(id=1)
-# self.assertTrue(isinstance(question, Buggy))
-
-# def test_not_instance_of_buggyfunction(self):
-# question = Question.objects.get_subclass(id=1)
-# self.assertFalse(isinstance(question, BuggyFunction))
-
-# def test_str_question_is_title(self):
-# question = Question.objects.get(id=1)
-# self.assertEquals(str(question), question.title)
+# generate_questions()
diff --git a/codewof/tests/programming/test_views.py b/codewof/tests/programming/test_views.py
index f3c0bee9f..669d3feaf 100644
--- a/codewof/tests/programming/test_views.py
+++ b/codewof/tests/programming/test_views.py
@@ -1,6 +1,4 @@
-# flake8: noqa
-
-# from django.test import TestCase as DjangoTestCase
+# from django.test import TestCase
# from django.contrib.auth.models import User
# from django.contrib.auth import login
# from unittest import skip
@@ -8,182 +6,82 @@
# import time
# import datetime
-# from questions.models import *
-# from questions.views import *
-
-
-# class ProfileViewTest(DjangoTestCase):
+# from programming.models import (
+# Token,
+# Badge,
+# Question,
+# Earned,
+# Attempt,
+# QuestionTypeProgram,
+# )
+# from codewof.tests.codewof_test_data_generator import (
+# generate_users,
+# generate_badges,
+# generate_questions,
+# generate_attempts,
+# )
+# from programming.views import (
+# CreateView,
+# QuestionListView,
+# QuestionView
+# )
+# from codewof.tests.conftest import user
+
+
+# class QuestionListViewTest():
+
+
+# class ProfileViewTest(TestCase):
# @classmethod
# def setUpTestData(cls):
# # never modify this object in tests
-# User.objects.create_user(username='john', email='john@uclive.ac.nz', password='onion')
+# generate_users(user)
+
+# def setUp(self):
+# self.client = Client()
# def login_user(self):
-# login = self.client.login(username='john', password='onion')
+# login = self.client.login(email='john@uclive.ac.nz', password='onion')
# self.assertTrue(login)
# ### tests begin ###
# def test_redirect_if_not_logged_in(self):
-# resp = self.client.get('/profile/')
-# self.assertRedirects(resp, '/login/?next=/profile/')
+# resp = self.client.get('/users/dashboard/')
+# self.assertRedirects(resp, '/accounts/login/?next=/users/dashboard/')
# def test_view_url_exists(self):
# self.login_user()
-# resp = self.client.get('/profile/')
+# resp = self.client.get('/users/dashboard/')
# self.assertEqual(resp.status_code, 200)
# def test_view_uses_correct_template(self):
# self.login_user()
-# resp = self.client.get('/profile/')
+# resp = self.client.get('/users/dashboard/')
# self.assertEqual(resp.status_code, 200)
-# self.assertTemplateUsed(resp, 'registration/profile.html')
+# self.assertTemplateUsed(resp, 'users/dashboard.html')
-# class BadgeViewTest(DjangoTestCase):
+# class BadgeViewTest(TestCase):
# @classmethod
# def setUpTestData(cls):
# # never modify this object in tests
-# user = User.objects.create_user(username='john', email='john@uclive.ac.nz', password='onion')
-# LoginDay.objects.create(profile=user.profile)
-# Badge.objects.create(id_name="create-account", display_name="test", description="test")
-# Badge.objects.create(id_name="login-3", display_name="test", description="test")
-# Badge.objects.create(id_name="solve-1", display_name="test", description="test")
-
-# def test_new_user_awards_create_account(self):
-# user = User.objects.get(pk=1)
-# check_badge_conditions(user)
-# badge = Badge.objects.get(id_name="create-account")
-# earned = Earned.objects.filter(profile=user.profile, badge=badge)
-# self.assertEquals(len(earned), 1)
-
-# def test_doesnt_award_twice_create_account(self):
-# user = User.objects.get(pk=1)
-# badge = Badge.objects.get(id_name="create-account")
-# Earned.objects.create(profile=user.profile, badge=badge)
-# check_badge_conditions(user)
-
-# earned = Earned.objects.filter(profile=user.profile, badge=badge)
-# self.assertEquals(len(earned), 1)
-
-# def test_adding_unknown_badge_doesnt_break(self):
-# Badge.objects.create(id_name="notrealbadge", display_name="test", description="test")
-# user = User.objects.get(pk=1)
-# check_badge_conditions(user)
-
-# def test_no_award_consecutive_login_2(self):
-# user = User.objects.get(pk=1)
-# login_day = LoginDay.objects.create(profile=user.profile)
-# yesterday = datetime.datetime.now() - datetime.timedelta(days=1)
-# LoginDay.objects.select_for_update().filter(pk=2).update(day=yesterday.date())
-
-# check_badge_conditions(user)
-# badge = Badge.objects.get(id_name="login-3")
-# earned = Earned.objects.filter(profile=user.profile, badge=badge)
-# self.assertEquals(len(earned), 0)
-
-# def test_award_consecutive_login_3(self):
-# user = User.objects.get(pk=1)
-# LoginDay.objects.create(profile=user.profile)
-# yesterday = datetime.datetime.now() - datetime.timedelta(days=1)
-# LoginDay.objects.select_for_update().filter(pk=2).update(day=yesterday.date())
-
-# LoginDay.objects.create(profile=user.profile)
-# day_before_yesterday = datetime.datetime.now() - datetime.timedelta(days=2)
-# LoginDay.objects.select_for_update().filter(pk=3).update(day=day_before_yesterday.date())
-
-# check_badge_conditions(user)
-# badge = Badge.objects.get(id_name="login-3")
-# earned = Earned.objects.filter(profile=user.profile, badge=badge)
-# self.assertEquals(len(earned), 1)
-
-# def test_award_consecutive_login_3_from_last_week(self):
-# user = User.objects.get(pk=1)
-# LoginDay.objects.create(profile=user.profile)
-# last_week3 = datetime.datetime.now() - datetime.timedelta(days=1, weeks=1)
-# LoginDay.objects.select_for_update().filter(pk=2).update(day=last_week3.date())
-
-# LoginDay.objects.create(profile=user.profile)
-# last_week2 = datetime.datetime.now() - datetime.timedelta(days=2, weeks=1)
-# LoginDay.objects.select_for_update().filter(pk=3).update(day=last_week2.date())
-
-# LoginDay.objects.create(profile=user.profile)
-# last_week1 = datetime.datetime.now() - datetime.timedelta(days=3, weeks=1)
-# LoginDay.objects.select_for_update().filter(pk=4).update(day=last_week1.date())
-
-# check_badge_conditions(user)
-# badge = Badge.objects.get(id_name="login-3")
-# earned = Earned.objects.filter(profile=user.profile, badge=badge)
-# self.assertEquals(len(earned), 1)
-
-# def test_award_consecutive_login_3_from_last_week_5(self):
-# user = User.objects.get(pk=1)
+# generate_users(user)
+# generate_badges()
# LoginDay.objects.create(profile=user.profile)
-# last_week3 = datetime.datetime.now() - datetime.timedelta(days=1, weeks=1)
-# LoginDay.objects.select_for_update().filter(pk=2).update(day=last_week3.date())
-
-# LoginDay.objects.create(profile=user.profile)
-# last_week2 = datetime.datetime.now() - datetime.timedelta(days=2, weeks=1)
-# LoginDay.objects.select_for_update().filter(pk=3).update(day=last_week2.date())
-
-# LoginDay.objects.create(profile=user.profile)
-# last_week1 = datetime.datetime.now() - datetime.timedelta(days=3, weeks=1)
-# LoginDay.objects.select_for_update().filter(pk=4).update(day=last_week1.date())
-
-# LoginDay.objects.create(profile=user.profile)
-# last_week4 = datetime.datetime.now() - datetime.timedelta(days=4, weeks=1)
-# LoginDay.objects.select_for_update().filter(pk=5).update(day=last_week4.date())
-
-# LoginDay.objects.create(profile=user.profile)
-# last_week5 = datetime.datetime.now() - datetime.timedelta(days=5, weeks=1)
-# LoginDay.objects.select_for_update().filter(pk=6).update(day=last_week5.date())
-
-# check_badge_conditions(user)
-# badge = Badge.objects.get(id_name="login-3")
-# earned = Earned.objects.filter(profile=user.profile, badge=badge)
-# self.assertEquals(len(earned), 1)
-
-# def test_no_award_consecutive_login_2_from_last_week(self):
-# user = User.objects.get(pk=1)
-# LoginDay.objects.create(profile=user.profile)
-# last_week3 = datetime.datetime.now() - datetime.timedelta(days=1, weeks=1)
-# LoginDay.objects.select_for_update().filter(pk=2).update(day=last_week3.date())
-
-# LoginDay.objects.create(profile=user.profile)
-# last_week2 = datetime.datetime.now() - datetime.timedelta(days=2, weeks=1)
-# LoginDay.objects.select_for_update().filter(pk=3).update(day=last_week2.date())
-
-# check_badge_conditions(user)
-# badge = Badge.objects.get(id_name="login-3")
-# earned = Earned.objects.filter(profile=user.profile, badge=badge)
-# self.assertEquals(len(earned), 0)
-
-# def test_award_solve_1_on_completed(self):
-# user = User.objects.get(pk=1)
-# question = Programming.objects.create(title="Test question", question_text="Print hello world")
-# attempt = Attempt.objects.create(profile=user.profile, question=question, passed_tests=True, is_save=False, user_code='')
-
-# check_badge_conditions(user)
-# badge = Badge.objects.get(id_name="solve-1")
-# earned = Earned.objects.filter(profile=user.profile, badge=badge)
-# self.assertEquals(len(earned), 1)
-
-# def test_not_award_solve_1_on_attempt(self):
-# user = User.objects.get(pk=1)
-# question = Programming.objects.create(title="Test question", question_text="Print hello world")
-# attempt = Attempt.objects.create(profile=user.profile, question=question, passed_tests=False, is_save=False, user_code='')
-# check_badge_conditions(user)
-# badge = Badge.objects.get(id_name="solve-1")
-# earned = Earned.objects.filter(profile=user.profile, badge=badge)
-# self.assertEquals(len(earned), 0)
# class BuggyQuestionViewTest(DjangoTestCase):
# @classmethod
# def setUpTestData(cls):
# # never modify this object in tests
# User.objects.create_user(username='john', email='john@uclive.ac.nz', password='onion')
-# question = Buggy.objects.create(title="test", question_text="Print input", solution="i=input()\nprint(i)", buggy_program="i=input()\nprint(i[1:])")
+# question = Buggy.objects.create(
+# title="test",
+# question_text="Print input",
+# solution="i=input()\nprint(i)",
+# buggy_program="i=input()\nprint(i[1:])"
+# )
# token_file = open("../../token_file.txt", "r")
# sphere_token = token_file.read().strip()
@@ -233,7 +131,12 @@
# self.get_the_output(user_code, buggy_stdin, exp_print, exp_return, 1, '"correct": [true]')
# def test_buggy_function(self):
-# BuggyFunction.objects.create(title="test", question_text="Print input", function_name="hi", solution="def hi(n):\n return n", buggy_program="def hi(n):\n return n+1")
+# BuggyFunction.objects.create(
+# title="test",
+# question_text="Print input",
+# function_name="hi", solution="def hi(n):\n return n",
+# buggy_program="def hi(n):\n return n+1"
+# )
# user_code = '3'
# buggy_stdin = ''
@@ -243,7 +146,13 @@
# self.get_the_output(user_code, buggy_stdin, exp_print, exp_return, 2, '"correct": [true]')
# def test_buggy_function_and_input_output(self):
-# BuggyFunction.objects.create(title="test", question_text="Print input", function_name="hi", solution="def hi(n):\n i=input()\n print(i)\n return n", buggy_program="def hi(n):\n i=input()\n print(i[1:])\n return n")
+# BuggyFunction.objects.create(
+# title="test",
+# question_text="Print input",
+# function_name="hi",
+# solution="def hi(n):\n i=input()\n print(i)\n return n",
+# buggy_program="def hi(n):\n i=input()\n print(i[1:])\n return n"
+# )
# user_code = '3'
# buggy_stdin = 'hello'
@@ -349,7 +258,8 @@
# self.get_the_output(user_code, 2, '"correct": [true]')
# def test_get_output_program_escaped_newline_not_replaced(self):
-# question = Programming.objects.create(title="Test 2", question_text="Print hello world on different lines using single print")
+# question = Programming.objects.create(
+# title="Test 2", question_text="Print hello world on different lines using single print")
# TestCaseProgram.objects.create(question=question, expected_output="hello\nworld\n")
# user_code = 'print("hello\\nworld")'
@@ -358,29 +268,36 @@
# # functions
# def test_get_output_function(self):
-# question = ProgrammingFunction.objects.create(title="Test 2", question_text="Return given word", function_name="direct_return")
+# question = ProgrammingFunction.objects.create(
+# title="Test 2", question_text="Return given word", function_name="direct_return")
# TestCaseFunction.objects.create(question=question, function_params="'hello'", expected_return="'hello'")
# user_code = 'def direct_return(word):\n return word'
# self.get_the_output(user_code, 2, '"correct": [true]')
# def test_get_output_print_function(self):
-# question = ProgrammingFunction.objects.create(title="Test 2", question_text="Print given word", function_name="direct_print")
-# TestCaseFunction.objects.create(question=question, function_params="'hello'", expected_output="hello\n", expected_return="")
+# question = ProgrammingFunction.objects.create(
+# title="Test 2", question_text="Print given word", function_name="direct_print")
+# TestCaseFunction.objects.create(
+# question=question, function_params="'hello'", expected_output="hello\n", expected_return="")
# user_code = 'def direct_print(word):\n print(word)'
# self.get_the_output(user_code, 2, '"correct": [true]')
# def test_get_output_print_and_return_function_multiple_test_cases(self):
-# question = ProgrammingFunction.objects.create(title="Test 2", question_text="Print and return given word", function_name="print_return")
-# TestCaseFunction.objects.create(question=question, function_params="'hello'", expected_output="hello\n", expected_return="'hello'")
-# TestCaseFunction.objects.create(question=question, function_params="'world'", expected_output="world\n", expected_return="'world'")
+# question = ProgrammingFunction.objects.create(
+# title="Test 2", question_text="Print and return given word", function_name="print_return")
+# TestCaseFunction.objects.create(
+# question=question, function_params="'hello'", expected_output="hello\n", expected_return="'hello'")
+# TestCaseFunction.objects.create(
+# question=question, function_params="'world'", expected_output="world\n", expected_return="'world'")
# user_code = 'def print_return(word):\n print(word)\n return word'
# self.get_the_output(user_code, 2, '"correct": [true, true]')
# def test_blank_test_function_multiple_test_cases(self):
-# question = ProgrammingFunction.objects.create(title="Test 2", question_text="Return the string doubled", function_name="return_double")
+# question = ProgrammingFunction.objects.create(
+# title="Test 2", question_text="Return the string doubled", function_name="return_double")
# TestCaseFunction.objects.create(question=question, function_params="'hello'", expected_return="'hellohello'")
# TestCaseFunction.objects.create(question=question, function_params="''", expected_return="''")
@@ -388,15 +305,19 @@
# self.get_the_output(user_code, 2, '"correct": [true, true]')
# def test_function_multiple_params(self):
-# question = ProgrammingFunction.objects.create(title="Test 2", question_text="Add the strings", function_name="add_words")
-# TestCaseFunction.objects.create(question=question, function_params="'good','night'", expected_return="'goodnight'")
+# question = ProgrammingFunction.objects.create(
+# title="Test 2", question_text="Add the strings", function_name="add_words")
+# TestCaseFunction.objects.create(
+# question=question, function_params="'good','night'", expected_return="'goodnight'")
# user_code = 'def add_words(word1, word2):\n return word1 + word2'
# self.get_the_output(user_code, 2, '"correct": [true]')
# def test_function_false_for_incorrect_answer(self):
-# question = ProgrammingFunction.objects.create(title="Test 2", question_text="Add the strings", function_name="add_words")
-# TestCaseFunction.objects.create(question=question, function_params="'good','night'", expected_return="'goodnight'")
+# question = ProgrammingFunction.objects.create(
+# title="Test 2", question_text="Add the strings", function_name="add_words")
+# TestCaseFunction.objects.create(
+# question=question, function_params="'good','night'", expected_return="'goodnight'")
# user_code = 'def add_words(word1, word2):\n return word1'
# self.get_the_output(user_code, 2, '"correct": [false]')
diff --git a/codewof/tests/users/test_models.py b/codewof/tests/users/test_models.py
index 7bc96f640..cebe3a0ba 100644
--- a/codewof/tests/users/test_models.py
+++ b/codewof/tests/users/test_models.py
@@ -1,8 +1,44 @@
import pytest
-from django.conf import settings
+from django.test import TestCase
+from users.models import UserType, User
+
+from codewof.tests.codewof_test_data_generator import generate_users
+from codewof.tests.conftest import user
pytestmark = pytest.mark.django_db
-def test_user_get_absolute_url(user: settings.AUTH_USER_MODEL):
- assert user.get_absolute_url() == f"/users/dashboard/"
+class UserModelTests(TestCase):
+ @classmethod
+ def setUpTestData(cls):
+ # never modify this object in tests - read only
+ generate_users(user)
+
+ def test_default_username(self):
+ user = User.objects.create(
+ id=3,
+ first_name='Test',
+ last_name='Case',
+ email='testcase@email.com',
+ password='password',
+ user_type=UserType.objects.get(slug='other')
+ )
+ self.assertEqual(user.username, 'user' + str(user.id))
+
+ def test_user_get_absolute_url(self):
+ user = User.objects.get(id=1)
+ self.assertEqual(user.get_absolute_url(), '/users/dashboard/')
+
+ def test_str_representation(self):
+ user = User.objects.get(id=1)
+ self.assertEqual(
+ str(user),
+ '{} {} ({})'.format(user.first_name, user.last_name, user.email)
+ )
+
+ def test_full_name_representation(self):
+ user = User.objects.get(id=1)
+ self.assertEqual(
+ user.full_name(),
+ '{} {}'.format(user.first_name, user.last_name)
+ )
diff --git a/codewof/users/urls.py b/codewof/users/urls.py
index 2feb0127d..8ab747b34 100644
--- a/codewof/users/urls.py
+++ b/codewof/users/urls.py
@@ -9,4 +9,5 @@
path("dashboard/", view=views.UserDetailView.as_view(), name="dashboard"),
path("redirect/", view=views.UserRedirectView.as_view(), name="redirect"),
path("update/", view=views.UserUpdateView.as_view(), name="update"),
+ path("achievements/", view=views.UserAchievementsView.as_view(), name="achievements"),
]
diff --git a/codewof/users/views.py b/codewof/users/views.py
index b6fe70290..d8ea22ab7 100644
--- a/codewof/users/views.py
+++ b/codewof/users/views.py
@@ -13,12 +13,31 @@
from rest_framework.permissions import IsAdminUser
from users.serializers import UserSerializer
from programming import settings
-from programming.models import Question, Attempt
from users.forms import UserChangeForm
from research.models import StudyRegistration
+
+from programming.models import (
+ Question,
+ Attempt,
+ Badge
+)
+
+from programming.codewof_utils import check_badge_conditions, get_questions_answered_in_past_month
+
User = get_user_model()
+
logger = logging.getLogger(__name__)
+del logging
+
+LOGGING = {
+ 'version': 1,
+ 'disable_existing_loggers': False,
+ 'incremental': True,
+ 'root': {
+ 'level': 'DEBUG',
+ },
+}
class UserDetailView(LoginRequiredMixin, DetailView):
@@ -34,6 +53,7 @@ def get_object(self):
def get_context_data(self, **kwargs):
"""Get additional context data for template."""
+ user = self.request.user
context = super().get_context_data(**kwargs)
now = timezone.now()
today = now.date()
@@ -58,7 +78,7 @@ def get_context_data(self, **kwargs):
log_message = 'Questions for user {} on {} ({}):\n'.format(self.request.user, now, today)
for i, question in enumerate(questions):
log_message += '{}: {}\n'.format(i, question)
- logging.info(log_message)
+ logger.info(log_message)
# TODO: Also filter by questions added before today
questions = questions.filter(
@@ -71,7 +91,7 @@ def get_context_data(self, **kwargs):
log_message = 'Filtered questions for user {}:\n'.format(self.request.user)
for i, question in enumerate(questions):
log_message += '{}: {}\n'.format(i, question)
- logging.info(log_message)
+ logger.info(log_message)
# Randomly pick 3 based off seed of todays date
if len(questions) > 0:
@@ -94,7 +114,7 @@ def get_context_data(self, **kwargs):
log_message = 'Chosen questions for user {}:\n'.format(self.request.user)
for i, question in enumerate(todays_questions):
log_message += '{}: {}\n'.format(i, question)
- logging.info(log_message)
+ logger.info(log_message)
context['questions_to_do'] = todays_questions
context['all_complete'] = all_complete
@@ -111,6 +131,13 @@ def get_context_data(self, **kwargs):
study_group__in=study.groups.all(),
).exists()
context['studies'] = studies
+ context['codewof_profile'] = self.object.profile
+ context['goal'] = user.profile.goal
+ context['all_badges'] = Badge.objects.all()
+ questions_answered = get_questions_answered_in_past_month(user)
+ context['num_questions_answered'] = questions_answered
+ logger.warning(questions_answered)
+ check_badge_conditions(user)
return context
@@ -139,6 +166,27 @@ def get_redirect_url(self):
return reverse("users:dashboard")
+class UserAchievementsView(LoginRequiredMixin, DetailView):
+ """View for a user's achievements."""
+
+ model = User
+ context_object_name = 'user'
+ template_name = 'users/achievements.html'
+
+ def get_object(self):
+ """Get object for template."""
+ return self.request.user
+
+ def get_context_data(self, **kwargs):
+ """Get additional context data for template."""
+ user = self.request.user
+ context = super().get_context_data(**kwargs)
+ context['badges_not_earned'] = Badge.objects.all().difference(user.profile.earned_badges.all())
+ context['num_badges_earned'] = user.profile.earned_badges.all().count()
+ context['num_badges'] = Badge.objects.all().count()
+ return context
+
+
class UserAPIViewSet(viewsets.ReadOnlyModelViewSet):
"""API endpoint that allows users to be viewed."""
diff --git a/dev b/dev
index b60b4d977..17fe3cb4a 100755
--- a/dev
+++ b/dev
@@ -170,6 +170,12 @@ cmd_load_questions() {
}
defhelp load_questions "Load questions."
+# Run load_badges command
+cmd_load_badges() {
+ docker-compose exec django /docker_venv/bin/python3 ./manage.py load_badges
+}
+defhelp load_badges "Load badges."
+
cmd_createsuperuser() {
docker-compose exec django /docker_venv/bin/python3 ./manage.py createsuperuser
}
@@ -326,6 +332,11 @@ cmd_dev() {
fi
}
+cmd_backdate() {
+ docker-compose exec django /docker_venv/bin/python3 ./manage.py backdate_points_and_badges
+}
+defhelp backdate 'Re-calculates points and badges earned for all user profiles.'
+
# If no command given
if [ $# -eq 0 ]; then
echo -e "${RED}ERROR: This script requires a command!${NC}"
diff --git a/infrastructure/prod-deploy/update-content.sh b/infrastructure/prod-deploy/update-content.sh
index 9a969413e..3890788c0 100755
--- a/infrastructure/prod-deploy/update-content.sh
+++ b/infrastructure/prod-deploy/update-content.sh
@@ -16,3 +16,5 @@ source ./codewof/load-prod-envs.sh
./dev migrate
docker-compose exec django /docker_venv/bin/python3 ./manage.py load_user_types
docker-compose exec django /docker_venv/bin/python3 ./manage.py load_questions
+docker-compose exec django /docker_venv/bin/python3 ./manage.py load_badges
+docker-compose exec django /docker_venv/bin/python3 ./manage.py backdate
diff --git a/requirements/local.txt b/requirements/local.txt
index 0ca7def1c..7c450fa59 100644
--- a/requirements/local.txt
+++ b/requirements/local.txt
@@ -6,7 +6,7 @@ psycopg2-binary==2.8.4 # https://github.com/psycopg/psycopg2
# Testing
# ------------------------------------------------------------------------------
mypy==0.770 # https://github.com/python/mypy
-pytest==5.4.1 # https://github.com/pytest-dev/pytest
+pytest==5.3.5 # https://github.com/pytest-dev/pytest
pytest-sugar==0.9.2 # https://github.com/Frozenball/pytest-sugar
# Code quality
+ You earned points!
+
+