Skip to content

Commit

Permalink
#280 Fix test_detail view (#423)
Browse files Browse the repository at this point in the history
* #280 Fix test_detail view

* #280 Add inforequest test_detail tests

* #280 Refactroring tests names
  • Loading branch information
viliambalaz committed Apr 12, 2022
1 parent 3343e2f commit ce9f9f2
Show file tree
Hide file tree
Showing 6 changed files with 309 additions and 211 deletions.
4 changes: 2 additions & 2 deletions chcemvediet/apps/inforequests/tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ def _create_inforequest_scenario(self, *args):
``_create_message()`` and <recipient_args> arguments for ``_create_recipient()``.
"""
args = list(args)
applicant = args.pop(0) if args and isinstance(args[0], User) else self.user1
obligee = args.pop(0) if args and isinstance(args[0], Obligee) else self.obligee1
applicant = args.pop(0) if args and isinstance(args[0], User) else self.user
obligee = args.pop(0) if args and isinstance(args[0], Obligee) else self.obligee
extra = args.pop(0) if args and isinstance(args[0], dict) else {}
inforequest = Inforequest.objects.create(applicant=applicant, **extra)
branch, actions = self._create_inforequest_scenario__branch(inforequest, obligee, None, u'request', args)
Expand Down
15 changes: 15 additions & 0 deletions chcemvediet/apps/inforequests/tests/render_query_patterns.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
from poleno.utils.misc import squeeze


base = [
u'FROM "accounts_profile" WHERE "accounts_profile"."user_id" = %s LIMIT 21',
squeeze(u"""
SELECT COUNT\(\*\) FROM "mail_message"
INNER JOIN "inforequests_inforequestemail" ON \( "mail_message"."id" = "inforequests_inforequestemail"."email_id" \)
INNER JOIN "inforequests_inforequest" ON \( "inforequests_inforequestemail"."inforequest_id" = "inforequests_inforequest"."id" \)
WHERE \("inforequests_inforequestemail"."type" = %s
AND "inforequests_inforequest"."applicant_id" = %s
AND "inforequests_inforequest"."closed" = %s\)
"""),
u'FROM "invitations_invitationsupply" WHERE "invitations_invitationsupply"."user_id" = %s LIMIT 21',
]
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ def test_slug_property_with_empty_subject(self):
self.assertEqual(inforequest.slug, ugettext(u'inforequests:Inforequest:fallback_slug'))

def test_prefetch_branches_staticmethod(self):
inforequest, branch1, actions = self._create_inforequest_scenario(u'advancement')
inforequest, branch1, actions = self._create_inforequest_scenario(self.user1, u'advancement')
_, (_, ((branch2, _),)) = actions

# Without arguments
Expand Down Expand Up @@ -288,7 +288,7 @@ def test_branches_property(self):
self.assertEqual(inforequest.branches, [branch1, branch2])

def test_prefetch_main_branch_staticmethod(self):
inforequest, branch, _ = self._create_inforequest_scenario(u'advancement')
inforequest, branch, _ = self._create_inforequest_scenario(self.user1, u'advancement')

# Without arguments
with self.assertNumQueries(2):
Expand Down Expand Up @@ -372,7 +372,7 @@ def test_undecided_emails_set_property_is_not_ordered(self):
self.assertFalse(inforequest.undecided_emails_set.all().ordered)

def test_prefetch_undecided_emails_staticmethod(self):
inforequest, _, _ = self._create_inforequest_scenario()
inforequest, _, _ = self._create_inforequest_scenario(self.user1)
_, rel1 = self._create_inforequest_email(inforequest=inforequest, reltype=InforequestEmail.TYPES.UNKNOWN)
_, rel2 = self._create_inforequest_email(inforequest=inforequest, reltype=InforequestEmail.TYPES.UNRELATED)
_, rel3 = self._create_inforequest_email(inforequest=inforequest, reltype=InforequestEmail.TYPES.UNDECIDED)
Expand Down Expand Up @@ -661,7 +661,7 @@ def test_oldest_undecided_email_property_with_no_undecided_emails(self):
self.assertIsNone(inforequest.oldest_undecided_email)

def test_prefetch_newest_undecided_email_staticmethod(self):
inforequest, _, _ = self._create_inforequest_scenario()
inforequest, _, _ = self._create_inforequest_scenario(self.user1)
_, rel1 = self._create_inforequest_email(inforequest=inforequest, reltype=InforequestEmail.TYPES.UNKNOWN)
_, rel2 = self._create_inforequest_email(inforequest=inforequest, reltype=InforequestEmail.TYPES.UNRELATED)
_, rel3 = self._create_inforequest_email(inforequest=inforequest, reltype=InforequestEmail.TYPES.UNDECIDED)
Expand Down
192 changes: 0 additions & 192 deletions chcemvediet/apps/inforequests/tests/test_views/skip_test_detail.py

This file was deleted.

Loading

0 comments on commit ce9f9f2

Please sign in to comment.