Updated and tested all buttons

This commit is contained in:
alexjanousekGSA
2025-07-02 18:14:22 -04:00
parent bee667a5e9
commit 3e2fe8be04
31 changed files with 34 additions and 34 deletions

View File

@@ -122,7 +122,7 @@ describe('Collapsible fieldset', () => {
test("has a button to expand the fieldset", () => {
const button = formGroup.querySelector('.govuk-button');
const button = formGroup.querySelector('.usa-button');
expect(button).not.toBeNull();
expect(button.textContent.trim()).toEqual('Choose folders');
@@ -131,7 +131,7 @@ describe('Collapsible fieldset', () => {
test("has the correct aria attributes on the button", () => {
expect(helpers.element(formGroup.querySelector('.govuk-button')).hasAttributesSetTo({
expect(helpers.element(formGroup.querySelector('.usa-button')).hasAttributesSetTo({
'aria-controls': fieldset.getAttribute('id'),
'aria-expanded': 'false'
})).toBe(true);
@@ -231,7 +231,7 @@ describe('Collapsible fieldset', () => {
// start module
window.GOVUK.modules.start();
helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
});
@@ -249,13 +249,13 @@ describe('Collapsible fieldset', () => {
test("it uses ARIA to mark the checkboxes as expanded", () => {
expect(formGroup.querySelector('.govuk-button').getAttribute('aria-expanded')).toEqual('true');
expect(formGroup.querySelector('.usa-button').getAttribute('aria-expanded')).toEqual('true');
});
test("it changes it's text to indicate it's new action", () => {
expect(formGroup.querySelector('.govuk-button').textContent.trim()).toEqual("Done choosing folders");
expect(formGroup.querySelector('.usa-button').textContent.trim()).toEqual("Done choosing folders");
});
@@ -269,10 +269,10 @@ describe('Collapsible fieldset', () => {
window.GOVUK.modules.start();
// show the checkboxes
helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
// click the button
helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
});
@@ -290,13 +290,13 @@ describe('Collapsible fieldset', () => {
test("it uses ARIA to mark the checkboxes as collapsed", () => {
expect(formGroup.querySelector('.govuk-button').getAttribute('aria-expanded')).toEqual('false');
expect(formGroup.querySelector('.usa-button').getAttribute('aria-expanded')).toEqual('false');
});
test("it changes it's text to indicate it's new action", () => {
expect(formGroup.querySelector('.govuk-button').textContent.trim()).toEqual("Choose folders");
expect(formGroup.querySelector('.usa-button').textContent.trim()).toEqual("Choose folders");
});
});
@@ -311,7 +311,7 @@ describe('Collapsible fieldset', () => {
window.GOVUK.modules.start();
// show the checkboxes
helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
expect(formGroup.querySelector('.selection-footer').previousElementSibling.nodeName).toBe('FIELDSET');
@@ -329,7 +329,7 @@ describe('Collapsible fieldset', () => {
window.GOVUK.modules.start();
// show the checkboxes
helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
expect(formGroup.querySelector('.selection-footer').previousElementSibling.nodeName).toBe('FIELDSET');
@@ -348,7 +348,7 @@ describe('Collapsible fieldset', () => {
window.GOVUK.modules.start();
// show the checkboxes
helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
});
@@ -361,7 +361,7 @@ describe('Collapsible fieldset', () => {
test("is removed when the fieldset is collapsed", () => {
// click the button to collapse the fieldset
helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
expect(formGroup.querySelector('.selection-footer').classList.contains('js-stick-at-bottom-when-scrolling')).toBe(false);
@@ -376,7 +376,7 @@ describe('Collapsible fieldset', () => {
beforeEach(() => {
window.GOVUK.modules.start();
helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
});
test("adds a 'Select all' button when checkboxes are shown", () => {
@@ -420,7 +420,7 @@ describe('Collapsible fieldset', () => {
test("button is hidden when fieldset is collapsed", () => {
const toggleButton = document.querySelector('.usa-button--small');
const doneButton = formGroup.querySelector('.govuk-button');
const doneButton = formGroup.querySelector('.usa-button');
expect(toggleButton.parentElement.style.display).not.toEqual('none');
@@ -436,13 +436,13 @@ describe('Collapsible fieldset', () => {
test("shows toggle button again when fieldset is re-opened", () => {
window.GOVUK.modules.start();
helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
const toggleButton = document.querySelector('.usa-button--small');
expect(toggleButton).not.toBeNull();
helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
const toggleButtonAfter = document.querySelector('.usa-button--small');
expect(toggleButtonAfter).not.toBeNull();
@@ -454,7 +454,7 @@ describe('Collapsible fieldset', () => {
describe("when the selection changes", () => {
const showCheckboxes = () => {
helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
};
const checkFirstCheckbox = () => {

View File

@@ -25,7 +25,7 @@ describe('File upload', () => {
Upload logo
</label>
<label class="file-upload-filename" for="file"></label>
<button type="submit" class="govuk-button file-upload-submit">Submit</button>
<button type="submit" class="usa-button file-upload-submit">Submit</button>
</form>`;
form = document.querySelector('form');

View File

@@ -19,7 +19,7 @@ describe('Prevent duplicate form submissions', () => {
// set up DOM
document.body.innerHTML = `
<form action="/" method="post">
<button class="govuk-button" type="submit">Continue</button>
<button class="usa-button" type="submit">Continue</button>
</form>`;
form = document.querySelector('form');

View File

@@ -91,7 +91,7 @@ describe("Stick to top/bottom of window when scrolling", () => {
</div>
</div>
<div class="page-footer">
<button type="submit" class="govuk-button">Continue</button>
<button type="submit" class="usa-button">Continue</button>
</div>
</form>
</main>
@@ -756,7 +756,7 @@ describe("Stick to top/bottom of window when scrolling", () => {
</div>
<div class="page-footer js-stick-at-bottom-when-scrolling">
<form method="post" action="">
<button type="submit" class="govuk-button">Send 1 email </button>
<button type="submit" class="usa-button">Send 1 email </button>
</form>
</div>
</div>