diff --git a/test/plausible/ingestion/event_test.exs b/test/plausible/ingestion/event_test.exs deleted file mode 100644 index 4e3d6c007..000000000 --- a/test/plausible/ingestion/event_test.exs +++ /dev/null @@ -1,74 +0,0 @@ -defmodule Plausible.Ingestion.EventTest do - use Plausible.DataCase - - def get_event(domain) do - Plausible.TestUtils.eventually(fn -> - Plausible.Event.WriteBuffer.flush() - - event = - Plausible.ClickhouseRepo.one( - from e in Plausible.ClickhouseEvent, where: e.domain == ^domain - ) - - {!is_nil(event), event} - end) - end - - @valid_request %Plausible.Ingestion.Request{ - remote_ip: "2.2.2.2", - user_agent: - "Mozilla/5.0 (iPad; U; CPU OS 3_2_1 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Mobile/7B405", - event_name: "pageview", - uri: URI.parse("http://skywalker.test"), - referrer: "http://m.facebook.test/", - screen_width: 1440, - hash_mode: nil, - query_params: %{ - "utm_medium" => "utm_medium", - "utm_source" => "utm_source", - "utm_campaign" => "utm_campaign", - "utm_content" => "utm_content", - "utm_term" => "utm_term", - "source" => "source", - "ref" => "ref" - } - } - - test "build_and_buffer/3 creates an event" do - assert :ok == - @valid_request - |> Map.put(:domain, "plausible-ingestion-event-basic.test") - |> Plausible.Ingestion.Event.build_and_buffer() - - assert %Plausible.ClickhouseEvent{ - session_id: session_id, - user_id: user_id, - domain: "plausible-ingestion-event-basic.test", - browser: "Safari", - browser_version: "", - city_geoname_id: 2_988_507, - country_code: "FR", - hostname: "skywalker.test", - "meta.key": [], - "meta.value": [], - name: "pageview", - operating_system: "iOS", - operating_system_version: "3.2", - pathname: "/", - referrer: "m.facebook.test", - referrer_source: "utm_source", - screen_size: "Desktop", - subdivision1_code: "FR-IDF", - subdivision2_code: "FR-75", - transferred_from: "", - utm_campaign: "utm_campaign", - utm_content: "utm_content", - utm_medium: "utm_medium", - utm_source: "utm_source", - utm_term: "utm_term" - } = get_event("plausible-ingestion-event-basic.test") - - assert is_integer(session_id) - assert is_integer(user_id) - end -end diff --git a/test/plausible/session/cache_store_test.exs b/test/plausible/session/cache_store_test.exs deleted file mode 100644 index 6f14c5206..000000000 --- a/test/plausible/session/cache_store_test.exs +++ /dev/null @@ -1,124 +0,0 @@ -defmodule Plausible.Session.CacheStoreTest do - use Plausible.DataCase - import Double - alias Plausible.Session.{CacheStore, WriteBuffer} - - setup do - buffer = - WriteBuffer - |> stub(:insert, fn _sessions -> nil end) - - [buffer: buffer] - end - - test "creates a session from an event", %{buffer: buffer} do - event = - build(:event, - name: "pageview", - referrer: "ref", - referrer_source: "refsource", - utm_medium: "medium", - utm_source: "source", - utm_campaign: "campaign", - utm_content: "content", - utm_term: "term", - browser: "browser", - browser_version: "55", - country_code: "EE", - screen_size: "Desktop", - operating_system: "Mac", - operating_system_version: "11", - "meta.key": ["logged_in", "darkmode"], - "meta.value": ["true", "false"] - ) - - CacheStore.on_event(event, nil, buffer) - - assert_receive({WriteBuffer, :insert, [sessions]}) - assert [session] = sessions - assert session.hostname == event.hostname - assert session.domain == event.domain - assert session.user_id == event.user_id - assert session.entry_page == event.pathname - assert session.exit_page == event.pathname - assert session.is_bounce == true - assert session.duration == 0 - assert session.pageviews == 1 - assert session.events == 1 - assert session.referrer == event.referrer - assert session.referrer_source == event.referrer_source - assert session.utm_medium == event.utm_medium - assert session.utm_source == event.utm_source - assert session.utm_campaign == event.utm_campaign - assert session.utm_content == event.utm_content - assert session.utm_term == event.utm_term - assert session.country_code == event.country_code - assert session.screen_size == event.screen_size - assert session.operating_system == event.operating_system - assert session.operating_system_version == event.operating_system_version - assert session.browser == event.browser - assert session.browser_version == event.browser_version - assert session.timestamp == event.timestamp - assert session.start === event.timestamp - # assert Map.get(session, :"entry.meta.key") == ["logged_in", "darkmode"] - # assert Map.get(session, :"entry.meta.value") == ["true", "false"] - end - - test "updates a session", %{buffer: buffer} do - timestamp = Timex.now() - event1 = build(:event, name: "pageview", timestamp: timestamp |> Timex.shift(seconds: -10)) - - event2 = - build(:event, - domain: event1.domain, - user_id: event1.user_id, - name: "pageview", - timestamp: timestamp, - country_code: "US", - subdivision1_code: "SUB1", - subdivision2_code: "SUB2", - city_geoname_id: 12312, - screen_size: "Desktop", - operating_system: "Mac", - operating_system_version: "11", - browser: "Firefox", - browser_version: "10" - ) - - CacheStore.on_event(event1, nil, buffer) - CacheStore.on_event(event2, nil, buffer) - assert_receive({WriteBuffer, :insert, [[session, _negative_record]]}) - assert session.is_bounce == false - assert session.duration == 10 - assert session.pageviews == 2 - assert session.events == 2 - assert session.country_code == "US" - assert session.subdivision1_code == "SUB1" - assert session.subdivision2_code == "SUB2" - assert session.city_geoname_id == 12312 - assert session.operating_system == "Mac" - assert session.operating_system_version == "11" - assert session.browser == "Firefox" - assert session.browser_version == "10" - assert session.screen_size == "Desktop" - end - - test "calculates duration correctly for out-of-order events", %{buffer: buffer} do - timestamp = Timex.now() - event1 = build(:event, name: "pageview", timestamp: timestamp |> Timex.shift(seconds: 10)) - - event2 = - build(:event, - domain: event1.domain, - user_id: event1.user_id, - name: "pageview", - timestamp: timestamp - ) - - CacheStore.on_event(event1, nil, buffer) - CacheStore.on_event(event2, nil, buffer) - - assert_receive({WriteBuffer, :insert, [[session, _negative_record]]}) - assert session.duration == 10 - end -end diff --git a/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs b/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs index 984eada41..558074065 100644 --- a/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs +++ b/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs @@ -186,12 +186,15 @@ defmodule PlausibleWeb.Api.ExternalStatsController.AggregateTest do domain: site.domain, timestamp: ~N[2021-01-01 00:00:00] ), + build(:pageview, domain: site.domain, timestamp: ~N[2021-03-01 00:00:00]) + ]) + + populate_stats([ build(:pageview, user_id: @user_id, domain: site.domain, timestamp: ~N[2021-02-01 00:25:00] - ), - build(:pageview, domain: site.domain, timestamp: ~N[2021-03-01 00:00:00]) + ) ]) conn = diff --git a/test/plausible_web/controllers/api/stats_controller/pages_test.exs b/test/plausible_web/controllers/api/stats_controller/pages_test.exs index 8d4eef0d0..ebddd7fb5 100644 --- a/test/plausible_web/controllers/api/stats_controller/pages_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/pages_test.exs @@ -627,6 +627,14 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do end test "returns top entry pages by visitors with imported data", %{conn: conn, site: site} do + populate_stats(site, [ + build(:pageview, + pathname: "/page2", + user_id: @user_id, + timestamp: ~N[2021-01-01 23:15:00] + ) + ]) + populate_stats(site, [ build(:pageview, pathname: "/page1", @@ -645,11 +653,6 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do pathname: "/page2", user_id: @user_id, timestamp: ~N[2021-01-01 00:15:00] - ), - build(:pageview, - pathname: "/page2", - user_id: @user_id, - timestamp: ~N[2021-01-01 23:15:00] ) ])