From 1d4bddd79d01e93f2b8e1ff95b95c6333c79e318 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Tue, 17 Nov 2020 14:52:37 +0200 Subject: [PATCH] Decode URLs properly --- .../controllers/api/stats_controller/browsers_test.exs | 2 +- .../controllers/api/stats_controller/main_graph_test.exs | 8 ++++---- .../api/stats_controller/operating_systems_test.exs | 2 +- .../controllers/api/stats_controller/sources_test.exs | 4 ++-- test/support/clickhouse_setup.ex | 5 ++++- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/test/plausible_web/controllers/api/stats_controller/browsers_test.exs b/test/plausible_web/controllers/api/stats_controller/browsers_test.exs index f9afccaa8..e00252d4a 100644 --- a/test/plausible_web/controllers/api/stats_controller/browsers_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/browsers_test.exs @@ -23,7 +23,7 @@ defmodule PlausibleWeb.Api.StatsController.BrowsersTest do conn = get(conn, "/api/stats/#{site.domain}/browser-versions?period=day&date=2019-01-01&filters=#{filters}") assert json_response(conn, 200) == [ - %{"name" => "78.0", "count" => 2, "percentage" => 100} + %{"name" => "78.0", "count" => 1, "percentage" => 100} ] 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 55cc16a32..3499c43ed 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 @@ -167,7 +167,7 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest do ) res = json_response(conn, 200) - assert %{"name" => "Unique visitors", "count" => 2, "change" => 100} in res["top_stats"] + assert %{"name" => "Unique visitors", "count" => 3, "change" => 100} in res["top_stats"] end test "returns only visitors with specific screen size", %{conn: conn, site: site} do @@ -180,7 +180,7 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest do ) res = json_response(conn, 200) - assert %{"name" => "Unique visitors", "count" => 2, "change" => 100} in res["top_stats"] + assert %{"name" => "Unique visitors", "count" => 3, "change" => 100} in res["top_stats"] end test "returns only visitors with specific browser", %{conn: conn, site: site} do @@ -193,7 +193,7 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest do ) res = json_response(conn, 200) - assert %{"name" => "Unique visitors", "count" => 2, "change" => 100} in res["top_stats"] + assert %{"name" => "Unique visitors", "count" => 3, "change" => 100} in res["top_stats"] end test "returns only visitors with specific operating system", %{conn: conn, site: site} do @@ -206,7 +206,7 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest do ) res = json_response(conn, 200) - assert %{"name" => "Unique visitors", "count" => 2, "change" => 100} in res["top_stats"] + assert %{"name" => "Unique visitors", "count" => 3, "change" => 100} in res["top_stats"] end end end diff --git a/test/plausible_web/controllers/api/stats_controller/operating_systems_test.exs b/test/plausible_web/controllers/api/stats_controller/operating_systems_test.exs index 0a4181ce6..71658d93f 100644 --- a/test/plausible_web/controllers/api/stats_controller/operating_systems_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/operating_systems_test.exs @@ -23,7 +23,7 @@ defmodule PlausibleWeb.Api.StatsController.OperatingSystemsTest do conn = get(conn, "/api/stats/#{site.domain}/operating-system-versions?period=day&date=2019-01-01&filters=#{filters}") assert json_response(conn, 200) == [ - %{"name" => "10.15", "count" => 2, "percentage" => 100} + %{"name" => "10.15", "count" => 1, "percentage" => 100} ] end end diff --git a/test/plausible_web/controllers/api/stats_controller/sources_test.exs b/test/plausible_web/controllers/api/stats_controller/sources_test.exs index 9f688900a..3eb6dc0f0 100644 --- a/test/plausible_web/controllers/api/stats_controller/sources_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/sources_test.exs @@ -128,7 +128,7 @@ defmodule PlausibleWeb.Api.StatsController.SourcesTest do ) assert json_response(conn, 200) == %{ - "total_visitors" => 3, + "total_visitors" => 4, "referrers" => [ %{"name" => "10words.com/page1", "url" => "10words.com", "count" => 2} ] @@ -147,7 +147,7 @@ defmodule PlausibleWeb.Api.StatsController.SourcesTest do ) assert json_response(conn, 200) == %{ - "total_visitors" => 3, + "total_visitors" => 4, "referrers" => [ %{ "name" => "10words.com/page1", diff --git a/test/support/clickhouse_setup.ex b/test/support/clickhouse_setup.ex index 4b171338d..73ba2e514 100644 --- a/test/support/clickhouse_setup.ex +++ b/test/support/clickhouse_setup.ex @@ -16,7 +16,8 @@ defmodule Plausible.Test.ClickhouseSetup do screen_size: "Desktop", referrer_source: "10words", referrer: "10words.com/page1", - timestamp: ~N[2019-01-01 00:00:00] + timestamp: ~N[2019-01-01 00:00:00], + session_id: @conversion_1_session_id, }, %{ name: "pageview", @@ -161,7 +162,9 @@ defmodule Plausible.Test.ClickhouseSetup do country_code: "US", screen_size: "Desktop", browser: "Chrome", + browser_version: "78.0", operating_system: "Mac", + operating_system_version: "10.15", session_id: @conversion_1_session_id, is_bounce: true, duration: 100,