From 072212ea9a680cb6d75f84178254c1de5cf24487 Mon Sep 17 00:00:00 2001 From: bymyself Date: Sun, 1 Nov 2026 19:49:06 +0000 Subject: [PATCH 1/7] test(extensions): a disabled extension's shortcut does nothing in the browser Covers the browser case left open by #22246: with a third-party extension listed in Comfy.Extension.Disabled, its keybinding does not run and its command is not registered, while an enabled control extension's shortcut still fires. --- .../disabledExtensionShortcut.spec.ts | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 browser_tests/tests/settings/disabledExtensionShortcut.spec.ts diff --git a/browser_tests/tests/settings/disabledExtensionShortcut.spec.ts b/browser_tests/tests/settings/disabledExtensionShortcut.spec.ts new file mode 100644 index 00000000000..b55b31392fb --- /dev/null +++ b/browser_tests/tests/settings/disabledExtensionShortcut.spec.ts @@ -0,0 +1,70 @@ +import { + comfyExpect as expect, + comfyPageFixture as test +} from '@e2e/fixtures/ComfyPage' + +const DISABLED = 'Test.DisabledShortcutPack' +const ENABLED = 'Test.EnabledShortcutPack' + +test.use({ initialSettings: { 'Comfy.Extension.Disabled': [DISABLED] } }) + +test.describe( + 'Disabled third-party extension shortcuts', + { tag: ['@settings', '@keyboard'] }, + () => { + test.beforeEach(async ({ comfyPage }) => { + await comfyPage.page.evaluate( + ({ disabled, enabled }) => { + const counts = (window.__commandExecutionCounts ??= {}) + for (const [name, key] of [ + [disabled, 'j'], + [enabled, 'k'] + ] as const) { + const commandId = `${name}.Run` + window.app!.registerExtension({ + name, + keybindings: [{ combo: { key, alt: true }, commandId }], + commands: [ + { + id: commandId, + function: () => { + counts[commandId] = (counts[commandId] ?? 0) + 1 + } + } + ] + }) + } + }, + { disabled: DISABLED, enabled: ENABLED } + ) + await comfyPage.canvas.click({ position: { x: 400, y: 400 } }) + await comfyPage.nextFrame() + }) + + test('a disabled extension adds no command and its shortcut does nothing', async ({ + comfyPage + }) => { + await comfyPage.canvas.press('Alt+KeyK') + await expect + .poll(() => comfyPage.command.getExecutionCount(`${ENABLED}.Run`)) + .toBe(1) + + await comfyPage.canvas.press('Alt+KeyJ') + await comfyPage.nextFrame() + expect(await comfyPage.command.getExecutionCount(`${DISABLED}.Run`)).toBe( + 0 + ) + + const registered = await comfyPage.page.evaluate( + (ids) => + ids.map((id) => + window.app!.extensionManager.command.commands.some( + (command) => command.id === id + ) + ), + [`${DISABLED}.Run`, `${ENABLED}.Run`] + ) + expect(registered).toEqual([false, true]) + }) + } +) From c29da067f0350efd686bb85b68ad174dda890fdd Mon Sep 17 00:00:00 2001 From: bymyself Date: Sun, 1 Nov 2026 19:49:33 +0000 Subject: [PATCH 2/7] test(extensions): screenshot the agent-created filter in the Extensions panel Snapshot of the Settings content area only (not the action bar or menus), after filtering to agent-created extensions, so the badge and summary placement from #21950 is covered visually. Ports the remaining item of #21969. --- .../settings/agentExtensionProvenance.spec.ts | 118 ++++++++++-------- 1 file changed, 64 insertions(+), 54 deletions(-) diff --git a/browser_tests/tests/settings/agentExtensionProvenance.spec.ts b/browser_tests/tests/settings/agentExtensionProvenance.spec.ts index 2a39431015a..fa5568cd91d 100644 --- a/browser_tests/tests/settings/agentExtensionProvenance.spec.ts +++ b/browser_tests/tests/settings/agentExtensionProvenance.spec.ts @@ -4,71 +4,81 @@ import { comfyExpect as expect, comfyPageFixture as test } from '@e2e/fixtures/ComfyPage' +import { expectElementScreenshot } from '@e2e/fixtures/utils/screenshotRegion' import type { WorkspaceStore } from '@e2e/types/globals' test.describe( 'Agent-created extension provenance', { tag: '@settings' }, () => { - test('shows agent attribution and filters the extension list', async ({ - comfyPage, - page - }) => { - await page.evaluate(() => { - window.app!.registerExtension({ name: 'Manual.Toolbar' }) - window.app!.registerExtension({ - name: 'agent.cushions.toolbar', - provenance: { - createdBy: 'comfy-agent', - summary: 'Adds cushion controls' - } + test( + 'shows agent attribution and filters the extension list', + { + tag: '@screenshot' + }, + async ({ comfyPage, page }) => { + await page.evaluate(() => { + window.app!.registerExtension({ name: 'Manual.Toolbar' }) + window.app!.registerExtension({ + name: 'agent.cushions.toolbar', + provenance: { + createdBy: 'comfy-agent', + summary: 'Adds cushion controls' + } + }) }) - }) - await test.step('Open Extensions and see agent attribution', async () => { - await comfyPage.settingDialog.open() - await comfyPage.settingDialog.category('Extension').click() - await expect(page.getByText('Created by agent')).toBeVisible() - await expect( - comfyPage.settingDialog.contentArea.getByText(/Adds cushion controls/) - ).toBeVisible() - }) + await test.step('Open Extensions and see agent attribution', async () => { + await comfyPage.settingDialog.open() + await comfyPage.settingDialog.category('Extension').click() + await expect(page.getByText('Created by agent')).toBeVisible() + await expect( + comfyPage.settingDialog.contentArea.getByText( + /Adds cushion controls/ + ) + ).toBeVisible() + }) - await test.step('Show only agent-created extensions', async () => { - await page.getByRole('button', { name: 'Agent-created' }).click() - await expect( - page.getByRole('switch', { name: 'agent.cushions.toolbar' }) - ).toBeVisible() - await expect( - page.getByRole('switch', { name: 'Manual.Toolbar' }) - ).toBeHidden() - }) + await test.step('Show only agent-created extensions', async () => { + await page.getByRole('button', { name: 'Agent-created' }).click() + await expect( + page.getByRole('switch', { name: 'agent.cushions.toolbar' }) + ).toBeVisible() + await expect( + page.getByRole('switch', { name: 'Manual.Toolbar' }) + ).toBeHidden() + await expectElementScreenshot( + comfyPage.settingDialog.contentArea, + 'agent-extensions-filtered.png' + ) + }) - await test.step('Disable every agent-created extension', async () => { - const dialog = comfyPage.settingDialog - await dialog.openExtensionActions() - await comfyPage.contextMenu - .menuItem('Disable all agent-created') - .click() - await expect( - dialog.root.getByRole('switch', { name: 'agent.cushions.toolbar' }) - ).not.toBeChecked() - await expect( - dialog.root.getByRole('button', { name: 'Reload to apply changes' }) - ).toBeVisible() - await expect - .poll(() => - comfyPage.settings.getPersistedSetting( - 'Comfy.Extension.Disabled' + await test.step('Disable every agent-created extension', async () => { + const dialog = comfyPage.settingDialog + await dialog.openExtensionActions() + await comfyPage.contextMenu + .menuItem('Disable all agent-created') + .click() + await expect( + dialog.root.getByRole('switch', { name: 'agent.cushions.toolbar' }) + ).not.toBeChecked() + await expect( + dialog.root.getByRole('button', { name: 'Reload to apply changes' }) + ).toBeVisible() + await expect + .poll(() => + comfyPage.settings.getPersistedSetting( + 'Comfy.Extension.Disabled' + ) ) - ) - .toContain('agent.cushions.toolbar') - await dialog.root.getByRole('button', { name: 'All' }).click() - await expect( - dialog.root.getByRole('switch', { name: 'Manual.Toolbar' }) - ).toBeChecked() - }) - }) + .toContain('agent.cushions.toolbar') + await dialog.root.getByRole('button', { name: 'All' }).click() + await expect( + dialog.root.getByRole('switch', { name: 'Manual.Toolbar' }) + ).toBeChecked() + }) + } + ) test('disables the bulk action when every agent extension is read-only', async ({ comfyPage, From fe4e0996c4a044c3f5c14f78f4cce942a52cf3bf Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 1 Nov 2026 20:08:36 +0000 Subject: [PATCH 3/7] [automated] Update screenshot expectations Taken from the failed screenshot assertions of https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/41343821515 without rerunning Playwright. | snapshot | status | changed pixels | | --- | --- | --- | | `browser_tests/tests/settings/agentExtensionProvenance.spec.ts-snapshots/agent-extensions-filtered-chromium-linux.png` | new | n/a | Screenshot capture is not bit-deterministic; small pixel deltas are usually text rasterization noise. Confirm each update corresponds to a test expected to change. --- ...agent-extensions-filtered-chromium-linux.png | Bin 0 -> 24879 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 browser_tests/tests/settings/agentExtensionProvenance.spec.ts-snapshots/agent-extensions-filtered-chromium-linux.png diff --git a/browser_tests/tests/settings/agentExtensionProvenance.spec.ts-snapshots/agent-extensions-filtered-chromium-linux.png b/browser_tests/tests/settings/agentExtensionProvenance.spec.ts-snapshots/agent-extensions-filtered-chromium-linux.png new file mode 100644 index 0000000000000000000000000000000000000000..49797aae84ee7c3f584c8ffdc50a9402a2978011 GIT binary patch literal 24879 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�JdIWtF_Q( zwlyS@NhS9HgdOv$je7l-<|Rv@!d$?jt@i`G(ZE8Rjh1bAQ@cNMgSPr(FtIChSJ>|S zI=3fbjswbeCMDeLR(n3!oT9C47qyGO#*z;SAlp>!B!xCUEvx*5qt1qN#o zDy(-(htL@G;kjc6YQ|;FZc)hMw5Ky>dgL>o<@rmAhEl6uw&)kdg;QX=W)>1;j#Yip zKkk2gFG3(L$=zex>qhjIp5GoleXBvhcHq&_!IH0?Jd4|LQXXax!fdt4TfubohDHLf zdPJ;XiqrI$Y23!trk(oZmFjm3WKEH5UoM?s`}_I3^7yeI{&t#NTAp0p#TF%`;i`;U z8$T8tetOE~w%@kxB%xfhGx`uxKuBn&zpGKr=9T7x?yAVhG?C(3CPtR0)DCmF*I`sK zkGhn{>bhk;jxY{(OCu+T=98NoYkVh03FdJJd-D&vN}8J(@$i@#cXG9#ZzB|rca?|3 z)B0?DN)(?SV{KR_l=)%{bm$e5mV9?Ex^=rp(&mw|$uzMLNS6YcK;%XCZ!#go)APt= zq^zPsY#nJpAK0L=Xv?&=d4#@#}ltqvDlMiQ(Q?;6EX1IVU@SYs7_6F z-)wPN-Fr9B{z<`_M|CXS+An%^yW{fsPc1vX;ZIy6`G~!#K5`L4>U%CyQK)>#1fPZK z*hz34S--p2d&PdvPP-o*Ki;xp##ag`DaT$Q+S8wGp`H^hLJHi54x#VQH)sC{bf|jR zyG4~tnlj3XW70$u$~qh^f8Kwnl_2MS-1A>Z^^`XeDOybBoD2-V#mRlDx?ha5dz`#j zVrGr6@zBh0XeMVaZpzMHrsOS=Kq>TBmX$R&gY(-)VoT#JXh>{Pj1Fwz?f}6evt{-Q zeM#>)1O(a+eFFnV&Pp(MLLp7b=NPPkj{M90-`YE`u%;6=jpKOG85NnKh)B~>Q9@Bs zLAs8G5&?w(Dq!f{P!p6o1EV7~10*0IMIfM*AVTOxR0I=4M@oPoRfGTr0tPAjg_(Vx zJ^P&9tG(EZb4N)+>i_?J@B98oPGUoK4m%s2{#< zJwP$<)l<5vr#@72=S|qWwvRUsQT#Ris%C03$*D1a{=xkrYpcgJ5M5CeFxJ8}W`qWscAa*Y%&)d$ zJIBF85BjJ~kN=ME9O`-vBNFr2p^lE`40PIYPfa*iVb(v~V}6&$wovcPlRTL#>7`v; zc$_^MrX{YazpH~&RXY!gSe$y6iM9uGVPOG2H3g}#rdc`QfrwCQ<*^n8(AhJ~Y(QHJ zi;4m+A+7(r2{|!5UmnN}mtly@-@SDoc2T4)2MjHWkh-E2$+asN7T@w0$f8)gXQ2{! zOSMv}kDVP?a~m>)#@|=#%Zx~fh`D(2_Px>Hn$hd{!XI`mY_3G%DK0|GO@hANE|&f8 z-mpEJ^bbn=P3aIKt9JP~Znk#_x2-dWgd{^Zu-w-t>f~oC6jIEO4&-k>xit{%#bnF< zLoxMt{nOmyYEy^bN!xa=euGIhR)Z)abi+8rfnHL{-rV&8(=R8_pt!{)TW`=_4l*sw zhuz=&db?+@aZEnTvVsuzSS>Y#mZ^O<-Sw$}zfSv4*lp*1|64#rZNQgn`Jm9Wr#$}o z%nN_=$MM*(`b~x17;6ZKTpZkYagr2+BdU!~qCq7~oIHd&L{~6;OUZ`36Quf7J#J`! zdk)Jh*mkI1qz5sI4eWm_FR>3{F_?`3^rzLj{^hVGrkvBoOG^p+g1-2QdL1ll;RCC^ zZ>WGHd;x64dY@6cW|c=j8{`^m!xI0&Q<#pd`#@cpA--FBbjltIC&p7YeA~1N=8o$Q zR(ikQE=UM}OOHd&(+=!ox5+&IL= zo^P8mF=^YV_OYI*QxKT1AkK^$A4UF#V-3Eeg|4pkM^^3p(1t3>XY)=zMaTb#z>Nv{ z?CIQQ^(F;*c_q{yqx;*@#O-Rc^)|hu!FQ4rZn7abdD+LO6VBCu9-x`g_r~Kw!8OHo z<|NgB9bE)@?x}y1i55(te_MuifY5DOhC&n{0$>`vkOd69DYZOh4Q4?LRV_|;!tn5I zV1xcF>SS#f)O>1mBzSe&d3?U@$;F*8)|LmZNOQ>F0T-1Ky3qt#o}XhN*mvv3jjyoC z$f^994N6eHZt@w|c*#$n$nR_z|EUFZWG5c5R5zHgwNN{ZTxa+U^2nDE-#>Sl=7s3o zV^@5>bG$G}Nz8^mDV04Jiu*Ra-J~YQO=51=Va@SN{!c5~uJv{29Z96zz>ENFTjOE> zLCvqQ^Xan_e5R*Noj2DQk#7j6VIbg+bDU>-I7L=->kBh7ZB7o@`N56)5>?BAy3FUF zHg5-6#`eM78mNnZq#XE!)M0?LDhVl=l^8DU_-OCFd6!#^zxy`Km+45zw3-MNQxGtY z4gB`HZL{2`F0~-47~gyGM6LB$GQ!+U`zAkMrYKC9g`u9aC)k32syC?E<}KE9%V!VK zm)>=}h?1)`boFv?x(+GwsI)g-Ve!%oX#$2qkc|h2{i*F>~WItBd zyJ5=B!`#Uv?`M%j(aGw<5avXSPm{`h`c9GMVDqWjxw1LaBKY2Q^hVeix))=lG?wFZrKL|h6^?82TO6^>Vwtg0LmMQ;J8Jb`uga@>NG&exR+*ca zo2>TUAgo^4c3Mn{-a?)B4bDq6d=0DTGG1S$=i7-rU{#XUxvz)iWA;1L876ZX_D%eb z_xtA-rB!pKOg&76evDHc4Ni;7``CA@qG^JODkWf8`!~rQd2u({Y+AAA`cfB!(UlLx zz)lZ)*^gEGlA`byX$!eAM|v@X^-~eO+RuZVYuCbRGVV^G+t!$OF7DLhsvJ|DXCyD8 zH`>HN@gWi(TpAcGFC4vHE(-=Sz2<@z`I=)>A?61d#W3qghsA*$oh! z&L9rU*GxT)pz`n|Ti;U9_8Ks)AV?47Y$=I!CgJTa8;RiS zu_lj-M%aiJ#O6WX9eSOdlFh0*5n}dtR;2i zI5a(-0zQ>4=R5+jC&=Q2)z6N(Cc!wUyQnL z9Z#i20iv~^^H_AV)CwsGZm_Jo3tL+o9yVk7Y=|oB3f&V4DJfZSyTpCs#xjV_y-pWo z(M~>(*cH_WO^0z~$*$zSidl9IN!=3A!DbMJ)7#PsacjErNPTduM(qM3aI=ZHVVXJI6Im~3Qs2@$XK5p8#HX&)uh)nKZ71i1%gg(Mbocg z%k~_lboK0luD8W|T#t$D^l7Iz9C;2-WD6d=Nno#Ot<%-N^^3oXVyp9VE*#6Vcjw%Uco3QF`d@|ky|ruK3`UIpILKpm zMp7ng{bNsIOdB(M4FxnTJy6=m8jrubZgD-uY$?Drd@uinB3edcLCEywyx!?Fk?gg~ zPsTDn)*G>hbPT=Eg@b5pC)jvMfLxvBftMc2&dS;=mA^6b8+d}81utVHvcQ{E2h!SL zz|2!fx>4oV*Vg8$XIi0{Co8>k}=i|i(L*Bc~+B6JIyA)5Tfe?(6bY5S|uqR zwD247*g2$rKSrcmvmi*U`yMQv<9ZKh6b}@E!ESy#Wg0O$&%CYPPLa3+$AI*d6z~kY za}C{n%dj{chFNdDzRJN%s<~lqvZx~?nJ}9M1Oz}0k=@Fi7BNs|{~mBKTzRBi;K<8H z*dvY|vj+v3U5xNdse$T)Zkb-!7eVJpkFQV`{VtntfHz5K)h&bYUZ;pZR}W@ z?LVx&k<$=51RHBh3iX@$=c-1~8V+fpJXltaVl&|-bs464LP#VM3?e|JNsZWE?DTM5 zszMThfMP^&Ge0n)H_waMY4+R``K|g&K{;T8LL87-Dj*aV9UTpWy}m72uYJwUQ!s@j zGW8%g8p;e7CbB=c+= zjt)>WUUUu(87{A{uQa)lDQEU0^LUw|qLa=a7N?F_C7!eFKYNQplr;Bltm9<`4P{L) zU6Lo+Nke0<^Lv?il)PdQbbm%hMb%8D*Zi?Z9O$K|Da$AmHep%lYj={+yaJtGR4yzY zJ+4O@oi~6onh6sZV){|#)oma zGof0cq|m+@s@7EHlnjbG2CpD$44S0wwV~yJ?>?A;hW9F9wGu)mp*{I#pI5W8?56Xn zAFt*r4>2cAX9`#jkX?>+Gz-A_`@@-q^440ZGGq7tXwnLl?v8X;?JFpU%1A&J0Dxdz zvxQp&NgV2tAb9K(r*-h)`Dc|A<^TmdJQ*OqI2d7=p9&{Tc!RK)mQMOhOGwPHSVPcE zadVl?PJyB>IEtWDNqYw>y$|0MmzGxQohkA+QKU@C8m6?o*z*i%WgwJF9Fq{?&&+g4 zB+`{^(>ps&89dhHd6avJ8w1|9!pDqI^#)2`3ao2dz`-QnC}HQOUU71CoaO|$9!@<% zOm9%u(y}&)j~5}Kpb<*Lb2!M?!lx+|6#DHuhi{;|EtQv`IP0nE(Ho^sEGU~gt*i`t zO?K;jN~b;r!Lb_u_z{q#T*y!R`>Qf=T!xLu{1kX2U?YPMI|AIchs@PG#_)2yRNBG@ zwJu?2t9_fDCO#kInki*NX4$N@zK6VL*Dfe{iX--f7$Q!dJPFz9x30M#G@d0c1x>ye zPk5KpS2)mUbzX;Z;649iU`8r;^q;yS#KZ8s)ZnYzH7gWe9_H=8BJ=*Xzxosh_KAs^ z1$u%N$M;g`hd+Tq0_ab10QxzqYHGI9N%SM<;X4G*uE8ZWl{Gq=4;STAfhuhp9caQg zm<|;+wUUtVlkm5ICJb+XP9R)rGTH-(N@SYIzI~A1&&|u@RYji%GR`%b;P)c)Ai6|2 z@Ct)%J57M3kodGS#B%|Elr^->$uOk1Ja@*FIhTp@bGho5#iTpRyHRfN(Lo}w$|mr_ zK&U~%#;(%Xq$E$;!Uui*AC~EqU$*+BQ;qU=fB*d#ASV|VynK9kxjDYeatH*KMx)c{ zMn>g~wE?PLIh%m0r&%sZS?}i}6Uq_-IxcK72!Wmvr5U&2R=Y3bH5eB2Q zb!>Xs133hg&hnd6TTmC-4kjq8dzdJ=;A7tZ5wNv2T%KnXEo|{=Rz08wLB;~&GosRE z@Vft6kOW!JVsu?!-`HnlemPvLa+N?N-unjH0(X9}BCR>^e-D-BL89&_8$}Z Bs&)VX literal 0 HcmV?d00001 From 0d561e8c55cd6811cb72408431c924c5cf9edaba Mon Sep 17 00:00:00 2001 From: bymyself Date: Sun, 1 Nov 2026 20:19:42 +0000 Subject: [PATCH 4/7] test(extensions): load the shortcut fixture as a real pack script and check the Keybindings panel From review: the extensions now come from a served pack script, loaded the way ComfyUI loads a custom node's JS, instead of page.evaluate. The test presses the shortcuts, checks the visible effect, and checks that only the enabled extension's shortcut is listed in Settings > Keybinding, so a disabled extension's binding that still occupied the combo would fail it. --- .../fixtures/data/shortcutPackFixture.ts | 27 +++++ .../disabledExtensionShortcut.spec.ts | 104 +++++++++--------- 2 files changed, 78 insertions(+), 53 deletions(-) create mode 100644 browser_tests/fixtures/data/shortcutPackFixture.ts diff --git a/browser_tests/fixtures/data/shortcutPackFixture.ts b/browser_tests/fixtures/data/shortcutPackFixture.ts new file mode 100644 index 00000000000..22fb6b54b68 --- /dev/null +++ b/browser_tests/fixtures/data/shortcutPackFixture.ts @@ -0,0 +1,27 @@ +export const DISABLED_SHORTCUT_EXTENSION = 'Test.DisabledShortcutPack' +export const ENABLED_SHORTCUT_EXTENSION = 'Test.EnabledShortcutPack' +export const SHORTCUT_PACK_SCRIPT = '/extensions/shortcut-pack/main.js' + +/** Pack script registering two extensions with Alt+J / Alt+K; a run stamps `body[data-ran-shortcut]`. */ +export const shortcutPackSource = ` +import { app } from '../../scripts/app.js' + +for (const [name, key] of [ + ['${DISABLED_SHORTCUT_EXTENSION}', 'j'], + ['${ENABLED_SHORTCUT_EXTENSION}', 'k'] +]) { + app.registerExtension({ + name, + commands: [ + { + id: name + '.Run', + label: name + ' run', + function: () => { + document.body.dataset.ranShortcut = name + } + } + ], + keybindings: [{ combo: { key, alt: true }, commandId: name + '.Run' }] + }) +} +` diff --git a/browser_tests/tests/settings/disabledExtensionShortcut.spec.ts b/browser_tests/tests/settings/disabledExtensionShortcut.spec.ts index b55b31392fb..55afacd4e12 100644 --- a/browser_tests/tests/settings/disabledExtensionShortcut.spec.ts +++ b/browser_tests/tests/settings/disabledExtensionShortcut.spec.ts @@ -1,70 +1,68 @@ +import type { GetExtensionsResponse } from '@comfyorg/ingest-types' + import { comfyExpect as expect, comfyPageFixture as test } from '@e2e/fixtures/ComfyPage' +import { + DISABLED_SHORTCUT_EXTENSION, + ENABLED_SHORTCUT_EXTENSION, + SHORTCUT_PACK_SCRIPT, + shortcutPackSource +} from '@e2e/fixtures/data/shortcutPackFixture' -const DISABLED = 'Test.DisabledShortcutPack' -const ENABLED = 'Test.EnabledShortcutPack' +test.use({ + initialSettings: { 'Comfy.Extension.Disabled': [DISABLED_SHORTCUT_EXTENSION] } +}) -test.use({ initialSettings: { 'Comfy.Extension.Disabled': [DISABLED] } }) +test.beforeEach(async ({ page }) => { + await page.route('**/extensions', (route) => + route.fulfill({ + json: [SHORTCUT_PACK_SCRIPT] satisfies GetExtensionsResponse + }) + ) + await page.route(`**${SHORTCUT_PACK_SCRIPT}*`, (route) => + route.fulfill({ contentType: 'text/javascript', body: shortcutPackSource }) + ) +}) test.describe( 'Disabled third-party extension shortcuts', { tag: ['@settings', '@keyboard'] }, () => { - test.beforeEach(async ({ comfyPage }) => { - await comfyPage.page.evaluate( - ({ disabled, enabled }) => { - const counts = (window.__commandExecutionCounts ??= {}) - for (const [name, key] of [ - [disabled, 'j'], - [enabled, 'k'] - ] as const) { - const commandId = `${name}.Run` - window.app!.registerExtension({ - name, - keybindings: [{ combo: { key, alt: true }, commandId }], - commands: [ - { - id: commandId, - function: () => { - counts[commandId] = (counts[commandId] ?? 0) + 1 - } - } - ] - }) - } - }, - { disabled: DISABLED, enabled: ENABLED } - ) - await comfyPage.canvas.click({ position: { x: 400, y: 400 } }) - await comfyPage.nextFrame() - }) - - test('a disabled extension adds no command and its shortcut does nothing', async ({ - comfyPage + test("a disabled extension's shortcut does nothing and is not listed", async ({ + comfyPage, + page }) => { - await comfyPage.canvas.press('Alt+KeyK') - await expect - .poll(() => comfyPage.command.getExecutionCount(`${ENABLED}.Run`)) - .toBe(1) + const body = page.locator('body') + + await test.step('Alt+J (disabled extension) does nothing', async () => { + await comfyPage.canvas.click({ position: { x: 400, y: 400 } }) + await comfyPage.canvas.press('Alt+KeyJ') + await comfyPage.nextFrame() + await expect(body).not.toHaveAttribute('data-ran-shortcut') + }) - await comfyPage.canvas.press('Alt+KeyJ') - await comfyPage.nextFrame() - expect(await comfyPage.command.getExecutionCount(`${DISABLED}.Run`)).toBe( - 0 - ) + await test.step('Alt+K (enabled extension) still runs', async () => { + await comfyPage.canvas.press('Alt+KeyK') + await expect(body).toHaveAttribute( + 'data-ran-shortcut', + ENABLED_SHORTCUT_EXTENSION + ) + }) - const registered = await comfyPage.page.evaluate( - (ids) => - ids.map((id) => - window.app!.extensionManager.command.commands.some( - (command) => command.id === id - ) - ), - [`${DISABLED}.Run`, `${ENABLED}.Run`] - ) - expect(registered).toEqual([false, true]) + await test.step('Only the enabled shortcut is in Keybindings', async () => { + const { keybindingPanel } = comfyPage.settingDialog + await comfyPage.settingDialog.open() + await comfyPage.settingDialog.category('Keybinding').click() + await keybindingPanel.search('ShortcutPack') + await expect( + keybindingPanel.commandRow(`${ENABLED_SHORTCUT_EXTENSION}.Run`) + ).toBeVisible() + await expect( + keybindingPanel.commandRow(`${DISABLED_SHORTCUT_EXTENSION}.Run`) + ).toHaveCount(0) + }) }) } ) From ca304bd1ea0ebaf8a50398d139aa68e550c51145 Mon Sep 17 00:00:00 2001 From: bymyself Date: Sun, 1 Nov 2026 20:23:37 +0000 Subject: [PATCH 5/7] test(extensions): register test extensions through comfyPage.extensions From review: the agent provenance spec repeated page.evaluate + registerExtension for data-only extensions. A small ExtensionHelper now does it, and the spec uses it everywhere except the sidebar case, which also registers a sidebar tab. --- browser_tests/fixtures/ComfyPage.ts | 3 + .../fixtures/helpers/ExtensionHelper.ts | 18 ++++++ .../settings/agentExtensionProvenance.spec.ts | 60 ++++++++----------- 3 files changed, 46 insertions(+), 35 deletions(-) create mode 100644 browser_tests/fixtures/helpers/ExtensionHelper.ts diff --git a/browser_tests/fixtures/ComfyPage.ts b/browser_tests/fixtures/ComfyPage.ts index 2ce4619969e..d6de49ac92d 100644 --- a/browser_tests/fixtures/ComfyPage.ts +++ b/browser_tests/fixtures/ComfyPage.ts @@ -60,6 +60,7 @@ import { CanvasHelper } from '@e2e/fixtures/helpers/CanvasHelper' import { ClipboardHelper } from '@e2e/fixtures/helpers/ClipboardHelper' import { CloudAuthHelper } from '@e2e/fixtures/helpers/CloudAuthHelper' import { CommandHelper } from '@e2e/fixtures/helpers/CommandHelper' +import { ExtensionHelper } from '@e2e/fixtures/helpers/ExtensionHelper' import { DragDropHelper } from '@e2e/fixtures/helpers/DragDropHelper' import { FeatureFlagHelper } from '@e2e/fixtures/helpers/FeatureFlagHelper' import { KeyboardHelper } from '@e2e/fixtures/helpers/KeyboardHelper' @@ -222,6 +223,7 @@ export class ComfyPage { public readonly dragDrop: DragDropHelper public readonly featureFlags: FeatureFlagHelper public readonly command: CommandHelper + public readonly extensions: ExtensionHelper public readonly bottomPanel: BottomPanel public readonly queuePanel: QueuePanel public readonly perf: PerformanceHelper @@ -278,6 +280,7 @@ export class ComfyPage { this.dragDrop = new DragDropHelper(page) this.featureFlags = new FeatureFlagHelper(page) this.command = new CommandHelper(page) + this.extensions = new ExtensionHelper(page) this.bottomPanel = new BottomPanel(page) this.queuePanel = new QueuePanel(page) this.perf = new PerformanceHelper(page) diff --git a/browser_tests/fixtures/helpers/ExtensionHelper.ts b/browser_tests/fixtures/helpers/ExtensionHelper.ts new file mode 100644 index 00000000000..cbd46413fa5 --- /dev/null +++ b/browser_tests/fixtures/helpers/ExtensionHelper.ts @@ -0,0 +1,18 @@ +import type { Page } from '@playwright/test' + +import type { ComfyExtension } from '@/types/comfy' + +/** A test extension with no hooks: only data that survives `page.evaluate`. */ +export type DataOnlyExtension = Pick + +export class ExtensionHelper { + constructor(private readonly page: Page) {} + + /** Registers each extension through the app, in order. */ + async register(...extensions: DataOnlyExtension[]): Promise { + await this.page.evaluate((extensions) => { + for (const extension of extensions) + window.app!.registerExtension(extension) + }, extensions) + } +} diff --git a/browser_tests/tests/settings/agentExtensionProvenance.spec.ts b/browser_tests/tests/settings/agentExtensionProvenance.spec.ts index fa5568cd91d..82a8f6d7af6 100644 --- a/browser_tests/tests/settings/agentExtensionProvenance.spec.ts +++ b/browser_tests/tests/settings/agentExtensionProvenance.spec.ts @@ -17,16 +17,16 @@ test.describe( tag: '@screenshot' }, async ({ comfyPage, page }) => { - await page.evaluate(() => { - window.app!.registerExtension({ name: 'Manual.Toolbar' }) - window.app!.registerExtension({ + await comfyPage.extensions.register( + { name: 'Manual.Toolbar' }, + { name: 'agent.cushions.toolbar', provenance: { createdBy: 'comfy-agent', summary: 'Adds cushion controls' } - }) - }) + } + ) await test.step('Open Extensions and see agent attribution', async () => { await comfyPage.settingDialog.open() @@ -81,14 +81,11 @@ test.describe( ) test('disables the bulk action when every agent extension is read-only', async ({ - comfyPage, - page + comfyPage }) => { - await page.evaluate(() => { - window.app!.registerExtension({ - name: 'pysssss.Locking', - provenance: { createdBy: 'comfy-agent' } - }) + await comfyPage.extensions.register({ + name: 'pysssss.Locking', + provenance: { createdBy: 'comfy-agent' } }) await comfyPage.settingDialog.open() @@ -100,17 +97,14 @@ test.describe( }) test('announces a newly registered agent extension with both actions', async ({ - comfyPage, - page + comfyPage }) => { - await page.evaluate(() => { - window.app!.registerExtension({ - name: 'agent.cushions.notices', - provenance: { - createdBy: 'comfy-agent', - summary: 'Adds cushion controls' - } - }) + await comfyPage.extensions.register({ + name: 'agent.cushions.notices', + provenance: { + createdBy: 'comfy-agent', + summary: 'Adds cushion controls' + } }) const notice = comfyPage.toast.withText( @@ -147,14 +141,12 @@ test.describe( await comfyPage.settingDialog.goToAboutPanel() }) - await page.evaluate(() => { - window.app!.registerExtension({ - name: 'agent.cushions.routing', - provenance: { - createdBy: 'comfy-agent', - summary: 'Adds cushion controls' - } - }) + await comfyPage.extensions.register({ + name: 'agent.cushions.routing', + provenance: { + createdBy: 'comfy-agent', + summary: 'Adds cushion controls' + } }) const notice = comfyPage.toast.withText( @@ -173,11 +165,9 @@ test.describe( await comfyPage.settingDialog.goToAboutPanel() await expect(page.locator('.about-container')).toBeVisible() - await page.evaluate(() => { - window.app!.registerExtension({ - name: 'agent.cushions.rerouting', - provenance: { createdBy: 'comfy-agent' } - }) + await comfyPage.extensions.register({ + name: 'agent.cushions.rerouting', + provenance: { createdBy: 'comfy-agent' } }) await comfyPage.toast .withText('Your agent added agent.cushions.rerouting') From 71b5b57706134365a060f41f133b84619b8f6455 Mon Sep 17 00:00:00 2001 From: bymyself Date: Sun, 1 Nov 2026 20:42:21 +0000 Subject: [PATCH 6/7] test(extensions): expose ExtensionHelper as its own Playwright fixture From review: new domain helpers are fixtures, not ComfyPage members. The provenance spec now uses extensionTest and its extensions fixture. --- browser_tests/fixtures/ComfyPage.ts | 3 --- browser_tests/fixtures/extensionFixture.ts | 10 ++++++++ .../settings/agentExtensionProvenance.spec.ts | 25 ++++++++++--------- 3 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 browser_tests/fixtures/extensionFixture.ts diff --git a/browser_tests/fixtures/ComfyPage.ts b/browser_tests/fixtures/ComfyPage.ts index d6de49ac92d..2ce4619969e 100644 --- a/browser_tests/fixtures/ComfyPage.ts +++ b/browser_tests/fixtures/ComfyPage.ts @@ -60,7 +60,6 @@ import { CanvasHelper } from '@e2e/fixtures/helpers/CanvasHelper' import { ClipboardHelper } from '@e2e/fixtures/helpers/ClipboardHelper' import { CloudAuthHelper } from '@e2e/fixtures/helpers/CloudAuthHelper' import { CommandHelper } from '@e2e/fixtures/helpers/CommandHelper' -import { ExtensionHelper } from '@e2e/fixtures/helpers/ExtensionHelper' import { DragDropHelper } from '@e2e/fixtures/helpers/DragDropHelper' import { FeatureFlagHelper } from '@e2e/fixtures/helpers/FeatureFlagHelper' import { KeyboardHelper } from '@e2e/fixtures/helpers/KeyboardHelper' @@ -223,7 +222,6 @@ export class ComfyPage { public readonly dragDrop: DragDropHelper public readonly featureFlags: FeatureFlagHelper public readonly command: CommandHelper - public readonly extensions: ExtensionHelper public readonly bottomPanel: BottomPanel public readonly queuePanel: QueuePanel public readonly perf: PerformanceHelper @@ -280,7 +278,6 @@ export class ComfyPage { this.dragDrop = new DragDropHelper(page) this.featureFlags = new FeatureFlagHelper(page) this.command = new CommandHelper(page) - this.extensions = new ExtensionHelper(page) this.bottomPanel = new BottomPanel(page) this.queuePanel = new QueuePanel(page) this.perf = new PerformanceHelper(page) diff --git a/browser_tests/fixtures/extensionFixture.ts b/browser_tests/fixtures/extensionFixture.ts new file mode 100644 index 00000000000..586d947f48e --- /dev/null +++ b/browser_tests/fixtures/extensionFixture.ts @@ -0,0 +1,10 @@ +import { comfyPageFixture } from '@e2e/fixtures/ComfyPage' +import { ExtensionHelper } from '@e2e/fixtures/helpers/ExtensionHelper' + +export const extensionTest = comfyPageFixture.extend<{ + extensions: ExtensionHelper +}>({ + extensions: async ({ page }, use) => { + await use(new ExtensionHelper(page)) + } +}) diff --git a/browser_tests/tests/settings/agentExtensionProvenance.spec.ts b/browser_tests/tests/settings/agentExtensionProvenance.spec.ts index 82a8f6d7af6..f1f5231811d 100644 --- a/browser_tests/tests/settings/agentExtensionProvenance.spec.ts +++ b/browser_tests/tests/settings/agentExtensionProvenance.spec.ts @@ -1,9 +1,7 @@ import type { GetExtensionsResponse } from '@comfyorg/ingest-types' -import { - comfyExpect as expect, - comfyPageFixture as test -} from '@e2e/fixtures/ComfyPage' +import { comfyExpect as expect } from '@e2e/fixtures/ComfyPage' +import { extensionTest as test } from '@e2e/fixtures/extensionFixture' import { expectElementScreenshot } from '@e2e/fixtures/utils/screenshotRegion' import type { WorkspaceStore } from '@e2e/types/globals' @@ -16,8 +14,8 @@ test.describe( { tag: '@screenshot' }, - async ({ comfyPage, page }) => { - await comfyPage.extensions.register( + async ({ comfyPage, extensions, page }) => { + await extensions.register( { name: 'Manual.Toolbar' }, { name: 'agent.cushions.toolbar', @@ -81,9 +79,10 @@ test.describe( ) test('disables the bulk action when every agent extension is read-only', async ({ - comfyPage + comfyPage, + extensions }) => { - await comfyPage.extensions.register({ + await extensions.register({ name: 'pysssss.Locking', provenance: { createdBy: 'comfy-agent' } }) @@ -97,9 +96,10 @@ test.describe( }) test('announces a newly registered agent extension with both actions', async ({ - comfyPage + comfyPage, + extensions }) => { - await comfyPage.extensions.register({ + await extensions.register({ name: 'agent.cushions.notices', provenance: { createdBy: 'comfy-agent', @@ -134,6 +134,7 @@ test.describe( test('routes an already-open Settings dialog to the extension controls', async ({ comfyPage, + extensions, page }) => { await test.step('Open Settings on another panel first', async () => { @@ -141,7 +142,7 @@ test.describe( await comfyPage.settingDialog.goToAboutPanel() }) - await comfyPage.extensions.register({ + await extensions.register({ name: 'agent.cushions.routing', provenance: { createdBy: 'comfy-agent', @@ -165,7 +166,7 @@ test.describe( await comfyPage.settingDialog.goToAboutPanel() await expect(page.locator('.about-container')).toBeVisible() - await comfyPage.extensions.register({ + await extensions.register({ name: 'agent.cushions.rerouting', provenance: { createdBy: 'comfy-agent' } }) From faf875267a2d49f623b64b6d5c54259147918967 Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Wed, 4 Nov 2026 03:31:33 -0800 Subject: [PATCH 7/7] fix(browser_tests): compose extensionTest via mergeTests extensionFixture extended comfyPageFixture directly, which diverges from the mergeTests(comfyPageFixture, helperFixture) pattern every other helper fixture in this directory follows (linkVisibilityFixture, legacyNodeBadgeFixture, etc). Extend the network-isolation base instead and compose with comfyPageFixture via mergeTests. --- browser_tests/fixtures/extensionFixture.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/browser_tests/fixtures/extensionFixture.ts b/browser_tests/fixtures/extensionFixture.ts index 586d947f48e..421d9165113 100644 --- a/browser_tests/fixtures/extensionFixture.ts +++ b/browser_tests/fixtures/extensionFixture.ts @@ -1,10 +1,18 @@ +import { mergeTests } from '@playwright/test' +import { networkIsolationFixture as base } from '@e2e/fixtures/networkIsolationFixture' + import { comfyPageFixture } from '@e2e/fixtures/ComfyPage' import { ExtensionHelper } from '@e2e/fixtures/helpers/ExtensionHelper' -export const extensionTest = comfyPageFixture.extend<{ +const extensionHelperFixture = base.extend<{ extensions: ExtensionHelper }>({ extensions: async ({ page }, use) => { await use(new ExtensionHelper(page)) } }) + +export const extensionTest = mergeTests( + comfyPageFixture, + extensionHelperFixture +)