Do not rely on insertion order in tests

pull/1892/head
Uku Taht 5 years ago
parent 18e2711556
commit cd8df23e5e

@ -408,7 +408,7 @@ defmodule Plausible.Stats.Imported do
|> select_merge([s, i], %{
visit_duration:
fragment(
"(? + ? * ?) / (? + ?)",
"round((? + ? * ?) / (? + ?), 1)",
i.visit_duration,
s.visit_duration,
s.visits,

@ -211,6 +211,7 @@ defmodule Plausible.ImportedTest do
test "UTM terms data imported from Google Analytics", %{conn: conn, site: site} do
populate_stats(site, [
build(:pageview, utm_term: "oat milk", timestamp: ~N[2021-01-01 00:00:00]),
build(:pageview, utm_term: "Sweden", timestamp: ~N[2021-01-01 00:00:00]),
build(:pageview, utm_term: "Sweden", timestamp: ~N[2021-01-01 00:00:00])
])
@ -243,9 +244,9 @@ defmodule Plausible.ImportedTest do
assert json_response(conn, 200) == [
%{
"name" => "Sweden",
"visitors" => 2,
"bounce_rate" => 50.0,
"visit_duration" => 50.0
"visitors" => 3,
"bounce_rate" => 67.0,
"visit_duration" => 33.3
},
%{
"name" => "oat milk",

@ -606,7 +606,6 @@ defmodule PlausibleWeb.Api.ExternalStatsController.BreakdownTest do
build(:pageview,
domain: site.domain,
pathname: "/non-existing",
user_id: @user_id,
timestamp: ~N[2021-01-01 00:00:01]
),
build(:pageview,
@ -641,7 +640,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.BreakdownTest do
assert json_response(conn, 200) == %{
"results" => [
%{"name" => "pageview", "visitors" => 1, "events" => 4},
%{"name" => "pageview", "visitors" => 2, "events" => 4},
%{"name" => "404", "visitors" => 1, "events" => 2}
]
}
@ -922,6 +921,13 @@ defmodule PlausibleWeb.Api.ExternalStatsController.BreakdownTest do
domain: site.domain,
timestamp: ~N[2021-01-01 00:00:00]
),
build(:event,
name: "Purchase",
"meta.key": ["cost"],
"meta.value": ["16"],
domain: site.domain,
timestamp: ~N[2021-01-01 00:00:00]
),
build(:event,
name: "Purchase",
domain: site.domain,
@ -954,7 +960,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.BreakdownTest do
assert json_response(conn, 200) == %{
"results" => [
%{"cost" => "16", "visitors" => 2},
%{"cost" => "16", "visitors" => 3},
%{"cost" => "14", "visitors" => 2},
%{"cost" => "(none)", "visitors" => 1}
]

Loading…
Cancel
Save