Merge pull request #884 from GSA/801-send-message-button

801 send message button

tests/app/main/test_permissions.py

@@ -111,6 +111,7 @@ def test_service_navigation_for_org_user(
         service_id=SERVICE_ONE_ID,
     )
     assert [item.text.strip() for item in page.select("nav.nav a")] == [
+        "Send messages",
         "Usage",
         "Team members",
     ]

tests/app/main/views/accounts/test_choose_accounts.py

@@ -363,7 +363,7 @@ def test_should_show_back_to_service_if_user_belongs_to_service(
 ):
     mock_get_service.return_value = service_one
     expected_page_text = (
-        "Test Service Switch service " "" "Dashboard " "Send messages " "Team members"
+        "Test Service Switch service " "Send messages " "Dashboard " "Team members"
     )  # TODO: set sidebar variables in common test module
 
     page = client_request.get(

tests/app/test_navigation.py

@@ -354,7 +354,6 @@ def test_raises_on_invalid_navigation_item(client_request, navigation_instance):
 @pytest.mark.parametrize(
     ("endpoint", "selected_nav_item"),
     [
-        ("main.choose_template", "Send messages"),
         ("main.manage_users", "Team members"),
     ],
 )
@@ -423,9 +422,9 @@ def test_navigation_urls(
     mock_get_api_keys,
 ):
     page = client_request.get("main.choose_template", service_id=SERVICE_ONE_ID)
-    assert [a["href"] for a in page.select(".nav.margin-bottom-5 a")] == [
-        "/services/{}".format(SERVICE_ONE_ID),
+    assert [a["href"] for a in page.select(".nav a")] == [
         "/services/{}/templates".format(SERVICE_ONE_ID),
+        "/services/{}".format(SERVICE_ONE_ID),
         "/services/{}/users".format(SERVICE_ONE_ID),
         "/services/{}/usage".format(SERVICE_ONE_ID),
         "/services/{}/service-settings".format(SERVICE_ONE_ID),