@salesforcedevs/sfdocs-e2e 1.0.12-e2e-topic-version-1 → 1.0.12-e2e-topic-version-3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforcedevs/sfdocs-e2e",
-  "version": "1.0.12-e2e-topic-version-1",
+  "version": "1.0.12-e2e-topic-version-3",
   "description": "E2E test suite for SFDocs static portal pages (SSG)",
   "license": "ISC",
   "bin": {

package/src/content-repo/specs/sitemap.test.ts

@@ -56,7 +56,9 @@ describe('Test Sitemap Routes', () => {
         );
 
         // Spec (Redoc) topics are published without an extension.
-        expect(data.body).toContain('<loc>/docs/docs-content-type-example/sample-api</loc>');
+        expect(data.body).toContain(
+            '<loc>/docs/docs-content-type-example/widgets-api-reference</loc>',
+        );
         expect(data.body).toContain('<loc>/docs/docs-content-type-example/new-sample-api</loc>');
 
         // Each markdown URL appears exactly once.

package/src/shared/pageobjects/page.ts

@@ -88,6 +88,21 @@ export default class Page {
         return treeItem.shadow$('dx-tree-tile');
     }
 
+    /**
+     * Options render in a single shared overlay, one per picker on the page, hidden until their
+     * own dropdown opens — filtering to visible ones scopes this to whichever just opened.
+     */
+    async getVersionOptions(): Promise<WebdriverIO.Element[]> {
+        const allOptions = await $$('>>>doc-version-picker dx-dropdown-option');
+        const visible: WebdriverIO.Element[] = [];
+        for (const option of allOptions) {
+            if (await option.isDisplayed()) {
+                visible.push(option);
+            }
+        }
+        return visible;
+    }
+
     async waitForSpinnerToDisappear(element: WebdriverIO.Element): Promise<void> {
         await browser.waitUntil(
             async function () {

package/src/shared/pageobjects/topic-version.page.ts

@@ -166,11 +166,6 @@ export default class TopicVersionPage extends Page {
         await trigger.click();
     }
 
-    /** Dropdown options render in a single shared overlay, so this is a global (unscoped) query. */
-    async getVersionOptions(): Promise<WebdriverIO.ElementArray> {
-        return $$('>>>doc-version-picker dx-dropdown-option');
-    }
-
     async getOptionLabel(option: WebdriverIO.Element): Promise<string> {
         const label = await option.shadow$('div>div');
         return (await label.getText()).trim();

package/src/shared/specs/docsContentType.test.ts

@@ -85,7 +85,7 @@ describe('Docs content type', () => {
         await parentTile.click();
         await page.waitPageLoad();
 
-        expect(await browser.getUrl()).toContain('parent-with-refs.html');
+        expect(await browser.getUrl()).toContain('errors-and-rate-limits.html');
         expect(await (await page.getContentHeading()).getText()).toContain(
             'Errors and Rate Limits',
         );
@@ -197,7 +197,7 @@ describe('Docs content type > internal links', () => {
 
 describe('Docs content type > spec (Redoc) topic', () => {
     beforeEach(async () => {
-        page = new DocsPage('/docs/docs-content-type-example/sample-api');
+        page = new DocsPage('/docs/docs-content-type-example/widgets-api-reference');
         page.open();
         await page.waitForRedocLoad();
     });
@@ -218,7 +218,7 @@ describe('Docs content type > spec (Redoc) topic', () => {
 
     it('falls back to the landing topic when the back link is clicked on a directly opened spec', async () => {
         await browser.reloadSession();
-        page = new DocsPage('/docs/docs-content-type-example/sample-api');
+        page = new DocsPage('/docs/docs-content-type-example/widgets-api-reference');
         page.open();
         await page.waitForRedocLoad();
 
@@ -245,7 +245,7 @@ describe('Docs content type > locale picker', () => {
     });
 
     it('shows the language picker on a spec topic of a localized project', async () => {
-        page = new DocsPage('/docs/docs-content-type-example/sample-api');
+        page = new DocsPage('/docs/docs-content-type-example/widgets-api-reference');
         page.open();
         await page.waitForRedocLoad();
 
@@ -256,7 +256,7 @@ describe('Docs content type > locale picker', () => {
     });
 
     it('re-renders the spec in the selected locale when switching language on a spec page', async () => {
-        page = new DocsPage('/docs/docs-content-type-example/sample-api');
+        page = new DocsPage('/docs/docs-content-type-example/widgets-api-reference');
         page.open();
         await page.waitForRedocLoad();
 
@@ -306,7 +306,7 @@ describe('Docs content type > localized (ja-jp) rendering', () => {
     });
 
     it('renders the Redoc view from a ja-jp spec URL', async () => {
-        page = new DocsPage('/docs/ja-jp/docs-content-type-example/sample-api');
+        page = new DocsPage('/docs/ja-jp/docs-content-type-example/widgets-api-reference');
         page.open();
         await page.waitForRedocLoad();
 

package/src/shared/specs/reference.test.ts

@@ -106,7 +106,7 @@ describe('Reference Versioning', () => {
         const versionBtn = await $('>>>.version-picker-button');
         await versionBtn.waitForDisplayed();
         await versionBtn.click();
-        const versionOptions = await $$('>>>doc-version-picker dx-dropdown-option');
+        const versionOptions = await referencePage.getVersionOptions();
 
         expect(versionOptions.length).toEqual(2);
         expect(await (await versionOptions[0].shadow$('div>div')).getText()).toEqual('0.1.3');
@@ -131,14 +131,21 @@ describe('Reference Versioning', () => {
         await versionBtn.waitForDisplayed();
         await versionBtn.click();
 
-        const versionOptions = await $$('>>>doc-version-picker dx-dropdown-option');
+        const versionOptions = await referencePage.getVersionOptions();
 
         await versionOptions[1].waitForClickable();
         await versionOptions[1].click();
         await referencePage.waitForSpecBasedReferencePageLoad();
 
-        const apiTitle = await (await $('>>>div.api-title span')).getText();
-        const apiVersion = await (await $('>>>p.version span')).getText();
+        // The outer container can display before Redoc finishes populating its content, so wait
+        // for each element directly rather than reading them immediately.
+        const apiTitleElement = await $('>>>div.api-title span');
+        await apiTitleElement.waitForDisplayed();
+        const apiVersionElement = await $('>>>p.version span');
+        await apiVersionElement.waitForDisplayed();
+
+        const apiTitle = await apiTitleElement.getText();
+        const apiVersion = await apiVersionElement.getText();
 
         expect(apiTitle).toEqual('Salesforce Connect API');
         expect(apiVersion).toEqual('53.0');
@@ -150,7 +157,7 @@ describe('Reference Versioning', () => {
         await versionPicker.waitForDisplayed();
         await versionPicker.click();
 
-        const versionOptions = await $$('>>>doc-version-picker dx-dropdown-option');
+        const versionOptions = await referencePage.getVersionOptions();
         const selectedVersionText = await (await versionOptions[1].shadow$('div>div')).getText();
 
         await versionOptions[1].click();