test: fix e2e tests

ycnmhd · ycnmhd · commit 264ef7eab70e · 2025-01-08T21:03:56.000+01:00
diff --git a/e2e/helpers/getters/lineage-view/card/get-card-text.ts b/e2e/helpers/getters/lineage-view/card/get-card-text.ts
@@ -1,7 +1,7 @@
 import { ElementHandle } from '@playwright/test';
 import invariant from 'tiny-invariant';
 
-export const MARKDOWN_PREVIEW = '.preview-container';
+export const MARKDOWN_PREVIEW = '.lng-prev';
 export const getCardText = async (
     card: ElementHandle<HTMLElement | SVGElement>,
 ) => {
diff --git a/e2e/helpers/interactions/lineage-view/card/delete-card-using-button.ts b/e2e/helpers/interactions/lineage-view/card/delete-card-using-button.ts
@@ -17,4 +17,6 @@ export const deleteCardUsingButton = async () => {
     invariant(button);
     await button.click();
     await delay(SHORT);
+    await button.click();
+    await delay(SHORT);
 };
diff --git a/e2e/helpers/interactions/lineage-view/card/select-card.ts b/e2e/helpers/interactions/lineage-view/card/select-card.ts
@@ -1,10 +1,17 @@
 import { getCardsOfColumns } from '../../../getters/lineage-view/card/get-cards-of-columns';
 import { delay, SHORT } from '../../../general/delay';
 import { MARKDOWN_PREVIEW } from '../../../getters/lineage-view/card/get-card-text';
+import { LINEAGE_INLINE_EDITOR } from '../../../getters/lineage-view/card/get-inline-editor';
 
-export const selectCard = async (column: number, cardNumber: number) => {
+export const selectCard = async (
+    column: number,
+    cardNumber: number,
+    mode: 'preview' | 'edit' = 'preview',
+) => {
     const card = (await getCardsOfColumns())[column][cardNumber];
     await card.click();
-    await card.waitForSelector(MARKDOWN_PREVIEW);
+    await card.waitForSelector(
+        mode === 'preview' ? MARKDOWN_PREVIEW : LINEAGE_INLINE_EDITOR,
+    );
     await delay(SHORT);
 };
diff --git a/e2e/helpers/interactions/lineage-view/hotkeys/delete-card-using-hotkey.ts b/e2e/helpers/interactions/lineage-view/hotkeys/delete-card-using-hotkey.ts
@@ -6,4 +6,6 @@ export const deleteCardUsingHotkey = async () => {
     await __obsidian__.waitForSelector(LINEAGE_CARD_ACTIVE);
     await __obsidian__.keyboard.press('Control+Backspace');
     await delay(SHORT);
+    await __obsidian__.keyboard.press('Control+Backspace');
+    await delay(SHORT);
 };
diff --git a/e2e/helpers/interactions/lineage-view/search/set-search-query.ts b/e2e/helpers/interactions/lineage-view/search/set-search-query.ts
@@ -3,7 +3,7 @@ import { getActiveView } from '../../../getters/lineage-view/card/get-active-vie
 import { delay, SHORT } from '../../../general/delay';
 import { __obsidian__ } from '../../../getters/obsidian/load-obsidian';
 
-export const SEL_SEARCH_INPUT = `input[aria-label="Search document"]`;
+export const SEL_SEARCH_INPUT = `input.search-input-element`;
 
 export const setSearchQuery = async (query: string) => {
     const input = await getSearchInput();
diff --git a/e2e/helpers/interactions/lineage-view/search/toggle-search-query.ts b/e2e/helpers/interactions/lineage-view/search/toggle-search-query.ts
@@ -1,7 +1,7 @@
 import invariant from 'tiny-invariant';
 import { getActiveView } from '../../../getters/lineage-view/card/get-active-view';
 
-const SEL_SEARCH_TOGGLE = `button[aria-label${'Toggle search input'}]`;
+const SEL_SEARCH_TOGGLE = `button[aria-label="${'Toggle search input'}"]`;
 
 export const toggleSearchQuery = async () => {
     const view = await getActiveView();
diff --git a/e2e/helpers/interactions/lineage-view/search/toggle-show-all-search-results.ts b/e2e/helpers/interactions/lineage-view/search/toggle-show-all-search-results.ts
@@ -0,0 +1,11 @@
+import invariant from 'tiny-invariant';
+import { getActiveView } from '../../../getters/lineage-view/card/get-active-view';
+
+const SELECTOR = `div[aria-label="${'Show all cards'}"]`;
+
+export const toggleShowAllSearchResults = async () => {
+    const view = await getActiveView();
+    const button = await view.$(SELECTOR);
+    invariant(button);
+    await button.click();
+};
diff --git a/e2e/tests/card-hotkeys.spec.ts b/e2e/tests/card-hotkeys.spec.ts
@@ -19,6 +19,7 @@ import { toggleSearchUsingHotkey } from '../helpers/interactions/lineage-view/ho
 import { setSearchQuery } from '../helpers/interactions/lineage-view/search/set-search-query';
 import { getTextsOfColumns } from '../helpers/getters/lineage-view/card/get-texts-of-columns';
 import { discardInputChanges } from '../helpers/interactions/lineage-view/hotkeys/discard-input-changes';
+import { toggleShowAllSearchResults } from '../helpers/interactions/lineage-view/search/toggle-show-all-search-results';
 
 test.describe('card hotkeys', () => {
     test('save card, edit card and discard changes using hotkey', async () => {
@@ -359,6 +360,7 @@ test.describe('card hotkeys', () => {
 
         await toggleSearchUsingHotkey();
         await setSearchQuery('4');
+        await toggleShowAllSearchResults();
 
         expect(await getTextsOfColumns()).toEqual([[], [], [n4]]);
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "devDependencies": {
         "@commitlint/cli": "17.4.0",
         "@commitlint/config-conventional": "17.4.0",
-        "@playwright/test": "1.42.1",
+        "@playwright/test": "1.49.1",
         "@tsconfig/svelte": "5.0.2",
         "@types/diff": "5.2.1",
         "@types/electron": "1.6.10",
diff --git a/playwright.config.ts b/playwright.config.ts
@@ -23,7 +23,7 @@ export default defineConfig({
     /* Opt out of parallel tests on CI. */
     workers: 1,
     /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-    reporter: 'html',
+    reporter: 'null',
     /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
     use: {
         /* Base URL to use in actions like `await page.goto('/')`. */
diff --git a/src/lang/lang.ts b/src/lang/lang.ts
@@ -120,7 +120,7 @@ export const lang = {
 
     // undo
     controls_history: 'History',
-    controls_history_undo: 'Undo change',
+    controls_history_undo: 'Undo',
     controls_history_redo: 'Redo',
     hk_undo_change: 'Undo change',
     hk_redo_change: 'Redo change',
diff --git a/src/obsidian/helpers/inline-editor/inline-editor.ts b/src/obsidian/helpers/inline-editor/inline-editor.ts
@@ -94,9 +94,25 @@ export class InlineEditor {
         this.inlineView.editor.focus();
     };
 
+    isCursorInRange = (cursor: EditorPosition): boolean => {
+        const docStart = { line: 0, ch: 0 };
+        const lastLine = this.inlineView.editor.lastLine();
+        const docEnd = {
+            line: lastLine,
+            ch: this.inlineView.editor.getLine(lastLine).length,
+        };
+
+        const isLineInRange =
+            cursor.line >= docStart.line && cursor.line <= docEnd.line;
+        const isChInRange =
+            (cursor.line === docStart.line ? cursor.ch >= docStart.ch : true) &&
+            (cursor.line === docEnd.line ? cursor.ch <= docEnd.ch : true);
+
+        return isLineInRange && isChInRange;
+    };
     restoreCursor = () => {
         const existingCursor = this.cursorPositions.get(this.nodeId!);
-        if (existingCursor) {
+        if (existingCursor && this.isCursorInRange(existingCursor)) {
             this.setCursor(existingCursor);
         } else {
             const lastLine = this.inlineView.editor.lastLine();
@@ -108,10 +124,10 @@ export class InlineEditor {
         }
     };
 
-    unloadNode(nodeId?: string) {
+    unloadNode(nodeId?: string, discardChanges = false) {
         const currentNodeId = this.nodeId;
         if (nodeId && nodeId !== currentNodeId) return;
-        if (currentNodeId) {
+        if (currentNodeId && !discardChanges) {
             this.saveContent();
             const cursor = this.getCursor();
             this.cursorPositions.set(currentNodeId, cursor);
diff --git a/src/view/actions/keyboard-shortcuts/helpers/commands/commands/helpers/cancel-changes.ts b/src/view/actions/keyboard-shortcuts/helpers/commands/commands/helpers/cancel-changes.ts
@@ -3,7 +3,7 @@ import { LineageView } from 'src/view/view';
 export const cancelChanges = (view: LineageView) => {
     const documentViewState = view.viewStore.getValue().document;
     if (documentViewState.pendingConfirmation.disableEdit) {
-        view.inlineEditor.unloadNode();
+        view.inlineEditor.unloadNode(undefined, true);
         if (documentViewState.editing.isInSidebar) {
             view.viewStore.dispatch({
                 type: 'view/sidebar/disable-edit',
diff --git a/src/view/components/container/toolbar/components/search-input.svelte b/src/view/components/container/toolbar/components/search-input.svelte
@@ -8,7 +8,6 @@
     const viewStore = view.viewStore;
     const search = searchStore(view);
 
-    let focusTimeout: ReturnType<typeof setTimeout>;
     const onInput = (
         // eslint-disable-next-line no-undef
         e: Event & { currentTarget: EventTarget & HTMLInputElement },
