diff --git a/atst/domain/environments.py b/atst/domain/environments.py index e4e9e5b6..eebc6c15 100644 --- a/atst/domain/environments.py +++ b/atst/domain/environments.py @@ -27,9 +27,9 @@ class Environments(object): db.session.commit() @classmethod - def add_member(cls, environment, member, role): + def add_member(cls, environment, user, role): environment_user = EnvironmentRole( - user=member, environment=environment, role=role + user=user, environment=environment, role=role ) db.session.add(environment_user) db.session.commit() diff --git a/tests/domain/test_environments.py b/tests/domain/test_environments.py index d4ddce37..2b7f4995 100644 --- a/tests/domain/test_environments.py +++ b/tests/domain/test_environments.py @@ -29,8 +29,8 @@ def test_update_environment_roles(): dev_env = project.environments[0] staging_env = project.environments[1] - Environments.add_member(owner, dev_env, workspace_user.user, role="devops") - Environments.add_member(owner, staging_env, workspace_user.user, role="developer") + Environments.add_member(dev_env, workspace_user.user, "devops") + Environments.add_member(staging_env, workspace_user.user, "developer") new_ids_and_roles = [ {"id": dev_env.id, "role": "billing_admin"}, diff --git a/tests/domain/test_workspaces.py b/tests/domain/test_workspaces.py index 06d3f836..90464b93 100644 --- a/tests/domain/test_workspaces.py +++ b/tests/domain/test_workspaces.py @@ -169,7 +169,7 @@ def test_scoped_workspace_only_returns_a_users_projects_and_environments( ) developer = UserFactory.from_atat_role("developer") dev_environment = Environments.add_member( - workspace_owner, new_project.environments[0], developer + new_project.environments[0], developer, "developer" ) scoped_workspace = Workspaces.get(developer, workspace.id) diff --git a/tests/models/test_environments.py b/tests/models/test_environments.py index 05be623f..32faeef2 100644 --- a/tests/models/test_environments.py +++ b/tests/models/test_environments.py @@ -14,5 +14,5 @@ def test_add_user_to_environment(): ) dev_environment = project.environments[0] - dev_environment = Environments.add_member(owner, dev_environment, developer) + dev_environment = Environments.add_member(dev_environment, developer, "developer") assert developer in dev_environment.users diff --git a/tests/models/test_workspace_user.py b/tests/models/test_workspace_user.py index fac20d68..da1f08d0 100644 --- a/tests/models/test_workspace_user.py +++ b/tests/models/test_workspace_user.py @@ -36,7 +36,7 @@ def test_has_environment_roles(): project = Projects.create( owner, workspace, "my test project", "It's mine.", ["dev", "staging", "prod"] ) - Environments.add_member(owner, project.environments[0], workspace_user.user) + Environments.add_member(project.environments[0], workspace_user.user, "developer") assert workspace_user.has_environment_roles diff --git a/tests/routes/test_workspaces.py b/tests/routes/test_workspaces.py index 31dce11f..3523d207 100644 --- a/tests/routes/test_workspaces.py +++ b/tests/routes/test_workspaces.py @@ -108,7 +108,7 @@ def test_update_member_environment_role(client, user_session): env1_id = project.environments[0].id env2_id = project.environments[1].id for env in project.environments: - Environments.add_member(owner, env, user, "developer") + Environments.add_member(env, user, "developer") user_session(owner) response = client.post( url_for(