From fe3160e7a1b4e2eab328bfabaa96fb1bd84d2c78 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 8 Jan 2026 20:22:50 +0200 Subject: [PATCH] e2e(server): adapt tests to new layout directly --- apps/server-e2e/src/note_types/pdf.spec.ts | 13 +++---------- apps/server-e2e/src/note_types/text.spec.ts | 7 ++++--- apps/server-e2e/src/support/app.ts | 2 +- apps/server/spec/db/document.db | Bin 8404992 -> 8404992 bytes 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/apps/server-e2e/src/note_types/pdf.spec.ts b/apps/server-e2e/src/note_types/pdf.spec.ts index 65bbeb1fb2..d79ddb37e4 100644 --- a/apps/server-e2e/src/note_types/pdf.spec.ts +++ b/apps/server-e2e/src/note_types/pdf.spec.ts @@ -1,12 +1,12 @@ -import test, { BrowserContext, expect, Page } from "@playwright/test"; +import test, { expect, Page } from "@playwright/test"; import App from "../support/app"; test.beforeEach(async ({ page, context }) => { - const app = await setLayout({ page, context }, true); + const app = new App(page, context); + await app.goto(); await app.setOption("rightPaneCollapsedItems", "[]"); }); -test.afterEach(async ({ page, context }) => await setLayout({ page, context }, false)); test("Table of contents works", async ({ page, context }) => { const app = new App(page, context); @@ -107,13 +107,6 @@ test("Layers listing works", async ({ page, context }) => { await expect(layersList.locator(".pdf-layer-item")).toHaveCount(0); }); -async function setLayout({ page, context}: { page: Page; context: BrowserContext }, newLayout: boolean) { - const app = new App(page, context); - await app.goto(); - await app.setOption("newLayout", newLayout ? "true" : "false"); - return app; -} - class PdfHelper { private contentFrame: ReturnType; diff --git a/apps/server-e2e/src/note_types/text.spec.ts b/apps/server-e2e/src/note_types/text.spec.ts index c99ad5d7d6..25e45a551f 100644 --- a/apps/server-e2e/src/note_types/text.spec.ts +++ b/apps/server-e2e/src/note_types/text.spec.ts @@ -1,4 +1,5 @@ -import { test, expect, Page } from "@playwright/test"; +import { expect, test } from "@playwright/test"; + import App from "../support/app"; test("Table of contents is displayed", async ({ page, context }) => { @@ -8,7 +9,7 @@ test("Table of contents is displayed", async ({ page, context }) => { await app.goToNoteInNewTab("Table of contents"); await expect(app.sidebar).toContainText("Table of Contents"); - const rootList = app.sidebar.locator(".toc-widget > span > ol"); + const rootList = app.sidebar.locator(".toc > ol"); // Heading 1.1 // Heading 1.1 @@ -42,7 +43,7 @@ test("Highlights list is displayed", async ({ page, context }) => { await app.closeAllTabs(); await app.goToNoteInNewTab("Highlights list"); - await expect(app.sidebar).toContainText("Highlights List"); + await expect(app.sidebar).toContainText("10 highlights"); const rootList = app.sidebar.locator(".highlights-list ol"); let index = 0; for (const highlightedEl of ["Bold 1", "Italic 1", "Underline 1", "Colored text 1", "Background text 1", "Bold 2", "Italic 2", "Underline 2", "Colored text 2", "Background text 2"]) { diff --git a/apps/server-e2e/src/support/app.ts b/apps/server-e2e/src/support/app.ts index 12097c6567..9185a19189 100644 --- a/apps/server-e2e/src/support/app.ts +++ b/apps/server-e2e/src/support/app.ts @@ -37,7 +37,7 @@ export default class App { this.noteTreeHoistedNote = this.noteTree.locator(".fancytree-node", { has: page.locator(".unhoist-button") }); this.launcherBar = page.locator("#launcher-container"); this.currentNoteSplit = page.locator(".note-split:not(.hidden-ext)"); - this.currentNoteSplitTitle = this.currentNoteSplit.locator(".note-title"); + this.currentNoteSplitTitle = this.currentNoteSplit.locator(".note-title").first(); this.currentNoteSplitContent = this.currentNoteSplit.locator(".note-detail-printable.visible"); this.sidebar = page.locator("#right-pane"); } diff --git a/apps/server/spec/db/document.db b/apps/server/spec/db/document.db index c488fb1071205fcdb88a4ae6ab44be7fbec599f5..ad993226e079c01cfa121c0f83cb8c479a78efd9 100644 GIT binary patch delta 6602 zcma)=33yaRwt#QdUHa}fy(Aq-2%V4!0!eyFXF&rASs|Uh$ zbLyN^H8L{Fj1b16fOki94)8u$w?7$N{*d*5J~pN%T5XBebc-#0iOs&mW=pa;@yF2s z0n_&-j?^T3Y6e0v;I1D^97#4?8Y-R(j%$asHtnSLl$NGlrqycuakK^WY07()+Qrl1 zpv&*?S%~%|0}FmC8RUhDvy>uAbt<t70mRM-D>}4 zR(5M}z79u{BPDH-)ovw!-^!-fA}Dj(@ZDE~4F>wOGJ)d*;JgeDqnKf^omZnNhN7td zMS&-U1;J1I5V%F1gT5XHa~bsuDjQigfI~WvGM|~V45H(!xN!8C%BuK_4Itqx-K@QW zXV<~6RmInwl5bt^cCYeegl$9dewb%$)zb;EvY=$Wt>0bWTVieIJJGd%xZ1ckD5zQP zEXb?K_u9NppZFF2&=2R<={9RewGXtHaM(#WpqXZx`__GLLcH%yx@m-A|ATrAvvtfo zfEIcgH^b#~`FO<3#4`+cfimDjO-vO~?bf#1p6a&h%CdrhIReY;n6G&7Bw_>1Ymi@o zP6wEScylLH#DQUSvY#1N(^9(z8}q$Q1vX!gIS#KLU>?`hY=2jM!O;3PPp!S%Y{Bu{ z7~KL;iWg5X34p$l`WHIc1?tiIrIn2BSh-`;6Gc;e0+8<(KSokazGd+aweTeyZ z-_D(DXW_%8?1*|~xbhWnw2oD*pa`pDY&;D?6iV62uF!3|hUOBt%tx6!*?h#zA;UNA zVw2E4J6XMM)JtGk8~2B|+_HjJYI zgr$hrb7Ktq8~#pohn{=T5cErtucInI+n>`|lV5C}gS`gsN_t9A+~({qZ!c+bR<0iq zci`WKb6>z|fv>8dy=GO0Z$(iNFXAJST*Lm3%I6* zpUNxmu)kAYR*oy<%0A@=Wk6|G+{$vrs>CS&P-OXn{DJ(c{EYmNd_dkVUn{rCHF7?^ zL{5?8WW7vDpGc>r7o_gm8y&lQ1N-2vtI^bWpGh7D44N@~`v1=O5UOo zpUTJc1|H}>)t%A(LHA#}dv&{Y*XcTSYjwrCD|HKXk=iFZj(dwc$vw#(=Js;ixIV6t ztKhP@jY*uye#O4WzQRthcd$3HLu?CM#pbeh*21dHMdm~1b>{cX!^~aG7_))#F&?In z1g?Rh=uha=^b7Q(^g((Ty@?LcYiJj}fR3OU_ywGVFTp3^{qQ!pRa*diVFN7JmT-TA z%U~1~z&Y?P_!Bsxoz`BkXpd?KwM|-pi`HCxA-{qDP`yu!&=_rvwk!CH4%oDCwIbhI zm|`t2?Q86+Hpk$JQEn?Y<2Z77K!c;8$39r-i#UTe zZsR=D<7rh*frid>N0~cEdmVqYjT>h#2?Dl&yFbv?Q<%#?iSFOd#mAF06JPwjgb@t9 z@|@zTwt>ddiVU~ioPc)TE-XNcZ{h4{^mZWv_1wZ)ke__Q_uayI%D@m}C%Jo}E)pG{ zh&zH44=QWYg|wVFQH8yY~vwk31^$17;yz4UztN#b{dF(&P)Q4b=&^pb03^14Ao4Dg7>U6iz@wIulI5smOb~kgC>XG&GiU*oqofwxow=qGcUYgrz3UT3Hxq zDDqXT@Tp6ul4$DSfUmVIt+BVeMcjtpxLt^x-mFy>y-m4!-Gzgt&Glw8X7>vh!x(uV zRgFo~F{w~}7Da7W53|G|ndgf(CIY{;U5x=pj|-X?q@u7`aYSTk3c}{;iu4kxNaL|$ z)pn4D*aT- zDAvdt(Pu}MwV=;9Ymt-*;0%ess}djxmhyfQ`wR=Mo>z9bV~eVQO=Dv)4DJtg`kN z7Or!fBk|7lQWe}-Tkq)Tt4y)yyWM{Cf+;UA_YDrTr>)Oex4bO8N?k@7zF$0p&v@)U zYoNpBtt_n1HqV|KX=om-aunrud#p_ncdHHLTWS6k-TjS$PLHRGZw@|FTkFnW?kr1R z+3c?|^O}pASA$zRq`b5Dh5eo(X&)3oC>0b+@h)?m$%m4;x9Bu;}@4Isj-%1_%yBUm!4EV zSN~ltS4HJTWs6d*%$Ik`OJ$>QEsCpCs_;;qat{yAB1@}s6`f3bQTBcqH?@}HrL}AU zBWUzlH32Pi$ja8UtqMNds#+oxH9+-(cuHHZm1s8NDB~Weeva<28jG*krXD9XKR_mS z>1QrucEWm}zrH)aEWO23=4=n-m1bvG*_+E62hz<$ z>?kdxgHH&nv%Y(DrryxJfLOFlo0_TbCRJr(7|da#nOM@H1(O~kNsq+RlfrD2bU!1b z@ny!!d%>8R#Rzt42WC&I^8iDal(nF`Q|c_7cS;o?dTYKIN%G?K(CDAkk*gSa2lYH= zty(*P;C<9((=OYQZAKHL41*rAY4#~Ub+%OI)u;5iYSUJ^%=7Vio90sii<`5we=<7r z{8%O`4WI`nVKm;Fr)}XFD=o5s@Dc{VrpuOqNj;^92e^t(adtF0YZceSgro!)P>}>OAhNh{KY*)e1U}I^Z zqGerC*~~`}tA~lDdZ&$cd~0#0+iG&^(-+kwySj4vnyqCXo3p#Q(^p)a8QLWL zl2vjDOm}#y$K#OoOJkJVSLt0-vUo$>mLU;Dl zv8a7ZnCJ|3?=L8IOf}@5j`2C@RIV6R6eC|63SV-?`j&ogXixsLx@}7w=}9S0 zhsQS_jljKfl>7U-FO^DPdTYbVSEMczVX8(5Vbz)>Lh;n4z}UbmeE4 z=XE<*c|%*AU!&aaSu;Kxfeay{DD<_fR#f@ZOV*c`wuTnDU#HMFZbsz?wI#ODhUiy( z)t-uv9n@L?9KReT#qbg6%0rrbMRrADPEn^fe_${)8UL)h>BG6xhQhnVL45I$whkcp zqL#3%eW0K@P+8Pm(%$QDZY^o_S9+@|-M^sAo{?ltw|ROV2%yp1#94UqKCK9l_9Pfa z=;kjaGg@<46P=-b#m{P-ju(gB<9nbJm9>dxbYKxZ3;*|FE#+>8>7brPY+2Yx1}=t^ z*$dn|>TT=??5pfE>_dnv58DOR27GII*sIVWGn6588s>OB;tt!aW0d#FL7cxT?C(p| zp>??_tsP|@^_2~U=2$GDu=BTq^CWBPH2{SHWU}c$L=|;n{1HpmKWIEVRqvq{U4K(O zPa7c#T+$niX6Uc00s+L1>EEJVe8-M#)1DJR#QY9@f)2!?Q*}lYIu@qq;~^hQ=fRLn z6uc;zo^6VK>Y{`s@UdI<;X9-DOL+UO`fi<$6pv2opAc*tv8Z#G2YkxhnCCD=WX zes#?7C8NFqUf!wCdK6jC0s%jdbG2*3EsCOo!vx+GqGUUt{l7r18MGu2;b7(&L_QYY1MmC)( z0v(5^uKDGCVVm6Tjo%%rmWXakJ>vlv;q~fGGtp4VcOm@Hjdl zDG_Mmn5h8&b=YJ!#9RY9D7jCr(>~Oml1t@udA@AW{w!UT-jz;??;y*V=`Tljn4S~B zT;$zrGNChjO}cOsy$IG1Sn3D56PsIoO^H*Hj?eEkNi1#P&LZ6bQ!Jx%b7#r&Ji=uL zwq7k2*vxYmflQv_f4nv!uK2MKJ!n)DY<}O%+>1(*kN{<%yKgmGwR)>aL!GR zyv&*U9W?T)X*SyUnyDJv?dbK_O!G=ZLxEI~U?*eyiR<0zE{9l9r!CCX$AwyOOj)?% z2Nr(m0@>;z7Q|@_(_K1w>CJ*jt8Y`0~F6wnN#;CSN(WV ze`+N3^z{=9ZTGmhFygX=gi97iId<08flp0@a6$yZOo$`|$7d6w2+@Q&gc!nHf`t%E zh$GA+#1j$-ml5U@77#8cEF>% g=ppnH`Uw4m0m2|*h;R+zTEZ}410MKvN@2kZ_5fdBvi delta 4517 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 NmRN^<->=`4|Gy$cyE^~?