mirror of
https://github.com/logseq/logseq.git
synced 2026-04-24 22:25:01 +00:00
test(e2e): update rtc-task-blocks-test and rtc-property-test
This commit is contained in:
rcmerci
@@ -6,6 +6,7 @@
|
||||
|
||||
(defn goto-page
|
||||
[page-name]
|
||||
(assert (string? page-name) page-name)
|
||||
(util/search-and-click page-name))
|
||||
|
||||
(defn new-page
|
||||
|
||||
@@ -75,7 +75,9 @@
|
||||
|
||||
(defn create-page
|
||||
[]
|
||||
(page/new-page (str "page " (swap! *page-number inc))))
|
||||
(let [page-name (str "page " (swap! *page-number inc))]
|
||||
(page/new-page page-name)
|
||||
page-name))
|
||||
|
||||
(defn new-logseq-page
|
||||
[f]
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
[logseq.e2e.graph :as graph]
|
||||
[logseq.e2e.keyboard :as k]
|
||||
[logseq.e2e.locator :as loc]
|
||||
[logseq.e2e.page :as page]
|
||||
[logseq.e2e.rtc :as rtc]
|
||||
[logseq.e2e.settings :as settings]
|
||||
[logseq.e2e.util :as util]
|
||||
@@ -37,10 +38,48 @@
|
||||
(w/with-page @*page2
|
||||
(graph/remove-remote-graph graph-name))))
|
||||
|
||||
(defn- new-logseq-page
|
||||
"new logseq page and switch to this page on both page1 and page2"
|
||||
[]
|
||||
(let [*page-name (atom nil)
|
||||
{:keys [_local-tx remote-tx]}
|
||||
(w/with-page @*page1
|
||||
(rtc/with-wait-tx-updated
|
||||
(reset! *page-name (fixtures/create-page))))]
|
||||
(w/with-page @*page2
|
||||
(rtc/wait-tx-update-to remote-tx)
|
||||
(page/goto-page @*page-name))))
|
||||
|
||||
(defn- new-logseq-page-fixture
|
||||
[f]
|
||||
(new-logseq-page)
|
||||
(f))
|
||||
|
||||
(use-fixtures :once
|
||||
fixtures/open-2-pages
|
||||
prepare-rtc-graph-fixture)
|
||||
|
||||
(use-fixtures :each
|
||||
new-logseq-page-fixture)
|
||||
|
||||
(defn- with-stop-restart-rtc
|
||||
[pw-page f]
|
||||
(w/with-page pw-page
|
||||
(rtc/rtc-stop))
|
||||
(f)
|
||||
(w/with-page pw-page
|
||||
(rtc/rtc-start)))
|
||||
|
||||
(defn- validate-2-graphs
|
||||
[]
|
||||
(let [[p1-summary p2-summary]
|
||||
(map
|
||||
(fn [p]
|
||||
(w/with-page p
|
||||
(graph/validate-graph)))
|
||||
[@*page1 @*page2])]
|
||||
(assert/assert-graph-summary-equal p1-summary p2-summary)))
|
||||
|
||||
(defn- insert-task-blocks
|
||||
[title-prefix]
|
||||
(doseq [status ["Backlog" "Todo" "Doing" "In review" "Done" "Canceled"]
|
||||
@@ -50,72 +89,84 @@
|
||||
(util/input-command priority)))
|
||||
|
||||
(deftest rtc-task-blocks-test
|
||||
(testing "rtc-stop app1, add some task blocks, then rtc-start on app1"
|
||||
(let [*latest-remote-tx (atom nil)]
|
||||
(w/with-page @*page1
|
||||
(rtc/rtc-stop))
|
||||
(let [insert-task-blocks-in-page2
|
||||
(fn [*latest-remote-tx]
|
||||
(w/with-page @*page2
|
||||
(let [{:keys [_local-tx remote-tx]}
|
||||
(rtc/with-wait-tx-updated
|
||||
(insert-task-blocks "t1"))]
|
||||
(reset! *latest-remote-tx remote-tx))
|
||||
;; TODO: more operations
|
||||
(util/exit-edit)))]
|
||||
(testing "rtc-stop app1, add some task blocks, then rtc-start on app1"
|
||||
(let [*latest-remote-tx (atom nil)]
|
||||
(with-stop-restart-rtc @*page1 #(insert-task-blocks-in-page2 *latest-remote-tx))
|
||||
(w/with-page @*page1
|
||||
(rtc/wait-tx-update-to @*latest-remote-tx))
|
||||
(validate-2-graphs)))
|
||||
|
||||
(w/with-page @*page2
|
||||
(let [{:keys [_local-tx remote-tx]}
|
||||
(rtc/with-wait-tx-updated
|
||||
(insert-task-blocks "t1"))]
|
||||
(reset! *latest-remote-tx remote-tx))
|
||||
;; TODO: more operations
|
||||
(util/exit-edit))
|
||||
(new-logseq-page)
|
||||
|
||||
(w/with-page @*page1
|
||||
(rtc/rtc-start)
|
||||
(rtc/wait-tx-update-to @*latest-remote-tx))
|
||||
(let [[p1-summary p2-summary]
|
||||
(map (fn [p]
|
||||
(w/with-page p
|
||||
(graph/validate-graph)))
|
||||
[@*page1 @*page2])]
|
||||
(assert/assert-graph-summary-equal p1-summary p2-summary)))))
|
||||
(testing "perform same operations on page2 while keeping rtc connected on page1"
|
||||
(let [*latest-remote-tx (atom nil)]
|
||||
(insert-task-blocks-in-page2 *latest-remote-tx)
|
||||
(w/with-page @*page1
|
||||
(rtc/wait-tx-update-to @*latest-remote-tx))
|
||||
(validate-2-graphs)))))
|
||||
|
||||
(defn- add-new-properties
|
||||
[title-prefix]
|
||||
(b/new-blocks (map #(str title-prefix "-" %) ["Text" "Number" "Date" "DateTime" "Checkbox" "Url" "Node"]))
|
||||
(doseq [property-type ["Text" "Number" "Date" "DateTime" "Checkbox" "Url" "Node"]]
|
||||
(w/click (util/get-by-text (str title-prefix "-" property-type) true))
|
||||
(k/press "Control+e")
|
||||
(util/input-command "Add new property")
|
||||
(util/input (str "p-" property-type))
|
||||
(w/click (w/get-by-text "New option:"))
|
||||
(assert/assert-is-visible (w/get-by-text "Select a property type"))
|
||||
(w/click (loc/and "span" (util/get-by-text property-type true)))
|
||||
(case property-type
|
||||
"Text" (util/input "Text")
|
||||
"Number" (do (assert/assert-is-visible (format "input[placeholder='%s']" (str "Set " "p-" property-type)))
|
||||
(util/input "111")
|
||||
(w/click (w/get-by-text "New option:")))
|
||||
("DateTime" "Date") (do
|
||||
(assert/assert-is-visible ".ls-property-dialog")
|
||||
(k/enter)
|
||||
(k/esc))
|
||||
"Checkbox" nil
|
||||
"Url" nil
|
||||
"Node" (do
|
||||
(w/click (w/get-by-text "Skip choosing tag"))
|
||||
(util/input (str title-prefix "-Node-value"))
|
||||
(w/click (w/get-by-text "New option:"))))))
|
||||
(let [property-name (str "p-" title-prefix "-" property-type)]
|
||||
(w/click (util/get-by-text (str title-prefix "-" property-type) true))
|
||||
(k/press "Control+e")
|
||||
(util/input-command "Add new property")
|
||||
(util/input property-name)
|
||||
(w/click (w/get-by-text "New option:"))
|
||||
(assert/assert-is-visible (w/get-by-text "Select a property type"))
|
||||
(w/click (loc/and "span" (util/get-by-text property-type true)))
|
||||
(case property-type
|
||||
"Text" (util/input "Text")
|
||||
"Number" (do (assert/assert-is-visible (format "input[placeholder='%s']" (str "Set " property-name)))
|
||||
(util/input "111")
|
||||
(w/click (w/get-by-text "New option:")))
|
||||
("DateTime" "Date") (do
|
||||
(assert/assert-is-visible ".ls-property-dialog")
|
||||
(k/enter)
|
||||
(k/esc))
|
||||
"Checkbox" nil
|
||||
"Url" nil
|
||||
"Node" (do
|
||||
(w/click (w/get-by-text "Skip choosing tag"))
|
||||
(util/input (str title-prefix "-Node-value"))
|
||||
(w/click (w/get-by-text "New option:")))))))
|
||||
|
||||
(deftest rtc-property-test
|
||||
(let [*latest-remote-tx (atom nil)]
|
||||
(testing "create some user properties with different type, sync to the other client"
|
||||
(w/with-page @*page1
|
||||
(let [{:keys [_local-tx remote-tx]}
|
||||
(rtc/with-wait-tx-updated
|
||||
(add-new-properties "rtc-property-test"))]
|
||||
(reset! *latest-remote-tx remote-tx)))
|
||||
(w/with-page @*page2
|
||||
(rtc/wait-tx-update-to @*latest-remote-tx))
|
||||
(let [[p1-summary p2-summary]
|
||||
(map (fn [p]
|
||||
(w/with-page p
|
||||
(graph/validate-graph)))
|
||||
[@*page1 @*page2])]
|
||||
(assert/assert-graph-summary-equal p1-summary p2-summary)))))
|
||||
(let [insert-new-property-blocks-in-page2
|
||||
(fn [*latest-remote-tx title-prefix]
|
||||
(w/with-page @*page2
|
||||
(let [{:keys [_local-tx remote-tx]}
|
||||
(rtc/with-wait-tx-updated
|
||||
(add-new-properties title-prefix))]
|
||||
(reset! *latest-remote-tx remote-tx))))]
|
||||
(testing "page1: rtc-stop
|
||||
page2: create some user properties with different type
|
||||
page1: rtc-start"
|
||||
(let [*latest-remote-tx (atom nil)]
|
||||
(with-stop-restart-rtc @*page1 #(insert-new-property-blocks-in-page2 *latest-remote-tx "rtc-property-test-1"))
|
||||
(w/with-page @*page1
|
||||
(rtc/wait-tx-update-to @*latest-remote-tx))
|
||||
(validate-2-graphs)))
|
||||
|
||||
(new-logseq-page)
|
||||
|
||||
(testing "perform same operations on page2 while keeping rtc connected on page1"
|
||||
(let [*latest-remote-tx (atom nil)]
|
||||
(insert-new-property-blocks-in-page2 *latest-remote-tx "rtc-property-test-2")
|
||||
(w/with-page @*page1
|
||||
(rtc/wait-tx-update-to @*latest-remote-tx))
|
||||
(validate-2-graphs)))))
|
||||
|
||||
(comment
|
||||
(let [title-prefix "xxxx"
|
||||
|
||||
Reference in New Issue
Block a user