Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/publish-extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: cd dist && zip -r ../extension-chrome.zip .

- name: Upload to Chrome Web Store
uses: mnao305/chrome-extension-upload@v5.0.0
uses: mnao305/chrome-extension-upload@4008e29e13c144d0f6725462cbd49b7c291b4928 # v5.0.0
with:
file-path: packages/devtools-extension/extension-chrome.zip
extension-id: ${{ secrets.CHROME_EXTENSION_ID }}
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
run: zip -r source.zip . -x 'node_modules/*' '*/node_modules/*' '*/dist/*' '.git/*' '*.zip'

- name: Upload to Firefox Add-ons
uses: trmcnvn/firefox-addon@v1
uses: trmcnvn/firefox-addon@0d05671269b82c69c3f22ed86d8e772e89d47cf4 # v1
with:
uuid: oidc-devtool@wolfcola
xpi: packages/devtools-extension/extension-firefox.zip
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:

- name: Publish Chrome extension to testers
if: inputs.extension
uses: mnao305/chrome-extension-upload@v5.0.0
uses: mnao305/chrome-extension-upload@4008e29e13c144d0f6725462cbd49b7c291b4928 # v5.0.0
with:
file-path: packages/devtools-extension/extension-chrome.zip
extension-id: ${{ secrets.CHROME_EXTENSION_ID }}
Expand All @@ -77,7 +77,7 @@ jobs:

- name: Publish Firefox extension (unlisted)
if: inputs.extension
uses: trmcnvn/firefox-addon@v1
uses: trmcnvn/firefox-addon@0d05671269b82c69c3f22ed86d8e772e89d47cf4 # v1
with:
uuid: oidc-devtool@wolfcola
xpi: packages/devtools-extension/extension-firefox.zip
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
run: pnpm build

- name: Create release PR or publish
uses: changesets/action@v1
uses: changesets/action@63a615b9cd06ba9a3e6d13796c7fbcb080a60a0b # v1.8.0
with:
publish: pnpm release
version: pnpm run version
Expand Down
2 changes: 1 addition & 1 deletion e2e/fixtures/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export const test = base.extend<TestFixtures>({
mockServer: async ({}, use) => {
const result = await createMockOidcServer(0);
await use(result);
result.server.close();
await new Promise<void>((resolve) => result.server.close(() => resolve()));
},
});

Expand Down
31 changes: 14 additions & 17 deletions e2e/tests/network-capture.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,13 @@ test.describe('network capture pipeline', () => {
});
}, `${mockServer.baseUrl}/.well-known/openid-configuration`);

await panelPage.waitForTimeout(1000);

await panelPage.reload();
await panelPage.waitForSelector('.toolbar', { state: 'visible' });
await panelPage.waitForTimeout(500);

const eventCount = await getEventCount(panelPage);
expect(eventCount).toBeGreaterThanOrEqual(1);
// Wait for the service worker to persist the event, then reload to verify
await expect(async () => {
await panelPage.reload();
await panelPage.waitForSelector('.toolbar', { state: 'visible' });
const eventCount = await getEventCount(panelPage);
expect(eventCount).toBeGreaterThanOrEqual(1);
}).toPass({ timeout: 5000 });

await panelPage.close();
});
Expand Down Expand Up @@ -75,8 +74,6 @@ test.describe('network capture pipeline', () => {
});
}, `${mockServer.baseUrl}/.well-known/openid-configuration`);

await panelPage.waitForTimeout(500);

await panelPage.evaluate((url) => {
chrome.runtime.sendMessage({
type: 'NETWORK_EVENT',
Expand Down Expand Up @@ -104,13 +101,13 @@ test.describe('network capture pipeline', () => {
});
}, `${mockServer.baseUrl}/token`);

await panelPage.waitForTimeout(1000);
await panelPage.reload();
await panelPage.waitForSelector('.toolbar', { state: 'visible' });
await panelPage.waitForTimeout(500);

const eventCount = await getEventCount(panelPage);
expect(eventCount).toBeGreaterThanOrEqual(2);
// Wait for both events to be persisted, then reload to verify
await expect(async () => {
await panelPage.reload();
await panelPage.waitForSelector('.toolbar', { state: 'visible' });
const eventCount = await getEventCount(panelPage);
expect(eventCount).toBeGreaterThanOrEqual(2);
}).toPass({ timeout: 5000 });

await panelPage.close();
});
Expand Down
37 changes: 17 additions & 20 deletions e2e/tests/panel-renders-events.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ test.describe('panel renders events', () => {
makeSdkEvent('test-sdk-1', 'test-flow-sdk-1'),
);

await panelPage.waitForTimeout(500);
await panelPage.reload();
await panelPage.waitForSelector('.toolbar', { state: 'visible' });
await panelPage.waitForTimeout(500);

const after = await panelPage.locator('.tl-row').count();
expect(after).toBeGreaterThan(before);
// Wait for the event to be persisted, then reload to verify
await expect(async () => {
await panelPage.reload();
await panelPage.waitForSelector('.toolbar', { state: 'visible' });
const after = await panelPage.locator('.tl-row').count();
expect(after).toBeGreaterThan(before);
}).toPass({ timeout: 5000 });

await panelPage.close();
});
Expand All @@ -56,22 +56,19 @@ test.describe('panel renders events', () => {
makeSdkEvent('test-sdk-clear', 'test-flow-clear'),
);

await panelPage.waitForTimeout(500);
await panelPage.reload();
await panelPage.waitForSelector('.toolbar', { state: 'visible' });
await panelPage.waitForTimeout(500);

let rows = await panelPage.locator('.tl-row').count();
expect(rows).toBeGreaterThan(0);
// Wait for event to appear
await expect(async () => {
await panelPage.reload();
await panelPage.waitForSelector('.toolbar', { state: 'visible' });
const rows = await panelPage.locator('.tl-row').count();
expect(rows).toBeGreaterThan(0);
}).toPass({ timeout: 5000 });

const clearBtn = panelPage.locator('.tb-btn', { hasText: 'Clear' });
if (await clearBtn.isVisible()) {
await clearBtn.click();
await panelPage.waitForTimeout(500);
await expect(clearBtn).toBeVisible();
await clearBtn.click();

rows = await panelPage.locator('.tl-row').count();
expect(rows).toBe(0);
}
await expect(panelPage.locator('.tl-row')).toHaveCount(0, { timeout: 3000 });

await panelPage.close();
});
Expand Down
14 changes: 3 additions & 11 deletions packages/devtools-bridge/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
export { attachDevToolsBridge } from './lib/bridge.js';
export type { BridgeHandle } from './lib/bridge.js';
export { attachDaVinciBridge } from './lib/davinci-bridge.js';
export { attachJourneyBridge } from './lib/journey-bridge.js';
export type { JourneyBridgeHandle } from './lib/journey-bridge.js';
export { attachOidcBridge } from './lib/oidc-bridge.js';
export type { OidcBridgeHandle } from './lib/oidc-bridge.js';
export {
DEVTOOLS_EVENT_NAME,
emitAuthEvent,
emitConfigEvent,
configureDevtools,
} from './lib/emit.js';
export type { DevtoolsOptions } from './lib/emit.js';
export { DEVTOOLS_EVENT_NAME, emitAuthEvent, emitConfigEvent } from './lib/emit.js';
export type { BridgeHandle, DevtoolsOptions } from './lib/emit.js';
Loading
Loading