Fix tests

pull/53/head
Uku Taht 7 years ago
parent 9b9160ae86
commit e14001664c

@ -1,76 +0,0 @@
defmodule Plausible.Ingest.Session do
use GenServer
use Plausible.Repo
@session_timeout Application.get_env(:plausible, :session_timeout)
def on_event(event) do
user_session = :global.whereis_name(event.user_id)
if is_pid(user_session) do
GenServer.cast(user_session, {:on_event, event})
else
GenServer.start_link(__MODULE__, event, name: {:global, event.user_id})
end
end
def on_unload(user_id, timestamp) do
user_session = :global.whereis_name(user_id)
if is_pid(user_session) do
GenServer.cast(user_session, {:on_unload, timestamp})
end
end
def init(event) do
timer = Process.send_after(self(), :finalize, @session_timeout)
{:ok, %{first_event: event, last_event: event, timer: timer, is_bounce: true, last_unload: nil}}
end
def handle_cast({:on_event, event}, state) do
Process.cancel_timer(state[:timer])
new_timer = Process.send_after(self(), :finalize, @session_timeout)
{:noreply, %{state | timer: new_timer, last_event: event, is_bounce: false, last_unload: nil}}
end
def handle_cast({:on_unload, timestamp}, state) do
{:noreply, %{state | last_unload: timestamp}}
end
def handle_info(:finalize, state) do
first_event = state[:first_event]
last_event = state[:last_event]
if !is_potential_leftover?(first_event) do
length = if state[:last_unload] do
Timex.diff(state[:last_unload], first_event.timestamp, :seconds)
end
Plausible.Session.changeset(%Plausible.Session{}, %{
hostname: first_event.hostname,
domain: first_event.domain,
user_id: first_event.user_id,
new_visitor: first_event.new_visitor,
entry_page: first_event.pathname,
exit_page: last_event.pathname,
is_bounce: state[:is_bounce],
length: length,
referrer: first_event.referrer,
referrer_source: first_event.referrer_source,
country_code: first_event.country_code,
operating_system: first_event.operating_system,
browser: first_event.browser,
start: first_event.timestamp
}) |> Repo.insert!
end
{:stop, :normal, state}
end
defp is_potential_leftover?(%{new_visitor: true}), do: false
defp is_potential_leftover?(%{timestamp: timestamp}) do
server_start_time = Application.get_env(:plausible, :server_start)
Timex.diff(timestamp, server_start_time, :milliseconds) < @session_timeout
end
end

@ -33,7 +33,7 @@ defmodule PlausibleWeb.Api.ExternalController do
end
defp create_event(conn, params) do
uri = URI.parse(params["url"])
uri = params["url"] && URI.parse(params["url"])
country_code = Plug.Conn.get_req_header(conn, "cf-ipcountry") |> List.first
user_agent = Plug.Conn.get_req_header(conn, "user-agent") |> List.first
if UAInspector.bot?(user_agent) do
@ -48,9 +48,9 @@ defmodule PlausibleWeb.Api.ExternalController do
event_attrs = %{
name: params["name"],
hostname: strip_www(uri.host),
domain: strip_www(params["domain"]) || strip_www(uri.host),
pathname: uri.path,
hostname: strip_www(uri && uri.host),
domain: strip_www(params["domain"]) || strip_www(uri && uri.host),
pathname: uri && uri.path,
new_visitor: params["new_visitor"],
country_code: country_code,
user_id: params["uid"],

@ -1,81 +0,0 @@
defmodule Plausible.Ingest.SessionTest do
use Plausible.DataCase
alias Plausible.Ingest
defp capture_session(user_id) do
session_pid = :global.whereis_name(user_id)
Process.monitor(session_pid)
assert_receive({:DOWN, session_pid, :process, _, :normal})
Repo.one(Plausible.Session)
end
describe "on_event/1" do
test "starts a new session if there is no session for user id" do
pageview = insert(:pageview)
refute is_pid(:global.whereis_name(pageview.user_id))
Ingest.Session.on_event(pageview)
assert is_pid(:global.whereis_name(pageview.user_id))
end
test "copies event data to session" do
pageview = insert(:pageview)
Ingest.Session.on_event(pageview)
session = capture_session(pageview.user_id)
assert session.user_id == pageview.user_id
assert session.new_visitor == pageview.new_visitor
assert session.start == pageview.timestamp
end
test "inserts bounced session when timeout fires after one pageview" do
pageview = insert(:pageview)
Ingest.Session.on_event(pageview)
session = capture_session(pageview.user_id)
assert session.is_bounce
end
test "session with two events is not a bounce" do
pageview = insert(:pageview)
pageview2 = insert(:pageview, user_id: pageview.user_id)
Ingest.Session.on_event(pageview)
Ingest.Session.on_event(pageview2)
session = capture_session(pageview.user_id)
refute session.is_bounce
end
test "captures the exit page" do
pageview = insert(:pageview)
pageview2 = insert(:pageview, user_id: pageview.user_id, pathname: "/exit")
Ingest.Session.on_event(pageview)
Ingest.Session.on_event(pageview2)
session = capture_session(pageview.user_id)
assert session.exit_page == "/exit"
end
end
describe "on_unload/1" do
test "uses the unload timestamp to calculate session length" do
pageview = insert(:pageview)
unload_timestamp = Timex.shift(pageview.timestamp, seconds: 30)
Ingest.Session.on_event(pageview)
Ingest.Session.on_unload(pageview.user_id, unload_timestamp)
session = capture_session(pageview.user_id)
assert session.length == 30
end
end
end

@ -18,9 +18,7 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
name: "pageview",
url: "http://gigride.live/",
referrer: "http://m.facebook.com/",
new_visitor: true,
screen_width: 1440,
uid: UUID.uuid4()
screen_width: 1440
}
conn = conn
@ -36,7 +34,6 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
assert pageview.hostname == "gigride.live"
assert pageview.domain == "gigride.live"
assert pageview.pathname == "/"
assert pageview.new_visitor == true
assert pageview.country_code == @country_code
end
@ -402,10 +399,7 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
end
test "responds 400 when required fields are missing", %{conn: conn} do
params = %{
name: "pageview",
url: "http://gigride.live/",
}
params = %{}
conn = conn
|> put_req_header("content-type", "text/plain")

