Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hotfix - fix generational animal group form #983

Merged
merged 2 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hawc/apps/animal/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ class Meta:

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.fields["generation"].choices = self.fields["generation"].choices[1:]
self.fields["generation"].choices = constants.Generation.choices[1:]
self.fields["parents"].queryset = models.AnimalGroup.objects.filter(
experiment=self.instance.experiment
)
Expand Down
28 changes: 27 additions & 1 deletion tests/hawc/apps/animal/test_views.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import json

import pytest
from django.forms.models import model_to_dict
from django.test.client import Client
from django.urls import reverse
from pytest_django.asserts import assertTemplateUsed

from hawc.apps.animal import models
from hawc.apps.animal import constants, models

from ..test_utils import check_200, get_client

Expand Down Expand Up @@ -98,6 +99,31 @@ def test_bad_dose_group(self, db_keys):
assert "Each dose-type must have 3 dose groups" in resp.context["dose_groups_errors"]


@pytest.mark.django_db
class TestAnimalGroupUpdate:
@pytest.mark.parametrize(
"filter",
[
constants.Generation.NA, # non generational
constants.Generation.P0, # generational
],
)
def test_success(self, filter):
instance = models.AnimalGroup.objects.filter(generation=filter)[0]
url = reverse("animal:animal_group_update", args=(instance.id,))

c = Client()
assert c.login(username="admin@hawcproject.org", password="pw") is True

resp = c.get(url)
assertTemplateUsed(resp, "animal/animalgroup_form.html")

payload = model_to_dict(instance)
payload.pop("siblings")
resp = c.post(url, payload, follow=True)
assertTemplateUsed(resp, "animal/animalgroup_detail.html")


@pytest.mark.django_db
class TestDosingRegimeUpdate:
def valid_payload(self):
Expand Down
Loading