Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Fix flaky event / session insert test (#6622)

Artur Pata7791792301dd
diff --git a/test/plausible_web/controllers/api/external_controller_test.exs b/test/plausible_web/controllers/api/external_controller_test.exs
index d5726c5d15..49c5aac6cc 100644
--- a/test/plausible_web/controllers/api/external_controller_test.exs
+++ b/test/plausible_web/controllers/api/external_controller_test.exs
@@ -1278,7 +1278,7 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
}
end
- test "salts rotating once does not", %{conn: conn, site: site} do
+ test "salts rotating once keeps the same session", %{conn: conn, site: site} do
post(conn, "/api/event", %{n: "pageview", u: "https://test.com", d: site.domain})
Plausible.Session.WriteBuffer.flush()
Plausible.Session.Salts.rotate()
@@ -1286,9 +1286,11 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
post(conn, "/api/event", %{n: "pageview", u: "https://test.com", d: site.domain})
[event1, event2] = get_events(site)
- [session1, session2] = get_sessions(site)
+ [session] = get_sessions_final(site)
- records = [event1, event2, session1, session2]
+ assert session.pageviews == 2
+
+ records = [event1, event2, session]
assert records |> Enum.map(& &1.user_id) |> Enum.uniq() |> Enum.count() == 1
assert records |> Enum.map(& &1.session_id) |> Enum.uniq() |> Enum.count() == 1
@@ -2581,6 +2583,18 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
)
end
+ defp get_sessions_final(site) do
+ Plausible.Session.WriteBuffer.flush()
+
+ ClickhouseRepo.all(
+ from(s in Plausible.ClickhouseSessionV2,
+ hints: "FINAL",
+ where: s.site_id == ^site.id,
+ order_by: [desc: s.timestamp]
+ )
+ )
+ end
+
defp get_sessions(site) do
Plausible.Session.WriteBuffer.flush()