Skip to content
Snippets Groups Projects
Commit ebdd856d authored by Uku Taht's avatar Uku Taht
Browse files

Fix tests

parent f00457c5
No related branches found
No related tags found
No related merge requests found
...@@ -80,21 +80,12 @@ defmodule PlausibleWeb.BillingController do ...@@ -80,21 +80,12 @@ defmodule PlausibleWeb.BillingController do
def change_enterprise_plan(conn, %{"plan_id" => plan_id}) do def change_enterprise_plan(conn, %{"plan_id" => plan_id}) do
user = conn.assigns[:current_user] user = conn.assigns[:current_user]
current_plan =
Repo.get_by(Plausible.Billing.EnterprisePlan,
user_id: user.id,
paddle_plan_id: user.subscription.paddle_plan_id
)
new_plan = Repo.get_by(Plausible.Billing.EnterprisePlan, user_id: user.id, id: plan_id) new_plan = Repo.get_by(Plausible.Billing.EnterprisePlan, user_id: user.id, id: plan_id)
cond do cond do
is_nil(user.subscription) -> is_nil(user.subscription) ->
redirect(conn, to: "/billing/upgrade") redirect(conn, to: "/billing/upgrade")
is_nil(current_plan) ->
render_error(conn, 404)
is_nil(new_plan) || new_plan.paddle_plan_id == user.subscription.paddle_plan_id -> is_nil(new_plan) || new_plan.paddle_plan_id == user.subscription.paddle_plan_id ->
render_error(conn, 404) render_error(conn, 404)
...@@ -109,7 +100,6 @@ defmodule PlausibleWeb.BillingController do ...@@ -109,7 +100,6 @@ defmodule PlausibleWeb.BillingController do
def change_plan_preview(conn, %{"plan_id" => new_plan_id}) do def change_plan_preview(conn, %{"plan_id" => new_plan_id}) do
subscription = Billing.active_subscription_for(conn.assigns[:current_user].id) subscription = Billing.active_subscription_for(conn.assigns[:current_user].id)
IO.inspect(subscription)
if subscription do if subscription do
{:ok, preview_info} = Billing.change_plan_preview(subscription, new_plan_id) {:ok, preview_info} = Billing.change_plan_preview(subscription, new_plan_id)
......
...@@ -58,13 +58,13 @@ defmodule PlausibleWeb.BillingControllerTest do ...@@ -58,13 +58,13 @@ defmodule PlausibleWeb.BillingControllerTest do
assert redirected_to(conn) == "/billing/upgrade" assert redirected_to(conn) == "/billing/upgrade"
end end
test "redirects to enterprise change plan page if user has enterprise plan and existing subscription", test "prompts to contact us if user has enterprise plan and existing subscription",
%{conn: conn, user: user} do %{conn: conn, user: user} do
insert(:subscription, user: user) insert(:subscription, user: user)
plan = insert(:enterprise_plan, user: user) insert(:enterprise_plan, user: user)
conn = get(conn, "/billing/change-plan") conn = get(conn, "/billing/change-plan")
assert redirected_to(conn) == "/billing/change-plan/enterprise/#{plan.id}" assert html_response(conn, 200) =~ "please contact us"
end end
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment