fixup! WIP

Author: cammellos

Makefile

@@ -266,7 +266,9 @@ lint-fix: ##@test Run code style checks and fix issues
 
 test: export TARGET := clojure
 test: ##@test Run tests once in NodeJS
-	echo 0
+	yarn shadow-cljs compile mocks && \
+	yarn shadow-cljs compile test && \
+	node --require ./test-resources/override.js target/test/test.js
 
 coverage: ##@test Run tests once in NodeJS generating coverage
 	@scripts/run-coverage.sh

src/status_im/chat/db_test.cljs

@@ -41,18 +41,6 @@
       (is (= {:type :datemark
               :value "Dec 31, 1999"} d2)))))
 
-(deftest active-chats-test
-  (with-redefs [gfycat/generate-gfy (constantly "generated")
-                identicon/identicon (constantly "generated")]
-    (let [active-chat-1 {:is-active true :chat-id "1"}
-          active-chat-2 {:is-active true :chat-id "2"}
-          chats         {"1" active-chat-1
-                         "2" active-chat-2
-                         "3" {:is-active false :chat-id "3"}}]
-      (testing "it returns only chats with is-active"
-        (is (= #{"1" "2"}
-               (set (keys (db/active-chats {} chats {})))))))))
-
 (deftest add-gaps
   (testing "empty state"
     (is (empty?

src/status_im/chat/models/message.cljs

@@ -28,7 +28,7 @@
 
 (fx/defn rebuild-message-list
   [{:keys [db]} chat-id]
-  {:db (assoc-in db [:chats chat-id :message-list]
+  {:db (assoc-in db [:message-lists chat-id]
                  (message-list/add-many nil (vals (get-in db [:messages chat-id]))))})
 
 (fx/defn hidden-message-marked-as-seen

src/status_im/chat/models/message_test.cljs

@@ -270,6 +270,8 @@
       (testing "Deleting message deletes it along with all references"
         (is (= '(0)
                (keys (get-in fx1 [:db :messages "chat-id"]))))
+        (do
+          (println fx1))
         (is (= [{:one-to-one? false
                  :message-id 0
                  :whisper-timestamp 0
@@ -290,6 +292,6 @@
                (models.message-list/->seq
                 (get-in fx1 [:db :message-lists "chat-id"]))))
         (is (= {}
-               (get-in fx2 [:db :message-lists "chat-id"])))
+               (get-in fx2 [:db :messages "chat-id"])))
         (is (= nil
                (get-in fx2 [:db :message-lists "chat-id"])))))))

src/status_im/data_store/chats_test.cljs

@@ -5,7 +5,6 @@
 (deftest ->to-rpc
   (let [chat {:public? false
               :group-chat true
-              :message-list []
               :color "color"
               :contacts #{"a" "b" "c" "d"}
               :last-clock-value 10
@@ -15,11 +14,9 @@
               :membership-update-events :events
               :unviewed-messages-count 2
               :is-active true
-              :pagination-info {}
               :chat-id "chat-id"
               :loaded-unviewed-messages-ids []
-              :timestamp 2
-              :messages-initialized? true}
+              :timestamp 2}
         expected-chat {:id "chat-id"
                        :color "color"
                        :name "name"
@@ -71,6 +68,7 @@
         expected-chat {:public? false
                        :group-chat true
                        :color "color"
+                       :chat-name "name"
                        :contacts #{"a" "b" "c" "d"}
                        :last-clock-value 10
                        :last-message nil