pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Default creating an invite in the AppliationRoleFactory to True and fix tests

Browse Source
This commit is contained in:
leigh-mil 2019-11-19 13:58:44 -05:00
parent 8aa302357b
commit ef12701dbb
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/factories.py
View File

@ -202,7 +202,7 @@ class EnvironmentFactory(Base):
for member in with_members: for member in with_members:
user = member.get("user", UserFactory.create()) user = member.get("user", UserFactory.create())
application_role = ApplicationRoleFactory.create( application_role = ApplicationRoleFactory.create(
application=environment.application, user=user, invite=True application=environment.application, user=user
) )
role_name = member["role_name"] role_name = member["role_name"]
EnvironmentRoleFactory.create( EnvironmentRoleFactory.create(
@ -235,7 +235,7 @@ class ApplicationRoleFactory(Base):
@classmethod @classmethod
def _create(cls, model_class, *args, **kwargs): def _create(cls, model_class, *args, **kwargs):
with_invite = kwargs.pop("invite", False) with_invite = kwargs.pop("invite", True)
app_role = super()._create(model_class, *args, **kwargs) app_role = super()._create(model_class, *args, **kwargs)
if with_invite: if with_invite:
@ -269,7 +269,7 @@ class ApplicationInvitationFactory(Base):
email = factory.Faker("email") email = factory.Faker("email")
status = InvitationStatus.PENDING status = InvitationStatus.PENDING
expiration_time = PortfolioInvitations.current_expiration_time() expiration_time = PortfolioInvitations.current_expiration_time()
role = factory.SubFactory(ApplicationRoleFactory) role = factory.SubFactory(ApplicationRoleFactory, invite=False)
class AttachmentFactory(Base): class AttachmentFactory(Base):

6
tests/routes/applications/test_settings.py
View File

@ -110,13 +110,11 @@ def test_edit_application_environments_obj(app, client, user_session):
{"env"}, {"env"},
) )
env = application.environments[0] env = application.environments[0]
app_role1 = ApplicationRoleFactory.create(application=application, invite=True) app_role1 = ApplicationRoleFactory.create(application=application)
env_role1 = EnvironmentRoleFactory.create( env_role1 = EnvironmentRoleFactory.create(
application_role=app_role1, environment=env, role=CSPRole.BASIC_ACCESS.value application_role=app_role1, environment=env, role=CSPRole.BASIC_ACCESS.value
) )
app_role2 = ApplicationRoleFactory.create( app_role2 = ApplicationRoleFactory.create(application=application, user=None)
application=application, user=None, invite=True
)
env_role2 = EnvironmentRoleFactory.create( env_role2 = EnvironmentRoleFactory.create(
application_role=app_role2, environment=env, role=CSPRole.NETWORK_ADMIN.value application_role=app_role2, environment=env, role=CSPRole.NETWORK_ADMIN.value
) )