@ -6,9 +6,9 @@ defmodule PlausibleWeb.Api.StatsController.BrowsersTest do
setup [:create_user, :log_in, :create_site]
test "returns top browsers by new visitors", %{conn: conn, site: site} do
insert(:pageview, domain: site.domain, browser: "Chrome", new_visitor: true, timestamp: ~N[2019-01-01 01:00:00])
insert(:pageview, domain: site.domain, browser: "Chrome", new_visitor: true, timestamp: ~N[2019-01-01 02:00:00])
insert(:pageview, domain: site.domain, browser: "Firefox", new_visitor: true, timestamp: ~N[2019-01-01 02:00:00])
insert(:pageview, domain: site.domain, browser: "Chrome", timestamp: ~N[2019-01-01 01:00:00])
insert(:pageview, domain: site.domain, browser: "Chrome", timestamp: ~N[2019-01-01 02:00:00])
insert(:pageview, domain: site.domain, browser: "Firefox", timestamp: ~N[2019-01-01 02:00:00])
conn = get(conn, "/api/stats/#{site.domain}/browsers?period=day&date=2019-01-01")

@ -6,9 +6,9 @@ defmodule PlausibleWeb.Api.StatsController.CountriesTest do
setup [:create_user, :log_in, :create_site]
test "returns top countries by new visitors", %{conn: conn, site: site} do
insert(:pageview, domain: site.domain, country_code: "EE", new_visitor: true, timestamp: ~N[2019-01-01 01:00:00])
insert(:pageview, domain: site.domain, country_code: "EE", new_visitor: true, timestamp: ~N[2019-01-01 02:00:00])
insert(:pageview, domain: site.domain, country_code: "GB", new_visitor: true, timestamp: ~N[2019-01-01 02:00:00])
insert(:pageview, domain: site.domain, country_code: "EE", timestamp: ~N[2019-01-01 01:00:00])
insert(:pageview, domain: site.domain, country_code: "EE", timestamp: ~N[2019-01-01 02:00:00])
insert(:pageview, domain: site.domain, country_code: "GB", timestamp: ~N[2019-01-01 02:00:00])
conn = get(conn, "/api/stats/#{site.domain}/countries?period=day&date=2019-01-01")

