@salesforcedevs/sfdocs-e2e 1.0.12-e2e-topic-version-7 → 1.0.12-e2e-topic-version

package/package.json

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

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

@@ -39,7 +39,10 @@ describe('Topic-level versioning > versioned markdown topic', () => {
         await page.waitForMarkdownTopicLoad();
 
         expect(await (await $('>>>h1')).getText()).toEqual('OAuth 1.0');
-        expect(await browser.getUrl()).toContain(`${BASE}/v1/oauth.html`);
+        await browser.waitUntil(
+            async () => (await browser.getUrl()).includes(`${BASE}/v1/oauth.html`),
+            { timeout: 15000, timeoutMsg: 'expected URL to contain /v1/oauth.html' },
+        );
     });
 
     it('should return to the canonical URL when the latest version is reselected', async () => {
@@ -51,6 +54,10 @@ describe('Topic-level versioning > versioned markdown topic', () => {
         await page.selectVersionByLabel(picker!, "WI'26");
         await page.waitForMarkdownTopicLoad();
 
+        await browser.waitUntil(
+            async () => (await browser.getUrl()).endsWith(`${BASE}/oauth.html`),
+            { timeout: 15000, timeoutMsg: 'expected URL to end with /oauth.html' },
+        );
         const url = await browser.getUrl();
         expect(url.endsWith(`${BASE}/oauth.html`)).toBeTruthy();
         expect(url).not.toContain('/v2/');
@@ -91,7 +98,10 @@ describe('Topic-level versioning > versioned parent with versioned child subtree
         await page.selectVersionByLabel(picker!, "SU'26");
         await page.waitForMarkdownTopicLoad();
 
-        expect(await browser.getUrl()).toContain(`${BASE}/v1/android.html`);
+        await browser.waitUntil(
+            async () => (await browser.getUrl()).includes(`${BASE}/v1/android.html`),
+            { timeout: 15000, timeoutMsg: 'expected URL to contain /v1/android.html' },
+        );
         expect(await (await $('>>>h1')).getText()).toEqual('Android SDK v1');
 
         // Sibling child (iOS SDK) should also have moved to the v1 URL, not just this one.
@@ -145,7 +155,13 @@ describe('Topic-level versioning > versioned parent with own content, subtopics
         await page.waitForMarkdownTopicLoad();
 
         expect(await (await $('>>>h1')).getText()).toEqual('Errors and Rate Limits (v1)');
-        expect(await browser.getUrl()).toContain(`${BASE}/v1/errors-and-rate-limits.html`);
+        await browser.waitUntil(
+            async () => (await browser.getUrl()).includes(`${BASE}/v1/errors-and-rate-limits.html`),
+            {
+                timeout: 15000,
+                timeoutMsg: 'expected URL to contain /v1/errors-and-rate-limits.html',
+            },
+        );
     });
 
     it('should switch the markdown subtopics when the version changes', async () => {
@@ -158,7 +174,10 @@ describe('Topic-level versioning > versioned parent with own content, subtopics
         await page.waitForMarkdownTopicLoad();
 
         expect(await (await $('>>>h1')).getText()).toEqual('Common Error Codes (v1)');
-        expect(await browser.getUrl()).toContain(`${BASE}/v1/extra-child-a.html`);
+        await browser.waitUntil(
+            async () => (await browser.getUrl()).includes(`${BASE}/v1/extra-child-a.html`),
+            { timeout: 15000, timeoutMsg: 'expected URL to contain /v1/extra-child-a.html' },
+        );
     });
 
     it('should switch the spec (Redoc) subtopic to the matching version when the version changes', async () => {
@@ -171,7 +190,10 @@ describe('Topic-level versioning > versioned parent with own content, subtopics
         await child.click();
         await page.waitForRedocTopicLoad();
 
-        expect(await browser.getUrl()).toContain(`${BASE}/v1/new-sample-api`);
+        await browser.waitUntil(
+            async () => (await browser.getUrl()).includes(`${BASE}/v1/new-sample-api`),
+            { timeout: 15000, timeoutMsg: 'expected URL to contain /v1/new-sample-api' },
+        );
         // v1's spec lacks the `GET /errors/{code}` operation that only v2 has — its absence
         // confirms the v1 spec asset loaded, since both versions share the same spec title.
         const getErrorCodeOperation = await $('a[href*="operation/getErrorCode"]');
@@ -218,7 +240,10 @@ describe('Topic-level versioning > standalone Redoc reference', () => {
         await page.selectVersionByLabel(picker!, "SP'26");
         await page.waitForRedocTopicLoad();
 
-        expect(await browser.getUrl()).toContain(`${BASE}/v1/widgets-api-reference`);
+        await browser.waitUntil(
+            async () => (await browser.getUrl()).includes(`${BASE}/v1/widgets-api-reference`),
+            { timeout: 15000, timeoutMsg: 'expected URL to contain /v1/widgets-api-reference' },
+        );
         const apiInfo = await $('>>>div.api-info');
         expect(await apiInfo.getText()).toContain('1.0.0');
     });
@@ -365,7 +390,10 @@ describe('Topic-level versioning > topics without a version picker', () => {
         await getStarted.click();
         await page.waitForMarkdownTopicLoad();
 
-        expect(await browser.getUrl()).toContain(`${BASE}/get-started.html`);
+        await browser.waitUntil(
+            async () => (await browser.getUrl()).includes(`${BASE}/get-started.html`),
+            { timeout: 15000, timeoutMsg: 'expected URL to contain /get-started.html' },
+        );
         expect(await browser.getUrl()).not.toContain('/v1/');
     });
 });