Skip to content

Get cypress passing, improve slidein accessibility #2056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Crabcyborg merged 2 commits into from
Oct 16, 2024
Merged

Get cypress passing, improve slidein accessibility #2056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08e5bf9
Add the experimental option to show run all specs option in Chrome, s…
Crabcyborg Oct 16, 2024
2100c9b
Define a JS dependency, stop marking onboarding skipped when transien…
Crabcyborg Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion classes/controllers/FrmAppController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,7 +1359,7 @@ private static function enqueue_floating_links( $plugin_url, $version ) {
wp_enqueue_style( 's11-floating-links', $plugin_url . '/css/packages/s11-floating-links.css', array(), $version );

// Enqueue the Floating Links script.
wp_enqueue_script( 's11-floating-links', $plugin_url . '/js/packages/floating-links/s11-floating-links.js', array(), $version, true );
wp_enqueue_script( 's11-floating-links', $plugin_url . '/js/packages/floating-links/s11-floating-links.js', array( 'formidable_admin' ), $version, true );

// Enqueue the config script.
wp_enqueue_script( 's11-floating-links-config', $plugin_url . '/js/packages/floating-links/config.js', array( 'wp-i18n' ), $version, true );
Expand Down
1 change: 0 additions & 1 deletion classes/controllers/FrmOnboardingWizardController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ public static function do_admin_redirects() {

$transient_value = get_transient( self::TRANSIENT_NAME );
if ( ! in_array( $transient_value, array( self::TRANSIENT_VALUE, self::TRANSIENT_MULTI_VALUE ), true ) ) {
self::mark_onboarding_as_skipped();
return;
}

Expand Down
1 change: 1 addition & 0 deletions cypress.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ module.exports = defineConfig({
setupNodeEvents(on) {
htmlvalidate.install( on );
},
experimentalRunAllSpecs: true
},
});
1 change: 1 addition & 0 deletions js/packages/floating-links/s11-floating-links.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ class S11FloatingLinks {
children
});
slideIn.setAttribute( 'data-message', frmGlobal.inboxSlideIn.key );
slideIn.setAttribute( 'role', 'alert' );
slideIn.insertAdjacentHTML( 'beforeend', frmAdminBuild.purifyHtml( frmGlobal.inboxSlideIn.cta ) );
slideIn.querySelector( '.frm-button-secondary' )?.remove();
this.updateSlideInCtaUtm( slideIn );
Expand Down
42 changes: 21 additions & 21 deletions tests/cypress/e2e/Applications/validateApplicationsPage.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe("Applications page", () => {
.and('have.attr', 'aria-description', 'Business Directory Template');
cy.get('.frm-application-card-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/thumbnails/business-directory.png');
.and('include', '/images/applications/thumbnails/business-directory.png');
cy.get('h3 .frm-inner-text').should('contain.text', 'Business Directory').click();
});

