Test passed, good time to commit

This commit is contained in:
Jonathan Bobel
2023-06-16 14:55:24 -04:00
parent 618ac6df8d
commit f266084ddb
50 changed files with 110 additions and 104 deletions

View File

@@ -116,7 +116,7 @@ describe('Collapsible fieldset', () => {
const legend = helpers.element(fieldset.querySelector('legend'));
expect(legend.hasClass('govuk-visually-hidden')).toBe(true);
expect(legend.hasClass('usa-sr-only')).toBe(true);
});

View File

@@ -25,7 +25,7 @@ describe('copy to clipboard', () => {
${options.thing}
</h2>
<div data-module="copy-to-clipboard" data-value="${apiKey}" data-thing="${options.thing}" data-name="${options.name}">
<span class="copy-to-clipboard__value" aria-live="assertive">${(options.name === options.thing) ? '<span class="govuk-visually-hidden">' + options.thing + ': </span>' : ''}${apiKey}</span>
<span class="copy-to-clipboard__value" aria-live="assertive">${(options.name === options.thing) ? '<span class="usa-sr-only">' + options.thing + ': </span>' : ''}${apiKey}</span>
<span class="copy-to-clipboard__notice" aria-live="assertive"></span>
</div>`;
@@ -177,7 +177,7 @@ describe('copy to clipboard', () => {
// and so needs some prefix text to label it
test("The id should have a hidden prefix to label what it is", () => {
const value = component.querySelector('.copy-to-clipboard__value .govuk-visually-hidden');
const value = component.querySelector('.copy-to-clipboard__value .usa-sr-only');
expect(value).not.toBeNull();
expect(value.textContent).toEqual('ID: ');
@@ -185,7 +185,7 @@ describe('copy to clipboard', () => {
test("the button should have a hidden suffix naming the id it is for", () => {
const buttonSuffix = component.querySelector('button .govuk-visually-hidden');
const buttonSuffix = component.querySelector('button .usa-sr-only');
expect(buttonSuffix).not.toBeNull();
expect(buttonSuffix.textContent).toEqual(' for Default');
@@ -211,8 +211,8 @@ describe('copy to clipboard', () => {
test("Its button and id shouldn't have extra hidden text to identify them", () => {
const value = component.querySelector('.copy-to-clipboard__value .govuk-visually-hidden');
const buttonSuffix = component.querySelector('button .govuk-visually-hidden');
const value = component.querySelector('.copy-to-clipboard__value .usa-sr-only');
const buttonSuffix = component.querySelector('button .usa-sr-only');
expect(value).toBeNull();
expect(buttonSuffix).toBeNull();
@@ -246,7 +246,7 @@ describe('copy to clipboard', () => {
const liveRegion = component.querySelector('.copy-to-clipboard__notice');
expect(liveRegion.classList.contains('govuk-visually-hidden')).toBe(false);
expect(liveRegion.classList.contains('usa-sr-only')).toBe(false);
expect(liveRegion.textContent.trim()).toEqual(
expect.stringContaining('Copied to clipboard')
);
@@ -257,7 +257,7 @@ describe('copy to clipboard', () => {
// lower priority than the live-region
test("The live-region should contain some hidden text giving context to the statement shown", () => {
const liveRegionHiddenText = component.querySelectorAll('.copy-to-clipboard__notice .govuk-visually-hidden');
const liveRegionHiddenText = component.querySelectorAll('.copy-to-clipboard__notice .usa-sr-only');
expect(liveRegionHiddenText.length).toEqual(2);
expect(liveRegionHiddenText[0].textContent).toEqual('Some Thing ');
@@ -342,7 +342,7 @@ describe('copy to clipboard', () => {
test("the button should have a hidden suffix naming the id it is for", () => {
const buttonSuffix = component.querySelector('button .govuk-visually-hidden');
const buttonSuffix = component.querySelector('button .usa-sr-only');
expect(buttonSuffix).not.toBeNull();
expect(buttonSuffix.textContent).toEqual(' for Default');
@@ -385,8 +385,8 @@ describe('copy to clipboard', () => {
test("Its button and id shouldn't have extra hidden text to identify them", () => {
const prefix = component.querySelector('.copy-to-clipboard__value .govuk-visually-hidden');
const buttonSuffix = component.querySelector('button .govuk-visually-hidden');
const prefix = component.querySelector('.copy-to-clipboard__value .usa-sr-only');
const buttonSuffix = component.querySelector('button .usa-sr-only');
expect(prefix).toBeNull();
expect(buttonSuffix).toBeNull();

View File

@@ -51,7 +51,7 @@ describe("List entry", () => {
<div class="list-entry">
<div class="govuk-form-group">
<label for="domains-${idx + 1}" class="govuk-label govuk-input--numbered__label">
<span class="govuk-visually-hidden">domain number </span>${idx + 1}.
<span class="usa-sr-only">domain number </span>${idx + 1}.
</label>
<input type="text" name="domains-${idx + 1}" id="domains-${idx + 1}" class="govuk-input govuk-input--numbered govuk-!-width-full" autocomplete="off">
</div>

View File

@@ -70,7 +70,7 @@ describe('Live search', () => {
${searchLabelText}
</label>
<input autocomplete="off" class="form-control form-control-1-1 " id="search" name="search" rows="8" type="search" value="">
<div role="region" aria-live="polite" class="live-search__status govuk-visually-hidden"></div>
<div role="region" aria-live="polite" class="live-search__status usa-sr-only"></div>
</div>
</div>
<form method="post" autocomplete="off" novalidate>
@@ -559,7 +559,7 @@ describe('Live search', () => {
${searchLabelText}
</label>
<input autocomplete="off" class="form-control form-control-1-1 " data-module="" id="search" name="search" rows="8" type="search" value="">
<div role="region" aria-live="polite" class="live-search__status govuk-visually-hidden"></div>
<div role="region" aria-live="polite" class="live-search__status usa-sr-only"></div>
</div>
</div>
<form method="post" autocomplete="off" novalidate>

View File

@@ -26,7 +26,7 @@ function getRadioGroup (data) {
}
radioGroup.innerHTML = `
<fieldset class="govuk-fieldset" id="${data.name}">
<legend class="govuk-fieldset__legend${data.hideLegend ? " govuk-visually-hidden" : ""}">
<legend class="govuk-fieldset__legend${data.hideLegend ? " usa-sr-only" : ""}">
${data.label}
</legend>
<div class="govuk-radios">
@@ -46,7 +46,7 @@ function templatesAndFoldersCheckboxes (hierarchy) {
<div class="govuk-checkboxes__item template-list-item template-list-item-with-checkbox template-list-item-without-ancestors">
<input class="usa-checkbox__input" id="templates-or-folder-${idx}" name="templates_and_folders" type="checkbox" value="templates-or-folder-${idx}">
<label class="usa-checkbox__label template-list-item-label margin-top-05" for="templates-or-folder-${idx}">
<span class="govuk-visually-hidden">${node.label}</span>
<span class="usa-sr-only">${node.label}</span>
</label>
<a href="/services/6658542f-0cad-491f-bec8-ab8457700ead/templates/all/folders/3d057d9a-51fc-45ea-8b63-0003206350a6" class="govuk-link govuk-link--no-visited-state template-list-${node.type === 'folder' ? 'folder' : 'template'}">
<span class="live-search-relevant">${node.label}</span>

View File

@@ -392,8 +392,8 @@ describe('TemplateFolderForm', () => {
const cancelLink = formControls.querySelector('.js-cancel');
expect(cancelLink).not.toBeNull();
expect(cancelLink.querySelector('.govuk-visually-hidden')).not.toBeNull();
expect(cancelLink.querySelector('.govuk-visually-hidden').textContent.trim()).toEqual('new template');
expect(cancelLink.querySelector('.usa-sr-only')).not.toBeNull();
expect(cancelLink.querySelector('.usa-sr-only').textContent.trim()).toEqual('new template');
});
@@ -520,8 +520,8 @@ describe('TemplateFolderForm', () => {
const cancelLink = formControls.querySelector('.js-cancel');
expect(cancelLink).not.toBeNull();
expect(cancelLink.querySelector('.govuk-visually-hidden')).not.toBeNull();
expect(cancelLink.querySelector('.govuk-visually-hidden').textContent.trim()).toEqual('new folder');
expect(cancelLink.querySelector('.usa-sr-only')).not.toBeNull();
expect(cancelLink.querySelector('.usa-sr-only').textContent.trim()).toEqual('new folder');
});
@@ -742,8 +742,8 @@ describe('TemplateFolderForm', () => {
const cancelLink = formControls.querySelector('.js-cancel');
expect(cancelLink).not.toBeNull();
expect(cancelLink.querySelector('.govuk-visually-hidden')).not.toBeNull();
expect(cancelLink.querySelector('.govuk-visually-hidden').textContent.trim()).toEqual('move to folder');
expect(cancelLink.querySelector('.usa-sr-only')).not.toBeNull();
expect(cancelLink.querySelector('.usa-sr-only').textContent.trim()).toEqual('move to folder');
});
@@ -844,8 +844,8 @@ describe('TemplateFolderForm', () => {
const cancelLink = formControls.querySelector('.js-cancel');
expect(cancelLink).not.toBeNull();
expect(cancelLink.querySelector('.govuk-visually-hidden')).not.toBeNull();
expect(cancelLink.querySelector('.govuk-visually-hidden').textContent.trim()).toEqual('move to new folder');
expect(cancelLink.querySelector('.usa-sr-only')).not.toBeNull();
expect(cancelLink.querySelector('.usa-sr-only').textContent.trim()).toEqual('move to new folder');
});