Make existing tests pass

pull/2859/head
Adam Rutkowski 4 years ago
parent dd8fe3af9c
commit 0fc716c163

@ -8,7 +8,7 @@ defmodule Plausible.Funnels do
import Ecto.Query
def create(site, name, goals, id \\ 5) when is_list(goals) do
def create(site, name, goals) when is_list(goals) do
steps =
goals
|> Enum.with_index(1)
@ -20,8 +20,7 @@ defmodule Plausible.Funnels do
end)
%Funnel{
site_id: site.id,
id: id
site_id: site.id
}
|> Funnel.changeset(%{name: name, steps: steps})
|> Repo.insert()

@ -19,8 +19,7 @@ defmodule Plausible.FunnelsTest do
Funnels.create(
site,
"From blog to signup and purchase",
[g1, g2, g3],
nil
[g1, g2, g3]
)
assert funnel.inserted_at
@ -41,11 +40,10 @@ defmodule Plausible.FunnelsTest do
Funnels.create(
site,
"Lorem ipsum",
[g3, g1, g2],
nil
[g3, g1, g2]
)
funnel = Funnels.get(site, funnel.id)
assert {:ok, funnel} = Funnels.get(site, funnel.id)
assert funnel.name == "Lorem ipsum"
assert [%{step_order: 1}, %{step_order: 2}, %{step_order: 3}] = funnel.steps
end
@ -61,14 +59,13 @@ defmodule Plausible.FunnelsTest do
Funnels.create(
site,
"Lorem ipsum",
[g1, g1],
nil
[g1, g1]
)
end
test "funnels can be listed per site", %{site: site, goals: [g1, g2, g3]} do
Funnels.create(site, "Funnel 1", [g3, g1, g2], nil)
Funnels.create(site, "Funnel 2", [g2, g1, g3], nil)
Funnels.create(site, "Funnel 1", [g3, g1, g2])
Funnels.create(site, "Funnel 2", [g2, g1, g3])
funnels_list = Funnels.list(site)
assert [%{name: "Funnel 1"}, %{name: "Funnel 2"}] = funnels_list
@ -91,14 +88,15 @@ defmodule Plausible.FunnelsTest do
])
query = Plausible.Stats.Query.from(site, %{"period" => "all"})
funnel_data = Funnels.evaluate(query, funnel.id, site.id)
assert %{
steps: [
%{label: "Visit /go/to/blog/**", visitors: 2},
%{label: "Signup", visitors: 2},
%{label: "Visit /checkout", visitors: 1}
]
} = funnel_data
funnel_data = Funnels.evaluate(query, funnel.id, site)
assert {:ok,
%{
steps: [
%{label: "Visit /go/to/blog/**", visitors: 2},
%{label: "Signup", visitors: 2},
%{label: "Visit /checkout", visitors: 1}
]
}} = funnel_data
end
end

Loading…
Cancel
Save