mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-19 05:59:44 -04:00
Pull main
This commit is contained in:
@@ -23,11 +23,7 @@ def test_non_logged_in_user_can_see_homepage(
|
||||
"main.sign_in",
|
||||
)
|
||||
|
||||
assert page.select_one("meta[name=description]")["content"].strip() == (
|
||||
"Notify.gov lets you send text messages to your users. "
|
||||
"Try it now if you work in federal, state, or local government."
|
||||
)
|
||||
|
||||
assert page.select_one("meta[name=description]") is not None
|
||||
# This area is hidden for the pilot
|
||||
# assert normalize_spaces(page.select_one('#whos-using-notify').text) == (
|
||||
# 'Who’s using Notify.gov ' # Hiding this next area for the pilot
|
||||
@@ -114,7 +110,7 @@ def test_static_pages(
|
||||
|
||||
# Check the page loads when user is signed in
|
||||
page = request()
|
||||
assert not page.select_one("meta[name=description]")
|
||||
assert page.select_one("meta[name=description]")
|
||||
|
||||
# Check it still works when they don’t have a recent service
|
||||
with client_request.session_transaction() as session:
|
||||
|
||||
@@ -5,8 +5,8 @@ import pytest
|
||||
from flask import url_for
|
||||
from freezegun import freeze_time
|
||||
from itsdangerous import SignatureExpired
|
||||
from notifications_utils.url_safe_token import generate_token
|
||||
|
||||
from notifications_utils.url_safe_token import generate_token
|
||||
from tests.conftest import SERVICE_ONE_ID, url_for_endpoint_with_token
|
||||
|
||||
|
||||
|
||||
@@ -5,8 +5,7 @@ from unittest.mock import ANY
|
||||
import pytest
|
||||
from flask import url_for
|
||||
|
||||
from app.main.forms import RegisterUserForm
|
||||
from app.main.views.register import _handle_login_dot_gov_invite
|
||||
from app.main.views.register import check_invited_user_email_address_matches_expected
|
||||
from app.models.user import User
|
||||
from tests.conftest import normalize_spaces
|
||||
|
||||
@@ -382,85 +381,26 @@ def test_cannot_register_with_sms_auth_and_missing_mobile_number(
|
||||
assert err.attrs["data-error-label"] == "mobile_number"
|
||||
|
||||
|
||||
def test_handle_login_dot_gov_invite_bad_email(client_request, mocker):
|
||||
|
||||
mocker.patch(
|
||||
"app.main.views.register.sign_in._get_access_token",
|
||||
return_value="access token",
|
||||
)
|
||||
|
||||
mocker.patch(
|
||||
"app.main.views.register.sign_in._get_user_email_and_uuid",
|
||||
return_value=["fake@fake.gov", "12345"],
|
||||
)
|
||||
|
||||
mocker.patch(
|
||||
"app.main.views.register.get_invited_user_email_address",
|
||||
return_value="boo@fake.gov",
|
||||
)
|
||||
|
||||
def test_check_invited_user_email_address_matches_expected(mocker):
|
||||
mock_flash = mocker.patch("app.main.views.register.flash")
|
||||
|
||||
mock_abort = mocker.patch("app.main.views.register.abort")
|
||||
|
||||
mocker.patch("app.main.views.register.invited_user_accept_invite")
|
||||
check_invited_user_email_address_matches_expected("fake@fake.gov", "Fake@Fake.GOV")
|
||||
mock_flash.assert_not_called()
|
||||
mock_abort.assert_not_called()
|
||||
|
||||
invite_data = {"service_id": "service", "invited_user_id": "invited_user"}
|
||||
invite_data = json.dumps(invite_data)
|
||||
invite_data = invite_data.encode("utf8")
|
||||
invite_data = base64.b64encode(invite_data)
|
||||
invite_data = invite_data.decode("utf8")
|
||||
_handle_login_dot_gov_invite("code", invite_data, RegisterUserForm())
|
||||
|
||||
def test_check_invited_user_email_address_doesnt_match_expected(mocker):
|
||||
mock_flash = mocker.patch("app.main.views.register.flash")
|
||||
mock_abort = mocker.patch("app.main.views.register.abort")
|
||||
|
||||
check_invited_user_email_address_matches_expected("real@fake.gov", "Fake@Fake.GOV")
|
||||
mock_flash.assert_called_once_with(
|
||||
"You cannot accept an invite for another person."
|
||||
)
|
||||
mock_abort.assert_called_once_with(403)
|
||||
|
||||
|
||||
def test_handle_login_dot_gov_invite_good_email(client_request, mocker):
|
||||
|
||||
mocker.patch(
|
||||
"app.main.views.register.sign_in._get_access_token",
|
||||
return_value="access token",
|
||||
)
|
||||
|
||||
mocker.patch(
|
||||
"app.main.views.register.sign_in._get_user_email_and_uuid",
|
||||
return_value=["fake@fake.gov", "12345"],
|
||||
)
|
||||
|
||||
mocker.patch(
|
||||
"app.main.views.register.get_invited_user_email_address",
|
||||
return_value="fake@fake.gov",
|
||||
)
|
||||
|
||||
mocker.patch(
|
||||
"app.main.views.register.user_api_client.get_user_by_uuid_or_email",
|
||||
return_value={"id": "abc"},
|
||||
)
|
||||
|
||||
mock_user = mocker.patch(
|
||||
"app.main.views.register.User.add_to_service",
|
||||
)
|
||||
|
||||
mock_accept = mocker.patch("app.main.views.register.invited_user_accept_invite")
|
||||
|
||||
invite_data = {
|
||||
"service_id": "service",
|
||||
"invited_user_id": "invited_user",
|
||||
"permissions": ["manage_everything"],
|
||||
"folder_permissions": [],
|
||||
"from_user_id": "xyz",
|
||||
}
|
||||
invite_data = json.dumps(invite_data)
|
||||
invite_data = invite_data.encode("utf8")
|
||||
invite_data = base64.b64encode(invite_data)
|
||||
invite_data = invite_data.decode("utf8")
|
||||
_handle_login_dot_gov_invite("code", invite_data, RegisterUserForm())
|
||||
mock_accept.assert_called_once()
|
||||
mock_user.assert_called_once_with("service", ["manage_everything"], [], "xyz")
|
||||
|
||||
|
||||
def decode_invite_data(state):
|
||||
state = state.encode("utf8")
|
||||
state = base64.b64decode(state)
|
||||
|
||||
@@ -12,11 +12,11 @@ from zipfile import BadZipFile
|
||||
import pytest
|
||||
from flask import url_for
|
||||
from notifications_python_client.errors import HTTPError
|
||||
from notifications_utils.recipients import RecipientCSV
|
||||
from notifications_utils.template import SMSPreviewTemplate
|
||||
from xlrd.biffh import XLRDError
|
||||
from xlrd.xldate import XLDateAmbiguous, XLDateError, XLDateNegative, XLDateTooLarge
|
||||
|
||||
from notifications_utils.recipients import RecipientCSV
|
||||
from notifications_utils.template import SMSPreviewTemplate
|
||||
from tests import validate_route_permission, validate_route_permission_with_client
|
||||
from tests.conftest import (
|
||||
SERVICE_ONE_ID,
|
||||
|
||||
@@ -3,8 +3,8 @@ import uuid
|
||||
|
||||
import pytest
|
||||
from flask import url_for
|
||||
from notifications_utils.url_safe_token import generate_token
|
||||
|
||||
from notifications_utils.url_safe_token import generate_token
|
||||
from tests.conftest import (
|
||||
create_api_user_active,
|
||||
create_user,
|
||||
|
||||
Reference in New Issue
Block a user