From 6af6538a0101b59ef3676ef0db20a6f8012c2c0e Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 17 Jun 2020 11:18:23 +0300 Subject: [PATCH] Fix tests --- lib/plausible/stats/clickhouse.ex | 2 +- .../api/stats_controller/main_graph_test.exs | 2 +- .../controllers/api/stats_controller/pages_test.exs | 2 +- .../api/stats_controller/referrers_test.exs | 2 +- test/support/clickhouse_setup.ex | 11 ++++++++++- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.ex index 62b9cf8fd..fd5c1e443 100644 --- a/lib/plausible/stats/clickhouse.ex +++ b/lib/plausible/stats/clickhouse.ex @@ -568,7 +568,7 @@ defmodule Plausible.Stats.Clickhouse do defp base_session_query(site, query) do {first_datetime, last_datetime} = date_range_utc_boundaries(query.date_range, site.timezone) - q = from(s in "sessions", + from(s in "sessions", where: s.domain == ^site.domain, where: s.start >= ^first_datetime and s.start < ^last_datetime ) 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 2a7dfcb86..ddbd4f7bd 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 @@ -88,7 +88,7 @@ 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" => "Bounce rate", "percentage" => 50.0, "change" => nil} in res["top_stats"] + assert %{"name" => "Bounce rate", "percentage" => 33.0, "change" => nil} in res["top_stats"] end end 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 5cb918505..5495f5df7 100644 --- a/test/plausible_web/controllers/api/stats_controller/pages_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/pages_test.exs @@ -24,7 +24,7 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do ) assert json_response(conn, 200) == [ - %{"count" => 2, "name" => "/", "bounce_rate" => 50.0}, + %{"count" => 2, "name" => "/", "bounce_rate" => 33.0}, %{"bounce_rate" => nil, "count" => 2, "name" => "/register"}, %{"bounce_rate" => nil, "count" => 1, "name" => "/contact"}, %{"bounce_rate" => nil, "count" => 1, "name" => "/irrelevant"} 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 c17578f09..11bcdd9bf 100644 --- a/test/plausible_web/controllers/api/stats_controller/referrers_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/referrers_test.exs @@ -28,7 +28,7 @@ defmodule PlausibleWeb.Api.StatsController.ReferrersTest do "bounce_rate" => 50.0, "url" => "10words.com" }, - %{"name" => "Bing", "count" => 1, "bounce_rate" => nil, "url" => ""} + %{"name" => "Bing", "count" => 1, "bounce_rate" => 0, "url" => ""} ] end end diff --git a/test/support/clickhouse_setup.ex b/test/support/clickhouse_setup.ex index 6eb10bd62..d15dfd0a0 100644 --- a/test/support/clickhouse_setup.ex +++ b/test/support/clickhouse_setup.ex @@ -228,7 +228,16 @@ defmodule Plausible.Test.ClickhouseSetup do session_id: @conversion_2_session_id, is_bounce: false, start: ~N[2019-01-01 02:00:00] - } + }, + %{ + domain: "test-site.com", + entry_page: "/", + exit_page: "/", + referrer_source: "Bing", + referrer: "", + is_bounce: false, + start: ~N[2019-01-01 03:00:00] + }, ]) end end