darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-16 20:49:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge from main and resolve conflicts

Browse Source
This commit is contained in:
Kenneth Kehl
2023-09-22 12:37:32 -07:00
parent 75f5224019 492bc7b355
commit 1d66533111
35 changed files with 1162 additions and 859 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/app/main/views/test_index.py
View File

@@ -294,26 +294,6 @@ def test_email_branding_preview(
assert mock_get_email_branding.called is email_branding_retrieved
def test_font_preload(
client_request,
mock_get_service_and_organization_counts,
):
client_request.logout()
page = client_request.get("main.index", _test_page_title=False)
preload_tags = page.select(
'link[rel=preload][as=font][type="font/woff2"][crossorigin]'
)
assert (
len(preload_tags) == 4
), "Run `npm run build` to copy fonts into app/static/fonts/"
for element in preload_tags:
assert element["href"].startswith("https://static.example.com/fonts/")
assert element["href"].endswith(".woff2")
@pytest.mark.parametrize("current_date, expected_rate", (("2022-05-01", "1.72"),))
@pytest.mark.skip(reason="Currently hidden for TTS")
def test_sms_price(

3
tests/conftest.py
View File

@@ -9,6 +9,7 @@ from uuid import UUID, uuid4
import pytest
from bs4 import BeautifulSoup
from dotenv import load_dotenv
from flask import Flask, url_for
from notifications_python_client.errors import HTTPError
from notifications_utils.url_safe_token import generate_token
@@ -33,6 +34,8 @@ from . import (
user_json,
)
load_dotenv()
class ElementNotFound(Exception):
pass

78
tests/end_to_end/test_accounts_page.py
View File

@@ -2,50 +2,45 @@ import datetime
import os
import re
import pytest
from playwright.sync_api import expect
@pytest.mark.skip(reason="Not authenticating test users.")
def test_accounts_page(end_to_end_authenticated_context):
def _bypass_sign_in(end_to_end_context):
# Open a new page and go to the staging site.
page = end_to_end_authenticated_context.new_page()
page = end_to_end_context.new_page()
accounts_uri = "{}accounts".format(os.getenv("NOTIFY_E2E_TEST_URI"))
page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
page.goto(accounts_uri)
sign_in_button = page.get_by_role("link", name="Sign in")
# Check to make sure that we've arrived at the next page.
# Test trying to sign in. Because we are loading the email and password
sign_in_button.click()
# Wait for the next page to fully load.
page.wait_for_load_state("domcontentloaded")
return page
def test_add_new_service_workflow(end_to_end_context):
# page = end_to_end_context.new_page()
page = _bypass_sign_in(end_to_end_context)
page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
# sign_in_button = page.get_by_role("link", name="Sign in")
#
# Test trying to sign in. Because we are loading the email and password
# sign_in_button.click()
#
# Wait for the next page to fully load.
page.wait_for_load_state("domcontentloaded")
# Check to make sure that we've arrived at the next page.
# Check the page title exists and matches what we expect.
expect(page).to_have_title(re.compile("Choose service"))
# Check for the sign in heading.
sign_in_heading = page.get_by_role("heading", name="Choose service")
expect(sign_in_heading).to_be_visible()
# Retrieve some prominent elements on the page for testing.
add_service_button = page.get_by_role(
"button", name=re.compile("Add a new service")
)
expect(add_service_button).to_be_visible()
@pytest.mark.skip(reason="Not authenticating test users.")
def test_add_new_service_workflow(end_to_end_authenticated_context):
# Prepare for adding a new service later in the test.
current_date_time = datetime.datetime.now()
new_service_name = "E2E Federal Test Service {now} - {browser_type}".format(
now=current_date_time.strftime("%m/%d/%Y %H:%M:%S"),
browser_type=end_to_end_authenticated_context.browser.browser_type.name,
browser_type=end_to_end_context.browser.browser_type.name,
)
# Open a new page and go to the staging site.
page = end_to_end_authenticated_context.new_page()
accounts_uri = "{}accounts".format(os.getenv("NOTIFY_E2E_TEST_URI"))
page.goto(accounts_uri)
@@ -100,7 +95,11 @@ def test_add_new_service_workflow(end_to_end_authenticated_context):
# Fill in the form.
service_name_input.fill(new_service_name)
federal_radio_button.click()
expect(federal_radio_button).to_be_enabled()
# Trying to click directly on the radio button resulted in a "not in viewport error" and this is the
# suggested workaround. Googling, the reason seems to be that there might be some (invisible?) css positioned
# above the radio button itself.
page.click("text='Federal government'")
# Click on add service.
add_service_button.click()
@@ -112,3 +111,22 @@ def test_add_new_service_workflow(end_to_end_authenticated_context):
service_heading = page.get_by_text(new_service_name)
expect(service_heading).to_be_visible()
expect(page).to_have_title(re.compile(new_service_name))
page.click("text='Settings'")
# Check to make sure that we've arrived at the next page.
page.wait_for_load_state("domcontentloaded")
page.click("text='Delete this service'")
# Check to make sure that we've arrived at the next page.
page.wait_for_load_state("domcontentloaded")
page.click("text='Yes, delete'")
# Check to make sure that we've arrived at the next page.
page.wait_for_load_state("domcontentloaded")
# Check to make sure that we've arrived at the next page.
# Check the page title exists and matches what we expect.
expect(page).to_have_title(re.compile("Choose service"))

235
tests/end_to_end/test_landing_and_sign_in_pages.py
View File

@@ -1,13 +1,12 @@
import os
import re
import pytest
from playwright.sync_api import expect
def test_landing_page(end_to_end_context):
# Open a new page and go to the staging site.
page = end_to_end_context.new_page()
page = end_to_end_context.browser.new_page()
page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
# Check to make sure that we've arrived at the next page.
@@ -49,118 +48,120 @@ def test_landing_page(end_to_end_context):
).to_be_visible()
@pytest.mark.skip(reason="Not authenticating test users.")
def test_sign_in_and_mfa_pages(end_to_end_context):
# Open a new page and go to the staging site.
page = end_to_end_context.new_page()
page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
sign_in_button = page.get_by_role("link", name="Sign in")
# Test trying to sign in.
sign_in_button.click()
# Check to make sure that we've arrived at the next page.
page.wait_for_load_state("domcontentloaded")
# Check the page title exists and matches what we expect.
expect(page).to_have_title(re.compile("Sign in"))
# Check for the sign in heading.
sign_in_heading = page.get_by_role("heading", name="Sign in")
expect(sign_in_heading).to_be_visible()
# Check for the sign in form elements.
# NOTE: Playwright cannot find input elements by role and recommends using
# get_by_label() instead; however, hidden form elements do not have
# labels associated with them, hence the XPath!
# See https://playwright.dev/python/docs/api/class-page#page-get-by-label
# and https://playwright.dev/python/docs/locators#locate-by-css-or-xpath
# for more information.
email_address_input = page.get_by_label("Email address")
password_input = page.get_by_label("Password")
csrf_token = page.locator('xpath=//input[@name="csrf_token"]')
continue_button = page.get_by_role("button", name=re.compile("Continue"))
forgot_password_link = page.get_by_role("link", name="Forgot your password?")
# Make sure form elements are visible and not visible as expected.
expect(email_address_input).to_be_visible()
expect(password_input).to_be_visible()
expect(continue_button).to_be_visible()
expect(forgot_password_link).to_be_visible()
expect(csrf_token).to_be_hidden()
# Make sure form elements are configured correctly with the right
# attributes.
expect(email_address_input).to_have_attribute("type", "email")
expect(password_input).to_have_attribute("type", "password")
expect(csrf_token).to_have_attribute("type", "hidden")
expect(continue_button).to_have_attribute("type", "submit")
expect(forgot_password_link).to_have_attribute("href", "/forgot-password")
# Sign in to the site.
email_address_input.fill(os.getenv("NOTIFY_E2E_TEST_EMAIL"))
password_input.fill(os.getenv("NOTIFY_E2E_TEST_PASSWORD"))
continue_button.click()
# Wait for the next page to fully load.
page.wait_for_load_state("domcontentloaded")
# Check the page title exists and matches what we expect.
expect(page).to_have_title(re.compile("Check your phone"))
# Check for the sign in heading.
sign_in_heading = page.get_by_role("heading", name="Check your phone")
expect(sign_in_heading).to_be_visible()
# Check for the sign in form elements.
# NOTE: Playwright cannot find input elements by role and recommends using
# get_by_label() instead; however, hidden form elements do not have
# labels associated with them, hence the XPath!
# See https://playwright.dev/python/docs/api/class-page#page-get-by-label
# and https://playwright.dev/python/docs/locators#locate-by-css-or-xpath
# for more information.
mfa_input = page.get_by_label("Text message code")
csrf_token = page.locator('xpath=//input[@name="csrf_token"]')
continue_button = page.get_by_role("button", name=re.compile("Continue"))
not_received_message_link = page.get_by_role(
"link", name="Not received a text message?"
)
# Make sure form elements are visible and not visible as expected.
expect(mfa_input).to_be_visible()
expect(continue_button).to_be_visible()
expect(not_received_message_link).to_be_visible()
expect(csrf_token).to_be_hidden()
# Make sure form elements are configured correctly with the right
# attributes.
expect(mfa_input).to_have_attribute("type", "tel")
expect(mfa_input).to_have_attribute("pattern", "[0-9]*")
expect(csrf_token).to_have_attribute("type", "hidden")
expect(continue_button).to_have_attribute("type", "submit")
expect(not_received_message_link).to_have_attribute("href", "/text-not-received")
# Enter MFA code and continue.
# TODO: Revisit this at a later point in time.
# totp = pyotp.TOTP(
# os.getenv('MFA_TOTP_SECRET'),
# digits=int(os.getenv('MFA_TOTP_LENGTH'))
# )
# mfa_input.fill('totp.now()')
# continue_button.click()
# # Check to make sure that we've arrived at the next page.
# page.wait_for_load_state('domcontentloaded')
# # Check that no MFA code error happened.
# code_not_found_error = page.get_by_text('Code not found')
# expect(code_not_found_error).to_have_count(0)
# # Check the page title exists and matches what we expect.
# # This could be either the Dashboard of a service if there is only
# # one, or choosing a service if there are multiple.
# expect(page).to_have_title(re.compile('Dashboard|Choose service'))
# def test_sign_in_and_mfa_pages(end_to_end_context):
# # Open a new page and go to the staging site.
# page = end_to_end_context.new_page()
# page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
# print(f"test_sign_in_and_mfa_pages initial {page}")
#
# sign_in_button = page.get_by_role("link", name="Sign in")
#
# # Test trying to sign in.
# sign_in_button.click()
#
# # Check to make sure that we've arrived at the next page.
# page.wait_for_load_state("domcontentloaded")
#
# # Check the page title exists and matches what we expect.
# expect(page).to_have_title(re.compile("Sign in"))
#
# # Check for the sign in heading.
# sign_in_heading = page.get_by_role("heading", name="Sign in")
# expect(sign_in_heading).to_be_visible()
#
# # Check for the sign in form elements.
# # NOTE: Playwright cannot find input elements by role and recommends using
# # get_by_label() instead; however, hidden form elements do not have
# # labels associated with them, hence the XPath!
# # See https://playwright.dev/python/docs/api/class-page#page-get-by-label
# # and https://playwright.dev/python/docs/locators#locate-by-css-or-xpath
# # for more information.
# email_address_input = page.get_by_label("Email address")
# password_input = page.get_by_label("Password")
# csrf_token = page.locator('xpath=//input[@name="csrf_token"]')
# continue_button = page.get_by_role("button", name=re.compile("Continue"))
# forgot_password_link = page.get_by_role("link", name="Forgot your password?")
#
# # Make sure form elements are visible and not visible as expected.
# expect(email_address_input).to_be_visible()
# expect(password_input).to_be_visible()
# expect(continue_button).to_be_visible()
# expect(forgot_password_link).to_be_visible()
#
# expect(csrf_token).to_be_hidden()
#
# # Make sure form elements are configured correctly with the right
# # attributes.
# expect(email_address_input).to_have_attribute("type", "email")
# expect(password_input).to_have_attribute("type", "password")
# expect(csrf_token).to_have_attribute("type", "hidden")
# expect(continue_button).to_have_attribute("type", "submit")
# expect(forgot_password_link).to_have_attribute("href", "/forgot-password")
#
# # Sign in to the site.
# email_address_input.fill(os.getenv("NOTIFY_E2E_TEST_EMAIL"))
# password_input.fill(os.getenv("NOTIFY_E2E_TEST_PASSWORD"))
# print(f"email and password {os.getenv('NOTIFY_E2E_TEST_EMAIL')} {os.getenv('NOTIFY_E2E_TEST_PASSWORD')}")
# continue_button.click()
#
# # Wait for the next page to fully load.
# page.wait_for_load_state("domcontentloaded")
#
# # Check the page title exists and matches what we expect.
# print(f"test_sign_in_and_mfa_pages finally is {page}")
# expect(page).to_have_title(re.compile("Check your phone"))
#
# # Check for the sign in heading.
# sign_in_heading = page.get_by_role("heading", name="Check your phone")
# expect(sign_in_heading).to_be_visible()
#
# # Check for the sign in form elements.
# # NOTE: Playwright cannot find input elements by role and recommends using
# # get_by_label() instead; however, hidden form elements do not have
# # labels associated with them, hence the XPath!
# # See https://playwright.dev/python/docs/api/class-page#page-get-by-label
# # and https://playwright.dev/python/docs/locators#locate-by-css-or-xpath
# # for more information.
# mfa_input = page.get_by_label("Text message code")
# csrf_token = page.locator('xpath=//input[@name="csrf_token"]')
# continue_button = page.get_by_role("button", name=re.compile("Continue"))
# not_received_message_link = page.get_by_role(
# "link", name="Not received a text message?"
# )
#
# # Make sure form elements are visible and not visible as expected.
# expect(mfa_input).to_be_visible()
# expect(continue_button).to_be_visible()
# expect(not_received_message_link).to_be_visible()
#
# expect(csrf_token).to_be_hidden()
#
# # Make sure form elements are configured correctly with the right
# # attributes.
# expect(mfa_input).to_have_attribute("type", "tel")
# expect(mfa_input).to_have_attribute("pattern", "[0-9]*")
# expect(csrf_token).to_have_attribute("type", "hidden")
# expect(continue_button).to_have_attribute("type", "submit")
# expect(not_received_message_link).to_have_attribute("href", "/text-not-received")
#
# # Enter MFA code and continue.
# # TODO: Revisit this at a later point in time.
# # totp = pyotp.TOTP(
# # os.getenv('MFA_TOTP_SECRET'),
# # digits=int(os.getenv('MFA_TOTP_LENGTH'))
# # )
#
# # mfa_input.fill('totp.now()')
# # continue_button.click()
#
# # # Check to make sure that we've arrived at the next page.
# # page.wait_for_load_state('domcontentloaded')
#
# # # Check that no MFA code error happened.
# # code_not_found_error = page.get_by_text('Code not found')
# # expect(code_not_found_error).to_have_count(0)
#
# # # Check the page title exists and matches what we expect.
# # # This could be either the Dashboard of a service if there is only
# # # one, or choosing a service if there are multiple.
# # expect(page).to_have_title(re.compile('Dashboard|Choose service'))