From 641e3f636cb326c651245ee391aacc0c7f9bf5cd Mon Sep 17 00:00:00 2001 From: Adam Rutkowski Date: Tue, 5 Mar 2024 11:24:51 +0100 Subject: [PATCH] wip --- lib/plausible/timezones.ex | 2 +- test/support/journey.ex | 5 +- test/support/test_utils.ex | 2 + test/workers/accept_traffic_until_test.exs | 53 ++++++++++++++-------- 4 files changed, 42 insertions(+), 20 deletions(-) diff --git a/lib/plausible/timezones.ex b/lib/plausible/timezones.ex index 9aa030e3d..af3fe4600 100644 --- a/lib/plausible/timezones.ex +++ b/lib/plausible/timezones.ex @@ -7,7 +7,7 @@ defmodule Plausible.Timezones do end @spec to_utc_datetime(NaiveDateTime.t(), String.t()) :: DateTime.t() - def to_utc_datetime(naive_date_time, timezone) do + def to_utc_datetime(naive_date_time, timezone \\ "UTC") do case Timex.to_datetime(naive_date_time, timezone) do %DateTime{} = tz_dt -> Timex.Timezone.convert(tz_dt, "UTC") diff --git a/test/support/journey.ex b/test/support/journey.ex index 9e33c2c9d..5ce3b851c 100644 --- a/test/support/journey.ex +++ b/test/support/journey.ex @@ -111,7 +111,10 @@ defmodule Plausible.Test.Support.Journey do end defp ingest(conn, state, idle) do - now = invoke_if_function(state.now) + now = + state.now + |> invoke_if_function() + |> Plausible.Timezones.to_utc_datetime() idle_offset = case idle do diff --git a/test/support/test_utils.ex b/test/support/test_utils.ex index a6aadb7cb..987992d9e 100644 --- a/test/support/test_utils.ex +++ b/test/support/test_utils.ex @@ -2,6 +2,8 @@ defmodule Plausible.TestUtils do use Plausible.Repo alias Plausible.Factory + require Logger + defmacro __using__(_) do quote do require Plausible.TestUtils diff --git a/test/workers/accept_traffic_until_test.exs b/test/workers/accept_traffic_until_test.exs index af76df44b..14d3863a6 100644 --- a/test/workers/accept_traffic_until_test.exs +++ b/test/workers/accept_traffic_until_test.exs @@ -26,14 +26,16 @@ defmodule Plausible.Workers.AcceptTrafficUntilTest do end test "does not send any notifications when site has stats older than 2d" do - today = Date.utc_today() - next_week = today |> Date.add(+7) + today = NaiveDateTime.utc_now() + next_week = today |> NaiveDateTime.add(+7, :day) user = insert(:user, accept_traffic_until: next_week) :site |> insert(members: [user]) - |> populate_stats([build(:pageview, timestamp: Date.add(today, -3))]) + |> journey now: NaiveDateTime.add(today, -3, :day) do + pageview "/" + end {:ok, 1} = AcceptTrafficUntil.perform(nil) @@ -41,15 +43,17 @@ defmodule Plausible.Workers.AcceptTrafficUntilTest do end test "does send notification when last stat is 2d old" do - today = Date.utc_today() - next_week = today |> Date.add(+7) + today = NaiveDateTime.utc_now() + next_week = today |> NaiveDateTime.add(+7, :day) user = insert(:user, accept_traffic_until: next_week) :site |> insert(members: [user]) - |> populate_stats([build(:pageview, timestamp: Date.add(today, -2))]) + |> journey now: NaiveDateTime.add(today, -2, :day) do + pageview "/" + end {:ok, 1} = AcceptTrafficUntil.perform(nil) @@ -60,7 +64,11 @@ defmodule Plausible.Workers.AcceptTrafficUntilTest do tomorrow = Date.utc_today() |> Date.add(+1) user = insert(:user, accept_traffic_until: tomorrow) - :site |> insert(members: [user]) |> populate_stats([build(:pageview)]) + :site + |> insert(members: [user]) + |> journey do + pageview "/" + end {:ok, 1} = AcceptTrafficUntil.perform(nil) assert_final_notification(user.email) @@ -70,7 +78,7 @@ defmodule Plausible.Workers.AcceptTrafficUntilTest do next_week = Date.utc_today() |> Date.add(+7) user = insert(:user, accept_traffic_until: next_week) - :site |> insert(members: [user]) |> populate_stats([build(:pageview)]) + :site |> insert(members: [user]) |> journey(do: pageview("/")) {:ok, 1} = AcceptTrafficUntil.perform(nil) assert_weekly_notification(user.email) @@ -87,10 +95,10 @@ defmodule Plausible.Workers.AcceptTrafficUntilTest do user3 = insert(:user, accept_traffic_until: in_8_days, email: "nope@example.com") user4 = insert(:user, accept_traffic_until: today, email: "nope2@example.com") - :site |> insert(members: [user1]) |> populate_stats([build(:pageview)]) - :site |> insert(members: [user2]) |> populate_stats([build(:pageview)]) - :site |> insert(members: [user3]) |> populate_stats([build(:pageview)]) - :site |> insert(members: [user4]) |> populate_stats([build(:pageview)]) + :site |> insert(members: [user1]) |> journey(do: pageview("/")) + :site |> insert(members: [user2]) |> journey(do: pageview("/")) + :site |> insert(members: [user3]) |> journey(do: pageview("/")) + :site |> insert(members: [user4]) |> journey(do: pageview("/")) {:ok, 2} = AcceptTrafficUntil.perform(nil) assert_weekly_notification(user1.email) @@ -105,12 +113,21 @@ defmodule Plausible.Workers.AcceptTrafficUntilTest do user = insert(:user, email: email) |> Plausible.Auth.User.start_trial() |> Repo.update!() site = insert(:site, members: [user]) - populate_stats(site, [ - build(:pageview, timestamp: today), - build(:pageview, timestamp: Date.add(user.trial_expiry_date, 7)), - build(:pageview, timestamp: Date.add(user.trial_expiry_date, 8)), - build(:pageview, timestamp: Date.add(user.trial_expiry_date, 13)) - ]) + journey site do + pageview "/" + end + + journey site, now: Date.add(user.trial_expiry_date, 7) do + pageview "/" + end + + journey site, now: Date.add(user.trial_expiry_date, 8) do + pageview "/" + end + + journey site, now: Date.add(user.trial_expiry_date, 13) do + pageview "/" + end # today's worker is no-op {:ok, 0} = AcceptTrafficUntil.perform(nil, today)