Browse Source

enhance(plugin): e2e tests

charlie 1 year ago
parent
commit
a7c5ae4776
3 changed files with 13 additions and 13 deletions
  1. 2 2
      e2e-tests/logseq-api.spec.ts
  2. 1 1
      e2e-tests/utils.ts
  3. 10 10
      src/main/logseq/api.cljs

+ 2 - 2
e2e-tests/logseq-api.spec.ts

@@ -8,8 +8,8 @@ test('block related apis',
 
     const bPageName = 'block-test-page'
     await callAPI('create_page', bPageName, null, { createFirstBlock: false })
-
-    await page.waitForSelector(`span[data-ref="${bPageName}"]`)
+    await callAPI('create_page', bPageName, null, { createFirstBlock: false })
+    await page.waitForSelector(`body[data-page="${bPageName}"]`)
 
     let p = await callAPI('get_current_page')
     const bp = await callAPI('append_block_in_page', bPageName, 'tests')

+ 1 - 1
e2e-tests/utils.ts

@@ -141,7 +141,7 @@ export async function loadLocalGraph(page: Page, path: string): Promise<void> {
     }
 
     await page.click('#left-sidebar .repo-switch');
-    await page.waitForSelector('#left-sidebar .dropdown-wrapper >> text="Add new graph"',
+    await page.waitForSelector('.cp__repos-quick-actions >> text="Add new graph"',
       { state: 'visible', timeout: 5000 })
     await page.click('text=Add new graph')
 

+ 10 - 10
src/main/logseq/api.cljs

@@ -927,17 +927,17 @@
   (fn [block-uuid key]
     (p/let [block-uuid (sdk-utils/uuid-or-throw-error block-uuid)
             _ (db-async/<get-block (state/get-current-repo) block-uuid :children? false)]
-      (when-let [block (db-model/get-block-by-uuid block-uuid)]
-        (let [properties (:block/properties block)
-              key (sanitize-user-property-name key)
-              property-name (-> (if (keyword? key) (name key) key) (util/safe-lower-case))
-              property-value (or (get properties key)
-                                 (get properties property-name)
+      (when-let [properties (some-> block-uuid (db-model/get-block-by-uuid) (:block/properties))]
+        (when (seq properties)
+          (let [key (sanitize-user-property-name key)
+                property-name (-> (if (keyword? key) (name key) key) (util/safe-lower-case))
+                property-value (or (get properties key)
+                                 (get properties (keyword property-name))
                                  (get properties (get-db-ident-for-property-name property-name)))
-              property-value (if-let [property-id (:db/id property-value)]
-                               (db/pull property-id) property-value)
-              ret (sdk-utils/normalize-keyword-for-json property-value)]
-          (bean/->js ret))))))
+                property-value (if-let [property-id (:db/id property-value)]
+                                 (db/pull property-id) property-value)
+                ret (sdk-utils/normalize-keyword-for-json property-value)]
+            (bean/->js ret)))))))
 
 (def ^:export get_block_properties
   (fn [block-uuid]