Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Slurp common test modules into exunit templates (#5909)

Adam Rutkowski0eea55d1c166
diff --git a/test/plausible/audit_test.exs b/test/plausible/audit_test.exs
index 445310bb86..a1450c069f 100644
--- a/test/plausible/audit_test.exs
+++ b/test/plausible/audit_test.exs
@@ -1,11 +1,7 @@
defmodule Plausible.AuditTest do
- use Plausible
+ use Plausible.DataCase
on_ee do
- use Plausible.DataCase
-
- use Plausible.Teams.Test
-
alias Plausible.Audit
alias Plausible.Audit.Encoder
alias Plausible.Audit.Entry
diff --git a/test/plausible/auth/auth_test.exs b/test/plausible/auth/auth_test.exs
index a09e10c825..d43158e1cb 100644
--- a/test/plausible/auth/auth_test.exs
+++ b/test/plausible/auth/auth_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.AuthTest do
use Plausible.DataCase, async: true
- use Plausible.Teams.Test
alias Plausible.Auth
test "enterprise_configured?/1 returns whether the user has an enterprise plan" do
diff --git a/test/plausible/auth/sso/domain/verification_test.exs b/test/plausible/auth/sso/domain/verification_test.exs
index 2e20e3c43d..db52aebc6f 100644
--- a/test/plausible/auth/sso/domain/verification_test.exs
+++ b/test/plausible/auth/sso/domain/verification_test.exs
@@ -1,12 +1,9 @@
defmodule Plausible.Auth.SSO.Domain.VerificationTest do
use Plausible.DataCase, async: true
- use Plausible
@moduletag :ee_only
on_ee do
- use Plausible.Teams.Test
-
alias Plasusible.Test.Support.DNSServer
alias Plausible.Auth.SSO.Domain.Verification
alias Plug.Conn
diff --git a/test/plausible/auth/sso/domains_test.exs b/test/plausible/auth/sso/domains_test.exs
index 854bbb5407..27f853e8b9 100644
--- a/test/plausible/auth/sso/domains_test.exs
+++ b/test/plausible/auth/sso/domains_test.exs
@@ -1,11 +1,9 @@
defmodule Plausible.Auth.SSO.DomainsTest do
use Plausible.DataCase, async: true
- use Plausible
@moduletag :ee_only
on_ee do
- use Plausible.Teams.Test
use Plausible.Auth.SSO.Domain.Status
use Oban.Testing, repo: Plausible.Repo
diff --git a/test/plausible/auth/sso_test.exs b/test/plausible/auth/sso_test.exs
index d2fc341295..6665f88f60 100644
--- a/test/plausible/auth/sso_test.exs
+++ b/test/plausible/auth/sso_test.exs
@@ -1,10 +1,8 @@
defmodule Plausible.Auth.SSOTest do
use Plausible.DataCase, async: true
- use Plausible
on_ee do
use Oban.Testing, repo: Plausible.Repo
- use Plausible.Teams.Test
alias Plausible.Auth
alias Plausible.Auth.SSO
diff --git a/test/plausible/auth/user_sessions_test.exs b/test/plausible/auth/user_sessions_test.exs
index fdb6cf4245..8afbaa84a7 100644
--- a/test/plausible/auth/user_sessions_test.exs
+++ b/test/plausible/auth/user_sessions_test.exs
@@ -1,7 +1,5 @@
defmodule Plausible.Auth.UserSessionsTest do
use Plausible.DataCase, async: true
- use Plausible.Teams.Test
- use Plausible
import Phoenix.ChannelTest
diff --git a/test/plausible/billing/billing_test.exs b/test/plausible/billing/billing_test.exs
index d946e29900..da25ecf4c2 100644
--- a/test/plausible/billing/billing_test.exs
+++ b/test/plausible/billing/billing_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.BillingTest do
use Plausible.DataCase
- use Plausible.Teams.Test
use Bamboo.Test, shared: true
require Plausible.Billing.Subscription.Status
alias Plausible.Billing
diff --git a/test/plausible/billing/enterprise_plan_test.exs b/test/plausible/billing/enterprise_plan_test.exs
index f54fbf06da..288aa03e85 100644
--- a/test/plausible/billing/enterprise_plan_test.exs
+++ b/test/plausible/billing/enterprise_plan_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.Billing.EnterprisePlanTest do
use Plausible.DataCase
- use Plausible.Teams.Test
alias Plausible.Billing.EnterprisePlan
test "changeset/2 loads and dumps the list of features" do
diff --git a/test/plausible/billing/feature_test.exs b/test/plausible/billing/feature_test.exs
index 37c40ee85b..82dfab0a4e 100644
--- a/test/plausible/billing/feature_test.exs
+++ b/test/plausible/billing/feature_test.exs
@@ -1,7 +1,6 @@
defmodule Plausible.Billing.FeatureTest do
alias Plausible.Billing.Feature.SiteSegments
use Plausible.DataCase
- use Plausible.Teams.Test
alias Plausible.Billing.Feature.{
Goals,
diff --git a/test/plausible/billing/plans_test.exs b/test/plausible/billing/plans_test.exs
index 2457835029..6b897b7d21 100644
--- a/test/plausible/billing/plans_test.exs
+++ b/test/plausible/billing/plans_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.Billing.PlansTest do
use Plausible.DataCase, async: true
- use Plausible.Teams.Test
alias Plausible.Billing.Plans
@legacy_plan_id "558746"
diff --git a/test/plausible/billing/quota_test.exs b/test/plausible/billing/quota_test.exs
index 0f482f2dde..a08d69b433 100644
--- a/test/plausible/billing/quota_test.exs
+++ b/test/plausible/billing/quota_test.exs
@@ -1,12 +1,9 @@
defmodule Plausible.Billing.QuotaTest do
alias Plausible.Billing.EnterprisePlan
use Plausible.DataCase, async: true
- use Plausible
alias Plausible.Billing.{Quota, Plans}
alias Plausible.Billing.Feature.{Goals, Props, StatsAPI, SharedLinks}
- use Plausible.Teams.Test
-
on_ee do
alias Plausible.Billing.Feature.{Funnels, RevenueGoals, SitesAPI}
end
diff --git a/test/plausible/billing/site_locker_test.exs b/test/plausible/billing/site_locker_test.exs
index 0ccd14bf9b..2d217f4edc 100644
--- a/test/plausible/billing/site_locker_test.exs
+++ b/test/plausible/billing/site_locker_test.exs
@@ -1,7 +1,6 @@
defmodule Plausible.Billing.SiteLockerTest do
use Plausible.DataCase
use Bamboo.Test, shared: true
- use Plausible.Teams.Test
require Plausible.Billing.Subscription.Status
alias Plausible.Billing.{SiteLocker, Subscription}
diff --git a/test/plausible/consolidated_view/cache_test.exs b/test/plausible/consolidated_view/cache_test.exs
index 2ad2722193..ee0ba3d5d2 100644
--- a/test/plausible/consolidated_view/cache_test.exs
+++ b/test/plausible/consolidated_view/cache_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.CondolidatedView.CacheTest do
use Plausible.DataCase, async: true
- use Plausible.Teams.Test
on_ee do
alias Plausible.ConsolidatedView
diff --git a/test/plausible/consolidated_view/cache_test_sync.exs b/test/plausible/consolidated_view/cache_test_sync.exs
index b36fded130..12f8871516 100644
--- a/test/plausible/consolidated_view/cache_test_sync.exs
+++ b/test/plausible/consolidated_view/cache_test_sync.exs
@@ -1,6 +1,5 @@
defmodule Plausible.CondolidatedView.CacheTestSync do
use Plausible.DataCase, async: false
- use Plausible.Teams.Test
on_ee do
alias Plausible.ConsolidatedView.Cache
diff --git a/test/plausible/consolidated_view_test.exs b/test/plausible/consolidated_view_test.exs
index b0057349d4..1d83f60eed 100644
--- a/test/plausible/consolidated_view_test.exs
+++ b/test/plausible/consolidated_view_test.exs
@@ -1,10 +1,9 @@
defmodule Plausible.ConsolidatedViewTest do
- use Plausible
+ use Plausible.DataCase, async: true
on_ee do
- use Plausible.DataCase, async: true
import Ecto.Query
- import Plausible.Teams.Test
+
alias Plausible.ConsolidatedView
alias Plausible.Teams
diff --git a/test/plausible/customer_support/enterprise_plan_test.exs b/test/plausible/customer_support/enterprise_plan_test.exs
index a11b679cbf..53f3629dbe 100644
--- a/test/plausible/customer_support/enterprise_plan_test.exs
+++ b/test/plausible/customer_support/enterprise_plan_test.exs
@@ -1,5 +1,4 @@
defmodule Plausible.CustomerSupport.EnterprisePlanTest do
- use Plausible
use Plausible.DataCase, async: true
@moduletag :ee_only
diff --git a/test/plausible/data_migration/backfill_teams_hourly_request_limit_test.exs b/test/plausible/data_migration/backfill_teams_hourly_request_limit_test.exs
index 39418eda17..bc44efd9ed 100644
--- a/test/plausible/data_migration/backfill_teams_hourly_request_limit_test.exs
+++ b/test/plausible/data_migration/backfill_teams_hourly_request_limit_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.DataMigration.BackfillTeamsHourlyRequestLimitTest do
use Plausible.DataCase, async: true
- use Plausible.Teams.Test
import ExUnit.CaptureIO
diff --git a/test/plausible/data_migration/prefix_tracker_script_configuration_id_test.exs b/test/plausible/data_migration/prefix_tracker_script_configuration_id_test.exs
index 1fa71b5ace..dbd8a82bb8 100644
--- a/test/plausible/data_migration/prefix_tracker_script_configuration_id_test.exs
+++ b/test/plausible/data_migration/prefix_tracker_script_configuration_id_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.DataMigration.PrefixTrackerScriptConfigurationIdTest do
use Plausible.DataCase, async: true
- use Plausible.Teams.Test
import ExUnit.CaptureIO
import Ecto.Query
diff --git a/test/plausible/funnels_test.exs b/test/plausible/funnels_test.exs
index c59d3bbb44..8b8236cf25 100644
--- a/test/plausible/funnels_test.exs
+++ b/test/plausible/funnels_test.exs
@@ -2,9 +2,6 @@ defmodule Plausible.FunnelsTest do
use Plausible.DataCase
@moduletag :ee_only
- use Plausible
- use Plausible.Teams.Test
-
on_ee do
alias Plausible.Goals
alias Plausible.Funnels
diff --git a/test/plausible/goals_test.exs b/test/plausible/goals_test.exs
index fe50aed4bb..0e319985ff 100644
--- a/test/plausible/goals_test.exs
+++ b/test/plausible/goals_test.exs
@@ -1,7 +1,5 @@
defmodule Plausible.GoalsTest do
use Plausible.DataCase
- use Plausible
- use Plausible.Teams.Test
alias Plausible.Goals
doctest Plausible.Goals.SystemGoals, import: true
diff --git a/test/plausible/help_scout_test.exs b/test/plausible/help_scout_test.exs
index 3b549ff43a..a47b32dad0 100644
--- a/test/plausible/help_scout_test.exs
+++ b/test/plausible/help_scout_test.exs
@@ -1,7 +1,5 @@
defmodule Plausible.HelpScoutTest do
use Plausible.DataCase, async: true
- use Plausible.Teams.Test
- use Plausible
@moduletag :ee_only
diff --git a/test/plausible/imported/csv_importer_test.exs b/test/plausible/imported/csv_importer_test.exs
index 5c67fa46ee..b498da3bdd 100644
--- a/test/plausible/imported/csv_importer_test.exs
+++ b/test/plausible/imported/csv_importer_test.exs
@@ -1,8 +1,6 @@
defmodule Plausible.Imported.CSVImporterTest do
- use Plausible
use Plausible.Repo
use PlausibleWeb.ConnCase
- use Plausible.Teams.Test
use Bamboo.Test
alias Plausible.Imported.{CSVImporter, SiteImport}
require SiteImport
diff --git a/test/plausible/imported/google_analytics4_test.exs b/test/plausible/imported/google_analytics4_test.exs
index 47718dab1f..4bab19ce91 100644
--- a/test/plausible/imported/google_analytics4_test.exs
+++ b/test/plausible/imported/google_analytics4_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.Imported.GoogleAnalytics4Test do
use PlausibleWeb.ConnCase, async: true
- use Plausible
use Oban.Testing, repo: Plausible.Repo
import Mox
diff --git a/test/plausible/imported_test.exs b/test/plausible/imported_test.exs
index 1c734b8181..1d5a122d0a 100644
--- a/test/plausible/imported_test.exs
+++ b/test/plausible/imported_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.ImportedTest do
use Plausible.DataCase
- use Plausible
alias Plausible.Imported
alias Plausible.Stats.{Query, DateTimeRange}
diff --git a/test/plausible/ingestion/counters_test.exs b/test/plausible/ingestion/counters_test.exs
index bbb0d2398c..36caff2cb9 100644
--- a/test/plausible/ingestion/counters_test.exs
+++ b/test/plausible/ingestion/counters_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.Ingestion.CountersTest do
use Plausible.DataCase, async: false
- use Plausible.Teams.Test
import Ecto.Query
alias Plausible.Ingestion.Counters
diff --git a/test/plausible/ingestion/event_telemetry_test.exs b/test/plausible/ingestion/event_telemetry_test.exs
index 9cf145856e..7a39516c85 100644
--- a/test/plausible/ingestion/event_telemetry_test.exs
+++ b/test/plausible/ingestion/event_telemetry_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.Ingestion.EventTelemetryTest do
import Phoenix.ConnTest
- import Plausible.Teams.Test
alias Plausible.Ingestion.Request
alias Plausible.Ingestion.Event
diff --git a/test/plausible/ingestion/event_test.exs b/test/plausible/ingestion/event_test.exs
index 47caa43fe2..bb0a2fbf4b 100644
--- a/test/plausible/ingestion/event_test.exs
+++ b/test/plausible/ingestion/event_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.Ingestion.EventTest do
use Plausible.DataCase, async: false
- use Plausible.Teams.Test
import Phoenix.ConnTest
diff --git a/test/plausible/installation_support/browserless_config_test.exs b/test/plausible/installation_support/browserless_config_test.exs
index 8bc38ca622..676ea2d00c 100644
--- a/test/plausible/installation_support/browserless_config_test.exs
+++ b/test/plausible/installation_support/browserless_config_test.exs
@@ -1,6 +1,6 @@
defmodule Plausible.InstallationSupport.BrowserlessConfigTest do
- use Plausible
use ExUnit.Case
+ use Plausible
on_ee do
doctest Plausible.InstallationSupport.BrowserlessConfig, import: true
diff --git a/test/plausible/installation_support/check_test.exs b/test/plausible/installation_support/check_test.exs
index f89b35d9e3..48f9089b55 100644
--- a/test/plausible/installation_support/check_test.exs
+++ b/test/plausible/installation_support/check_test.exs
@@ -1,5 +1,4 @@
defmodule Plausible.InstallationSupport.CheckTest do
- use Plausible
use Plausible.DataCase, async: true
@moduletag :ee_only
diff --git a/test/plausible/props_test.exs b/test/plausible/props_test.exs
index 3f3480502d..c57f75aae3 100644
--- a/test/plausible/props_test.exs
+++ b/test/plausible/props_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.PropsTest do
use Plausible.DataCase
- use Plausible.Teams.Test
test "allow/2 returns error when user plan does not include props" do
user = new_user() |> subscribe_to_growth_plan()
diff --git a/test/plausible/purge_test.exs b/test/plausible/purge_test.exs
index 5641fe11b6..3375abfe20 100644
--- a/test/plausible/purge_test.exs
+++ b/test/plausible/purge_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.PurgeTest do
use Plausible.DataCase
- use Plausible.Teams.Test
setup do
user = new_user()
diff --git a/test/plausible/release_test.exs b/test/plausible/release_test.exs
index a72584a295..d49861bdbd 100644
--- a/test/plausible/release_test.exs
+++ b/test/plausible/release_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.ReleaseTest do
use Plausible.DataCase, async: true
- use Plausible
alias Plausible.{Release, Auth}
import ExUnit.CaptureIO
diff --git a/test/plausible/site/cache_test.exs b/test/plausible/site/cache_test.exs
index 0ae035307b..37d7d3ee16 100644
--- a/test/plausible/site/cache_test.exs
+++ b/test/plausible/site/cache_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.Site.CacheTest do
use Plausible.DataCase, async: true
- use Plausible.Teams.Test
alias Plausible.{Site, Goal}
alias Plausible.Site.Cache
diff --git a/test/plausible/site/gate_keeper_test.exs b/test/plausible/site/gate_keeper_test.exs
index d1829cd975..7730e9da7c 100644
--- a/test/plausible/site/gate_keeper_test.exs
+++ b/test/plausible/site/gate_keeper_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.Site.GateKeeperTest do
use Plausible.DataCase, async: true
- use Plausible.Teams.Test
alias Plausible.Site.Cache
alias Plausible.Site.GateKeeper
diff --git a/test/plausible/site/site_removal_test.exs b/test/plausible/site/site_removal_test.exs
index 9cb7ef9278..c1e780cd83 100644
--- a/test/plausible/site/site_removal_test.exs
+++ b/test/plausible/site/site_removal_test.exs
@@ -1,7 +1,6 @@
defmodule Plausible.Site.SiteRemovalTest do
use Plausible.DataCase, async: true
use Oban.Testing, repo: Plausible.Repo
- use Plausible.Teams.Test
alias Plausible.Site.Removal
alias Plausible.Sites
diff --git a/test/plausible/sites_test.exs b/test/plausible/sites_test.exs
index b6aed3386f..e9e0ba935c 100644
--- a/test/plausible/sites_test.exs
+++ b/test/plausible/sites_test.exs
@@ -1,7 +1,5 @@
defmodule Plausible.SitesTest do
use Plausible.DataCase
- use Plausible
- use Plausible.Teams.Test
alias Plausible.Sites
diff --git a/test/plausible/stats/clickhouse_test.exs b/test/plausible/stats/clickhouse_test.exs
index 1c1dbf4082..ff03bed01b 100644
--- a/test/plausible/stats/clickhouse_test.exs
+++ b/test/plausible/stats/clickhouse_test.exs
@@ -1,8 +1,6 @@
defmodule Plausible.Stats.ClickhouseTest do
use Plausible.DataCase, async: true
- import Plausible.Teams.Test
- import Plausible.TestUtils
alias Plausible.Stats.Clickhouse
describe "last_24_visitors_hourly_intervals/1" do
diff --git a/test/plausible/stats/comparisons_test.exs b/test/plausible/stats/comparisons_test.exs
index ef77ade32b..c49d018aa0 100644
--- a/test/plausible/stats/comparisons_test.exs
+++ b/test/plausible/stats/comparisons_test.exs
@@ -1,7 +1,6 @@
defmodule Plausible.Stats.ComparisonsTest do
use Plausible.DataCase
alias Plausible.Stats.{Query, Comparisons}
- import Plausible.TestUtils
setup [:create_user, :create_site]
diff --git a/test/plausible/stats/consolidated_view_test.exs b/test/plausible/stats/consolidated_view_test.exs
index 316bb2bd7a..f7232f833f 100644
--- a/test/plausible/stats/consolidated_view_test.exs
+++ b/test/plausible/stats/consolidated_view_test.exs
@@ -2,8 +2,6 @@ defmodule Plausible.Stats.ConsolidatedViewTest do
use Plausible.DataCase, async: true
on_ee do
- import Plausible.Teams.Test
-
test "returns stats for a consolidated view merged with placeholder" do
fixed_now = ~N[2023-10-26 10:00:15]
owner = new_user()
diff --git a/test/plausible/stats/query/query_from_test.exs b/test/plausible/stats/query/query_from_test.exs
index 8ab9f0037f..d8a485f32c 100644
--- a/test/plausible/stats/query/query_from_test.exs
+++ b/test/plausible/stats/query/query_from_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.Stats.Query.QueryFromTest do
use Plausible.DataCase, async: true
- use Plausible.Teams.Test
alias Plausible.Stats.Query
alias Plausible.Stats.Legacy.QueryBuilder
alias Plausible.Stats.DateTimeRange
diff --git a/test/plausible/stats/query/query_parse_and_build_test.exs b/test/plausible/stats/query/query_parse_and_build_test.exs
index a2361bf179..73cd22e470 100644
--- a/test/plausible/stats/query/query_parse_and_build_test.exs
+++ b/test/plausible/stats/query/query_parse_and_build_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.Stats.Query.QueryParseAndBuildTest do
use Plausible.DataCase
- use Plausible.Teams.Test
import Plausible.AssertMatches
alias Plausible.Stats.{Query, DateTimeRange, Filters}
diff --git a/test/plausible/stats/query/query_result_test.exs b/test/plausible/stats/query/query_result_test.exs
index a11eceaf7b..cee105f965 100644
--- a/test/plausible/stats/query/query_result_test.exs
+++ b/test/plausible/stats/query/query_result_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.Stats.Query.QueryResultTest do
use Plausible.DataCase, async: true
- use Plausible.Teams.Test
alias Plausible.Stats.{Query, QueryRunner, QueryResult, QueryOptimizer}
setup do
diff --git a/test/plausible/stats/sampling_cache_test.exs b/test/plausible/stats/sampling_cache_test.exs
index 06364e8716..d02b473441 100644
--- a/test/plausible/stats/sampling_cache_test.exs
+++ b/test/plausible/stats/sampling_cache_test.exs
@@ -1,8 +1,6 @@
defmodule Plausible.Stats.SamplingCacheTest do
use Plausible.DataCase, async: true
- use Plausible
-
on_ee do
alias Plausible.Stats.SamplingCache
diff --git a/test/plausible/stats/sampling_test.exs b/test/plausible/stats/sampling_test.exs
index fc011f72e0..b323705bfa 100644
--- a/test/plausible/stats/sampling_test.exs
+++ b/test/plausible/stats/sampling_test.exs
@@ -1,8 +1,6 @@
defmodule Plausible.Stats.SamplingTest do
use Plausible.DataCase, async: true
- use Plausible
-
on_ee do
import Plausible.Stats.Sampling, only: [fractional_sample_rate: 2]
alias Plausible.Stats.{Query, DateTimeRange}
diff --git a/test/plausible/teams/grace_period_test.exs b/test/plausible/teams/grace_period_test.exs
index 2f7116e510..577a967c41 100644
--- a/test/plausible/teams/grace_period_test.exs
+++ b/test/plausible/teams/grace_period_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.Teams.GracePeriodTest do
use Plausible.DataCase, async: true
- use Plausible.Teams.Test
test "active?/1 returns false when grace period cannot be telled" do
without_grace_period =
diff --git a/test/plausible/teams/invitations/accept_test.exs b/test/plausible/teams/invitations/accept_test.exs
index 871c6760ca..b61729025f 100644
--- a/test/plausible/teams/invitations/accept_test.exs
+++ b/test/plausible/teams/invitations/accept_test.exs
@@ -1,9 +1,7 @@
defmodule Plausible.Teams.Invitations.AcceptTest do
- use Plausible
require Plausible.Billing.Subscription.Status
use Plausible.DataCase, async: true
use Bamboo.Test
- use Plausible.Teams.Test
alias Plausible.Teams.Invitations.Accept
diff --git a/test/plausible/teams/invitations/invite_to_site_test.exs b/test/plausible/teams/invitations/invite_to_site_test.exs
index bd675f6faf..e32a4d92a6 100644
--- a/test/plausible/teams/invitations/invite_to_site_test.exs
+++ b/test/plausible/teams/invitations/invite_to_site_test.exs
@@ -1,8 +1,6 @@
defmodule Plausible.Teams.Invitations.InviteToSiteTest do
- use Plausible
use Plausible.DataCase
use Bamboo.Test
- use Plausible.Teams.Test
alias Plausible.Teams.Invitations.InviteToSite
diff --git a/test/plausible/teams/invitations/invite_to_team_test.exs b/test/plausible/teams/invitations/invite_to_team_test.exs
index ac6070fa96..9975e0276b 100644
--- a/test/plausible/teams/invitations/invite_to_team_test.exs
+++ b/test/plausible/teams/invitations/invite_to_team_test.exs
@@ -1,8 +1,6 @@
defmodule Plausible.Teams.Invitations.InviteToTeamTest do
use Plausible.DataCase
- use Plausible
use Bamboo.Test
- use Plausible.Teams.Test
alias Plausible.Repo
alias Plausible.Teams
diff --git a/test/plausible/teams/invitations/reject_test.exs b/test/plausible/teams/invitations/reject_test.exs
index d4adbe0ca4..35c1b4e0ec 100644
--- a/test/plausible/teams/invitations/reject_test.exs
+++ b/test/plausible/teams/invitations/reject_test.exs
@@ -1,6 +1,4 @@
defmodule Plausible.Teams.Invitations.RejectTest do
- use Plausible
- use Plausible.Teams.Test
use Plausible.DataCase, async: true
use Bamboo.Test
diff --git a/test/plausible/teams/invitations/remove_from_site_test.exs b/test/plausible/teams/invitations/remove_from_site_test.exs
index d0f74eb479..548c7497cd 100644
--- a/test/plausible/teams/invitations/remove_from_site_test.exs
+++ b/test/plausible/teams/invitations/remove_from_site_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.Teams.Invitations.RemoveFromSiteTest do
use Plausible.DataCase, async: true
- use Plausible.Teams.Test
alias Plausible.Teams.Invitations.RemoveFromSite
diff --git a/test/plausible/teams/management/layout_test.exs b/test/plausible/teams/management/layout_test.exs
index 1f18d3f7bf..c2283caebb 100644
--- a/test/plausible/teams/management/layout_test.exs
+++ b/test/plausible/teams/management/layout_test.exs
@@ -1,8 +1,6 @@
defmodule Plausible.Teams.Management.LayoutTest do
use Plausible.DataCase, async: true
- use Plausible.Teams.Test
use Bamboo.Test
- use Plausible
alias Plausible.Teams.Management.Layout
alias Plausible.Teams.Management.Layout.Entry
diff --git a/test/plausible/teams/memberships/leave_test.exs b/test/plausible/teams/memberships/leave_test.exs
index 517dd4f850..77350b2ac8 100644
--- a/test/plausible/teams/memberships/leave_test.exs
+++ b/test/plausible/teams/memberships/leave_test.exs
@@ -1,8 +1,6 @@
defmodule Plausible.Teams.Memberships.LeaveTest do
use Plausible.DataCase, async: true
- use Plausible
use Plausible.Repo
- use Plausible.Teams.Test
use Bamboo.Test
alias Plausible.Teams.Memberships.Leave
diff --git a/test/plausible/teams/memberships/remove_test.exs b/test/plausible/teams/memberships/remove_test.exs
index e367524b68..f63c70bbff 100644
--- a/test/plausible/teams/memberships/remove_test.exs
+++ b/test/plausible/teams/memberships/remove_test.exs
@@ -1,8 +1,6 @@
defmodule Plausible.Teams.Memberships.RemoveTest do
use Plausible.DataCase, async: true
- use Plausible
use Plausible.Repo
- use Plausible.Teams.Test
use Bamboo.Test
alias Plausible.Teams.Memberships.Remove
diff --git a/test/plausible/teams/memberships/update_role_test.exs b/test/plausible/teams/memberships/update_role_test.exs
index 45f384c7d2..060b754709 100644
--- a/test/plausible/teams/memberships/update_role_test.exs
+++ b/test/plausible/teams/memberships/update_role_test.exs
@@ -1,9 +1,7 @@
defmodule Plausible.Teams.Memberships.UpdateRoleTest do
use Plausible.DataCase, async: true
use Plausible.Repo
- use Plausible.Teams.Test
use Bamboo.Test
- use Plausible
alias Plausible.Teams.Memberships.UpdateRole
diff --git a/test/plausible/teams/sites/transfer_test.exs b/test/plausible/teams/sites/transfer_test.exs
index 389beecb7a..2536146030 100644
--- a/test/plausible/teams/sites/transfer_test.exs
+++ b/test/plausible/teams/sites/transfer_test.exs
@@ -1,9 +1,7 @@
defmodule Plausible.Teams.Sites.TransferTest do
- use Plausible
require Plausible.Billing.Subscription.Status
use Plausible.DataCase, async: true
use Bamboo.Test
- use Plausible.Teams.Test
alias Plausible.Teams.Sites.Transfer
diff --git a/test/plausible/teams_test.exs b/test/plausible/teams_test.exs
index 8fce24325d..8df5bec668 100644
--- a/test/plausible/teams_test.exs
+++ b/test/plausible/teams_test.exs
@@ -1,7 +1,5 @@
defmodule Plausible.TeamsTest do
use Plausible.DataCase, async: true
- use Plausible
- use Plausible.Teams.Test
alias Plausible.Billing.Subscription
alias Plausible.Teams
diff --git a/test/plausible_web/components/billing/billing_test.exs b/test/plausible_web/components/billing/billing_test.exs
index dd5154644b..bde06ff23e 100644
--- a/test/plausible_web/components/billing/billing_test.exs
+++ b/test/plausible_web/components/billing/billing_test.exs
@@ -1,9 +1,7 @@
defmodule PlausibleWeb.Components.BillingTest do
use Plausible.DataCase
- use Plausible.Teams.Test
import Phoenix.Component
import Phoenix.LiveViewTest, only: [rendered_to_string: 1]
- import Plausible.Test.Support.HTML
describe "feature_gate/1" do
setup [:create_user]
diff --git a/test/plausible_web/components/billing/notice_test.exs b/test/plausible_web/components/billing/notice_test.exs
index a6d13ee995..bf6835d17d 100644
--- a/test/plausible_web/components/billing/notice_test.exs
+++ b/test/plausible_web/components/billing/notice_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Components.Billing.NoticeTest do
use Plausible.DataCase
- use Plausible.Teams.Test
import Phoenix.LiveViewTest, only: [render_component: 2]
alias PlausibleWeb.Components.Billing.Notice
diff --git a/test/plausible_web/components/flow_progress_test.exs b/test/plausible_web/components/flow_progress_test.exs
index 5739d98f67..34e512e75d 100644
--- a/test/plausible_web/components/flow_progress_test.exs
+++ b/test/plausible_web/components/flow_progress_test.exs
@@ -2,7 +2,6 @@ defmodule PlausibleWeb.Components.FlowProgressTest do
use Plausible.DataCase
import Phoenix.LiveViewTest, only: [render_component: 2]
- import Plausible.Test.Support.HTML
alias PlausibleWeb.Components.FlowProgress
diff --git a/test/plausible_web/controllers/api/external_controller_test.exs b/test/plausible_web/controllers/api/external_controller_test.exs
index 8a0143154b..f25f5529bb 100644
--- a/test/plausible_web/controllers/api/external_controller_test.exs
+++ b/test/plausible_web/controllers/api/external_controller_test.exs
@@ -1,7 +1,6 @@
defmodule PlausibleWeb.Api.ExternalControllerTest do
use PlausibleWeb.ConnCase
use Plausible.ClickhouseRepo
- use Plausible.Teams.Test
@user_agent "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Safari/537.36"
@user_agent_mobile "Mozilla/5.0 (Linux; Android 6.0; U007 Pro Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/44.0.2403.119 Mobile Safari/537.36"
diff --git a/test/plausible_web/controllers/api/external_sites_controller_sites_crud_api_test.exs b/test/plausible_web/controllers/api/external_sites_controller_sites_crud_api_test.exs
index 79db3fee07..458804f3b0 100644
--- a/test/plausible_web/controllers/api/external_sites_controller_sites_crud_api_test.exs
+++ b/test/plausible_web/controllers/api/external_sites_controller_sites_crud_api_test.exs
@@ -2,10 +2,8 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerSitesCrudApiTest do
@moduledoc """
Tests for Sites create/read/update/delete API.
"""
- use Plausible
use PlausibleWeb.ConnCase
use Plausible.Repo
- use Plausible.Teams.Test
use Bamboo.Test
on_ee do
diff --git a/test/plausible_web/controllers/api/external_sites_controller_test.exs b/test/plausible_web/controllers/api/external_sites_controller_test.exs
index acb534e302..012c494fd1 100644
--- a/test/plausible_web/controllers/api/external_sites_controller_test.exs
+++ b/test/plausible_web/controllers/api/external_sites_controller_test.exs
@@ -20,10 +20,8 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest do
Site CRUD endpoints tests are in ExternalSitesControllerSitesCrudApiTest
"""
- use Plausible
use PlausibleWeb.ConnCase, async: false
use Plausible.Repo
- use Plausible.Teams.Test
use Bamboo.Test
on_ee do
diff --git a/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs b/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs
index 6a3c3b19a3..08647abeb6 100644
--- a/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs
+++ b/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs
@@ -1,7 +1,5 @@
defmodule PlausibleWeb.Api.ExternalStatsController.AggregateTest do
use PlausibleWeb.ConnCase
- use Plausible.Teams.Test
- import Plausible.TestUtils
alias Plausible.Billing.Feature
setup [:create_user, :create_site, :create_api_key, :use_api_key]
diff --git a/test/plausible_web/controllers/api/external_stats_controller/auth_test.exs b/test/plausible_web/controllers/api/external_stats_controller/auth_test.exs
index e02567990f..c121078e8b 100644
--- a/test/plausible_web/controllers/api/external_stats_controller/auth_test.exs
+++ b/test/plausible_web/controllers/api/external_stats_controller/auth_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Api.ExternalStatsController.AuthTest do
use PlausibleWeb.ConnCase
- use Plausible.Teams.Test
alias Plausible.Repo
diff --git a/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exs b/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exs
index 87acbfda51..0aabad3517 100644
--- a/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exs
+++ b/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Api.ExternalStatsController.BreakdownTest do
use PlausibleWeb.ConnCase
- use Plausible.Teams.Test
alias Plausible.Billing.Feature
diff --git a/test/plausible_web/controllers/api/external_stats_controller/query_comparisons_test.exs b/test/plausible_web/controllers/api/external_stats_controller/query_comparisons_test.exs
index 830c94df5f..284d21431f 100644
--- a/test/plausible_web/controllers/api/external_stats_controller/query_comparisons_test.exs
+++ b/test/plausible_web/controllers/api/external_stats_controller/query_comparisons_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Api.ExternalStatsController.QueryComparisonsTest do
use PlausibleWeb.ConnCase
- import Plausible.Teams.Test
setup [:create_user, :create_site, :create_api_key, :use_api_key, :create_site_import]
diff --git a/test/plausible_web/controllers/api/external_stats_controller/query_consolidated_view_test.exs b/test/plausible_web/controllers/api/external_stats_controller/query_consolidated_view_test.exs
index 86a53dade9..a648af10a2 100644
--- a/test/plausible_web/controllers/api/external_stats_controller/query_consolidated_view_test.exs
+++ b/test/plausible_web/controllers/api/external_stats_controller/query_consolidated_view_test.exs
@@ -2,8 +2,6 @@ defmodule PlausibleWeb.Api.ExternalStatsController.QueryConsolidatedViewTest do
use PlausibleWeb.ConnCase
on_ee do
- use Plausible.Teams.Test
-
setup [:create_user, :create_team, :create_site, :create_api_key, :use_api_key]
test "simple aggregate query across all consolidated site_ids", %{
diff --git a/test/plausible_web/controllers/api/external_stats_controller/query_test.exs b/test/plausible_web/controllers/api/external_stats_controller/query_test.exs
index 998e7e5e4f..c5b5200bd3 100644
--- a/test/plausible_web/controllers/api/external_stats_controller/query_test.exs
+++ b/test/plausible_web/controllers/api/external_stats_controller/query_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Api.ExternalStatsController.QueryTest do
use PlausibleWeb.ConnCase
- use Plausible.Teams.Test
@user_id Enum.random(1000..9999)
diff --git a/test/plausible_web/controllers/api/external_stats_controller/query_timezone_test.exs b/test/plausible_web/controllers/api/external_stats_controller/query_timezone_test.exs
index c1c35542ec..0d1cb55df5 100644
--- a/test/plausible_web/controllers/api/external_stats_controller/query_timezone_test.exs
+++ b/test/plausible_web/controllers/api/external_stats_controller/query_timezone_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Api.ExternalStatsController.QueryTimezoneTest do
use PlausibleWeb.ConnCase
- use Plausible.Teams.Test
setup [:create_user, :create_site, :create_api_key, :use_api_key]
diff --git a/test/plausible_web/controllers/api/external_stats_controller/query_validations_test.exs b/test/plausible_web/controllers/api/external_stats_controller/query_validations_test.exs
index deb4dc97ce..1418f1ca2d 100644
--- a/test/plausible_web/controllers/api/external_stats_controller/query_validations_test.exs
+++ b/test/plausible_web/controllers/api/external_stats_controller/query_validations_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Api.ExternalStatsController.QueryValidationsTest do
use PlausibleWeb.ConnCase
- use Plausible.Teams.Test
alias Plausible.Billing.Feature
diff --git a/test/plausible_web/controllers/api/external_stats_controller/timeseries_test.exs b/test/plausible_web/controllers/api/external_stats_controller/timeseries_test.exs
index f128963887..297756bf81 100644
--- a/test/plausible_web/controllers/api/external_stats_controller/timeseries_test.exs
+++ b/test/plausible_web/controllers/api/external_stats_controller/timeseries_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Api.ExternalStatsController.TimeseriesTest do
use PlausibleWeb.ConnCase
- use Plausible.Teams.Test
alias Plausible.Billing.Feature
setup [:create_user, :create_site, :create_api_key, :use_api_key]
diff --git a/test/plausible_web/controllers/api/internal_controller/segments_controller_test.exs b/test/plausible_web/controllers/api/internal_controller/segments_controller_test.exs
index 733ea17e73..47658b8c81 100644
--- a/test/plausible_web/controllers/api/internal_controller/segments_controller_test.exs
+++ b/test/plausible_web/controllers/api/internal_controller/segments_controller_test.exs
@@ -1,7 +1,6 @@
defmodule PlausibleWeb.Api.Internal.SegmentsControllerTest do
use PlausibleWeb.ConnCase, async: true
use Plausible.Repo
- use Plausible.Teams.Test
describe "POST /api/:domain/segments" do
setup [:create_user, :log_in, :create_site]
diff --git a/test/plausible_web/controllers/api/internal_controller/sync_test.exs b/test/plausible_web/controllers/api/internal_controller/sync_test.exs
index b130f0898d..66445f1f48 100644
--- a/test/plausible_web/controllers/api/internal_controller/sync_test.exs
+++ b/test/plausible_web/controllers/api/internal_controller/sync_test.exs
@@ -1,7 +1,6 @@
defmodule PlausibleWeb.Api.InternalController.SyncTest do
use PlausibleWeb.ConnCase, async: false
use Plausible.Repo
- use Plausible.Teams.Test
describe "PUT /api/:domain/disable-feature" do
setup [:create_user, :log_in]
diff --git a/test/plausible_web/controllers/api/internal_controller_test.exs b/test/plausible_web/controllers/api/internal_controller_test.exs
index 191278434c..1039882381 100644
--- a/test/plausible_web/controllers/api/internal_controller_test.exs
+++ b/test/plausible_web/controllers/api/internal_controller_test.exs
@@ -1,7 +1,6 @@
defmodule PlausibleWeb.Api.InternalControllerTest do
use PlausibleWeb.ConnCase, async: true
use Plausible.Repo
- use Plausible.Teams.Test
describe "GET /api/sites" do
setup [:create_user, :log_in]
diff --git a/test/plausible_web/controllers/api/paddle_controller_test.exs b/test/plausible_web/controllers/api/paddle_controller_test.exs
index e1b5475948..f2bd0e35c9 100644
--- a/test/plausible_web/controllers/api/paddle_controller_test.exs
+++ b/test/plausible_web/controllers/api/paddle_controller_test.exs
@@ -69,7 +69,7 @@ defmodule PlausibleWeb.Api.PaddleControllerTest do
refute_receive :paddle_queried
new_ip =
- Plug.Conn.put_req_header(initial_conn, "x-forwarded-for", Plausible.TestUtils.random_ip())
+ Plug.Conn.put_req_header(initial_conn, "x-forwarded-for", random_ip())
conn = get(new_ip, Routes.paddle_path(initial_conn, :currency))
assert json_response(conn, 200) == %{"currency" => "£"}
diff --git a/test/plausible_web/controllers/api/stats_controller/authorization_test.exs b/test/plausible_web/controllers/api/stats_controller/authorization_test.exs
index 56fbdb5198..d6e85e99b2 100644
--- a/test/plausible_web/controllers/api/stats_controller/authorization_test.exs
+++ b/test/plausible_web/controllers/api/stats_controller/authorization_test.exs
@@ -1,5 +1,4 @@
defmodule PlausibleWeb.Api.StatsController.AuthorizationTest do
- use Plausible.Teams.Test
use PlausibleWeb.ConnCase
describe "API authorization - as anonymous user" do
diff --git a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs
index 194cd32a5a..79e261e1c5 100644
--- a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs
+++ b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Api.StatsController.ConversionsTest do
use PlausibleWeb.ConnCase
- use Plausible.Teams.Test
@user_id Enum.random(1000..9999)
diff --git a/test/plausible_web/controllers/api/stats_controller/custom_prop_breakdown_test.exs b/test/plausible_web/controllers/api/stats_controller/custom_prop_breakdown_test.exs
index f4acbd59ca..77a72687f7 100644
--- a/test/plausible_web/controllers/api/stats_controller/custom_prop_breakdown_test.exs
+++ b/test/plausible_web/controllers/api/stats_controller/custom_prop_breakdown_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Api.StatsController.CustomPropBreakdownTest do
use PlausibleWeb.ConnCase
- use Plausible.Teams.Test
describe "GET /api/stats/:domain/custom-prop-values/:prop_key" do
setup [:create_user, :log_in, :create_site, :create_legacy_site_import]
diff --git a/test/plausible_web/controllers/api/stats_controller/funnels_test.exs b/test/plausible_web/controllers/api/stats_controller/funnels_test.exs
index ac45192f58..aaa7a11f34 100644
--- a/test/plausible_web/controllers/api/stats_controller/funnels_test.exs
+++ b/test/plausible_web/controllers/api/stats_controller/funnels_test.exs
@@ -1,7 +1,5 @@
defmodule PlausibleWeb.Api.StatsController.FunnelsTest do
use PlausibleWeb.ConnCase, async: true
- use Plausible
- use Plausible.Teams.Test
@moduletag :ee_only
on_ee do
diff --git a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs
index ff0d11daa1..6270eb3148 100644
--- a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs
+++ b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Api.StatsController.MainGraphTest do
use PlausibleWeb.ConnCase
- use Plausible.Teams.Test
@user_id Enum.random(1000..9999)
diff --git a/test/plausible_web/controllers/api/stats_controller/pages_test.exs b/test/plausible_web/controllers/api/stats_controller/pages_test.exs
index a184938cb7..3db45b0c69 100644
--- a/test/plausible_web/controllers/api/stats_controller/pages_test.exs
+++ b/test/plausible_web/controllers/api/stats_controller/pages_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Api.StatsController.PagesTest do
use PlausibleWeb.ConnCase
- use Plausible.Teams.Test
@user_id Enum.random(1000..9999)
diff --git a/test/plausible_web/controllers/api/stats_controller/regions_test.exs b/test/plausible_web/controllers/api/stats_controller/regions_test.exs
index 0e94c63164..4065e5a5a0 100644
--- a/test/plausible_web/controllers/api/stats_controller/regions_test.exs
+++ b/test/plausible_web/controllers/api/stats_controller/regions_test.exs
@@ -1,5 +1,4 @@
defmodule PlausibleWeb.Api.StatsController.RegionsTest do
- use Plausible.Teams.Test
use PlausibleWeb.ConnCase
describe "GET /api/stats/:domain/regions" do
diff --git a/test/plausible_web/controllers/api/stats_controller/sources_test.exs b/test/plausible_web/controllers/api/stats_controller/sources_test.exs
index 98d20753a7..5fc930b274 100644
--- a/test/plausible_web/controllers/api/stats_controller/sources_test.exs
+++ b/test/plausible_web/controllers/api/stats_controller/sources_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Api.StatsController.SourcesTest do
use PlausibleWeb.ConnCase
- use Plausible.Teams.Test
@user_id Enum.random(1000..9999)
diff --git a/test/plausible_web/controllers/api/stats_controller/top_stats_test.exs b/test/plausible_web/controllers/api/stats_controller/top_stats_test.exs
index ed2dd5c51f..2e4d691a6a 100644
--- a/test/plausible_web/controllers/api/stats_controller/top_stats_test.exs
+++ b/test/plausible_web/controllers/api/stats_controller/top_stats_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
use PlausibleWeb.ConnCase
- use Plausible.Teams.Test
@user_id Enum.random(1000..9999)
diff --git a/test/plausible_web/controllers/auth_controller_test.exs b/test/plausible_web/controllers/auth_controller_test.exs
index 34427cf00d..a2d4fc9202 100644
--- a/test/plausible_web/controllers/auth_controller_test.exs
+++ b/test/plausible_web/controllers/auth_controller_test.exs
@@ -1,10 +1,8 @@
defmodule PlausibleWeb.AuthControllerTest do
use PlausibleWeb.ConnCase, async: true
use Bamboo.Test
- use Plausible.Teams.Test
use Plausible.Repo
- import Plausible.Test.Support.HTML
import Mox
require Logger
@@ -1811,7 +1809,7 @@ defmodule PlausibleWeb.AuthControllerTest do
})
|> recycle()
|> Map.put(:secret_key_base, secret_key_base())
- |> Plug.Conn.put_req_header("x-forwarded-for", Plausible.TestUtils.random_ip())
+ |> Plug.Conn.put_req_header("x-forwarded-for", random_ip())
end
defp set_remember_2fa_cookie(conn, user) do
@@ -1819,7 +1817,7 @@ defmodule PlausibleWeb.AuthControllerTest do
|> PlausibleWeb.TwoFactor.Session.maybe_set_remember_2fa(user, "true")
|> recycle()
|> Map.put(:secret_key_base, secret_key_base())
- |> Plug.Conn.put_req_header("x-forwarded-for", Plausible.TestUtils.random_ip())
+ |> Plug.Conn.put_req_header("x-forwarded-for", random_ip())
end
defp mock_captcha_success() do
diff --git a/test/plausible_web/controllers/billing_controller_test.exs b/test/plausible_web/controllers/billing_controller_test.exs
index a3c64bc1f4..87575e2dd4 100644
--- a/test/plausible_web/controllers/billing_controller_test.exs
+++ b/test/plausible_web/controllers/billing_controller_test.exs
@@ -1,7 +1,6 @@
defmodule PlausibleWeb.BillingControllerTest do
use PlausibleWeb.ConnCase, async: true
- use Plausible.Teams.Test
- import Plausible.Test.Support.HTML
+
require Plausible.Billing.Subscription.Status
alias Plausible.Billing.Subscription
diff --git a/test/plausible_web/controllers/error_report_controller_test.exs b/test/plausible_web/controllers/error_report_controller_test.exs
index 2812cc7c50..15d262547b 100644
--- a/test/plausible_web/controllers/error_report_controller_test.exs
+++ b/test/plausible_web/controllers/error_report_controller_test.exs
@@ -5,7 +5,6 @@ defmodule PlausibleWeb.ErrorReportControllerTest do
use Bamboo.Test
import Phoenix.View
- import Plausible.Test.Support.HTML
alias PlausibleWeb.Endpoint
alias PlausibleWeb.ErrorView
diff --git a/test/plausible_web/controllers/google_analytics_controller_test.exs b/test/plausible_web/controllers/google_analytics_controller_test.exs
index d7e99c71f9..816c388ab3 100644
--- a/test/plausible_web/controllers/google_analytics_controller_test.exs
+++ b/test/plausible_web/controllers/google_analytics_controller_test.exs
@@ -3,7 +3,6 @@ defmodule PlausibleWeb.GoogleAnalyticsControllerTest do
use Oban.Testing, repo: Plausible.Repo
import Mox
- import Plausible.Test.Support.HTML
alias Plausible.HTTPClient
alias Plausible.Imported.SiteImport
diff --git a/test/plausible_web/controllers/help_scout_controller_test.exs b/test/plausible_web/controllers/help_scout_controller_test.exs
index b8b9df5429..91caf4637d 100644
--- a/test/plausible_web/controllers/help_scout_controller_test.exs
+++ b/test/plausible_web/controllers/help_scout_controller_test.exs
@@ -1,12 +1,9 @@
defmodule PlausibleWeb.HelpScoutControllerTest do
use PlausibleWeb.ConnCase, async: true
- use Plausible
@moduletag :ee_only
on_ee do
- import Plausible.Teams.Test
-
alias Plausible.HelpScout
describe "callback/2" do
diff --git a/test/plausible_web/controllers/invitation_controller_test.exs b/test/plausible_web/controllers/invitation_controller_test.exs
index dfc429ff1a..d765354007 100644
--- a/test/plausible_web/controllers/invitation_controller_test.exs
+++ b/test/plausible_web/controllers/invitation_controller_test.exs
@@ -1,7 +1,6 @@
defmodule PlausibleWeb.Site.InvitationControllerTest do
use PlausibleWeb.ConnCase, async: true
use Plausible.Repo
- use Plausible.Teams.Test
use Bamboo.Test
alias Plausible.Teams
diff --git a/test/plausible_web/controllers/settings_controller_test.exs b/test/plausible_web/controllers/settings_controller_test.exs
index e062cd48da..6a912fd505 100644
--- a/test/plausible_web/controllers/settings_controller_test.exs
+++ b/test/plausible_web/controllers/settings_controller_test.exs
@@ -1,12 +1,10 @@
defmodule PlausibleWeb.SettingsControllerTest do
use PlausibleWeb.ConnCase, async: true
use Bamboo.Test
- use Plausible
use Plausible.Repo
- use Plausible.Teams.Test
import Mox
- import Plausible.Test.Support.HTML
+
import Ecto.Query
require Plausible.Billing.Subscription.Status
diff --git a/test/plausible_web/controllers/site/membership_controller_test.exs b/test/plausible_web/controllers/site/membership_controller_test.exs
index cf3cf7364b..a5c0138d27 100644
--- a/test/plausible_web/controllers/site/membership_controller_test.exs
+++ b/test/plausible_web/controllers/site/membership_controller_test.exs
@@ -1,13 +1,8 @@
defmodule PlausibleWeb.Site.MembershipControllerTest do
- use Plausible
use PlausibleWeb.ConnCase
use Plausible.Repo
use Bamboo.Test
- use Plausible.Teams.Test
- import Plausible.Teams.Test
- import Plausible.Test.Support.HTML
-
@subject_prefix if ee?(), do: "[Plausible Analytics] ", else: "[Plausible CE] "
setup [:create_user, :log_in]
diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exs
index 9ff1561f02..2be757b4c9 100644
--- a/test/plausible_web/controllers/site_controller_test.exs
+++ b/test/plausible_web/controllers/site_controller_test.exs
@@ -3,11 +3,9 @@ defmodule PlausibleWeb.SiteControllerTest do
use Plausible.Repo
use Bamboo.Test
use Oban.Testing, repo: Plausible.Repo
- use Plausible.Teams.Test
import ExUnit.CaptureLog
import Mox
- import Plausible.Test.Support.HTML
alias Plausible.Imported.SiteImport
alias Plausible.Teams
@@ -872,9 +870,7 @@ defmodule PlausibleWeb.SiteControllerTest do
assert html_response(conn, 200) =~ "Custom event"
assert html_response(conn, 200) =~ "Visit /register"
- end
- test "goal names are HTML safe", %{conn: conn, site: site} do
insert(:goal, site: site, event_name: "<some_event>")
conn = get(conn, "/#{site.domain}/settings/goals")
diff --git a/test/plausible_web/controllers/sso_controller_sync_test.exs b/test/plausible_web/controllers/sso_controller_sync_test.exs
index 48481f7c94..631f6a745e 100644
--- a/test/plausible_web/controllers/sso_controller_sync_test.exs
+++ b/test/plausible_web/controllers/sso_controller_sync_test.exs
@@ -4,8 +4,6 @@ defmodule PlausibleWeb.SSOControllerSyncTest do
@moduletag :ee_only
on_ee do
- use Plausible.Teams.Test
-
alias Plausible.Auth
alias Plausible.Auth.SSO
alias Plausible.Repo
diff --git a/test/plausible_web/controllers/sso_controller_test.exs b/test/plausible_web/controllers/sso_controller_test.exs
index 763df40a86..3d874b3136 100644
--- a/test/plausible_web/controllers/sso_controller_test.exs
+++ b/test/plausible_web/controllers/sso_controller_test.exs
@@ -1,13 +1,9 @@
defmodule PlausibleWeb.SSOControllerTest do
use PlausibleWeb.ConnCase, async: true
- use Plausible
@moduletag :ee_only
on_ee do
- import Plausible.Teams.Test
- import Plausible.Test.Support.HTML
-
alias Plausible.Auth
alias Plausible.Auth.SSO
alias Plausible.Repo
diff --git a/test/plausible_web/controllers/stats_controller_test.exs b/test/plausible_web/controllers/stats_controller_test.exs
index 618b1419c9..b835144f9c 100644
--- a/test/plausible_web/controllers/stats_controller_test.exs
+++ b/test/plausible_web/controllers/stats_controller_test.exs
@@ -1,8 +1,6 @@
defmodule PlausibleWeb.StatsControllerTest do
use PlausibleWeb.ConnCase, async: false
use Plausible.Repo
- use Plausible.Teams.Test
- import Plausible.Test.Support.HTML
@react_container "div#stats-react-container"
diff --git a/test/plausible_web/controllers/unsubscribe_controller_test.exs b/test/plausible_web/controllers/unsubscribe_controller_test.exs
index 4abb3acca1..4dfdd6aaab 100644
--- a/test/plausible_web/controllers/unsubscribe_controller_test.exs
+++ b/test/plausible_web/controllers/unsubscribe_controller_test.exs
@@ -1,7 +1,6 @@
defmodule PlausibleWeb.UnsubscribeControllerTest do
use PlausibleWeb.ConnCase, async: true
use Plausible.Repo
- use Plausible.Teams.Test
setup {PlausibleWeb.FirstLaunchPlug.Test, :skip}
diff --git a/test/plausible_web/email_test.exs b/test/plausible_web/email_test.exs
index d2c4e3e61e..2cb31b95ff 100644
--- a/test/plausible_web/email_test.exs
+++ b/test/plausible_web/email_test.exs
@@ -1,9 +1,7 @@
defmodule PlausibleWeb.EmailTest do
use Plausible.DataCase, async: true
- use Plausible.Teams.Test
import Plausible.Factory
- import Plausible.Test.Support.HTML
alias PlausibleWeb.Email
diff --git a/test/plausible_web/live/change_domain_test.exs b/test/plausible_web/live/change_domain_test.exs
index 864555415d..6cca9907da 100644
--- a/test/plausible_web/live/change_domain_test.exs
+++ b/test/plausible_web/live/change_domain_test.exs
@@ -1,10 +1,7 @@
defmodule PlausibleWeb.Live.ChangeDomainTest do
use PlausibleWeb.ConnCase, async: false
- use Plausible
import Phoenix.LiveViewTest
- import Plausible.TestUtils
- import Plausible.Test.Support.HTML
on_ee do
import Mox
diff --git a/test/plausible_web/live/choose_plan_test.exs b/test/plausible_web/live/choose_plan_test.exs
index 6acf0abe46..762d6fc8b4 100644
--- a/test/plausible_web/live/choose_plan_test.exs
+++ b/test/plausible_web/live/choose_plan_test.exs
@@ -2,11 +2,10 @@ defmodule PlausibleWeb.Live.ChoosePlanTest do
use PlausibleWeb.ConnCase, async: true
on_ee do
- use Plausible.Teams.Test
@moduletag :ee_only
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
+
require Plausible.Billing.Subscription.Status
alias Plausible.{Repo, Billing, Billing.Subscription}
diff --git a/test/plausible_web/live/components/combo_box_test.exs b/test/plausible_web/live/components/combo_box_test.exs
index 47d573d1dd..8db4a783cc 100644
--- a/test/plausible_web/live/components/combo_box_test.exs
+++ b/test/plausible_web/live/components/combo_box_test.exs
@@ -1,7 +1,6 @@
defmodule PlausibleWeb.Live.Components.ComboBoxTest do
use PlausibleWeb.ConnCase, async: true
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
alias PlausibleWeb.Live.Components.ComboBox
diff --git a/test/plausible_web/live/components/form_test.exs b/test/plausible_web/live/components/form_test.exs
index e078f3965f..b411d17cae 100644
--- a/test/plausible_web/live/components/form_test.exs
+++ b/test/plausible_web/live/components/form_test.exs
@@ -1,7 +1,6 @@
defmodule PlausibleWeb.Live.Components.FormTest do
use PlausibleWeb.ConnCase, async: true
import Phoenix.LiveViewTest, only: [render_component: 2]
- import Plausible.Test.Support.HTML
alias Plausible.Auth.User
alias PlausibleWeb.Live.Components.Form
diff --git a/test/plausible_web/live/components/verification_test.exs b/test/plausible_web/live/components/verification_test.exs
index 2525008c7d..2645de32cc 100644
--- a/test/plausible_web/live/components/verification_test.exs
+++ b/test/plausible_web/live/components/verification_test.exs
@@ -1,10 +1,8 @@
defmodule PlausibleWeb.Live.Components.VerificationTest do
- use Plausible
+ use PlausibleWeb.ConnCase, async: true
on_ee do
- use PlausibleWeb.ConnCase, async: true
import Phoenix.LiveViewTest, only: [render_component: 2]
- import Plausible.Test.Support.HTML
alias Plausible.InstallationSupport.{State, Verification}
diff --git a/test/plausible_web/live/customer_support/sites_test.exs b/test/plausible_web/live/customer_support/sites_test.exs
index 2cff615883..66e49f3843 100644
--- a/test/plausible_web/live/customer_support/sites_test.exs
+++ b/test/plausible_web/live/customer_support/sites_test.exs
@@ -3,12 +3,9 @@ defmodule PlausibleWeb.Live.CustomerSupport.SitesTest do
@moduletag :ee_only
on_ee do
- use Plausible.Teams.Test
- use Plausible
use Bamboo.Test, shared: true
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
defp open_site(id, opts \\ []) do
Routes.customer_support_site_path(PlausibleWeb.Endpoint, :show, id, opts)
diff --git a/test/plausible_web/live/customer_support/teams_test.exs b/test/plausible_web/live/customer_support/teams_test.exs
index 10212a1eb3..c045aa2710 100644
--- a/test/plausible_web/live/customer_support/teams_test.exs
+++ b/test/plausible_web/live/customer_support/teams_test.exs
@@ -1,12 +1,9 @@
defmodule PlausibleWeb.Live.CustomerSupport.TeamsTest do
use PlausibleWeb.ConnCase, async: false
- use Plausible.Teams.Test
- use Plausible
@moduletag :ee_only
on_ee do
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
alias Plausible.Auth.SSO
diff --git a/test/plausible_web/live/customer_support/users_test.exs b/test/plausible_web/live/customer_support/users_test.exs
index 2ec7152a8c..9406490c36 100644
--- a/test/plausible_web/live/customer_support/users_test.exs
+++ b/test/plausible_web/live/customer_support/users_test.exs
@@ -1,12 +1,9 @@
defmodule PlausibleWeb.Live.CustomerSupport.UsersTest do
use PlausibleWeb.ConnCase, async: false
- use Plausible.Teams.Test
- use Plausible
@moduletag :ee_only
on_ee do
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
defp open_user(id, qs \\ []) do
Routes.customer_support_user_path(PlausibleWeb.Endpoint, :show, id, qs)
diff --git a/test/plausible_web/live/customer_support_test.exs b/test/plausible_web/live/customer_support_test.exs
index a9762aab55..5a807f9f19 100644
--- a/test/plausible_web/live/customer_support_test.exs
+++ b/test/plausible_web/live/customer_support_test.exs
@@ -1,7 +1,5 @@
defmodule PlausibleWeb.Live.CustomerSupportTest do
use PlausibleWeb.ConnCase, async: false
- use Plausible.Teams.Test
- use Plausible
@moduletag :ee_only
@@ -9,7 +7,6 @@ defmodule PlausibleWeb.Live.CustomerSupportTest do
@cs_index Routes.customer_support_path(PlausibleWeb.Endpoint, :index)
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
alias Plausible.Auth.SSO
diff --git a/test/plausible_web/live/funnel_settings/form_test.exs b/test/plausible_web/live/funnel_settings/form_test.exs
index 9097975e57..5bbee3e2eb 100644
--- a/test/plausible_web/live/funnel_settings/form_test.exs
+++ b/test/plausible_web/live/funnel_settings/form_test.exs
@@ -3,7 +3,6 @@ defmodule PlausibleWeb.Live.FunnelSettings.FormTest do
@moduletag :ee_only
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
describe "integration - live rendering" do
setup [:create_user, :log_in, :create_site]
diff --git a/test/plausible_web/live/funnel_settings_test.exs b/test/plausible_web/live/funnel_settings_test.exs
index baf3444722..4fcf37d913 100644
--- a/test/plausible_web/live/funnel_settings_test.exs
+++ b/test/plausible_web/live/funnel_settings_test.exs
@@ -1,12 +1,9 @@
defmodule PlausibleWeb.Live.FunnelSettingsTest do
use PlausibleWeb.ConnCase, async: true
- use Plausible.Teams.Test
- use Plausible
@moduletag :ee_only
on_ee do
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
describe "GET /:domain/settings/funnels" do
setup [:create_user, :log_in, :create_site]
diff --git a/test/plausible_web/live/goal_settings/form_test.exs b/test/plausible_web/live/goal_settings/form_test.exs
index 2da5babc4b..6155267198 100644
--- a/test/plausible_web/live/goal_settings/form_test.exs
+++ b/test/plausible_web/live/goal_settings/form_test.exs
@@ -1,10 +1,8 @@
defmodule PlausibleWeb.Live.GoalSettings.FormTest do
use PlausibleWeb.ConnCase, async: true
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
on_ee do
- import Plausible.Teams.Test
end
@revenue_goal_settings ~s|div[data-test-id="revenue-goal-settings"]|
diff --git a/test/plausible_web/live/goal_settings_sync_test.exs b/test/plausible_web/live/goal_settings_sync_test.exs
index 595cdb0c88..f22ffc84e7 100644
--- a/test/plausible_web/live/goal_settings_sync_test.exs
+++ b/test/plausible_web/live/goal_settings_sync_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Live.GoalSettingsSyncTest do
use PlausibleWeb.ConnCase, async: false
- use Plausible.Teams.Test
import Phoenix.LiveViewTest
diff --git a/test/plausible_web/live/goal_settings_test.exs b/test/plausible_web/live/goal_settings_test.exs
index de71b98177..e44f171268 100644
--- a/test/plausible_web/live/goal_settings_test.exs
+++ b/test/plausible_web/live/goal_settings_test.exs
@@ -1,8 +1,6 @@
defmodule PlausibleWeb.Live.GoalSettingsTest do
use PlausibleWeb.ConnCase, async: true
- use Plausible.Teams.Test
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
@funnels_cta ~s|p[data-test-id="setup-funnels-cta"]|
diff --git a/test/plausible_web/live/installation_test.exs b/test/plausible_web/live/installation_test.exs
index 7b3a1c4f10..a3ac3aae5f 100644
--- a/test/plausible_web/live/installation_test.exs
+++ b/test/plausible_web/live/installation_test.exs
@@ -1,11 +1,8 @@
defmodule PlausibleWeb.Live.InstallationTest do
use PlausibleWeb.ConnCase
- use Plausible
use Plausible.Test.Support.DNS
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
- import Plausible.Teams.Test
alias Plausible.Site.TrackerScriptConfiguration
diff --git a/test/plausible_web/live/plugins_api_tokens_test.exs b/test/plausible_web/live/plugins_api_tokens_test.exs
index d5b2090275..4738df7f4f 100644
--- a/test/plausible_web/live/plugins_api_tokens_test.exs
+++ b/test/plausible_web/live/plugins_api_tokens_test.exs
@@ -1,7 +1,6 @@
defmodule PlausibleWeb.Live.PluginsAPISettingsTest do
use PlausibleWeb.ConnCase, async: true
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
alias Plausible.Plugins.API.Tokens
diff --git a/test/plausible_web/live/props_settings/form_test.exs b/test/plausible_web/live/props_settings/form_test.exs
index 7628d4d28d..f7983748b1 100644
--- a/test/plausible_web/live/props_settings/form_test.exs
+++ b/test/plausible_web/live/props_settings/form_test.exs
@@ -1,10 +1,8 @@
defmodule PlausibleWeb.Live.PropsSettings.FormTest do
use PlausibleWeb.ConnCase, async: true
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
on_ee do
- import Plausible.Teams.Test
end
describe "Props submission" do
diff --git a/test/plausible_web/live/props_settings_test.exs b/test/plausible_web/live/props_settings_test.exs
index d90fdffe69..98e73ac6a4 100644
--- a/test/plausible_web/live/props_settings_test.exs
+++ b/test/plausible_web/live/props_settings_test.exs
@@ -1,8 +1,6 @@
defmodule PlausibleWeb.Live.PropsSettingsTest do
use PlausibleWeb.ConnCase, async: true
- use Plausible.Teams.Test
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
describe "GET /:domain/settings/properties" do
setup [:create_user, :log_in, :create_site]
diff --git a/test/plausible_web/live/register_form_test.exs b/test/plausible_web/live/register_form_test.exs
index 08cd7d5f9d..3cd0811a65 100644
--- a/test/plausible_web/live/register_form_test.exs
+++ b/test/plausible_web/live/register_form_test.exs
@@ -3,9 +3,6 @@ defmodule PlausibleWeb.Live.RegisterFormTest do
import Mox
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
-
- use Plausible.Teams.Test
alias Plausible.Auth.User
alias Plausible.Repo
diff --git a/test/plausible_web/live/reset_password_form_test.exs b/test/plausible_web/live/reset_password_form_test.exs
index 2a28b0a6d0..ab53e92d04 100644
--- a/test/plausible_web/live/reset_password_form_test.exs
+++ b/test/plausible_web/live/reset_password_form_test.exs
@@ -3,7 +3,6 @@ defmodule PlausibleWeb.Live.ResetPasswordFormTest do
import Phoenix.ChannelTest
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
alias Plausible.Auth.User
alias Plausible.Auth.Token
diff --git a/test/plausible_web/live/shared_link_settings/form_test.exs b/test/plausible_web/live/shared_link_settings/form_test.exs
index 4a1926e237..e6e889c99c 100644
--- a/test/plausible_web/live/shared_link_settings/form_test.exs
+++ b/test/plausible_web/live/shared_link_settings/form_test.exs
@@ -1,8 +1,6 @@
defmodule PlausibleWeb.Live.SharedLinkSettings.FormTest do
use PlausibleWeb.ConnCase, async: true
- use Plausible.Teams.Test
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
describe "Shared link form" do
setup [:create_user, :log_in, :create_site]
diff --git a/test/plausible_web/live/shared_link_settings_test.exs b/test/plausible_web/live/shared_link_settings_test.exs
index 3841b4f75d..a3dbe90494 100644
--- a/test/plausible_web/live/shared_link_settings_test.exs
+++ b/test/plausible_web/live/shared_link_settings_test.exs
@@ -1,8 +1,6 @@
defmodule PlausibleWeb.Live.SharedLinkSettingsTest do
use PlausibleWeb.ConnCase, async: true
- use Plausible.Teams.Test
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
describe "SharedLinkSettings LiveView" do
setup [:create_user, :log_in, :create_site]
diff --git a/test/plausible_web/live/shields/countries_test.exs b/test/plausible_web/live/shields/countries_test.exs
index f097508932..16364d8bf1 100644
--- a/test/plausible_web/live/shields/countries_test.exs
+++ b/test/plausible_web/live/shields/countries_test.exs
@@ -2,7 +2,6 @@ defmodule PlausibleWeb.Live.Shields.CountriesTest do
use PlausibleWeb.ConnCase, async: true
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
alias Plausible.Shields
diff --git a/test/plausible_web/live/shields/hostnames_test.exs b/test/plausible_web/live/shields/hostnames_test.exs
index 22c150dc8f..063b5dee34 100644
--- a/test/plausible_web/live/shields/hostnames_test.exs
+++ b/test/plausible_web/live/shields/hostnames_test.exs
@@ -2,7 +2,6 @@ defmodule PlausibleWeb.Live.Shields.HostnamesTest do
use PlausibleWeb.ConnCase, async: true
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
alias Plausible.Shields
diff --git a/test/plausible_web/live/shields/ip_addresses_test.exs b/test/plausible_web/live/shields/ip_addresses_test.exs
index 2e044c5122..5050c1c356 100644
--- a/test/plausible_web/live/shields/ip_addresses_test.exs
+++ b/test/plausible_web/live/shields/ip_addresses_test.exs
@@ -2,7 +2,6 @@ defmodule PlausibleWeb.Live.Shields.IPAddressesTest do
use PlausibleWeb.ConnCase, async: true
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
alias Plausible.Shields
diff --git a/test/plausible_web/live/shields/pages_test.exs b/test/plausible_web/live/shields/pages_test.exs
index acc5d3eb31..79c57f23b5 100644
--- a/test/plausible_web/live/shields/pages_test.exs
+++ b/test/plausible_web/live/shields/pages_test.exs
@@ -2,7 +2,6 @@ defmodule PlausibleWeb.Live.Shields.PagesTest do
use PlausibleWeb.ConnCase, async: true
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
alias Plausible.Shields
diff --git a/test/plausible_web/live/sites_test.exs b/test/plausible_web/live/sites_test.exs
index ca08308c27..a7b91fed32 100644
--- a/test/plausible_web/live/sites_test.exs
+++ b/test/plausible_web/live/sites_test.exs
@@ -1,9 +1,7 @@
defmodule PlausibleWeb.Live.SitesTest do
use PlausibleWeb.ConnCase, async: true
- use Plausible.Teams.Test
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
alias Plausible.Repo
diff --git a/test/plausible_web/live/sso_management_test.exs b/test/plausible_web/live/sso_management_test.exs
index b9bb20686b..f803984dbe 100644
--- a/test/plausible_web/live/sso_management_test.exs
+++ b/test/plausible_web/live/sso_management_test.exs
@@ -6,10 +6,8 @@ defmodule PlausibleWeb.Live.SSOMangementTest do
on_ee do
use Bamboo.Test, shared: true
- use Plausible.Teams.Test
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
alias Plausible.Auth
alias Plausible.Auth.SSO
diff --git a/test/plausible_web/live/team_management_test.exs b/test/plausible_web/live/team_management_test.exs
index e574a2a75a..c1a3d5190f 100644
--- a/test/plausible_web/live/team_management_test.exs
+++ b/test/plausible_web/live/team_management_test.exs
@@ -1,10 +1,8 @@
defmodule PlausibleWeb.Live.TeamMangementTest do
use PlausibleWeb.ConnCase, async: false
use Bamboo.Test, shared: true
- use Plausible.Teams.Test
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
def team_general_path(), do: Routes.settings_path(PlausibleWeb.Endpoint, :team_general)
@subject_prefix if ee?(), do: "[Plausible Analytics] ", else: "[Plausible CE] "
diff --git a/test/plausible_web/live/team_setup_test.exs b/test/plausible_web/live/team_setup_test.exs
index 6590c819b1..1c9ac36195 100644
--- a/test/plausible_web/live/team_setup_test.exs
+++ b/test/plausible_web/live/team_setup_test.exs
@@ -1,10 +1,8 @@
defmodule PlausibleWeb.Live.TeamSetupTest do
use PlausibleWeb.ConnCase, async: false
- use Plausible.Teams.Test
use Bamboo.Test, shared: true
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
alias Plausible.Teams
alias Plausible.Repo
diff --git a/test/plausible_web/live/verification_test.exs b/test/plausible_web/live/verification_test.exs
index c3575d84b0..959af2645b 100644
--- a/test/plausible_web/live/verification_test.exs
+++ b/test/plausible_web/live/verification_test.exs
@@ -4,7 +4,6 @@ defmodule PlausibleWeb.Live.VerificationTest do
use Plausible.Test.Support.DNS
import Phoenix.LiveViewTest
- import Plausible.Test.Support.HTML
@moduletag :capture_log
diff --git a/test/plausible_web/plugins/api/controllers/capabilities_test.exs b/test/plausible_web/plugins/api/controllers/capabilities_test.exs
index 39eec985de..de8b5077bd 100644
--- a/test/plausible_web/plugins/api/controllers/capabilities_test.exs
+++ b/test/plausible_web/plugins/api/controllers/capabilities_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Plugins.API.Controllers.CapabilitiesTest do
use PlausibleWeb.PluginsAPICase, async: true
- use Plausible.Teams.Test
alias PlausibleWeb.Plugins.API.Schemas
describe "examples" do
diff --git a/test/plausible_web/plugins/api/controllers/custom_props_test.exs b/test/plausible_web/plugins/api/controllers/custom_props_test.exs
index 3ba556d55c..16143d24c0 100644
--- a/test/plausible_web/plugins/api/controllers/custom_props_test.exs
+++ b/test/plausible_web/plugins/api/controllers/custom_props_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Plugins.API.Controllers.CustomPropsTest do
use PlausibleWeb.PluginsAPICase, async: true
- use Plausible.Teams.Test
alias PlausibleWeb.Plugins.API.Schemas
describe "examples" do
diff --git a/test/plausible_web/plugins/api/controllers/funnels_test.exs b/test/plausible_web/plugins/api/controllers/funnels_test.exs
index 8ed2d40be7..298beadd39 100644
--- a/test/plausible_web/plugins/api/controllers/funnels_test.exs
+++ b/test/plausible_web/plugins/api/controllers/funnels_test.exs
@@ -1,7 +1,5 @@
defmodule PlausibleWeb.Plugins.API.Controllers.FunnelsTest do
use PlausibleWeb.PluginsAPICase, async: true
- use Plausible
- use Plausible.Teams.Test
@moduletag :ee_only
diff --git a/test/plausible_web/plugins/api/controllers/goals_test.exs b/test/plausible_web/plugins/api/controllers/goals_test.exs
index 129d374f04..d7361b972c 100644
--- a/test/plausible_web/plugins/api/controllers/goals_test.exs
+++ b/test/plausible_web/plugins/api/controllers/goals_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Plugins.API.Controllers.GoalsTest do
use PlausibleWeb.PluginsAPICase, async: true
- use Plausible.Teams.Test
alias PlausibleWeb.Plugins.API.Schemas
describe "examples" do
diff --git a/test/plausible_web/plugins/api/controllers/tracker_script_configuration_test.exs b/test/plausible_web/plugins/api/controllers/tracker_script_configuration_test.exs
index c61a257749..9e1415e52f 100644
--- a/test/plausible_web/plugins/api/controllers/tracker_script_configuration_test.exs
+++ b/test/plausible_web/plugins/api/controllers/tracker_script_configuration_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Plugins.API.Controllers.TrackerScriptConfigurationTest do
use PlausibleWeb.PluginsAPICase, async: true
- use Plausible.Teams.Test
import Plausible.AssertMatches
alias PlausibleWeb.Plugins.API.Schemas
diff --git a/test/plausible_web/plugs/auth_plug_test.exs b/test/plausible_web/plugs/auth_plug_test.exs
index d4a97ee3c1..f6de7f8d7f 100644
--- a/test/plausible_web/plugs/auth_plug_test.exs
+++ b/test/plausible_web/plugs/auth_plug_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.AuthPlugTest do
use PlausibleWeb.ConnCase, async: true
- use Plausible.Teams.Test
alias PlausibleWeb.AuthPlug
diff --git a/test/plausible_web/plugs/authorize_public_api_test.exs b/test/plausible_web/plugs/authorize_public_api_test.exs
index c078b8cd94..43a34a300c 100644
--- a/test/plausible_web/plugs/authorize_public_api_test.exs
+++ b/test/plausible_web/plugs/authorize_public_api_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Plugs.AuthorizePublicAPITest do
use PlausibleWeb.ConnCase, async: false
- use Plausible.Teams.Test
import ExUnit.CaptureLog
diff --git a/test/plausible_web/plugs/authorize_site_access_test.exs b/test/plausible_web/plugs/authorize_site_access_test.exs
index 47519121f3..cceaa5a7b0 100644
--- a/test/plausible_web/plugs/authorize_site_access_test.exs
+++ b/test/plausible_web/plugs/authorize_site_access_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Plugs.AuthorizeSiteAccessTest do
use PlausibleWeb.ConnCase, async: false
- use Plausible.Teams.Test
alias PlausibleWeb.Plugs.AuthorizeSiteAccess
setup [:create_user, :log_in, :create_site]
diff --git a/test/plausible_web/plugs/authorize_team_access_test.exs b/test/plausible_web/plugs/authorize_team_access_test.exs
index 227a8a0f73..3bdf2d3a91 100644
--- a/test/plausible_web/plugs/authorize_team_access_test.exs
+++ b/test/plausible_web/plugs/authorize_team_access_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.Plugs.AuthorizeTeamAccessTest do
use PlausibleWeb.ConnCase, async: true
- use Plausible.Teams.Test
alias Plausible.Plugs.AuthorizeTeamAccess
import Plug.Conn
diff --git a/test/plausible_web/plugs/handle_expired_session_test.exs b/test/plausible_web/plugs/handle_expired_session_test.exs
index 37752bdb44..506284eca9 100644
--- a/test/plausible_web/plugs/handle_expired_session_test.exs
+++ b/test/plausible_web/plugs/handle_expired_session_test.exs
@@ -1,10 +1,7 @@
defmodule Plausible.Plugs.HandleExpiredSessionTest do
use PlausibleWeb.ConnCase, async: true
- use Plausible
on_ee do
- use Plausible.Teams.Test
-
alias Plausible.Auth.UserSessions
alias Plausible.Plugs.HandleExpiredSession
alias Plausible.Repo
diff --git a/test/plausible_web/plugs/require_account_plug_test.exs b/test/plausible_web/plugs/require_account_plug_test.exs
index eb5e775b44..974af516cf 100644
--- a/test/plausible_web/plugs/require_account_plug_test.exs
+++ b/test/plausible_web/plugs/require_account_plug_test.exs
@@ -1,6 +1,5 @@
defmodule PlausibleWeb.RequireAccountPlugTest do
use PlausibleWeb.ConnCase, async: true
- use Plausible.Teams.Test
import Plug.Conn
diff --git a/test/plausible_web/plugs/sso_team_access_test.exs b/test/plausible_web/plugs/sso_team_access_test.exs
index 087d4503b1..167f85f38d 100644
--- a/test/plausible_web/plugs/sso_team_access_test.exs
+++ b/test/plausible_web/plugs/sso_team_access_test.exs
@@ -1,10 +1,7 @@
defmodule Plausible.Plugs.SSOTeamAccessTest do
use PlausibleWeb.ConnCase, async: true
- use Plausible
on_ee do
- use Plausible.Teams.Test
-
alias Plausible.Auth
alias Plausible.Plugs.SSOTeamAccess
alias PlausibleWeb.AuthPlug
diff --git a/test/plausible_web/plugs/tracker_plug_test.exs b/test/plausible_web/plugs/tracker_plug_test.exs
index 8af241e321..488b5b2292 100644
--- a/test/plausible_web/plugs/tracker_plug_test.exs
+++ b/test/plausible_web/plugs/tracker_plug_test.exs
@@ -14,7 +14,6 @@ defmodule PlausibleWeb.TrackerPlugTest do
do regenerate the files before running tests, so they're up to date.
"""
use PlausibleWeb.ConnCase, async: true
- use Plausible.Teams.Test
import Plug.Test
alias PlausibleWeb.Tracker
diff --git a/test/plausible_web/tracker_script_cache_test.exs b/test/plausible_web/tracker_script_cache_test.exs
index 773a543191..a7fb7ca239 100644
--- a/test/plausible_web/tracker_script_cache_test.exs
+++ b/test/plausible_web/tracker_script_cache_test.exs
@@ -1,7 +1,5 @@
defmodule PlausibleWeb.TrackerScriptCacheTest do
- use Plausible
use Plausible.DataCase, async: true
- use Plausible.Teams.Test
alias Plausible.Site.TrackerScriptConfiguration
alias PlausibleWeb.TrackerScriptCache
diff --git a/test/plausible_web/tracker_test.exs b/test/plausible_web/tracker_test.exs
index 78b6bb0530..8c152e4f51 100644
--- a/test/plausible_web/tracker_test.exs
+++ b/test/plausible_web/tracker_test.exs
@@ -1,8 +1,6 @@
defmodule PlausibleWeb.TrackerTest do
use Plausible.DataCase
use Oban.Testing, repo: Plausible.Repo
- use Plausible
- use Plausible.Teams.Test
alias Plausible.Site.TrackerScriptConfiguration
alias PlausibleWeb.Tracker
diff --git a/test/plausible_web/user_auth_test.exs b/test/plausible_web/user_auth_test.exs
index 26b52d93c3..2ff543613c 100644
--- a/test/plausible_web/user_auth_test.exs
+++ b/test/plausible_web/user_auth_test.exs
@@ -1,7 +1,5 @@
defmodule PlausibleWeb.UserAuthTest do
use PlausibleWeb.ConnCase, async: true
- use Plausible
- use Plausible.Teams.Test
alias Plausible.Repo
alias PlausibleWeb.UserAuth
diff --git a/test/support/audit/test_schema.ex b/test/support/audit/test_schema.ex
index d878cf66d8..0ae99ef205 100644
--- a/test/support/audit/test_schema.ex
+++ b/test/support/audit/test_schema.ex
@@ -1,5 +1,6 @@
defmodule Plausible.Audit.TestSchema do
@moduledoc false
+
use Plausible
on_ee do
diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex
index 484cd70018..1a0565ee8f 100644
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@ -17,16 +17,18 @@ defmodule PlausibleWeb.ConnCase do
using do
quote do
- # Import conveniences for testing with connections
use Plausible.TestUtils
use Plausible
+ use Plausible.Teams.Test
+
+ import Plausible.Test.Support.HTML
import Plug.Conn
import Phoenix.ConnTest
+
alias PlausibleWeb.Router.Helpers, as: Routes
import Plausible.Factory
import Plausible.AssertMatches
- # The default endpoint for testing
@endpoint PlausibleWeb.Endpoint
end
end
diff --git a/test/support/data_case.ex b/test/support/data_case.ex
index 4e245534af..54fc41685a 100644
--- a/test/support/data_case.ex
+++ b/test/support/data_case.ex
@@ -19,6 +19,9 @@ defmodule Plausible.DataCase do
use Plausible.Repo
use Plausible.TestUtils
use Plausible
+ use Plausible.Teams.Test
+
+ import Plausible.Test.Support.HTML
import Ecto.Changeset
import Plausible.DataCase
diff --git a/test/support/dev/billing/dev_subscriptions.ex b/test/support/dev/billing/dev_subscriptions.ex
index ee58731569..2622cf360d 100644
--- a/test/support/dev/billing/dev_subscriptions.ex
+++ b/test/support/dev/billing/dev_subscriptions.ex
@@ -2,6 +2,7 @@ defmodule Plausible.Billing.DevSubscriptions do
@moduledoc """
Module for conveniently handling subscriptions in the :dev environment.
"""
+
use Plausible
on_ee do
diff --git a/test/support/plugins_api_case.ex b/test/support/plugins_api_case.ex
index 4c6b6cfabf..6eab811344 100644
--- a/test/support/plugins_api_case.ex
+++ b/test/support/plugins_api_case.ex
@@ -8,11 +8,12 @@ defmodule PlausibleWeb.PluginsAPICase do
using do
quote do
- # The default endpoint for testing
@endpoint PlausibleWeb.Endpoint
- # Import conveniences for testing with connections
use Plausible.TestUtils
+ use Plausible.Teams.Test
+ use Plausible
+
import Plug.Conn
import Phoenix.ConnTest
import PlausibleWeb.Plugins.API.Spec, only: [spec: 0]
diff --git a/test/workers/accept_traffic_until_test.exs b/test/workers/accept_traffic_until_test.exs
index 353da02f2a..3450ddd007 100644
--- a/test/workers/accept_traffic_until_test.exs
+++ b/test/workers/accept_traffic_until_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.Workers.AcceptTrafficUntilTest do
use Plausible.DataCase, async: true
- use Plausible.Teams.Test
use Bamboo.Test
alias Plausible.Workers.AcceptTrafficUntil
diff --git a/test/workers/check_usage_test.exs b/test/workers/check_usage_test.exs
index 7d1763a862..9a012f4210 100644
--- a/test/workers/check_usage_test.exs
+++ b/test/workers/check_usage_test.exs
@@ -1,7 +1,6 @@
defmodule Plausible.Workers.CheckUsageTest do
use Plausible.DataCase, async: true
use Bamboo.Test
- use Plausible.Teams.Test
import Double
alias Plausible.Workers.CheckUsage
diff --git a/test/workers/clean_invitations_test.exs b/test/workers/clean_invitations_test.exs
index 38fc012f41..e17f82374d 100644
--- a/test/workers/clean_invitations_test.exs
+++ b/test/workers/clean_invitations_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.Workers.CleanInvitationsTest do
use Plausible.DataCase
- use Plausible.Teams.Test
alias Plausible.Workers.CleanInvitations
test "cleans invitations and transfers that are more than 48h old" do
diff --git a/test/workers/clickhouse_clean_sites_test.exs b/test/workers/clickhouse_clean_sites_test.exs
index 61e852e711..18cc2c96f7 100644
--- a/test/workers/clickhouse_clean_sites_test.exs
+++ b/test/workers/clickhouse_clean_sites_test.exs
@@ -1,7 +1,5 @@
defmodule Plausible.Workers.ClickhouseCleanSitesTest do
use Plausible.DataCase
- use Plausible.TestUtils
- use Plausible
import Plausible.Factory
alias Plausible.Workers.ClickhouseCleanSites
diff --git a/test/workers/import_analytics_test.exs b/test/workers/import_analytics_test.exs
index f89337142e..42613cbaa4 100644
--- a/test/workers/import_analytics_test.exs
+++ b/test/workers/import_analytics_test.exs
@@ -1,7 +1,6 @@
defmodule Plausible.Workers.ImportAnalyticsTest do
use Plausible.DataCase
use Bamboo.Test
- use Plausible.Teams.Test
alias Plausible.Imported.SiteImport
alias Plausible.Workers.ImportAnalytics
diff --git a/test/workers/lock_sites_test.exs b/test/workers/lock_sites_test.exs
index e9e809dac9..fb8489fd0b 100644
--- a/test/workers/lock_sites_test.exs
+++ b/test/workers/lock_sites_test.exs
@@ -1,6 +1,5 @@
defmodule Plausible.Workers.LockSitesTest do
use Plausible.DataCase, async: true
- use Plausible.Teams.Test
require Plausible.Billing.Subscription.Status
alias Plausible.Workers.LockSites
alias Plausible.Billing.Subscription
diff --git a/test/workers/notify_annual_renewal_test.exs b/test/workers/notify_annual_renewal_test.exs
index 19cef4b5a8..76ea02f54c 100644
--- a/test/workers/notify_annual_renewal_test.exs
+++ b/test/workers/notify_annual_renewal_test.exs
@@ -1,7 +1,6 @@
defmodule Plausible.Workers.NotifyAnnualRenewalTest do
use Plausible.DataCase, async: true
use Bamboo.Test
- use Plausible.Teams.Test
require Plausible.Billing.Subscription.Status
alias Plausible.Workers.NotifyAnnualRenewal
alias Plausible.Billing.Subscription
diff --git a/test/workers/notify_exported_analytics_test.exs b/test/workers/notify_exported_analytics_test.exs
index ae34787901..967770a58e 100644
--- a/test/workers/notify_exported_analytics_test.exs
+++ b/test/workers/notify_exported_analytics_test.exs
@@ -1,7 +1,5 @@
defmodule Plausible.Workers.NotifyExportedAnalyticsTest do
- use Plausible
use Plausible.DataCase
- use Plausible.Teams.Test
use Bamboo.Test
describe "perform/1" do
diff --git a/test/workers/schedule_email_reports_test.exs b/test/workers/schedule_email_reports_test.exs
index 8a0bb63a6c..70f46ac7bd 100644
--- a/test/workers/schedule_email_reports_test.exs
+++ b/test/workers/schedule_email_reports_test.exs
@@ -1,7 +1,7 @@
defmodule Plausible.Workers.ScheduleEmailReportsTest do
use Plausible.DataCase
use Oban.Testing, repo: Plausible.Repo
- import Plausible.Teams.Test
+
alias Plausible.Workers.{ScheduleEmailReports, SendEmailReport}
describe "weekly reports" do
diff --git a/test/workers/send_check_stats_emails_test.exs b/test/workers/send_check_stats_emails_test.exs
index d892c825e7..466f3413d9 100644
--- a/test/workers/send_check_stats_emails_test.exs
+++ b/test/workers/send_check_stats_emails_test.exs
@@ -2,7 +2,6 @@ defmodule Plausible.Workers.SendCheckStatsEmailsTest do
use Plausible.DataCase, async: true
use Oban.Testing, repo: Plausible.Repo
use Bamboo.Test
- use Plausible.Teams.Test
alias Plausible.Workers.SendCheckStatsEmails
diff --git a/test/workers/send_email_report_test.exs b/test/workers/send_email_report_test.exs
index bbf93178e0..9d79b3c86f 100644
--- a/test/workers/send_email_report_test.exs
+++ b/test/workers/send_email_report_test.exs
@@ -1,9 +1,8 @@
defmodule Plausible.Workers.SendEmailReportTest do
use Plausible.DataCase
use Bamboo.Test
- use Plausible.Teams.Test
use Oban.Testing, repo: Plausible.Repo
- import Plausible.Test.Support.HTML
+
alias Plausible.Workers.SendEmailReport
@green "#15803d"
diff --git a/test/workers/send_site_setup_emails_test.exs b/test/workers/send_site_setup_emails_test.exs
index 854deb630a..db7f962055 100644
--- a/test/workers/send_site_setup_emails_test.exs
+++ b/test/workers/send_site_setup_emails_test.exs
@@ -2,7 +2,6 @@ defmodule Plausible.Workers.SendSiteSetupEmailsTest do
use Plausible.DataCase, async: true
use Bamboo.Test
use Oban.Testing, repo: Plausible.Repo
- use Plausible.Teams.Test
alias Plausible.Workers.SendSiteSetupEmails
diff --git a/test/workers/send_trial_notifications_test.exs b/test/workers/send_trial_notifications_test.exs
index 9d27cae6a2..22c2277158 100644
--- a/test/workers/send_trial_notifications_test.exs
+++ b/test/workers/send_trial_notifications_test.exs
@@ -2,7 +2,6 @@ defmodule Plausible.Workers.SendTrialNotificationsTest do
use Plausible.DataCase
use Bamboo.Test
use Oban.Testing, repo: Plausible.Repo
- use Plausible.Teams.Test
alias Plausible.Workers.SendTrialNotifications
test "does not send a notification if user didn't create a site" do
diff --git a/test/workers/set_legacy_time_on_page_cutoff_test.exs b/test/workers/set_legacy_time_on_page_cutoff_test.exs
index 4b1689600e..979ecd087c 100644
--- a/test/workers/set_legacy_time_on_page_cutoff_test.exs
+++ b/test/workers/set_legacy_time_on_page_cutoff_test.exs
@@ -1,7 +1,5 @@
defmodule Plausible.Workers.SetLegacyTimeOnPageCutoffTest do
use Plausible.DataCase
- use Plausible.TestUtils
- use Plausible
alias Plausible.Workers.SetLegacyTimeOnPageCutoff
diff --git a/test/workers/sso_domain_verification_worker_test.exs b/test/workers/sso_domain_verification_worker_test.exs
index ba3b80c4a6..d75a013cf6 100644
--- a/test/workers/sso_domain_verification_worker_test.exs
+++ b/test/workers/sso_domain_verification_worker_test.exs
@@ -1,12 +1,10 @@
defmodule Plausible.Auth.SSO.Domain.Verification.WorkerTest do
use Plausible.DataCase
- use Plausible
on_ee do
use Bamboo.Test, shared: true
use Oban.Testing, repo: Plausible.Repo
use Plausible.Auth.SSO.Domain.Status
- use Plausible.Teams.Test
alias Plausible.Auth.SSO
alias Plausible.Auth.SSO.Domain.Verification.Worker
diff --git a/test/workers/traffic_change_notifier_test.exs b/test/workers/traffic_change_notifier_test.exs
index b5bbaab424..a77d87027e 100644
--- a/test/workers/traffic_change_notifier_test.exs
+++ b/test/workers/traffic_change_notifier_test.exs
@@ -1,7 +1,6 @@
defmodule Plausible.Workers.TrafficChangeNotifierTest do
use Plausible.DataCase, async: true
use Bamboo.Test
- use Plausible.Teams.Test
alias Plausible.Workers.TrafficChangeNotifier
@view_dashboard_text "View dashboard"