diff --git a/Pipfile.lock b/Pipfile.lock
index f3093cf87..033e75f3b 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "38185e0c6d864b4be766da7762a71b9a7922d6c8466d78ce660786e49e06b507"
+ "sha256": "b0ea2da4caefc4542f6620d0ea96769996991b8d42a2802652d90c8799f86db8"
},
"pipfile-spec": 6,
"requires": {
@@ -32,6 +32,34 @@
"markers": "python_full_version <= '3.11.2'",
"version": "==4.0.3"
},
+ "black": {
+ "hashes": [
+ "sha256:01ede61aac8c154b55f35301fac3e730baf0c9cf8120f65a9cd61a81cfb4a0c3",
+ "sha256:022a582720b0d9480ed82576c920a8c1dde97cc38ff11d8d8859b3bd6ca9eedb",
+ "sha256:25cc308838fe71f7065df53aedd20327969d05671bac95b38fdf37ebe70ac087",
+ "sha256:27eb7a0c71604d5de083757fbdb245b1a4fae60e9596514c6ec497eb63f95320",
+ "sha256:327a8c2550ddc573b51e2c352adb88143464bb9d92c10416feb86b0f5aee5ff6",
+ "sha256:47e56d83aad53ca140da0af87678fb38e44fd6bc0af71eebab2d1f59b1acf1d3",
+ "sha256:501387a9edcb75d7ae8a4412bb8749900386eaef258f1aefab18adddea1936bc",
+ "sha256:552513d5cd5694590d7ef6f46e1767a4df9af168d449ff767b13b084c020e63f",
+ "sha256:5c4bc552ab52f6c1c506ccae05681fab58c3f72d59ae6e6639e8885e94fe2587",
+ "sha256:642496b675095d423f9b8448243336f8ec71c9d4d57ec17bf795b67f08132a91",
+ "sha256:6d1c6022b86f83b632d06f2b02774134def5d4d4f1dac8bef16d90cda18ba28a",
+ "sha256:7f3bf2dec7d541b4619b8ce526bda74a6b0bffc480a163fed32eb8b3c9aed8ad",
+ "sha256:831d8f54c3a8c8cf55f64d0422ee875eecac26f5f649fb6c1df65316b67c8926",
+ "sha256:8417dbd2f57b5701492cd46edcecc4f9208dc75529bcf76c514864e48da867d9",
+ "sha256:86cee259349b4448adb4ef9b204bb4467aae74a386bce85d56ba4f5dc0da27be",
+ "sha256:893695a76b140881531062d48476ebe4a48f5d1e9388177e175d76234ca247cd",
+ "sha256:9fd59d418c60c0348505f2ddf9609c1e1de8e7493eab96198fc89d9f865e7a96",
+ "sha256:ad0014efc7acf0bd745792bd0d8857413652979200ab924fbf239062adc12491",
+ "sha256:b5b0ee6d96b345a8b420100b7d71ebfdd19fab5e8301aff48ec270042cd40ac2",
+ "sha256:c333286dc3ddca6fdff74670b911cccedacb4ef0a60b34e491b8a67c833b343a",
+ "sha256:f9062af71c59c004cd519e2fb8f5d25d39e46d3af011b41ab43b9c74e27e236f",
+ "sha256:fb074d8b213749fa1d077d630db0d5f8cc3b2ae63587ad4116e8a436e9bbe995"
+ ],
+ "index": "pypi",
+ "version": "==23.7.0"
+ },
"bleach": {
"hashes": [
"sha256:1a1a85c1595e07d8db14c5f09f09e6433502c51c595970edc090551f0db99414",
@@ -50,19 +78,19 @@
},
"boto3": {
"hashes": [
- "sha256:2ccbea42fe4cbd22a8ba1e90a37ac65f05c1932e63432e429fb7158d8255bbc0",
- "sha256:4713a4e69120db5f358f4d378459fb4ea04be98664a0908088f6e04ab49d2583"
+ "sha256:580b584e36967155abed7cc9b088b3bd784e8242ae4d8841f58cb50ab05520dc",
+ "sha256:d77415f22bbc14f3d72eaed2fc9f96d161f3ba7686922ad26d6bbc9d4985f3df"
],
"markers": "python_version >= '3.7'",
- "version": "==1.28.34"
+ "version": "==1.28.35"
},
"botocore": {
"hashes": [
- "sha256:23ba9e3a8b4c0e5966bbe2db62edb27f61e16b846f153f22aefda7b3c05c7942",
- "sha256:456ef8eb458db35b8643eb10e652ed50750d13e5af431593471b2c705c34b5db"
+ "sha256:7e4534325262f43293a9cc9937cb3f1711365244ffde8b925a6ee862bcf30a83",
+ "sha256:943e1465aad66db4933b06809134bd08c5b05e8eb18c19742ffec82f54769457"
],
"markers": "python_version >= '3.7'",
- "version": "==1.31.34"
+ "version": "==1.31.35"
},
"cachetools": {
"hashes": [
@@ -235,7 +263,7 @@
"sha256:f779d3ad205f108d14e99bb3859aa7dd8e9c68874617c72354d7ecaec2a054ac",
"sha256:f87f746ee241d30d6ed93969de31e5ffd09a2961a051e60ae6bddde9ec3583aa"
],
- "markers": "python_version >= '3.7'",
+ "markers": "python_full_version >= '3.7.0'",
"version": "==3.2.0"
},
"click": {
@@ -516,9 +544,12 @@
"extras": [
"eventlet"
],
- "git": "https://github.com/benoitc/gunicorn.git",
- "ref": "1299ea9e967a61ae2edebe191082fd169b864c64",
- "version": "==20.1.0"
+ "hashes": [
+ "sha256:3213aa5e8c24949e792bcacfc176fef362e7aac80b76c56f6b5122bf350722f0",
+ "sha256:88ec8bff1d634f98e61b9f65bc4bf3cd918a90806c6f5c48bc5603849ec81033"
+ ],
+ "index": "pypi",
+ "version": "==21.2.0"
},
"humanize": {
"hashes": [
@@ -743,6 +774,14 @@
],
"version": "==0.8.4"
},
+ "mypy-extensions": {
+ "hashes": [
+ "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d",
+ "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"
+ ],
+ "markers": "python_version >= '3.5'",
+ "version": "==1.0.0"
+ },
"newrelic": {
"hashes": [
"sha256:16761522dde9c05146078f7729aefbf05cea7fc42c703c0b756618168939f872",
@@ -821,6 +860,22 @@
],
"version": "==2.0.3"
},
+ "packaging": {
+ "hashes": [
+ "sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61",
+ "sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f"
+ ],
+ "markers": "python_version >= '3.7'",
+ "version": "==23.1"
+ },
+ "pathspec": {
+ "hashes": [
+ "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20",
+ "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3"
+ ],
+ "markers": "python_version >= '3.7'",
+ "version": "==0.11.2"
+ },
"phonenumbers": {
"hashes": [
"sha256:38180247697240ccedd74dec4bfbdbc22bb108b9c5f991f270ca3e41395e6f96",
@@ -828,6 +883,14 @@
],
"version": "==8.13.19"
},
+ "platformdirs": {
+ "hashes": [
+ "sha256:b45696dab2d7cc691a3226759c0d3b00c47c8b6e293d96f6436f733303f77f6d",
+ "sha256:d7c24979f292f916dc9cbf8648319032f551ea8c49a4c9bf2fb556a02070ec1d"
+ ],
+ "markers": "python_version >= '3.7'",
+ "version": "==3.10.0"
+ },
"pycparser": {
"hashes": [
"sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9",
@@ -1039,14 +1102,6 @@
"markers": "python_version >= '3.7'",
"version": "==0.6.2"
},
- "setuptools": {
- "hashes": [
- "sha256:3d4dfa6d95f1b101d695a6160a7626e15583af71a5f52176efa5d39a054d475d",
- "sha256:3d8083eed2d13afc9426f227b24fd1659489ec107c0e86cec2ffdde5c92e790b"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==68.1.2"
- },
"shapely": {
"hashes": [
"sha256:01224899ff692a62929ef1a3f5fe389043e262698a708ab7569f43a99a48ae82",
@@ -1120,6 +1175,22 @@
"markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
"version": "==0.10.2"
},
+ "tomli": {
+ "hashes": [
+ "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc",
+ "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"
+ ],
+ "markers": "python_version < '3.11'",
+ "version": "==2.0.1"
+ },
+ "typing-extensions": {
+ "hashes": [
+ "sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36",
+ "sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2"
+ ],
+ "markers": "python_version < '3.10'",
+ "version": "==4.7.1"
+ },
"urllib3": {
"hashes": [
"sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f",
@@ -1210,19 +1281,19 @@
},
"boto3": {
"hashes": [
- "sha256:2ccbea42fe4cbd22a8ba1e90a37ac65f05c1932e63432e429fb7158d8255bbc0",
- "sha256:4713a4e69120db5f358f4d378459fb4ea04be98664a0908088f6e04ab49d2583"
+ "sha256:580b584e36967155abed7cc9b088b3bd784e8242ae4d8841f58cb50ab05520dc",
+ "sha256:d77415f22bbc14f3d72eaed2fc9f96d161f3ba7686922ad26d6bbc9d4985f3df"
],
"markers": "python_version >= '3.7'",
- "version": "==1.28.34"
+ "version": "==1.28.35"
},
"botocore": {
"hashes": [
- "sha256:23ba9e3a8b4c0e5966bbe2db62edb27f61e16b846f153f22aefda7b3c05c7942",
- "sha256:456ef8eb458db35b8643eb10e652ed50750d13e5af431593471b2c705c34b5db"
+ "sha256:7e4534325262f43293a9cc9937cb3f1711365244ffde8b925a6ee862bcf30a83",
+ "sha256:943e1465aad66db4933b06809134bd08c5b05e8eb18c19742ffec82f54769457"
],
"markers": "python_version >= '3.7'",
- "version": "==1.31.34"
+ "version": "==1.31.35"
},
"cachecontrol": {
"extras": [
@@ -1390,7 +1461,7 @@
"sha256:f779d3ad205f108d14e99bb3859aa7dd8e9c68874617c72354d7ecaec2a054ac",
"sha256:f87f746ee241d30d6ed93969de31e5ffd09a2961a051e60ae6bddde9ec3583aa"
],
- "markers": "python_version >= '3.7'",
+ "markers": "python_full_version >= '3.7.0'",
"version": "==3.2.0"
},
"cryptography": {
@@ -1424,11 +1495,11 @@
},
"cyclonedx-python-lib": {
"hashes": [
- "sha256:878e33b8e0080c786f6cbd4c6f87ad610db65d6a3a686a5698415d9cfcd8925d",
- "sha256:907b64f00df85d727a425de86604768b248cf19285993729e04f17bec767f692"
+ "sha256:28b8c6c96372345c61464561b3040ede38d1c82026f706d87e8728ba5f7f4ddb",
+ "sha256:7996657f9788758ed05bea8c247e3e6ffcccfbc48818cd34795a4ae094b307bd"
],
"markers": "python_version >= '3.7' and python_version < '4.0'",
- "version": "==4.0.1"
+ "version": "==4.1.0"
},
"defusedxml": {
"hashes": [
@@ -1843,7 +1914,7 @@
"sha256:4659bc2a667783e7a15d190f6fccf8b2486685b6dba4c19c3876314769c57526",
"sha256:b4fa3a7a0be38243123cf9d1f3518da10c51bdb165a2b2985566247f9155a7d3"
],
- "markers": "python_version >= '3.6'",
+ "markers": "python_full_version >= '3.6.0'",
"version": "==32.0.1"
},
"playwright": {
@@ -1861,11 +1932,11 @@
},
"pluggy": {
"hashes": [
- "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849",
- "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"
+ "sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12",
+ "sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7"
],
- "markers": "python_version >= '3.7'",
- "version": "==1.2.0"
+ "markers": "python_version >= '3.8'",
+ "version": "==1.3.0"
},
"py-serializable": {
"hashes": [
@@ -2060,7 +2131,7 @@
"sha256:146a90b3b6b47cac4a73c12866a499e9817426423f57c5a66949c086191a8808",
"sha256:fb9d6c0a0f643c99eed3875b5377a184132ba9be4d61516a55273d3554d75a39"
],
- "markers": "python_version >= '3.7'",
+ "markers": "python_full_version >= '3.7.0'",
"version": "==13.5.2"
},
"s3transfer": {
@@ -2145,7 +2216,7 @@
"sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36",
"sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2"
],
- "markers": "python_version >= '3.7'",
+ "markers": "python_version < '3.10'",
"version": "==4.7.1"
},
"urllib3": {
diff --git a/tests/app/main/views/accounts/test_choose_accounts.py b/tests/app/main/views/accounts/test_choose_accounts.py
index 801feff77..6976b3aea 100644
--- a/tests/app/main/views/accounts/test_choose_accounts.py
+++ b/tests/app/main/views/accounts/test_choose_accounts.py
@@ -347,7 +347,7 @@ def test_should_not_show_back_to_service_if_user_doesnt_belong_to_service(
_test_page_title=False,
)
- assert normalize_spaces(page.select_one(".govuk-grid-row").text).startswith(
+ assert normalize_spaces(page.select_one(".grid-row .grid-col-8").text).startswith(
normalize_spaces(expected_page_text)
)
diff --git a/tests/app/main/views/organizations/test_organizations.py b/tests/app/main/views/organizations/test_organizations.py
index 00ddee7a1..ccaffda14 100644
--- a/tests/app/main/views/organizations/test_organizations.py
+++ b/tests/app/main/views/organizations/test_organizations.py
@@ -83,7 +83,7 @@ def test_view_organization_shows_the_correct_organization(client_request, mocker
)
assert normalize_spaces(page.select_one("h1").text) == "Usage"
- assert normalize_spaces(page.select_one(".govuk-hint").text) == (
+ assert normalize_spaces(page.select_one(".usa-hint").text) == (
"Test 1 has no live services on Notify.gov"
)
assert not page.select("a[download]")
@@ -391,7 +391,7 @@ def test_organization_services_shows_live_services_and_usage(
mock.assert_called_once_with(ORGANISATION_ID, 2019)
services = page.select("main h3")
- usage_rows = page.select("main .govuk-grid-column-one-half")
+ usage_rows = page.select("main .grid-col-6")
assert len(services) == 2
# Totals
@@ -413,7 +413,7 @@ def test_organization_services_shows_live_services_and_usage(
assert normalize_spaces(usage_rows[5].text) == "$42.00 spent on text messages"
# Ensure there’s no ‘this org has no services message’
- assert not page.select(".govuk-hint")
+ assert not page.select(".usa-hint")
@freeze_time("2020-02-20 20:20")
@@ -445,7 +445,7 @@ def test_organization_services_shows_live_services_and_usage_with_count_of_1(
client_request.login(active_user_with_permissions)
page = client_request.get(".organization_dashboard", org_id=ORGANISATION_ID)
- usage_rows = page.select("main .govuk-grid-column-one-half")
+ usage_rows = page.select("main .grid-col-6")
# Totals
assert normalize_spaces(usage_rows[0].text) == "Emails 1 sent"
@@ -995,7 +995,7 @@ def test_view_organization_settings(
if "hint" in option:
option_values["hint"] = normalize_spaces(
page.select_one(
- "label[for={}] + .govuk-hint".format(radios[index]["id"])
+ "label[for={}] + .usa-hint".format(radios[index]["id"])
).text
)
assert option_values == option
diff --git a/tests/app/main/views/service_settings/test_service_settings.py b/tests/app/main/views/service_settings/test_service_settings.py
index 907777355..2284e61e3 100644
--- a/tests/app/main/views/service_settings/test_service_settings.py
+++ b/tests/app/main/views/service_settings/test_service_settings.py
@@ -278,7 +278,7 @@ def test_should_show_service_name(
assert page.find("h1").text == "Change your service name"
assert page.find("input", attrs={"type": "text"})["value"] == "service one"
assert (
- page.select_one("main .govuk-body").text
+ page.select_one("main .usa-body").text
== "Your service name should tell users what the message is about as well as who it’s from."
)
@@ -303,13 +303,13 @@ def test_should_show_different_change_service_name_page_for_local_services(
page = client_request.get("main.service_name_change", service_id=SERVICE_ONE_ID)
assert page.find("h1").text == "Change your service name"
assert page.find("input", attrs={"type": "text"})["value"] == "service one"
- assert page.select_one("main .govuk-body").text.strip() == (
+ assert page.select_one("main .usa-body").text.strip() == (
"Your service name should tell users what the message is about as well as who it’s from. For example:"
)
# when no organization on the service object, default org for the user is used for hint
assert (
"School admissions - Test Org"
- in page.find_all("ul", class_="govuk-list govuk-list--bullet")[0].text
+ in page.find_all("ul", class_="usa-list usa-list--bullet")[0].text
)
app.service_api_client.get_service.assert_called_with(SERVICE_ONE_ID)
@@ -336,7 +336,7 @@ def test_should_show_service_org_in_hint_on_change_service_name_page_for_local_s
# when there is organization on the service object, it is used for hint text instead of user default org
assert (
"School admissions - Local Authority"
- in page.find_all("ul", class_="govuk-list govuk-list--bullet")[0].text
+ in page.find_all("ul", class_="usa-list usa-list--bullet")[0].text
)
@@ -348,7 +348,7 @@ def test_should_show_service_name_with_no_prefixing(
page = client_request.get("main.service_name_change", service_id=SERVICE_ONE_ID)
assert page.find("h1").text == "Change your service name"
assert (
- page.select_one("main .govuk-body").text
+ page.select_one("main .usa-body").text
== "Your service name should tell users what the message is about as well as who it’s from."
)
@@ -3340,7 +3340,7 @@ def test_show_international_sms_as_radio_button(
checked_radios = client_request.get(
f"main.service_set_{permission}",
service_id=service_one["id"],
- ).select(".govuk-radios__item input[checked]")
+ ).select(".usa-radio input[checked]")
assert len(checked_radios) == 1
assert checked_radios[0]["value"] == expected_checked
@@ -4107,10 +4107,10 @@ def test_select_organization(
service_id=service_one["id"],
)
- assert len(page.select(".govuk-radios__item")) == 3
+ assert len(page.select(".usa-radio")) == 3
for i in range(0, 3):
assert normalize_spaces(
- page.select(".govuk-radios__item label")[i].text
+ page.select(".usa-radio label")[i].text
) == "Org {}".format(i + 1)
diff --git a/tests/app/main/views/test_add_service.py b/tests/app/main/views/test_add_service.py
index c1b7bef62..d0bf2a041 100644
--- a/tests/app/main/views/test_add_service.py
+++ b/tests/app/main/views/test_add_service.py
@@ -40,14 +40,12 @@ def test_get_should_render_add_service_template(
page = client_request.get("main.add_service")
assert page.select_one("h1").text.strip() == "About your service"
assert page.select_one("input[name=name]").get("value") is None
- assert [
- label.text.strip() for label in page.select(".govuk-radios__item label")
- ] == [
+ assert [label.text.strip() for label in page.select(".usa-radio label")] == [
"Federal government",
"State government",
"Other",
]
- assert [radio["value"] for radio in page.select(".govuk-radios__item input")] == [
+ assert [radio["value"] for radio in page.select(".usa-radio input")] == [
"federal",
"state",
"other",
@@ -210,14 +208,12 @@ def test_get_should_only_show_nhs_org_types_radios_if_user_has_nhs_email(
page = client_request.get("main.add_service")
assert page.select_one("h1").text.strip() == "About your service"
assert page.select_one("input[name=name]").get("value") is None
- assert [
- label.text.strip() for label in page.select(".govuk-radios__item label")
- ] == [
+ assert [label.text.strip() for label in page.select(".usa-radio label")] == [
"NHS – central government agency or public body",
"NHS Trust or Clinical Commissioning Group",
"GP practice",
]
- assert [radio["value"] for radio in page.select(".govuk-radios__item input")] == [
+ assert [radio["value"] for radio in page.select(".usa-radio input")] == [
"nhs_central",
"nhs_local",
"nhs_gp",
diff --git a/tests/app/main/views/test_api_integration.py b/tests/app/main/views/test_api_integration.py
index 1577100d2..560af5e3a 100644
--- a/tests/app/main/views/test_api_integration.py
+++ b/tests/app/main/views/test_api_integration.py
@@ -179,7 +179,7 @@ def test_should_show_create_api_key_page(
page = client_request.get("main.create_api_key", service_id=SERVICE_ONE_ID)
for index, option in enumerate(expected_options):
- item = page.select(".govuk-radios__item")[index]
+ item = page.select(".usa-radio")[index]
if type(option) is tuple:
assert normalize_spaces(item.select_one(".usa-label").text) == option[0]
assert normalize_spaces(item.select_one(".usa-hint").text) == option[1]
diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py
index 4ac46df1d..b3fc1766c 100644
--- a/tests/app/main/views/test_dashboard.py
+++ b/tests/app/main/views/test_dashboard.py
@@ -819,7 +819,7 @@ def test_usage_page(
assert normalize_spaces(unselected_nav_links[0].text) == "2010 to 2011 fiscal year"
assert normalize_spaces(unselected_nav_links[1].text) == "2009 to 2010 fiscal year"
- annual_usage = page.find_all("div", {"class": "govuk-grid-column-one-half"})
+ annual_usage = page.find_all("div", {"class": "grid-col-6"})
# annual stats are shown in two rows, each with three column; email is col 1
# email_column = normalize_spaces(annual_usage[0].text + annual_usage[2].text)
@@ -862,7 +862,7 @@ def test_usage_page_no_sms_spend(
service_id=SERVICE_ONE_ID,
)
- annual_usage = page.find_all("div", {"class": "govuk-grid-column-one-half"})
+ annual_usage = page.find_all("div", {"class": "grid-col-6"})
sms_column = normalize_spaces(annual_usage[0].text)
assert "Text messages" in sms_column
assert "1,000 sent" in sms_column
@@ -938,7 +938,7 @@ def test_usage_page_with_0_free_allowance(
year=2020,
)
- annual_usage = page.select("main .govuk-grid-column-one-half")
+ annual_usage = page.select("main .grid-col-6")
sms_column = normalize_spaces(annual_usage[0].text)
assert "0 free allowance" in sms_column
diff --git a/tests/app/main/views/test_find_users.py b/tests/app/main/views/test_find_users.py
index c5f93cb1c..21d6cd10c 100644
--- a/tests/app/main/views/test_find_users.py
+++ b/tests/app/main/views/test_find_users.py
@@ -215,7 +215,7 @@ def test_change_user_auth_preselects_current_auth_type(
checked_radios = client_request.get(
"main.change_user_auth",
user_id=api_user_active["id"],
- ).select(".govuk-radios__item input[checked]")
+ ).select(".usa-radio input[checked]")
assert len(checked_radios) == 1
assert checked_radios[0]["value"] == current_auth_type
diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py
index 249acaf44..5020b89a4 100644
--- a/tests/app/main/views/test_index.py
+++ b/tests/app/main/views/test_index.py
@@ -329,9 +329,7 @@ def test_sms_price(
pricing_page = client_request.get("main.pricing")
assert normalize_spaces(
- home_page.select(".product-page-section")[5]
- .select(".govuk-grid-column-one-half")[1]
- .text
+ home_page.select(".product-page-section")[5].select(".grid-col-6")[1].text
) == (
f"Text messages "
f"Up to 40,000 free text messages a year, "
diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py
index ee12c8ce3..8ad57a1f0 100644
--- a/tests/app/main/views/test_jobs.py
+++ b/tests/app/main/views/test_jobs.py
@@ -324,8 +324,7 @@ def test_should_show_old_job(
assert not page.select("a[download]")
assert page.select_one("tbody").text.strip() == expected_message
assert [
- normalize_spaces(column.text)
- for column in page.select("main .govuk-grid-column-one-quarter")
+ normalize_spaces(column.text) for column in page.select("main .grid-col-3")
] == [
"1 total text messages",
"1 pending",
diff --git a/tests/app/main/views/test_platform_admin.py b/tests/app/main/views/test_platform_admin.py
index e85303058..c27e3beda 100644
--- a/tests/app/main/views/test_platform_admin.py
+++ b/tests/app/main/views/test_platform_admin.py
@@ -596,7 +596,7 @@ def test_platform_admin_splash_doesnt_talk_to_api(
page = client_request.get("main.platform_admin_splash_page")
- assert page.select_one("main .govuk-body a")["href"] == url_for(
+ assert page.select_one("main .usa-body a")["href"] == url_for(
"main.platform_admin",
)
@@ -722,19 +722,19 @@ def test_platform_admin_displays_stats_in_right_boxes_and_with_correct_styling(
page = client_request.get("main.platform_admin")
# Email permanent failure status box - number is correct
- assert "3 permanent failures" in page.find_all(
- "div", class_="govuk-grid-column-one-half"
- )[0].find(string=re.compile("permanent"))
+ assert "3 permanent failures" in page.find_all("div", class_="grid-col-6")[0].find(
+ string=re.compile("permanent")
+ )
# Email complaints status box - link exists and number is correct
assert page.find("a", string="15 complaints")
# SMS total box - number is correct
assert page.find_all("span", class_="big-number-number")[1].text.strip() == "168"
# Test SMS box - number is correct
- assert "5" in page.find_all("div", class_="govuk-grid-column-one-half")[3].text
+ assert "5" in page.find_all("div", class_="grid-col-6")[3].text
# SMS technical failure status box - number is correct and failure class is used
assert (
"1 technical failures"
- in page.find_all("div", class_="govuk-grid-column-one-half")[1]
+ in page.find_all("div", class_="grid-col-6")[1]
.find("div", class_="big-number-status-failing")
.text
)
@@ -773,7 +773,7 @@ def test_clear_cache_shows_form(
"service-????????-????-????-????-????????????-template-????????-????-????-????-????????????-version-*" # noqa
),
call(
- "service-????????-????-????-????-????????????-template-????????-????-????-????-????????????-versions" # noqa
+ "service-????????-????-????-????-????????????-template-????????-????-????-????-????????????-versions" # noqa
),
],
"Removed 6 objects across 3 key formats for template",
diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py
index 4dfaf3627..c5410a240 100644
--- a/tests/app/main/views/test_template_folders.py
+++ b/tests/app/main/views/test_template_folders.py
@@ -521,7 +521,7 @@ def test_template_id_is_searchable_for_services_with_api_keys(
normalize_spaces(item.text)
for item in page.select(
# Text which should be hidden from all users
- r".template-list-item .govuk-\!-display-none"
+ r".template-list-item .display-none"
)
] == [
template_2["id"],
diff --git a/tests/app/main/views/test_tour.py b/tests/app/main/views/test_tour.py
index c26673bab..1d34a9999 100644
--- a/tests/app/main/views/test_tour.py
+++ b/tests/app/main/views/test_tour.py
@@ -21,8 +21,8 @@ def test_should_200_for_tour_start(
assert normalize_spaces(page.select(".banner-tour .heading-medium")[0].text) == (
"Try sending yourself this example"
)
- selected_hint = page.select(".banner-tour .govuk-grid-row")[0]
- selected_hint_text = normalize_spaces(selected_hint.select(".govuk-body")[0].text)
+ selected_hint = page.select(".banner-tour .grid-row")[0]
+ selected_hint_text = normalize_spaces(selected_hint.select(".usa-body")[0].text)
assert "greyed-out-step" not in selected_hint["class"]
assert selected_hint_text == "Every message is sent from a template"
@@ -136,8 +136,8 @@ def test_should_200_for_get_tour_step(
assert normalize_spaces(page.select(".banner-tour .heading-medium")[0].text) == (
"Try sending yourself this example"
)
- selected_hint = page.select(".banner-tour .govuk-grid-row")[1]
- selected_hint_text = normalize_spaces(selected_hint.select(".govuk-body")[0].text)
+ selected_hint = page.select(".banner-tour .grid-row")[1]
+ selected_hint_text = normalize_spaces(selected_hint.select(".usa-body")[0].text)
assert "greyed-out-step" not in selected_hint["class"]
assert selected_hint_text == "The template pulls in the data you provide"
@@ -530,8 +530,8 @@ def test_should_200_for_check_tour_notification(
assert normalize_spaces(page.select(".banner-tour .heading-medium")[0].text) == (
"Try sending yourself this example"
)
- selected_hint = page.select(".banner-tour .govuk-grid-row")[1]
- selected_hint_text = normalize_spaces(selected_hint.select(".govuk-body")[0].text)
+ selected_hint = page.select(".banner-tour .grid-row")[1]
+ selected_hint_text = normalize_spaces(selected_hint.select(".usa-body")[0].text)
assert "greyed-out-step" not in selected_hint["class"]
assert selected_hint_text == "The template pulls in the data you provide"
diff --git a/tests/javascripts/updateContent.test.js b/tests/javascripts/updateContent.test.js
index 4732325c9..f8229f63a 100644
--- a/tests/javascripts/updateContent.test.js
+++ b/tests/javascripts/updateContent.test.js
@@ -296,12 +296,12 @@ describe('Update content', () => {
${content.title}