Skip to content

Take 2, "project managers should be able to see allocations"" #137

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.

Sign up for GitHub

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

Merged
s-sajid-ali merged 3 commits into from
Jan 7, 2026
Merged

Take 2, "project managers should be able to see allocations"" #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
070446f
Revert "Revert "project managers should be able to see allocations""
s-sajid-ali Jan 7, 2026
7c5d96a
minor formattnig
s-sajid-ali Jan 7, 2026
c993d71
fix Q filter bug
s-sajid-ali Jan 7, 2026
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
76 changes: 30 additions & 46 deletions coldfront/core/project/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

from coldfront.core.test_helpers import utils
from coldfront.core.test_helpers.factories import (
AllocationFactory,
AllocationStatusChoiceFactory,
AllocationUserFactory,
AllocationUserStatusChoiceFactory,
UserFactory,
ProjectFactory,
ProjectUserFactory,
Expand Down Expand Up @@ -32,17 +36,18 @@ def setUpTestData(cls):
cls.project_user = project_user.user

manager_role = ProjectUserRoleChoiceFactory(name="Manager")
pi_user = ProjectUserFactory(
project=cls.project, role=manager_role, user=cls.project.pi
)
pi_user = ProjectUserFactory(project=cls.project, role=manager_role, user=cls.project.pi)
cls.pi_user = pi_user.user
cls.manager_user = ProjectUserFactory(project=cls.project, role=manager_role)
cls.admin_user = UserFactory(is_staff=True, is_superuser=True)
cls.nonproject_user = UserFactory(is_staff=False, is_superuser=False)

attributetype = PAttributeTypeFactory(name="string")
cls.projectattributetype = ProjectAttributeTypeFactory(
attribute_type=attributetype
)
cls.projectattributetype = ProjectAttributeTypeFactory(attribute_type=attributetype)

cls.allocation = AllocationFactory(status=AllocationStatusChoiceFactory(name="active"), project=cls.project)
active_ausc = AllocationUserStatusChoiceFactory(name="Active")
cls.pi_as_alloc_user = AllocationUserFactory(allocation=cls.allocation, status=active_ausc)

def project_access_tstbase(self, url):
"""Test basic access control for project views. For all project views:
Expand Down Expand Up @@ -94,9 +99,7 @@ def test_projectdetail_request_allocation_button_visibility(self):
# pi can see request allocation button
utils.page_contains_for_user(self, self.pi_user, self.url, button_text)
# non-manager user cannot see request allocation button
utils.page_does_not_contain_for_user(
self, self.project_user, self.url, button_text
)
utils.page_does_not_contain_for_user(self, self.project_user, self.url, button_text)

def test_projectdetail_edituser_button_visibility(self):
"""Test visibility of projectdetail edit button across user levels"""
Expand All @@ -105,24 +108,22 @@ def test_projectdetail_edituser_button_visibility(self):
# pi can see edit button
utils.page_contains_for_user(self, self.pi_user, self.url, "fa-user-edit")
# non-manager user cannot see edit button
utils.page_does_not_contain_for_user(
self, self.project_user, self.url, "fa-user-edit"
)
utils.page_does_not_contain_for_user(self, self.project_user, self.url, "fa-user-edit")

def test_projectdetail_addnotification_button_visibility(self):
"""Test visibility of projectdetail add notification button across user levels"""
# admin can see add notification button
utils.page_contains_for_user(
self, self.admin_user, self.url, "Add Notification"
)
utils.page_contains_for_user(self, self.admin_user, self.url, "Add Notification")
# pi cannot see add notification button
utils.page_does_not_contain_for_user(
self, self.pi_user, self.url, "Add Notification"
)
utils.page_does_not_contain_for_user(self, self.pi_user, self.url, "Add Notification")
# non-manager user cannot see add notification button
utils.page_does_not_contain_for_user(
self, self.project_user, self.url, "Add Notification"
)
utils.page_does_not_contain_for_user(self, self.project_user, self.url, "Add Notification")

def test_manager_can_view_allocations(self):
"""Project Manager should be able to view allocations on the project
without being a user on the Allocation"""
response = utils.login_and_get_page(self.client, self.manager_user.user, self.url)
self.assertEqual(len(response.context["allocations"]), 1)


class ProjectCreateTest(ProjectViewTestBase):
Expand Down Expand Up @@ -152,9 +153,7 @@ def setUpTestData(cls):
"""Set up users and project for testing"""
super(ProjectAttributeCreateTest, cls).setUpTestData()
int_attributetype = PAttributeTypeFactory(name="Int")
cls.int_projectattributetype = ProjectAttributeTypeFactory(
attribute_type=int_attributetype
)
cls.int_projectattributetype = ProjectAttributeTypeFactory(attribute_type=int_attributetype)
cls.url = f"/project/{cls.project.pk}/project-attribute-create/"

def test_project_access(self):
Expand All @@ -180,9 +179,7 @@ def test_project_attribute_create_post(self):
},
)
redirect_url = f"/project/{self.project.pk}/"
self.assertRedirects(
response, redirect_url, status_code=302, target_status_code=200
)
self.assertRedirects(response, redirect_url, status_code=302, target_status_code=200)

def test_project_attribute_create_post_required_values(self):
"""ProjectAttributeCreate correctly flags missing project or value"""
Expand All @@ -195,9 +192,7 @@ def test_project_attribute_create_post_required_values(self):
"value": "test_value",
},
)
self.assertFormError(
response.context["form"], "project", "This field is required."
)
self.assertFormError(response.context["form"], "project", "This field is required.")
# missing value
response = self.client.post(
self.url,
Expand All @@ -206,9 +201,7 @@ def test_project_attribute_create_post_required_values(self):
"project": self.project.pk,
},
)
self.assertFormError(
response.context["form"], "value", "This field is required."
)
self.assertFormError(response.context["form"], "value", "This field is required.")

def test_project_attribute_create_value_type_match(self):
"""ProjectAttributeCreate correctly flags value-type mismatch"""
Expand All @@ -223,9 +216,7 @@ def test_project_attribute_create_value_type_match(self):
"project": self.project.pk,
},
)
self.assertFormError(
response.context["form"], None, "Invalid Value True. Value must be an int."
)
self.assertFormError(response.context["form"], None, "Invalid Value True. Value must be an int.")


class ProjectAttributeUpdateTest(ProjectViewTestBase):
Expand Down Expand Up @@ -281,9 +272,7 @@ def setUpTestData(cls):
super(ProjectListViewTest, cls).setUpTestData()
# add 100 projects to test pagination, permissions, search functionality
additional_projects = [ProjectFactory() for i in list(range(100))]
cls.additional_projects = [
p for p in additional_projects if p.pi.last_name != cls.project.pi.last_name
]
cls.additional_projects = [p for p in additional_projects if p.pi.last_name != cls.project.pi.last_name]
cls.url = "/project/"

### ProjectListView access tests ###
Expand All @@ -305,9 +294,7 @@ def test_project_list_display_members(self):
response = utils.login_and_get_page(self.client, self.project_user, self.url)
self.assertEqual(len(response.context["object_list"]), 1)
proj_user = self.project.projectuser_set.get(user=self.project_user)
proj_user.status, _ = ProjectUserStatusChoice.objects.get_or_create(
name="Removed"
)
proj_user.status, _ = ProjectUserStatusChoice.objects.get_or_create(name="Removed")
proj_user.save()
response = utils.login_and_get_page(self.client, self.project_user, self.url)
self.assertEqual(len(response.context["object_list"]), 0)
Expand Down Expand Up @@ -335,10 +322,7 @@ def test_project_list_displayall_permission_project_user(self):
def test_project_list_search(self):
"""Test that project list search works."""
url_base = self.url + "?show_all_projects=on"
url = (
f"{url_base}&last_name={self.project.pi.last_name}"
+ f"&school={self.project.school.description}"
)
url = f"{url_base}&last_name={self.project.pi.last_name}" + f"&school={self.project.school.description}"
# search by project project_title
response = utils.login_and_get_page(self.client, self.admin_user, url)
self.assertEqual(len(response.context["object_list"]), 1)
Expand Down
Loading
Loading