zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-06 11:13:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge conflict pt 2

Browse source
This commit is contained in:
zandercymatics 2024-08-06 08:15:55 -06:00
parent f339266bd0
commit 9aa8224103
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/registrar/tests/test_reports.py
View file

@ -7,6 +7,7 @@ from registrar.models import (
UserDomainRole, UserDomainRole,
) )
from registrar.models import Portfolio, User from registrar.models import Portfolio, User
from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
from registrar.utility.csv_export import ( from registrar.utility.csv_export import (
DomainDataFull, DomainDataFull,
DomainDataType, DomainDataType,
@ -335,7 +336,7 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
self.domain_3.domain_info.save() self.domain_3.domain_info.save()
# Set up user permissions # Set up user permissions
self.user.portfolio_roles = [User.UserPortfolioRoleChoices.ORGANIZATION_ADMIN] self.user.portfolio_roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
self.user.save() self.user.save()
self.user.refresh_from_db() self.user.refresh_from_db()
@ -353,7 +354,7 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
self.assertNotIn(self.domain_2.name, csv_content) self.assertNotIn(self.domain_2.name, csv_content)
# Test the output for readonly admin # Test the output for readonly admin
self.user.portfolio_roles = [User.UserPortfolioRoleChoices.ORGANIZATION_ADMIN_READ_ONLY] self.user.portfolio_roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN_READ_ONLY]
self.user.save() self.user.save()
self.assertIn(self.domain_1.name, csv_content) self.assertIn(self.domain_1.name, csv_content)
@ -361,7 +362,7 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
self.assertNotIn(self.domain_2.name, csv_content) self.assertNotIn(self.domain_2.name, csv_content)
# Get the csv content # Get the csv content
self.user.portfolio_roles = [User.UserPortfolioRoleChoices.ORGANIZATION_MEMBER] self.user.portfolio_roles = [UserPortfolioRoleChoices.ORGANIZATION_MEMBER]
self.user.save() self.user.save()
csv_content = self._run_domain_data_type_user_export(request) csv_content = self._run_domain_data_type_user_export(request)