@ -172,8 +172,8 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest do
test "returns converted visitors", %{conn: conn, site: site} do
insert(:pageview, domain: site.domain, timestamp: ~N[2019-01-01 02:00:00])
insert(:pageview, domain: site.domain, user_id: @user_id, timestamp: ~N[2019-01-01 01:00:00])
insert(:event, name: "Signup", domain: site.domain, user_id: @user_id, timestamp: ~N[2019-01-01 02:00:00])
insert(:pageview, domain: site.domain, timestamp: ~N[2019-01-01 01:00:00])
insert(:event, name: "Signup", domain: site.domain, timestamp: ~N[2019-01-01 02:00:00])
filters = Jason.encode!(%{goal: "Signup"})
conn = get(conn, "/api/stats/#{site.domain}/main-graph?period=month&date=2019-01-01&filters=#{filters}")
@ -184,8 +184,8 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest do
test "returns conversion rate", %{conn: conn, site: site} do
insert(:pageview, domain: site.domain, timestamp: ~N[2019-01-01 02:00:00])
insert(:pageview, domain: site.domain, user_id: @user_id, timestamp: ~N[2019-01-01 01:00:00])
insert(:event, name: "Signup", domain: site.domain, user_id: @user_id, timestamp: ~N[2019-01-01 02:00:00])
insert(:pageview, domain: site.domain, timestamp: ~N[2019-01-01 01:00:00])
insert(:event, name: "Signup", domain: site.domain, timestamp: ~N[2019-01-01 02:00:00])
filters = Jason.encode!(%{goal: "Signup"})
conn = get(conn, "/api/stats/#{site.domain}/main-graph?period=day&date=2019-01-01&filters=#{filters}")

@ -6,9 +6,9 @@ defmodule PlausibleWeb.Api.StatsController.OperatingSystemsTest do
setup [:create_user, :log_in, :create_site]
test "returns operating systems by new visitors", %{conn: conn, site: site} do
insert(:pageview, domain: site.domain, operating_system: "Mac", new_visitor: true, timestamp: ~N[2019-01-01 01:00:00])
insert(:pageview, domain: site.domain, operating_system: "Mac", new_visitor: true, timestamp: ~N[2019-01-01 02:00:00])
insert(:pageview, domain: site.domain, operating_system: "Android", new_visitor: true, timestamp: ~N[2019-01-01 02:00:00])
insert(:pageview, domain: site.domain, operating_system: "Mac", timestamp: ~N[2019-01-01 01:00:00])
insert(:pageview, domain: site.domain, operating_system: "Mac", timestamp: ~N[2019-01-01 02:00:00])
insert(:pageview, domain: site.domain, operating_system: "Android", timestamp: ~N[2019-01-01 02:00:00])
conn = get(conn, "/api/stats/#{site.domain}/operating-systems?period=day&date=2019-01-01")

@ -74,7 +74,6 @@ defmodule PlausibleWeb.Api.StatsController.ReferrersTest do
domain: site.domain,
referrer: "10words.io/somepage",
referrer_source: "10words",
new_visitor: true,
timestamp: ~N[2019-01-01 01:00:00]
})
@ -82,7 +81,6 @@ defmodule PlausibleWeb.Api.StatsController.ReferrersTest do
domain: site.domain,
referrer: "10words.io/somepage",
referrer_source: "10words",
new_visitor: true,
timestamp: ~N[2019-01-01 01:00:00]
})
@ -90,7 +88,6 @@ defmodule PlausibleWeb.Api.StatsController.ReferrersTest do
domain: site.domain,
referrer: "10words.io/some_other_page",
referrer_source: "10words",
new_visitor: true,
timestamp: ~N[2019-01-01 01:00:00]
})

@ -6,9 +6,9 @@ defmodule PlausibleWeb.Api.StatsController.ScreenSizesTest do
setup [:create_user, :log_in, :create_site]
test "returns screen sizes by new visitors", %{conn: conn, site: site} do
insert(:pageview, domain: site.domain, screen_size: "Desktop", new_visitor: true, timestamp: ~N[2019-01-01 01:00:00])
insert(:pageview, domain: site.domain, screen_size: "Desktop", new_visitor: true, timestamp: ~N[2019-01-01 02:00:00])
insert(:pageview, domain: site.domain, screen_size: "Mobile", new_visitor: true, timestamp: ~N[2019-01-01 02:00:00])
insert(:pageview, domain: site.domain, screen_size: "Desktop", timestamp: ~N[2019-01-01 01:00:00])
insert(:pageview, domain: site.domain, screen_size: "Desktop", timestamp: ~N[2019-01-01 02:00:00])
insert(:pageview, domain: site.domain, screen_size: "Mobile", timestamp: ~N[2019-01-01 02:00:00])
conn = get(conn, "/api/stats/#{site.domain}/screen-sizes?period=day&date=2019-01-01")

@ -52,8 +52,6 @@ defmodule Plausible.Factory do
hostname: hostname,
domain: hostname,
pathname: "/",
new_visitor: true,
user_id: UUID.uuid4(),
fingerprint: UUID.uuid4()
}
end

Loading…
Cancel
Save