From 59acff02f8ccb91058957daf03fffc5e767d6e2b Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Mon, 21 Mar 2022 12:55:20 +0200 Subject: [PATCH] Fix tests --- .../controllers/site_controller_test.exs | 2 +- test/workers/import_google_analytics_test.exs | 24 ++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exs index 1c7903838..dc3b475e5 100644 --- a/test/plausible_web/controllers/site_controller_test.exs +++ b/test/plausible_web/controllers/site_controller_test.exs @@ -726,7 +726,7 @@ defmodule PlausibleWeb.SiteControllerTest do test "adds in-progress imported tag to site", %{conn: conn, site: site} do post(conn, "/#{site.domain}/settings/google-import", %{ - "profile" => "123", + "view_id" => "123", "end_date" => "2022-03-01" }) diff --git a/test/workers/import_google_analytics_test.exs b/test/workers/import_google_analytics_test.exs index d126144b9..63a06c47f 100644 --- a/test/workers/import_google_analytics_test.exs +++ b/test/workers/import_google_analytics_test.exs @@ -15,12 +15,14 @@ defmodule Plausible.Workers.ImportGoogleAnalyticsTest do site = insert(:site, members: [user], imported_data: @imported_data) api_stub = - stub(Plausible.Google.Api, :import_analytics, fn _site, _profile -> + stub(Plausible.Google.Api, :import_analytics, fn _site, _view_id, _end_date -> {:ok, nil} end) ImportGoogleAnalytics.perform( - %Oban.Job{args: %{"site_id" => site.id, "profile" => "profile"}}, + %Oban.Job{ + args: %{"site_id" => site.id, "view_id" => "view_id", "end_date" => "2022-01-01"} + }, api_stub ) @@ -32,12 +34,14 @@ defmodule Plausible.Workers.ImportGoogleAnalyticsTest do site = insert(:site, members: [user], imported_data: @imported_data) api_stub = - stub(Plausible.Google.Api, :import_analytics, fn _site, _profile -> + stub(Plausible.Google.Api, :import_analytics, fn _site, _view_id, _end_date -> {:ok, nil} end) ImportGoogleAnalytics.perform( - %Oban.Job{args: %{"site_id" => site.id, "profile" => "profile"}}, + %Oban.Job{ + args: %{"site_id" => site.id, "view_id" => "view_id", "end_date" => "2022-01-01"} + }, api_stub ) @@ -52,12 +56,14 @@ defmodule Plausible.Workers.ImportGoogleAnalyticsTest do site = insert(:site, members: [user], imported_data: @imported_data) api_stub = - stub(Plausible.Google.Api, :import_analytics, fn _site, _profile -> + stub(Plausible.Google.Api, :import_analytics, fn _site, _view_id, _end_date -> {:error, "Something went wrong"} end) ImportGoogleAnalytics.perform( - %Oban.Job{args: %{"site_id" => site.id, "profile" => "profile"}}, + %Oban.Job{ + args: %{"site_id" => site.id, "view_id" => "view_id", "end_date" => "2022-01-01"} + }, api_stub ) @@ -69,12 +75,14 @@ defmodule Plausible.Workers.ImportGoogleAnalyticsTest do site = insert(:site, members: [user], imported_data: @imported_data) api_stub = - stub(Plausible.Google.Api, :import_analytics, fn _site, _profile -> + stub(Plausible.Google.Api, :import_analytics, fn _site, _view_id, _end_date -> {:error, "Something went wrong"} end) ImportGoogleAnalytics.perform( - %Oban.Job{args: %{"site_id" => site.id, "profile" => "profile"}}, + %Oban.Job{ + args: %{"site_id" => site.id, "view_id" => "view_id", "end_date" => "2022-01-01"} + }, api_stub )