Reran reference tests and merged in main to fix conflicts

This commit is contained in:
alexjanousekGSA
2025-07-31 17:07:17 -04:00
parent 1203546a97
commit aa18d1447e
15 changed files with 19 additions and 22 deletions

View File

@@ -161,7 +161,7 @@
"filename": "app/config.py", "filename": "app/config.py",
"hashed_secret": "577a4c667e4af8682ca431857214b3a920883efc", "hashed_secret": "577a4c667e4af8682ca431857214b3a920883efc",
"is_verified": false, "is_verified": false,
"line_number": 124, "line_number": 122,
"is_secret": false "is_secret": false
} }
], ],
@@ -634,5 +634,5 @@
} }
] ]
}, },
"generated_at": "2025-07-31T11:53:28Z" "generated_at": "2025-07-31T21:07:14Z"
} }

View File

@@ -48,7 +48,7 @@
`; `;
}; };
ListEntry.prototype.renderAddButton = function(data) { ListEntry.prototype.renderAddButton = function(data) {
return `<button type="button" class="usa-button usa-button--outline input-list__button--add">Add another ${data.listItemName} (${data.entriesLeft} remaining)</button>`; return `<button type="button" class="usa-button usa-button--outline input-list__button--add margin-top-4">Add another ${data.listItemName} (${data.entriesLeft} remaining)</button>`;
}; };
ListEntry.prototype.getSharedAttributes = function () { ListEntry.prototype.getSharedAttributes = function () {
var $inputs = this.$wrapper.find('input'), var $inputs = this.$wrapper.find('input'),

View File

@@ -16,9 +16,7 @@ class Config(object):
API_PUBLIC_WS_URL = getenv("API_PUBLIC_WS_URL", "localhost") API_PUBLIC_WS_URL = getenv("API_PUBLIC_WS_URL", "localhost")
ADMIN_BASE_URL = getenv("ADMIN_BASE_URL", "http://localhost:6012") ADMIN_BASE_URL = getenv("ADMIN_BASE_URL", "http://localhost:6012")
HEADER_COLOUR = ( HEADER_COLOUR = "#81878b" # mix of dark-grey and mid-grey
"#81878b" # mix of dark-grey and mid-grey
)
LOGO_CDN_DOMAIN = ( LOGO_CDN_DOMAIN = (
"static-logos.notifications.service.gov.uk" # TODO use our own CDN "static-logos.notifications.service.gov.uk" # TODO use our own CDN
) )

View File

@@ -17,7 +17,8 @@
{% call govukFieldset({ {% call govukFieldset({
"legend": { "legend": {
"text": field.label.text, "text": field.label.text,
"isPageHeading": False "isPageHeading": False,
"classes": "text-bold"
}, },
"attributes": attributes "attributes": attributes
}) })

View File

@@ -59,11 +59,13 @@
autocomplete=False autocomplete=False
) }} ) }}
{{ list_entry( <div class="margin-top-4">
form.phone_numbers, {{ list_entry(
item_name='phone number', form.phone_numbers,
autocomplete=False item_name='phone number',
) }} autocomplete=False
) }}
</div>
</div> </div>
</div> </div>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 137 KiB

After

Width:  |  Height:  |  Size: 137 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 121 KiB

After

Width:  |  Height:  |  Size: 121 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 325 KiB

After

Width:  |  Height:  |  Size: 325 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 158 KiB

After

Width:  |  Height:  |  Size: 158 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 222 KiB

After

Width:  |  Height:  |  Size: 222 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 158 KiB

After

Width:  |  Height:  |  Size: 158 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 98 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 158 KiB

After

Width:  |  Height:  |  Size: 158 KiB

View File

@@ -185,7 +185,9 @@ def test_should_show_create_api_key_page(
label = item.select_one(".usa-radio__label") label = item.select_one(".usa-radio__label")
hint = label.select_one(".usa-hint") hint = label.select_one(".usa-hint")
# Get the label text without the hint text # Get the label text without the hint text
label_text = label.text.replace(hint.text, "").strip() if hint else label.text label_text = (
label.text.replace(hint.text, "").strip() if hint else label.text
)
assert normalize_spaces(label_text) == option[0] assert normalize_spaces(label_text) == option[0]
assert normalize_spaces(hint.text) == option[1] assert normalize_spaces(hint.text) == option[1]
else: else:

View File

@@ -145,9 +145,7 @@ def test_default_email_sender_is_checked_and_has_hint(
) )
assert page.select(".usa-radio input")[0].has_attr("checked") assert page.select(".usa-radio input")[0].has_attr("checked")
assert ( assert normalize_spaces(page.select_one(".usa-radio .usa-hint").text) == "(Default)"
normalize_spaces(page.select_one(".usa-radio .usa-hint").text) == "(Default)"
)
assert not page.select(".usa-radio input")[1].has_attr("checked") assert not page.select(".usa-radio input")[1].has_attr("checked")
@@ -162,9 +160,7 @@ def test_default_sms_sender_is_checked_and_has_hint(
) )
assert page.select(".usa-radio input")[0].has_attr("checked") assert page.select(".usa-radio input")[0].has_attr("checked")
assert ( assert normalize_spaces(page.select_one(".usa-radio .usa-hint").text) == "(Default)"
normalize_spaces(page.select_one(".usa-radio .usa-hint").text) == "(Default)"
)
assert not page.select(".usa-radio input")[1].has_attr("checked") assert not page.select(".usa-radio input")[1].has_attr("checked")
@@ -179,9 +175,7 @@ def test_default_sms_sender_is_checked_and_has_hint_when_there_are_no_inbound_nu
) )
assert page.select(".usa-radio input")[0].has_attr("checked") assert page.select(".usa-radio input")[0].has_attr("checked")
assert ( assert normalize_spaces(page.select_one(".usa-radio .usa-hint").text) == "(Default)"
normalize_spaces(page.select_one(".usa-radio .usa-hint").text) == "(Default)"
)
assert not page.select(".usa-radio input")[1].has_attr("checked") assert not page.select(".usa-radio input")[1].has_attr("checked")