Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Ensure stable sort in flaky tests (#6031)

Artur Pata8e38acb98601
diff --git a/test/plausible_web/controllers/api/external_stats_controller/query_goal_dimension_test.exs b/test/plausible_web/controllers/api/external_stats_controller/query_goal_dimension_test.exs
index a3b2388458..9deb1ee2ce 100644
--- a/test/plausible_web/controllers/api/external_stats_controller/query_goal_dimension_test.exs
+++ b/test/plausible_web/controllers/api/external_stats_controller/query_goal_dimension_test.exs
@@ -287,60 +287,81 @@ defmodule PlausibleWeb.Api.ExternalStatsController.QueryGoalDimensionTest do
site: site,
page_path: "/blog**",
scroll_threshold: threshold,
- display_name: "Scroll /blog #{threshold}"
+ display_name: "Scroll /blog** #{threshold}"
)
end
populate_stats(site, [
+ # visitor 1
build(:pageview,
- pathname: "/blog/john-post",
+ pathname: "/blog/december",
+ timestamp: ~N[2021-01-01 00:00:00],
"meta.key": ["author"],
- "meta.value": ["john"]
+ "meta.value": ["bob"]
),
+ # visitor 2
build(:pageview,
user_id: 12,
- pathname: "/blog/john-post",
+ pathname: "/blog/december",
timestamp: ~N[2021-01-01 00:00:00],
"meta.key": ["author"],
- "meta.value": ["john"]
+ "meta.value": ["bob"]
),
build(:engagement,
user_id: 12,
- pathname: "/blog/john-post",
+ pathname: "/blog/december",
timestamp: ~N[2021-01-01 00:00:10],
scroll_depth: 30,
"meta.key": ["author"],
- "meta.value": ["john"]
+ "meta.value": ["bob"]
),
+ # visitor 3
build(:pageview,
user_id: 34,
- pathname: "/blog/jane-post",
+ pathname: "/blog/january",
timestamp: ~N[2021-01-01 00:00:00],
"meta.key": ["author"],
"meta.value": ["jane"]
),
build(:engagement,
user_id: 34,
- pathname: "/blog/jane-post",
+ pathname: "/blog/january",
timestamp: ~N[2021-01-01 00:00:10],
scroll_depth: 50,
"meta.key": ["author"],
"meta.value": ["jane"]
),
+ # visitor 4
build(:pageview,
user_id: 56,
- pathname: "/blog/jane-post",
+ pathname: "/blog/january",
timestamp: ~N[2021-01-01 00:00:00],
"meta.key": ["author"],
"meta.value": ["jane"]
),
build(:engagement,
user_id: 56,
- pathname: "/blog/jane-post",
+ pathname: "/blog/january",
timestamp: ~N[2021-01-01 00:00:10],
scroll_depth: 75,
"meta.key": ["author"],
"meta.value": ["jane"]
+ ),
+ # visitor 5
+ build(:pageview,
+ user_id: 89,
+ pathname: "/blog/january",
+ timestamp: ~N[2021-01-01 00:00:00],
+ "meta.key": ["author"],
+ "meta.value": ["jane"]
+ ),
+ build(:engagement,
+ user_id: 89,
+ pathname: "/blog/january",
+ timestamp: ~N[2021-01-01 00:00:10],
+ scroll_depth: 49,
+ "meta.key": ["author"],
+ "meta.value": ["jane"]
)
])
@@ -348,15 +369,16 @@ defmodule PlausibleWeb.Api.ExternalStatsController.QueryGoalDimensionTest do
post(conn, "/api/v2/query", %{
"site_id" => site.domain,
"metrics" => ["visitors", "events", "conversion_rate"],
+ "order_by" => [["visitors", "desc"], ["event:props:author", "asc"]],
"date_range" => "all",
"dimensions" => ["event:goal", "event:props:author"]
})
assert json_response(conn, 200)["results"] == [
- %{"dimensions" => ["Scroll /blog 25", "jane"], "metrics" => [2, nil, 50.0]},
- %{"dimensions" => ["Scroll /blog 50", "jane"], "metrics" => [2, nil, 50.0]},
- %{"dimensions" => ["Scroll /blog 25", "john"], "metrics" => [1, nil, 25.0]},
- %{"dimensions" => ["Scroll /blog 75", "jane"], "metrics" => [1, nil, 25.0]}
+ %{"dimensions" => ["Scroll /blog** 25", "jane"], "metrics" => [3, nil, 60.0]},
+ %{"dimensions" => ["Scroll /blog** 50", "jane"], "metrics" => [2, nil, 40.0]},
+ %{"dimensions" => ["Scroll /blog** 25", "bob"], "metrics" => [1, nil, 20.0]},
+ %{"dimensions" => ["Scroll /blog** 75", "jane"], "metrics" => [1, nil, 20.0]}
]
end
diff --git a/test/plausible_web/controllers/api/external_stats_controller/query_test.exs b/test/plausible_web/controllers/api/external_stats_controller/query_test.exs
index 310875746d..810d7771f8 100644
--- a/test/plausible_web/controllers/api/external_stats_controller/query_test.exs
+++ b/test/plausible_web/controllers/api/external_stats_controller/query_test.exs
@@ -3663,6 +3663,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.QueryTest do
"site_id" => site.domain,
"date_range" => "all",
"metrics" => ["pageviews"],
+ "order_by" => [["pageviews", "desc"], ["visit:country_name", "asc"]],
"filters" => [
["is", "visit:country_name", ["Estonia", "United Kingdom"]],
["is_not", "visit:region_name", ["Tartumaa"]],