From 39bcff5c21f25d517d676ff3490aabea9cf814ca Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Tue, 28 Jul 2020 11:35:14 +0300 Subject: [PATCH] Fix tests --- lib/plausible/billing/billing.ex | 3 +-- lib/plausible/stats/clickhouse.ex | 12 ++++++++- .../api/stats_controller/main_graph_test.exs | 4 +-- .../api/stats_controller/pages_test.exs | 5 ++-- .../api/stats_controller/referrers_test.exs | 7 ++--- test/support/clickhouse_setup.ex | 27 +++++++++++++++++++ test/support/google_api_mock.ex | 2 +- 7 files changed, 49 insertions(+), 11 deletions(-) diff --git a/lib/plausible/billing/billing.ex b/lib/plausible/billing/billing.ex index a5214bf18..96201db31 100644 --- a/lib/plausible/billing/billing.ex +++ b/lib/plausible/billing/billing.ex @@ -125,8 +125,7 @@ defmodule Plausible.Billing do defp site_usage(site) do q = Plausible.Stats.Query.from(site.timezone, %{"period" => "30d"}) - {pageviews, _} = Plausible.Stats.Clickhouse.pageviews_and_visitors(site, q) - pageviews + Plausible.Stats.Clickhouse.total_events(site, q) end defp format_subscription(params) do diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.ex index 05fff168c..282826898 100644 --- a/lib/plausible/stats/clickhouse.ex +++ b/lib/plausible/stats/clickhouse.ex @@ -164,6 +164,16 @@ defmodule Plausible.Stats.Clickhouse do res["pageviews"] end + def total_events(site, query) do + [res] = + Clickhouse.all( + from e in base_query(site, query), + select: fragment("count(*) as events") + ) + + res["events"] + end + def pageviews_and_visitors(site, query) do [res] = Clickhouse.all( @@ -672,7 +682,7 @@ defmodule Plausible.Stats.Clickhouse do if goal_event do from(e in q, where: e.name == ^goal_event) else - q + from(e in q, where: e.name == "pageview") end end diff --git a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs index 72467e0d0..226326a25 100644 --- a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs @@ -83,14 +83,14 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest do conn = get(conn, "/api/stats/#{site.domain}/main-graph?period=day&date=2019-01-01") res = json_response(conn, 200) - assert %{"name" => "Unique visitors", "count" => 6, "change" => 100} in res["top_stats"] + assert %{"name" => "Unique visitors", "count" => 3, "change" => 100} in res["top_stats"] end test "counts total pageviews", %{conn: conn, site: site} do conn = get(conn, "/api/stats/#{site.domain}/main-graph?period=day&date=2019-01-01") res = json_response(conn, 200) - assert %{"name" => "Total pageviews", "count" => 6, "change" => 100} in res["top_stats"] + assert %{"name" => "Total pageviews", "count" => 3, "change" => 100} in res["top_stats"] end test "calculates bounce rate", %{conn: conn, site: site} do 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 73a178934..7e1ce01d5 100644 --- a/test/plausible_web/controllers/api/stats_controller/pages_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/pages_test.exs @@ -5,7 +5,7 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do describe "GET /api/stats/:domain/pages" do setup [:create_user, :log_in, :create_site] - test "returns top pages sources by pageviews", %{conn: conn, site: site} do + test "returns top pages by pageviews", %{conn: conn, site: site} do conn = get(conn, "/api/stats/#{site.domain}/pages?period=day&date=2019-01-01") assert json_response(conn, 200) == [ @@ -50,7 +50,8 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do conn = get(conn, "/api/stats/#{site.domain}/pages?period=realtime") assert json_response(conn, 200) == [ - %{"count" => 3, "name" => "/"} + %{"count" => 2, "name" => "/exit"}, + %{"count" => 1, "name" => "/"} ] end end diff --git a/test/plausible_web/controllers/api/stats_controller/referrers_test.exs b/test/plausible_web/controllers/api/stats_controller/referrers_test.exs index ec22f17df..ffbe476cd 100644 --- a/test/plausible_web/controllers/api/stats_controller/referrers_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/referrers_test.exs @@ -44,7 +44,7 @@ defmodule PlausibleWeb.Api.StatsController.ReferrersTest do assert json_response(conn, 200) == [ %{"name" => "10words", "count" => 2, "url" => "10words.com"}, - %{"name" => "Bing", "count" => 1, "url" => ""} + %{"name" => "Bing", "count" => 1, "url" => "bing.com"} ] end end @@ -90,7 +90,7 @@ defmodule PlausibleWeb.Api.StatsController.ReferrersTest do assert json_response(conn, 200) == %{ "total_visitors" => 2, "referrers" => [ - %{"name" => "10words.com/page1", "count" => 2} + %{"name" => "10words.com/page1", "url" => "10words.com" ,"count" => 2} ] } end @@ -107,6 +107,7 @@ defmodule PlausibleWeb.Api.StatsController.ReferrersTest do "referrers" => [ %{ "name" => "10words.com/page1", + "url" => "10words.com", "count" => 2, "bounce_rate" => 50.0, "visit_duration" => 50.0 @@ -118,7 +119,7 @@ defmodule PlausibleWeb.Api.StatsController.ReferrersTest do test "gets keywords from Google", %{conn: conn, user: user, site: site} do insert(:google_auth, user: user, user: user, site: site, property: "sc-domain:example.com") conn = get(conn, "/api/stats/#{site.domain}/referrers/Google?period=day&date=2019-02-01") - {:ok, terms} = Plausible.Google.Api.Mock.fetch_stats(nil, nil) + {:ok, terms} = Plausible.Google.Api.Mock.fetch_stats(nil, nil, nil) assert json_response(conn, 200) == %{ "total_visitors" => 2, diff --git a/test/support/clickhouse_setup.ex b/test/support/clickhouse_setup.ex index b591186d2..ff6d0e593 100644 --- a/test/support/clickhouse_setup.ex +++ b/test/support/clickhouse_setup.ex @@ -287,6 +287,33 @@ defmodule Plausible.Test.ClickhouseSetup do referrer_source: "Twitter", start: ~N[2019-03-01 02:00:00], timestamp: ~N[2019-03-01 02:00:00] + }, + %{ + domain: "test-site.com", + entry_page: "/", + exit_page: "/", + referrer_source: "Bing", + referrer: "bing.com", + start: Timex.now() |> Timex.shift(minutes: -1), + timestamp: Timex.now() |> Timex.shift(minutes: -1) + }, + %{ + domain: "test-site.com", + entry_page: "/", + exit_page: "/exit", + referrer_source: "10words", + referrer: "10words.com", + start: Timex.now() |> Timex.shift(minutes: -2), + timestamp: Timex.now() |> Timex.shift(minutes: -2) + }, + %{ + domain: "test-site.com", + entry_page: "/", + exit_page: "/exit", + referrer_source: "10words", + referrer: "10words.com", + start: Timex.now() |> Timex.shift(minutes: -3), + timestamp: Timex.now() |> Timex.shift(minutes: -3) } ]) end diff --git a/test/support/google_api_mock.ex b/test/support/google_api_mock.ex index 2e4e922f8..5aa33a718 100644 --- a/test/support/google_api_mock.ex +++ b/test/support/google_api_mock.ex @@ -1,5 +1,5 @@ defmodule Plausible.Google.Api.Mock do - def fetch_stats(_auth, _query) do + def fetch_stats(_auth, _query, _limit) do {:ok, [ %{"name" => "simple web analytics", "count" => 6},