@vardot/varbase-e2e 2.0.1 → 2.0.3

package/tests/step-definitions/drupal-layout-builder.steps.js

@@ -51,6 +51,28 @@ When(/^(?:I |we )*add a basic(?: "([^"]*)")? section at the end of layout$/, asy
   if (!(await layoutLink.count())) throw friendly(`The "${layout}" layout option was not found in the Add section list.`);
   await layoutLink.click();
   await smartSettle(this.page, budget(this));
+  // On newer Bootstrap Layout Builder the layout option adds the section
+  // directly instead of opening its settings in the off-canvas. When the
+  // section settings form (container type, breakpoints, background) did not
+  // open, click the newly added (highest-delta) section's "Configure" link -
+  // a use-ajax link that opens the settings in the #drupal-off-canvas dialog,
+  // where the following section-settings steps run.
+  const hasSettingsForm = await this.page.locator('[id*="layout-container-type"]').count();
+  if (!hasSettingsForm) {
+    const links = this.page.locator('a.layout-builder__link--configure[href*="/layout_builder/configure-form/section/"]');
+    const count = await links.count();
+    let bestLink = null;
+    let bestDelta = -1;
+    for (let i = 0; i < count; i++) {
+      const href = await links.nth(i).getAttribute('href');
+      const delta = parseInt(href.split('/').pop(), 10);
+      if (delta > bestDelta) { bestDelta = delta; bestLink = links.nth(i); }
+    }
+    if (bestLink) {
+      await bestLink.click();
+      await smartSettle(this.page, budget(this));
+    }
+  }
 });
 
 /**
@@ -69,8 +91,20 @@ When(/^(?:I |we )*save the section$/, async function () {
   // Drupal's jQuery-bound AJAX submit handler for this button - it can leave
   // the section silently un-added. Use a real Playwright mouse click instead,
   // which dispatches the full native event sequence.
-  const btn = this.page.locator('input[type="submit"], button').filter({ hasText: /Add section/i }).first();
-  if (!(await btn.count())) throw friendly('The "Add section" button was not found.');
+  // The submit reads "Add section" on a fresh section and "Update" when the
+  // settings were opened through the section's Configure link. Match the
+  // value attribute exactly (the control is usually an <input>) or a
+  // button's exact text, preferring the off-canvas dialog - a loose /Update/
+  // match grabs invisible widget buttons ("Update widget") elsewhere.
+  const label = /^(Add section|Update)$/;
+  const pick = (scope) => this.page
+    .locator(`${scope} input[type="submit"][value="Add section"], ${scope} input[type="submit"][value="Update"]`)
+    .or(this.page.locator(`${scope} button`).filter({ hasText: label }));
+  let btn = pick('#drupal-off-canvas').first();
+  if (!(await btn.count())) {
+    btn = pick('body').first();
+  }
+  if (!(await btn.count())) throw friendly('The "Add section" / "Update" button was not found.');
   await btn.click();
   await smartSettle(this.page, budget(this));
 });

package/tests/step-definitions/drupal-media.steps.js

@@ -55,15 +55,32 @@ When(/^(?:I |we )*open the "([^"]*)" media library$/, async function (field) {
   if (!(await btn.count())) {
     throw friendly(`No media library open button for the "${field}" field was found.`);
   }
+  const dialog = this.page.locator('.ui-dialog .media-library-view, .media-library-widget-modal').first();
+  const open = async () => {
+    try {
+      await btn.click({ timeout: 8000 });
+    } catch (e) {
+      // A stale jQuery UI overlay (ui-widget-overlay) from a previous dialog can
+      // intercept pointer events over a correctly-resolved button. The button is
+      // right - dispatch the click in-page so Drupal's AJAX handler still fires.
+      await btn.evaluate((el) => el.click());
+    }
+    await smartSettle(this.page, budget(this));
+  };
+  await open();
+  // The dialog can be torn down by a previous dialog's late close animation
+  // (two stacked jQuery UI dialogs) - verify it is really there, and re-open
+  // once when it is not, before letting the next step run against nothing.
   try {
-    await btn.click({ timeout: 8000 });
+    await dialog.waitFor({ state: 'visible', timeout: 10000 });
   } catch (e) {
-    // A stale jQuery UI overlay (ui-widget-overlay) from a previous dialog can
-    // intercept pointer events over a correctly-resolved button. The button is
-    // right - dispatch the click in-page so Drupal's AJAX handler still fires.
-    await btn.evaluate((el) => el.click());
+    await open();
+    try {
+      await dialog.waitFor({ state: 'visible', timeout: 10000 });
+    } catch (e2) {
+      throw friendly(`The media library dialog for "${field}" did not open.`);
+    }
   }
-  await smartSettle(this.page, budget(this));
 });
 
 /**

package/tests/step-definitions/varbase.steps.js

@@ -298,89 +298,6 @@ When(/^(?:I |we )*close (?:the )?(?:accessibility |a11y )?checker$/, async funct
   await smartSettle(this.page, budget(this));
 });
 
-/**
- * Verify the page header is "working".
- *
- * On a Varbase site the Main navigation menu is rendered through the Drupal
- * Canvas global Header region, so a working header means those primary links
- * are present. Alter the links below to match your own site's main menu.
- *
- * Example: Then the page should have a working header
- *
- * Example #1: Then the page should have a working header
- * Example #2: And I should have a working header
- * Example #3: Then I should have a working header
- * Example #4: And we should have a working header
- * Example #5: Then the page should have a working header
- */
-Then(/^(?:the page should have|(?:I |we )*should have) a working header$/, async function () {
-  // Smart-wait for the page to reach a quiet edge before reading the header.
-  await smartSettle(this.page, (this.minWaitTime && this.minWaitTime.page) || 8000);
-
-  // `banner` is the ARIA role of the site header (<header role="banner">).
-  const header = this.page.getByRole('banner').first();
-  const text = (await header.textContent().catch(() => '')) || '';
-
-  // Main navigation menu links expected in the header (one per line):
-  if (!text.includes('About Varbase')) throw friendly('Header is missing the "About Varbase" link.', 'Check the Main navigation menu in the Canvas Header region.');
-  if (!text.includes('Features')) throw friendly('Header is missing the "Features" link.', 'Check the Main navigation menu in the Canvas Header region.');
-  if (!text.includes('Blog')) throw friendly('Header is missing the "Blog" link.', 'Check the Main navigation menu in the Canvas Header region.');
-  if (!text.includes('Contact Us')) throw friendly('Header is missing the "Contact Us" link.', 'Check the Main navigation menu in the Canvas Header region.');
-});
-
-/**
- * Verify the page footer is "working".
- *
- * On a Varbase site the Secondary, Footer and Social media menus are rendered
- * through the Drupal Canvas global Footer region. A working footer means the
- * footer link text is present, the social profiles are linked, and the credits
- * and logos show. Alter the lines below to match your own site.
- *
- * Example: Then the page should have a working footer
- *
- * Example #1: Then the page should have a working footer
- * Example #2: And I should have a working footer
- * Example #3: Then I should have a working footer
- * Example #4: And we should have a working footer
- * Example #5: Then the page should have a working footer
- */
-Then(/^(?:the page should have|(?:I |we )*should have) a working footer$/, async function () {
-  // Smart-wait for the page to reach a quiet edge before reading the footer.
-  await smartSettle(this.page, (this.minWaitTime && this.minWaitTime.page) || 8000);
-
-  // `contentinfo` is the ARIA role of the site footer (<footer role="contentinfo">).
-  // Scope to the role so card/section <footer> elements elsewhere are ignored.
-  const footer = this.page.getByRole('contentinfo').first();
-  const text = (await footer.textContent().catch(() => '')) || '';
-
-  // Secondary menu (Footer sitemap / Quicklinks) link text (one per line):
-  if (!text.includes('Quicklinks')) throw friendly('Footer is missing the "Quicklinks" heading.', 'Check the Secondary menu in the Canvas Footer region.');
-  if (!text.includes('Features')) throw friendly('Footer is missing the "Features" link.', 'Check the Secondary menu in the Canvas Footer region.');
-  if (!text.includes('About Varbase')) throw friendly('Footer is missing the "About Varbase" link.', 'Check the Secondary menu in the Canvas Footer region.');
-
-  // Footer menu (Support) link text (one per line):
-  if (!text.includes('Support')) throw friendly('Footer is missing the "Support" heading.', 'Check the Footer menu in the Canvas Footer region.');
-  if (!text.includes('Documentation')) throw friendly('Footer is missing the "Documentation" link.', 'Check the Footer menu in the Canvas Footer region.');
-  if (!text.includes('Get Professional Support')) throw friendly('Footer is missing the "Get Professional Support" link.', 'Check the Footer menu in the Canvas Footer region.');
-  if (!text.includes('Community Support')) throw friendly('Footer is missing the "Community Support" link.', 'Check the Footer menu in the Canvas Footer region.');
-
-  // Footer credit and legal text (one per line):
-  if (!text.includes('Enjoy the free software, or')) throw friendly('Footer is missing the "Enjoy the free software, or get a quote ..." credit.');
-  if (!text.includes('get a quote')) throw friendly('Footer is missing the "get a quote" link text.');
-  if (!text.includes('Terms and Conditions')) throw friendly('Footer is missing the "Terms and Conditions" link.');
-  if (!text.includes('Powered by')) throw friendly('Footer is missing the "Powered by" credit.');
-
-  // Social media menu profiles - full links (one per line):
-  if ((await footer.locator('a[href="https://www.linkedin.com/company/vardot"]').count()) === 0) throw friendly('Footer is missing the LinkedIn link (https://www.linkedin.com/company/vardot).', 'Check the Social media menu in the Canvas Footer region.');
-  if ((await footer.locator('a[href="https://www.facebook.com/vardotters/"]').count()) === 0) throw friendly('Footer is missing the Facebook link (https://www.facebook.com/vardotters/).', 'Check the Social media menu in the Canvas Footer region.');
-  if ((await footer.locator('a[href="https://www.instagram.com/vardotters/"]').count()) === 0) throw friendly('Footer is missing the Instagram link (https://www.instagram.com/vardotters/).', 'Check the Social media menu in the Canvas Footer region.');
-  if ((await footer.locator('a[href="https://x.com/Vardot"]').count()) === 0) throw friendly('Footer is missing the X link (https://x.com/Vardot).', 'Check the Social media menu in the Canvas Footer region.');
-
-  // Footer logos (one per line):
-  if ((await footer.locator('img[alt="Varbase logo"]').count()) === 0) throw friendly('Footer is missing the Varbase logo.');
-  if ((await footer.locator('img[alt="Vardot"]').count()) === 0) throw friendly('Footer is missing the Vardot logo next to "Powered by".');
-});
-
 /**
  * Press a responsive-preview device button (Drupal core Responsive preview).
  *