Skip to content

Commit 9651d5c

Browse files
ArielA147ArielA147
committed
solve conflict
1 parent 78c4a32 commit 9651d5c

File tree

1 file changed

+64
-52
lines changed

1 file changed

+64
-52
lines changed

‎test/clojurians_log/slack_msg_test.clj

+64-52
Original file line numberDiff line numberDiff line change
@@ -8,57 +8,69 @@
88
(is (= [] (queries/filter-channel-day-messages [{:message/ts "1512384953.000000"
99
:message/thread-ts "1512384953.000000"}]))))
1010
(testing "thread parents should be retained"
11-
(is (= #:message{:ts "1014090027.000404"
12-
:inst #time/instant "2002-02-19T03:40:27.000404Z"}
13-
(first(queries/filter-channel-day-messages [{:message/ts "1014090027.000404"}])))))
11+
(is (= {:message/ts "1014090027.000404"
12+
:message/inst #time/instant "2002-02-19T03:40:27.000404Z"}
13+
(first (queries/filter-channel-day-messages [{:message/ts "1014090027.000404"}])))))
14+
1415
(testing "broadcast messages should be retained"
15-
(is (=
16-
#:message{:ts "1518095027.000404"
17-
:thread-ts "1518040988.000079"
18-
:thread-broadcast? true
19-
:top-level? true
20-
:inst #time/instant "2018-02-08T13:03:47.000404Z"}
21-
(first (queries/filter-channel-day-messages [{:message/ts "1518095027.000404"
22-
:message/thread-ts "1518040988.000079"
23-
:message/thread-broadcast? true}
24-
{:message/ts "1014090027.000404"
25-
:message/thread-ts "1010040908.000079"}])))))
16+
(is (= {:message/ts "1518095027.000404"
17+
:message/thread-ts "1518040988.000079"
18+
:message/thread-broadcast? true
19+
:message/top-level? true
20+
:message/inst #time/instant "2018-02-08T13:03:47.000404Z"}
21+
(first (queries/filter-channel-day-messages [{:message/ts "1518095027.000404"
22+
:message/thread-ts "1518040988.000079"
23+
:message/thread-broadcast? true}
24+
{:message/ts "1014090027.000404"
25+
:message/thread-ts "1010040908.000079"}])))))
26+
2627
(testing "should be sorted by timestamp"
27-
(is (=
28-
{#:messages{:ts "1512389691.000900"
29-
:inst #time/instant "2017-12-04T12:14:51.000900Z"}
30-
#:messages{:ts "1512394953.120000"
31-
:inst #time/instant "2017-12-04T13:42:33.120Z"}
32-
#:messages{:ts "1518384553.060000"
33-
:inst #time/instant "2018-02-11T21:29:13.060Z"}
34-
#:messages{:ts "1518989553.060000"
35-
:inst #time/instant "2018-02-18T21:32:33.060Z"}}
36-
(queries/filter-channel-day-messages [{:message/ts "1518989553.060000"}
37-
{:message/ts "1512394953.120000"}
38-
{:message/ts "1512389691.000900"}
39-
{:message/ts "1518384553.060000"}])))))
40-
(testing "should get the message/inst added to the messages"
41-
(is (= {#:messages {:ts "1014090027.000404"
42-
:inst #time/instant "2002-02-19T03:40:27.000404Z"}
43-
#:messages {:ts "1518384553.060000"
44-
:thread-broadcast? true
45-
:top-level true
46-
:inst #time/instant "2018-02-11T21:29:13.060Z"}}
47-
(queries/filter-channel-day-messages [{:message/ts "1014090027.000404"}
48-
{:message/ts "1218384553.060000"
49-
:message/thread-broadcast? true}]))))
50-
(testing "top-level messages should get marked as :message/top-level?"
51-
(is (= {#:message{:ts "1014090027.000404"
52-
:thread-broadcast? true
53-
:top-level? true
54-
:inst #time/instant "2002-02-19T03:40:27.000404Z"}
55-
#:message{:ts "1518008583.000370"
56-
:thread-ts 1517995093.000487
57-
:thread-broadcast? true
58-
:top-level? true
59-
:inst #time/instant "2018-02-07T13:03:03.000370Z"}}
60-
(queries/filter-channel-day-messages [{:message/ts "1014090027.000404"
61-
:message/thread-broadcast? true}
62-
{:message/ts "1518008583.000370"
63-
:message/thread-ts "1517995093.000487"
64-
:message/thread-broadcast? true}]))))
28+
(is (= [{:message/ts "1512389691.000900"
29+
:message/inst #time/instant "2017-12-04T12:14:51.000900Z"}
30+
{:message/ts "1512394953.120000"
31+
:message/inst #time/instant "2017-12-04T13:42:33.120Z"}
32+
{:message/ts "1518384553.060000"
33+
:message/inst #time/instant "2018-02-11T21:29:13.060Z"}
34+
{:message/ts "1518989553.060000"
35+
:message/inst #time/instant "2018-02-18T21:32:33.060Z"}]
36+
(vec (queries/filter-channel-day-messages [{:message/ts "1518989553.060000"}
37+
{:message/ts "1512394953.120000"}
38+
{:message/ts "1512389691.000900"}
39+
{:message/ts "1518384553.060000"}])))))
40+
41+
(testing "should get the message/inst added to the messages"
42+
(is (= [{:message/ts "1512394953.120000"
43+
:message/thread-ts "1512389691.000900",
44+
:message/thread-broadcast? true,
45+
:message/top-level? true,
46+
:message/inst #time/instant "2017-12-04T13:42:33.120Z"}
47+
{:message/ts "1518989553.060000"
48+
:message/inst #time/instant "2018-02-18T21:32:33.060Z"}]
49+
(vec (queries/filter-channel-day-messages [{:message/ts "1518989553.060000"}
50+
{:message/ts "1512394953.120000"
51+
:message/thread-ts "1512389691.000900"
52+
:message/thread-broadcast? true}])))))
53+
54+
(testing "top-level messages should get marked as :message/top-level?"
55+
(is (= [{:message/ts "1512389691.000900"
56+
:message/thread-ts "1512388691.000900"
57+
:message/thread-broadcast? true
58+
:message/top-level? true
59+
:message/inst #time/instant "2017-12-04T12:14:51.000900Z"}
60+
{:message/ts "1512394953.120000"
61+
:message/inst #time/instant "2017-12-04T13:42:33.120Z"}
62+
{:message/ts "1518989553.060000"
63+
:message/thread-broadcast? true
64+
:message/top-level? true
65+
:message/inst #time/instant "2018-02-18T21:32:33.060Z"}]
66+
(vec (queries/filter-channel-day-messages [{:message/ts "1518989553.060000"
67+
:message/thread-broadcast? true}
68+
{:message/ts "1512394953.120000"}
69+
{:message/ts "1512389691.000900"
70+
:message/thread-ts "1512388691.000900"
71+
:message/thread-broadcast? true}]))))))
72+
73+
(comment
74+
(require '[kaocha.repl :as k])
75+
(k/run)
76+
)

0 commit comments

Comments
 (0)