Expand All @@ -51,7 +51,7 @@ describe("Applications page", () => {
.should('contain.text', 'Access to this application requires the Elite plan.');
cy.get('.frm-application-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/placeholder.png');
.and('include', '/images/applications/placeholder.png');
cy.get('.frm-application-modal-details .frm-application-modal-label')
.should('contain.text', 'Description');
cy.get('.frm-application-modal-details div')
Expand Down Expand Up @@ -84,7 +84,7 @@ describe("Applications page", () => {
.and('have.attr', 'aria-description', 'Business Hours Template');
cy.get('.frm-application-card-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/thumbnails/business-hours.png');
.and('include', '/images/applications/thumbnails/business-hours.png');
});

cy.get('#frm_application_templates_grid')
Expand All @@ -96,7 +96,7 @@ describe("Applications page", () => {
.and('have.attr', 'aria-description', 'Certificate Template');
cy.get('.frm-application-card-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/thumbnails/certificate.webp');
.and('include', '/images/applications/thumbnails/certificate.webp');
});

cy.get('#frm_application_templates_grid')
Expand All @@ -108,7 +108,7 @@ describe("Applications page", () => {
.and('have.attr', 'aria-description', 'Charity Tracker Template');
cy.get('.frm-application-card-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/thumbnails/charity-tracker.webp');
.and('include', '/images/applications/thumbnails/charity-tracker.webp');
});

cy.get('#frm_application_templates_grid')
Expand All @@ -120,7 +120,7 @@ describe("Applications page", () => {
.and('have.attr', 'aria-description', 'Contract Agreement Template');
cy.get('.frm-application-card-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/thumbnails/contract-agreement.webp');
.and('include', '/images/applications/thumbnails/contract-agreement.webp');
});

cy.get('#frm_application_templates_grid')
Expand All @@ -132,7 +132,7 @@ describe("Applications page", () => {
.and('have.attr', 'aria-description', 'FAQ Template');
cy.get('.frm-application-card-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/thumbnails/faq-template-wordpress.png');
.and('include', '/images/applications/thumbnails/faq-template-wordpress.png');
});

cy.get('#frm_application_templates_grid')
Expand All @@ -144,7 +144,7 @@ describe("Applications page", () => {
.and('have.attr', 'aria-description', 'Freelance Invoice Generator Template');
cy.get('.frm-application-card-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/thumbnails/freelance-invoice-generator.webp');
.and('include', '/images/applications/thumbnails/freelance-invoice-generator.webp');
});

cy.get('#frm_application_templates_grid')
Expand All @@ -156,7 +156,7 @@ describe("Applications page", () => {
.and('have.attr', 'aria-description', 'Invoice PDF Template');
cy.get('.frm-application-card-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/thumbnails/invoice-pdf.webp');
.and('include', '/images/applications/thumbnails/invoice-pdf.webp');
});

cy.get('#frm_application_templates_grid')
Expand All @@ -167,7 +167,7 @@ describe("Applications page", () => {
.and('have.attr', 'aria-description', 'Letter of Recommendation Template');
cy.get('.frm-application-card-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/thumbnails/letter-of-recommendation.webp');
.and('include', '/images/applications/thumbnails/letter-of-recommendation.webp');
cy.get('h3 .frm-inner-text').should('contain.text', 'Letter of Recommendation').click();
});

Expand All @@ -179,7 +179,7 @@ describe("Applications page", () => {
.should('contain.text', 'Access to this application requires the Business plan');
cy.get('.frm-application-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/placeholder.png');
.and('include', '/images/applications/placeholder.png');
cy.get('.frm-application-modal-details .frm-application-modal-label')
.should('contain.text', 'Description');
cy.get('.frm-application-modal-details div')
Expand Down Expand Up @@ -212,7 +212,7 @@ describe("Applications page", () => {
.and('have.attr', 'aria-description', 'Link in Bio Instagram Page Template');
cy.get('.frm-application-card-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/thumbnails/link-in-bio-instagram.webp');
.and('include', '/images/applications/thumbnails/link-in-bio-instagram.webp');
});

cy.get('#frm_application_templates_grid')
Expand All @@ -224,7 +224,7 @@ describe("Applications page", () => {
.and('have.attr', 'aria-description', 'Member Directory Template');
cy.get('.frm-application-card-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/thumbnails/member-directory.webp');
.and('include', '/images/applications/thumbnails/member-directory.webp');
});

cy.get('#frm_application_templates_grid')
Expand All @@ -236,7 +236,7 @@ describe("Applications page", () => {
.and('have.attr', 'aria-description', 'Product Review and Purchase Template');
cy.get('.frm-application-card-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/thumbnails/product-review.png');
.and('include', '/images/applications/thumbnails/product-review.png');
});

cy.get('#frm_application_templates_grid')
Expand All @@ -248,7 +248,7 @@ describe("Applications page", () => {
.and('have.attr', 'aria-description', 'Real Estate Listing Template');
cy.get('.frm-application-card-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/thumbnails/real-estate-listings.png');
.and('include', '/images/applications/thumbnails/real-estate-listings.png');
});

cy.get('#frm_application_templates_grid')
Expand All @@ -260,7 +260,7 @@ describe("Applications page", () => {
.and('have.attr', 'aria-description', 'Restaurant Menu Template');
cy.get('.frm-application-card-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/thumbnails/restaurant-menu.png');
.and('include', '/images/applications/thumbnails/restaurant-menu.png');
});

cy.get('#frm_application_templates_grid')
Expand All @@ -272,7 +272,7 @@ describe("Applications page", () => {
.and('have.attr', 'aria-description', 'Team Directory Template');
cy.get('.frm-application-card-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/thumbnails/team-directory.png');
.and('include', '/images/applications/thumbnails/team-directory.png');
});

cy.get('#frm_application_templates_grid')
Expand All @@ -283,7 +283,7 @@ describe("Applications page", () => {
.and('have.attr', 'aria-description', 'Testimonials Template');
cy.get('.frm-application-card-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/thumbnails/testimonials.webp');
.and('include', '/images/applications/thumbnails/testimonials.webp');
cy.get('h3 .frm-inner-text').should('contain.text', 'Testimonials').click();
});

Expand All @@ -296,7 +296,7 @@ describe("Applications page", () => {
.should('contain.text', 'Access to this application requires the Business plan');
cy.get('.frm-application-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/placeholder.png');
.and('include', '/images/applications/placeholder.png');
cy.get('.frm-application-modal-details .frm-application-modal-label')
.should('contain.text', 'Description');
cy.get('.frm-application-modal-details div')
Expand Down Expand Up @@ -338,7 +338,7 @@ describe("Applications page", () => {
.and('have.attr', 'aria-description', 'Business Directory Template');
cy.get('.frm-application-card-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/thumbnails/business-directory.png');
.and('include', '/images/applications/thumbnails/business-directory.png');
});
cy.get('#frm_application_templates_grid')
.contains('.frm-application-template-card.frm-search-result', 'Business Hours')
Expand All @@ -348,7 +348,7 @@ describe("Applications page", () => {
.and('have.attr', 'aria-description', 'Business Hours Template');
cy.get('.frm-application-card-image-wrapper img')
.should('have.attr', 'src')
.and('include', '/plugins/formidable-forms/images/applications/thumbnails/business-hours.png');
.and('include', '/images/applications/thumbnails/business-hours.png');
});
cy.log("Search for non-valid application templates");
cy.get('#frm-application-search').clear().type("Application does not exist");
Expand Down