Skip to content

Commit

Permalink
Merge pull request #1248 from GSA/1219-delete-terms-of-use
Browse files Browse the repository at this point in the history
1219 - Deleting references to the "Terms" page
  • Loading branch information
ccostino authored Mar 4, 2024
2 parents 8091a4a + 602f2fc commit 4635b21
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 30 deletions.
11 changes: 0 additions & 11 deletions app/main/views/index.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,6 @@ def security():
return render_template("views/security.html", navigation_links=features_nav())


@main.route("/features/terms", endpoint="terms")
@user_is_logged_in
def terms():
return render_template(
"views/terms-of-use.html",
navigation_links=features_nav(),
)


@main.route("/features/using_notify")
@user_is_logged_in
def using_notify():
Expand Down Expand Up @@ -214,15 +205,13 @@ def send_files_by_email():


@main.route("/roadmap", endpoint="old_roadmap")
@main.route("/terms", endpoint="old_terms")
@main.route("/information-security", endpoint="information_security")
@main.route("/using_notify", endpoint="old_using_notify")
@main.route("/information-risk-management", endpoint="information_risk_management")
@main.route("/integration_testing", endpoint="old_integration_testing")
def old_page_redirects():
redirects = {
"main.old_roadmap": "main.roadmap",
"main.old_terms": "main.terms",
"main.information_security": "main.using_notify",
"main.old_using_notify": "main.using_notify",
"main.information_risk_management": "main.security",
Expand Down
4 changes: 0 additions & 4 deletions app/main/views/sub_navigation_dictionaries.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ def features_nav():
"name": "Security",
"link": "main.security",
},
{
"name": "Terms of use",
"link": "main.terms",
},
]


Expand Down
1 change: 0 additions & 1 deletion app/navigation.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ class HeaderNavigation(Navigation):
"features_sms",
"roadmap",
"security",
"terms",
},
"using_notify": {
"get_started",
Expand Down
4 changes: 0 additions & 4 deletions app/templates/admin_template.html
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,6 @@
"href": url_for("main.security"),
"text": "Security"
},
{
"href": url_for("main.terms"),
"text": "Terms of use"
},
]
},
{
Expand Down
14 changes: 6 additions & 8 deletions tests/app/main/views/test_index.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ def test_hiding_pages_from_search_engines(
[
"privacy",
"pricing",
"terms",
"roadmap",
"features",
"documentation",
Expand Down Expand Up @@ -167,7 +166,6 @@ def test_guidance_pages_link_to_service_pages_when_signed_in(
("information_risk_management", "security"),
("old_integration_testing", "integration_testing"),
("old_roadmap", "roadmap"),
("old_terms", "terms"),
("information_security", "using_notify"),
("old_using_notify", "using_notify"),
("delivery_and_failure", "message_status"),
Expand Down Expand Up @@ -226,12 +224,12 @@ def test_old_using_notify_page(client_request):
# )


def test_terms_page_has_correct_content(client_request):
terms_page = client_request.get("main.terms")
assert normalize_spaces(terms_page.select("main p")[0].text) == (
"These terms apply to your service’s use of Notify.gov. "
"You must be the service manager to accept them."
)
# def test_terms_page_has_correct_content(client_request):
# terms_page = client_request.get("main.terms")
# assert normalize_spaces(terms_page.select("main p")[0].text) == (
# "These terms apply to your service’s use of Notify.gov. "
# "You must be the service manager to accept them."
# )


def test_css_is_served_from_correct_path(client_request):
Expand Down
2 changes: 0 additions & 2 deletions tests/app/test_navigation.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@
"old_integration_testing",
"old_roadmap",
"old_service_dashboard",
"old_terms",
"old_using_notify",
"organization_billing",
"organization_dashboard",
Expand Down Expand Up @@ -205,7 +204,6 @@
"suspend_service",
"template_history",
"template_usage",
"terms",
"tour_step",
"trial_mode",
"trial_mode_new",
Expand Down

0 comments on commit 4635b21

Please sign in to comment.