Remove redundant 'ccpo' from ccpo route function names

This commit is contained in:
leigh-mil
2019-08-09 10:09:23 -04:00
parent feb24b8e16
commit 864e11ea11
6 changed files with 30 additions and 30 deletions

View File

@@ -8,11 +8,11 @@ from tests.factories import UserFactory
def test_ccpo_users(user_session, client):
ccpo = UserFactory.create_ccpo()
user_session(ccpo)
response = client.get(url_for("ccpo.ccpo_users"))
response = client.get(url_for("ccpo.users"))
assert ccpo.email in response.data.decode()
def test_submit_add_new_ccpo_user(user_session, client):
def test_submit_new_user(user_session, client):
ccpo = UserFactory.create_ccpo()
new_user = UserFactory.create()
random_dod_id = "1234567890"
@@ -20,18 +20,18 @@ def test_submit_add_new_ccpo_user(user_session, client):
# give new_user CCPO permissions
response = client.post(
url_for("ccpo.submit_add_new_ccpo_user"), data={"dod_id": new_user.dod_id}
url_for("ccpo.submit_new_user"), data={"dod_id": new_user.dod_id}
)
assert new_user.email in response.data.decode()
# give person with out ATAT account CCPO permissions
response = client.post(
url_for("ccpo.submit_add_new_ccpo_user"), data={"dod_id": random_dod_id}
url_for("ccpo.submit_new_user"), data={"dod_id": random_dod_id}
)
assert translate("ccpo.form.user_not_found_title") in response.data.decode()
def test_confirm_new_ccpo_user(user_session, client):
def test_confirm_new_user(user_session, client):
ccpo = UserFactory.create_ccpo()
new_user = UserFactory.create()
random_dod_id = "1234567890"
@@ -39,7 +39,7 @@ def test_confirm_new_ccpo_user(user_session, client):
# give new_user CCPO permissions
response = client.post(
url_for("ccpo.confirm_new_ccpo_user"),
url_for("ccpo.confirm_new_user"),
data={"dod_id": new_user.dod_id},
follow_redirects=True,
)
@@ -47,7 +47,7 @@ def test_confirm_new_ccpo_user(user_session, client):
# give person with out ATAT account CCPO permissions
response = client.post(
url_for("ccpo.confirm_new_ccpo_user"),
url_for("ccpo.confirm_new_user"),
data={"dod_id": random_dod_id},
follow_redirects=True,
)

View File

@@ -120,43 +120,43 @@ def test_atst_activity_history_access(get_url_assert_status):
get_url_assert_status(rando, url, 404)
# ccpo.ccpo_users
def test_ccpo_ccpo_users_access(get_url_assert_status):
# ccpo.users
def test_ccpo_users_access(get_url_assert_status):
ccpo = user_with(PermissionSets.MANAGE_CCPO_USERS)
rando = user_with()
url = url_for("ccpo.ccpo_users")
url = url_for("ccpo.users")
get_url_assert_status(ccpo, url, 200)
get_url_assert_status(rando, url, 404)
# ccpo.add_new_ccpo_user
def test_ccpo_add_new_ccpo_user_access(get_url_assert_status):
# ccpo.add_new_user
def test_ccpo_add_new_user_access(get_url_assert_status):
ccpo = user_with(PermissionSets.MANAGE_CCPO_USERS)
rando = user_with()
url = url_for("ccpo.add_new_ccpo_user")
url = url_for("ccpo.add_new_user")
get_url_assert_status(ccpo, url, 200)
get_url_assert_status(rando, url, 404)
# ccpo.submit_add_new_ccpo_user
def test_ccpo_submit_add_new_ccpo_user_access(post_url_assert_status):
# ccpo.submit_new_user
def test_ccpo_submit_new_user_access(post_url_assert_status):
ccpo = user_with(PermissionSets.MANAGE_CCPO_USERS)
rando = user_with()
url = url_for("ccpo.submit_add_new_ccpo_user")
url = url_for("ccpo.submit_new_user")
post_url_assert_status(ccpo, url, 200, data={"dod_id": "1234567890"})
post_url_assert_status(rando, url, 404, data={"dod_id": "1234567890"})
# ccpo.confirm_new_ccpo_user
def test_ccpo_confirm_new_ccpo_user_access(post_url_assert_status):
# ccpo.confirm_new_user
def test_ccpo_confirm_new_user_access(post_url_assert_status):
ccpo = user_with(PermissionSets.MANAGE_CCPO_USERS)
rando = user_with()
user = UserFactory.create()
url = url_for("ccpo.confirm_new_ccpo_user")
url = url_for("ccpo.confirm_new_user")
post_url_assert_status(ccpo, url, 302, data={"dod_id": user.dod_id})
post_url_assert_status(rando, url, 404, data={"dod_id": user.dod_id})