diff --git a/e2e-tests/fixtures.ts b/e2e-tests/fixtures.ts index b9906d2279..035735768c 100644 --- a/e2e-tests/fixtures.ts +++ b/e2e-tests/fixtures.ts @@ -70,6 +70,16 @@ base.beforeAll(async () => { console.log("Test start with:", info) page = await electronApp.firstWindow() + + // inject testing flags + await page.evaluate( + () => { + Object.assign(window, { + __E2E_TESTING__: true, + }) + }, + ) + // Direct Electron console to watcher page.on('console', consoleLogWatcher) page.on('crash', () => { diff --git a/e2e-tests/page-search.spec.ts b/e2e-tests/page-search.spec.ts index f8a251fba3..53218fca63 100644 --- a/e2e-tests/page-search.spec.ts +++ b/e2e-tests/page-search.spec.ts @@ -41,8 +41,8 @@ import { IsMac, createRandomPage, newBlock, newInnerBlock, randomString, lastBlo const results = await page.$$('#ui__ac-inner>div') expect(results.length).toBeGreaterThan(3) // 2 blocks + 1 page + 2 page content await page.keyboard.press("Escape") - await page.keyboard.press("Escape") await page.waitForTimeout(1000) // wait for modal disappear + await page.keyboard.press("Escape") }) async function alias_test(page: Page, page_name: string, search_kws: string[]) { diff --git a/src/main/frontend/handler/events.cljs b/src/main/frontend/handler/events.cljs index 68e0998b02..9cda9187d8 100644 --- a/src/main/frontend/handler/events.cljs +++ b/src/main/frontend/handler/events.cljs @@ -369,6 +369,7 @@ (fn [] (let [filename-format (state/get-filename-format repo)] (when (and (util/electron?) + (not (util/ci?)) (not (config/demo-graph?)) (not= filename-format :triple-lowbar)) (state/pub-event! [:ui/notify-outdated-filename-format []])))) diff --git a/src/main/frontend/util.cljc b/src/main/frontend/util.cljc index edb64fb4c0..f3ba3f209d 100644 --- a/src/main/frontend/util.cljc +++ b/src/main/frontend/util.cljc @@ -113,6 +113,11 @@ [] (when (electron?) (. js/window -__MOCKED_OPEN_DIR_PATH__)))) +#?(:cljs + (defn ci? + [] + (boolean (. js/window -__E2E_TESTING__)))) + #?(:cljs (do (def nfs? (and (not (electron?))