clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-24 22:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

test(e2e,rtc): update rtc-outliner-conflict-update-test

Browse Source
This commit is contained in:
rcmerci
2025-05-28 16:30:06 +08:00
parent c14b7e8d30
commit f02269e3da
2 changed files with 56 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
clj-e2e/src/logseq/e2e/keyboard.clj
View File

@@ -1,6 +1,8 @@
(ns logseq.e2e.keyboard
(:require [wally.main :as w]))
(def ^:private mac? (= "Mac OS X" (System/getProperty "os.name")))
(def press w/keyboard-press)
(def enter #(press "Enter"))
@@ -9,5 +11,11 @@
(def tab #(press "Tab"))
(def shift+tab #(press "Shift+Tab"))
(def shift+enter #(press "Shift+Enter"))
(def shift+arrow-up #(press "Shift+ArrowUp"))
(def shift+arrow-down #(press "Shift+ArrowDown"))
(def arrow-up #(press "ArrowUp"))
(def arrow-down #(press "ArrowDown"))
(def meta+shift+arrow-up #(press (str (if mac? "Meta" "Alt") "+Shift+ArrowUp")))
(def meta+shift+arrow-down #(press (str (if mac? "Meta" "Alt") "+Shift+ArrowDown")))

60
clj-e2e/test/logseq/e2e/rtc_extra_test.clj
View File

@@ -7,6 +7,7 @@
[logseq.e2e.custom-report :as custom-report]
[logseq.e2e.fixtures :as fixtures :refer [*page1 *page2]]
[logseq.e2e.graph :as graph]
[logseq.e2e.keyboard :as k]
[logseq.e2e.locator :as loc]
[logseq.e2e.outliner-basic-test :as outliner-basic-test]
[logseq.e2e.page :as page]
@@ -236,15 +237,50 @@
(w/with-page @*page2
(rtc/wait-tx-update-to @*latest-remote-tx))
(validate-2-graphs)))
(testing "disconnect on page1 and page2, do some conflict updates, reconnect and check"
(rtc/with-stop-restart-rtc
[@*page1 @*page2]
[@*page1 (rtc/with-wait-tx-updated (b/new-block "xxxx"))
@*page2 (rtc/with-wait-tx-updated (b/new-block "yyyy"))]
(w/with-page @*page1
(w/click (format ".ls-block :text('%s')" (str title-prefix "-" 1)))
(b/indent))
(w/with-page @*page2
(w/click (format ".ls-block :text('%s')" (str title-prefix "-" 0)))
(b/delete-blocks)))
(validate-2-graphs))))
(testing "page1: indent block1 as child of block0, page2: delete block0"
(rtc/with-stop-restart-rtc
[@*page1 @*page2]
[@*page1 (rtc/with-wait-tx-updated (b/new-block "page1-done-1"))
@*page2 (rtc/with-wait-tx-updated (b/new-block "page2-done-1"))]
(w/with-page @*page1
(w/click (format ".ls-block :text('%s')" (str title-prefix "-" 1)))
(b/indent))
(w/with-page @*page2
(w/click (format ".ls-block :text('%s')" (str title-prefix "-" 0)))
(b/delete-blocks)))
(validate-2-graphs))
(comment
"this case is failing now"
(testing "
origin:
- block2
- block3
- block4
page1:
- block2
- block3
- block4
page2:
;; block2 deleted
- block4
- block3"
(rtc/with-stop-restart-rtc
[@*page1 @*page2]
[@*page1 (rtc/with-wait-tx-updated (b/new-block "page1-done-2"))
@*page2 (rtc/with-wait-tx-updated (b/new-block "page2-done-2"))]
(w/with-page @*page1
(w/click (format ".ls-block :text('%s')" (str title-prefix "-" 3)))
(b/indent)
(k/arrow-down)
(b/indent)
(b/indent))
(w/with-page @*page2
(w/click (format ".ls-block :text('%s')" (str title-prefix "-" 2)))
(b/delete-blocks)
(w/click (format ".ls-block :text('%s')" (str title-prefix "-" 3)))
(k/shift+arrow-down)
(k/meta+shift+arrow-down)
(k/enter)
(b/indent)))
(validate-2-graphs)
))))