Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Slurp common test modules into exunit templates (#5909)
Adam Rutkowski0eea55d1c166
diff --git a/test/plausible/audit_test.exs b/test/plausible/audit_test.exsindex 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.DataCaseon_ee do- use Plausible.DataCase-- use Plausible.Teams.Test-alias Plausible.Auditalias Plausible.Audit.Encoderalias Plausible.Audit.Entrydiff --git a/test/plausible/auth/auth_test.exs b/test/plausible/auth/auth_test.exsindex a09e10c825..d43158e1cb 100644--- a/test/plausible/auth/auth_test.exs+++ b/test/plausible/auth/auth_test.exs@@ -1,6 +1,5 @@defmodule Plausible.AuthTest douse Plausible.DataCase, async: true- use Plausible.Teams.Testalias Plausible.Authtest "enterprise_configured?/1 returns whether the user has an enterprise plan" dodiff --git a/test/plausible/auth/sso/domain/verification_test.exs b/test/plausible/auth/sso/domain/verification_test.exsindex 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 douse Plausible.DataCase, async: true- use Plausible@moduletag :ee_onlyon_ee do- use Plausible.Teams.Test-alias Plasusible.Test.Support.DNSServeralias Plausible.Auth.SSO.Domain.Verificationalias Plug.Conndiff --git a/test/plausible/auth/sso/domains_test.exs b/test/plausible/auth/sso/domains_test.exsindex 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 douse Plausible.DataCase, async: true- use Plausible@moduletag :ee_onlyon_ee do- use Plausible.Teams.Testuse Plausible.Auth.SSO.Domain.Statususe Oban.Testing, repo: Plausible.Repodiff --git a/test/plausible/auth/sso_test.exs b/test/plausible/auth/sso_test.exsindex 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 douse Plausible.DataCase, async: true- use Plausibleon_ee douse Oban.Testing, repo: Plausible.Repo- use Plausible.Teams.Testalias Plausible.Authalias Plausible.Auth.SSOdiff --git a/test/plausible/auth/user_sessions_test.exs b/test/plausible/auth/user_sessions_test.exsindex 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 douse Plausible.DataCase, async: true- use Plausible.Teams.Test- use Plausibleimport Phoenix.ChannelTestdiff --git a/test/plausible/billing/billing_test.exs b/test/plausible/billing/billing_test.exsindex d946e29900..da25ecf4c2 100644--- a/test/plausible/billing/billing_test.exs+++ b/test/plausible/billing/billing_test.exs@@ -1,6 +1,5 @@defmodule Plausible.BillingTest douse Plausible.DataCase- use Plausible.Teams.Testuse Bamboo.Test, shared: truerequire Plausible.Billing.Subscription.Statusalias Plausible.Billingdiff --git a/test/plausible/billing/enterprise_plan_test.exs b/test/plausible/billing/enterprise_plan_test.exsindex 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 douse Plausible.DataCase- use Plausible.Teams.Testalias Plausible.Billing.EnterprisePlantest "changeset/2 loads and dumps the list of features" dodiff --git a/test/plausible/billing/feature_test.exs b/test/plausible/billing/feature_test.exsindex 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 doalias Plausible.Billing.Feature.SiteSegmentsuse Plausible.DataCase- use Plausible.Teams.Testalias Plausible.Billing.Feature.{Goals,diff --git a/test/plausible/billing/plans_test.exs b/test/plausible/billing/plans_test.exsindex 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 douse Plausible.DataCase, async: true- use Plausible.Teams.Testalias Plausible.Billing.Plans@legacy_plan_id "558746"diff --git a/test/plausible/billing/quota_test.exs b/test/plausible/billing/quota_test.exsindex 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 doalias Plausible.Billing.EnterprisePlanuse Plausible.DataCase, async: true- use Plausiblealias Plausible.Billing.{Quota, Plans}alias Plausible.Billing.Feature.{Goals, Props, StatsAPI, SharedLinks}- use Plausible.Teams.Test-on_ee doalias Plausible.Billing.Feature.{Funnels, RevenueGoals, SitesAPI}enddiff --git a/test/plausible/billing/site_locker_test.exs b/test/plausible/billing/site_locker_test.exsindex 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 douse Plausible.DataCaseuse Bamboo.Test, shared: true- use Plausible.Teams.Testrequire Plausible.Billing.Subscription.Statusalias Plausible.Billing.{SiteLocker, Subscription}diff --git a/test/plausible/consolidated_view/cache_test.exs b/test/plausible/consolidated_view/cache_test.exsindex 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 douse Plausible.DataCase, async: true- use Plausible.Teams.Teston_ee doalias Plausible.ConsolidatedViewdiff --git a/test/plausible/consolidated_view/cache_test_sync.exs b/test/plausible/consolidated_view/cache_test_sync.exsindex 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 douse Plausible.DataCase, async: false- use Plausible.Teams.Teston_ee doalias Plausible.ConsolidatedView.Cachediff --git a/test/plausible/consolidated_view_test.exs b/test/plausible/consolidated_view_test.exsindex 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: trueon_ee do- use Plausible.DataCase, async: trueimport Ecto.Query- import Plausible.Teams.Test+alias Plausible.ConsolidatedViewalias Plausible.Teamsdiff --git a/test/plausible/customer_support/enterprise_plan_test.exs b/test/plausible/customer_support/enterprise_plan_test.exsindex 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 Plausibleuse Plausible.DataCase, async: true@moduletag :ee_onlydiff --git a/test/plausible/data_migration/backfill_teams_hourly_request_limit_test.exs b/test/plausible/data_migration/backfill_teams_hourly_request_limit_test.exsindex 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 douse Plausible.DataCase, async: true- use Plausible.Teams.Testimport ExUnit.CaptureIOdiff --git a/test/plausible/data_migration/prefix_tracker_script_configuration_id_test.exs b/test/plausible/data_migration/prefix_tracker_script_configuration_id_test.exsindex 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 douse Plausible.DataCase, async: true- use Plausible.Teams.Testimport ExUnit.CaptureIOimport Ecto.Querydiff --git a/test/plausible/funnels_test.exs b/test/plausible/funnels_test.exsindex c59d3bbb44..8b8236cf25 100644--- a/test/plausible/funnels_test.exs+++ b/test/plausible/funnels_test.exs@@ -2,9 +2,6 @@ defmodule Plausible.FunnelsTest douse Plausible.DataCase@moduletag :ee_only- use Plausible- use Plausible.Teams.Test-on_ee doalias Plausible.Goalsalias Plausible.Funnelsdiff --git a/test/plausible/goals_test.exs b/test/plausible/goals_test.exsindex fe50aed4bb..0e319985ff 100644--- a/test/plausible/goals_test.exs+++ b/test/plausible/goals_test.exs@@ -1,7 +1,5 @@defmodule Plausible.GoalsTest douse Plausible.DataCase- use Plausible- use Plausible.Teams.Testalias Plausible.Goalsdoctest Plausible.Goals.SystemGoals, import: truediff --git a/test/plausible/help_scout_test.exs b/test/plausible/help_scout_test.exsindex 3b549ff43a..a47b32dad0 100644--- a/test/plausible/help_scout_test.exs+++ b/test/plausible/help_scout_test.exs@@ -1,7 +1,5 @@defmodule Plausible.HelpScoutTest douse Plausible.DataCase, async: true- use Plausible.Teams.Test- use Plausible@moduletag :ee_onlydiff --git a/test/plausible/imported/csv_importer_test.exs b/test/plausible/imported/csv_importer_test.exsindex 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 Plausibleuse Plausible.Repouse PlausibleWeb.ConnCase- use Plausible.Teams.Testuse Bamboo.Testalias Plausible.Imported.{CSVImporter, SiteImport}require SiteImportdiff --git a/test/plausible/imported/google_analytics4_test.exs b/test/plausible/imported/google_analytics4_test.exsindex 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 douse PlausibleWeb.ConnCase, async: true- use Plausibleuse Oban.Testing, repo: Plausible.Repoimport Moxdiff --git a/test/plausible/imported_test.exs b/test/plausible/imported_test.exsindex 1c734b8181..1d5a122d0a 100644--- a/test/plausible/imported_test.exs+++ b/test/plausible/imported_test.exs@@ -1,6 +1,5 @@defmodule Plausible.ImportedTest douse Plausible.DataCase- use Plausiblealias Plausible.Importedalias Plausible.Stats.{Query, DateTimeRange}diff --git a/test/plausible/ingestion/counters_test.exs b/test/plausible/ingestion/counters_test.exsindex 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 douse Plausible.DataCase, async: false- use Plausible.Teams.Testimport Ecto.Queryalias Plausible.Ingestion.Countersdiff --git a/test/plausible/ingestion/event_telemetry_test.exs b/test/plausible/ingestion/event_telemetry_test.exsindex 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 doimport Phoenix.ConnTest- import Plausible.Teams.Testalias Plausible.Ingestion.Requestalias Plausible.Ingestion.Eventdiff --git a/test/plausible/ingestion/event_test.exs b/test/plausible/ingestion/event_test.exsindex 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 douse Plausible.DataCase, async: false- use Plausible.Teams.Testimport Phoenix.ConnTestdiff --git a/test/plausible/installation_support/browserless_config_test.exs b/test/plausible/installation_support/browserless_config_test.exsindex 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 Plausibleuse ExUnit.Case+ use Plausibleon_ee dodoctest Plausible.InstallationSupport.BrowserlessConfig, import: truediff --git a/test/plausible/installation_support/check_test.exs b/test/plausible/installation_support/check_test.exsindex 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 Plausibleuse Plausible.DataCase, async: true@moduletag :ee_onlydiff --git a/test/plausible/props_test.exs b/test/plausible/props_test.exsindex 3f3480502d..c57f75aae3 100644--- a/test/plausible/props_test.exs+++ b/test/plausible/props_test.exs@@ -1,6 +1,5 @@defmodule Plausible.PropsTest douse Plausible.DataCase- use Plausible.Teams.Testtest "allow/2 returns error when user plan does not include props" douser = new_user() |> subscribe_to_growth_plan()diff --git a/test/plausible/purge_test.exs b/test/plausible/purge_test.exsindex 5641fe11b6..3375abfe20 100644--- a/test/plausible/purge_test.exs+++ b/test/plausible/purge_test.exs@@ -1,6 +1,5 @@defmodule Plausible.PurgeTest douse Plausible.DataCase- use Plausible.Teams.Testsetup douser = new_user()diff --git a/test/plausible/release_test.exs b/test/plausible/release_test.exsindex a72584a295..d49861bdbd 100644--- a/test/plausible/release_test.exs+++ b/test/plausible/release_test.exs@@ -1,6 +1,5 @@defmodule Plausible.ReleaseTest douse Plausible.DataCase, async: true- use Plausiblealias Plausible.{Release, Auth}import ExUnit.CaptureIOdiff --git a/test/plausible/site/cache_test.exs b/test/plausible/site/cache_test.exsindex 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 douse Plausible.DataCase, async: true- use Plausible.Teams.Testalias Plausible.{Site, Goal}alias Plausible.Site.Cachediff --git a/test/plausible/site/gate_keeper_test.exs b/test/plausible/site/gate_keeper_test.exsindex 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 douse Plausible.DataCase, async: true- use Plausible.Teams.Testalias Plausible.Site.Cachealias Plausible.Site.GateKeeperdiff --git a/test/plausible/site/site_removal_test.exs b/test/plausible/site/site_removal_test.exsindex 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 douse Plausible.DataCase, async: trueuse Oban.Testing, repo: Plausible.Repo- use Plausible.Teams.Testalias Plausible.Site.Removalalias Plausible.Sitesdiff --git a/test/plausible/sites_test.exs b/test/plausible/sites_test.exsindex b6aed3386f..e9e0ba935c 100644--- a/test/plausible/sites_test.exs+++ b/test/plausible/sites_test.exs@@ -1,7 +1,5 @@defmodule Plausible.SitesTest douse Plausible.DataCase- use Plausible- use Plausible.Teams.Testalias Plausible.Sitesdiff --git a/test/plausible/stats/clickhouse_test.exs b/test/plausible/stats/clickhouse_test.exsindex 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 douse Plausible.DataCase, async: true- import Plausible.Teams.Test- import Plausible.TestUtilsalias Plausible.Stats.Clickhousedescribe "last_24_visitors_hourly_intervals/1" dodiff --git a/test/plausible/stats/comparisons_test.exs b/test/plausible/stats/comparisons_test.exsindex 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 douse Plausible.DataCasealias Plausible.Stats.{Query, Comparisons}- import Plausible.TestUtilssetup [:create_user, :create_site]diff --git a/test/plausible/stats/consolidated_view_test.exs b/test/plausible/stats/consolidated_view_test.exsindex 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 douse Plausible.DataCase, async: trueon_ee do- import Plausible.Teams.Test-test "returns stats for a consolidated view merged with placeholder" dofixed_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.exsindex 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 douse Plausible.DataCase, async: true- use Plausible.Teams.Testalias Plausible.Stats.Queryalias Plausible.Stats.Legacy.QueryBuilderalias Plausible.Stats.DateTimeRangediff --git a/test/plausible/stats/query/query_parse_and_build_test.exs b/test/plausible/stats/query/query_parse_and_build_test.exsindex 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 douse Plausible.DataCase- use Plausible.Teams.Testimport Plausible.AssertMatchesalias Plausible.Stats.{Query, DateTimeRange, Filters}diff --git a/test/plausible/stats/query/query_result_test.exs b/test/plausible/stats/query/query_result_test.exsindex 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 douse Plausible.DataCase, async: true- use Plausible.Teams.Testalias Plausible.Stats.{Query, QueryRunner, QueryResult, QueryOptimizer}setup dodiff --git a/test/plausible/stats/sampling_cache_test.exs b/test/plausible/stats/sampling_cache_test.exsindex 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 douse Plausible.DataCase, async: true- use Plausible-on_ee doalias Plausible.Stats.SamplingCachediff --git a/test/plausible/stats/sampling_test.exs b/test/plausible/stats/sampling_test.exsindex 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 douse Plausible.DataCase, async: true- use Plausible-on_ee doimport 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.exsindex 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 douse Plausible.DataCase, async: true- use Plausible.Teams.Testtest "active?/1 returns false when grace period cannot be telled" dowithout_grace_period =diff --git a/test/plausible/teams/invitations/accept_test.exs b/test/plausible/teams/invitations/accept_test.exsindex 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 Plausiblerequire Plausible.Billing.Subscription.Statususe Plausible.DataCase, async: trueuse Bamboo.Test- use Plausible.Teams.Testalias Plausible.Teams.Invitations.Acceptdiff --git a/test/plausible/teams/invitations/invite_to_site_test.exs b/test/plausible/teams/invitations/invite_to_site_test.exsindex 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 Plausibleuse Plausible.DataCaseuse Bamboo.Test- use Plausible.Teams.Testalias Plausible.Teams.Invitations.InviteToSitediff --git a/test/plausible/teams/invitations/invite_to_team_test.exs b/test/plausible/teams/invitations/invite_to_team_test.exsindex 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 douse Plausible.DataCase- use Plausibleuse Bamboo.Test- use Plausible.Teams.Testalias Plausible.Repoalias Plausible.Teamsdiff --git a/test/plausible/teams/invitations/reject_test.exs b/test/plausible/teams/invitations/reject_test.exsindex 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.Testuse Plausible.DataCase, async: trueuse Bamboo.Testdiff --git a/test/plausible/teams/invitations/remove_from_site_test.exs b/test/plausible/teams/invitations/remove_from_site_test.exsindex 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 douse Plausible.DataCase, async: true- use Plausible.Teams.Testalias Plausible.Teams.Invitations.RemoveFromSitediff --git a/test/plausible/teams/management/layout_test.exs b/test/plausible/teams/management/layout_test.exsindex 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 douse Plausible.DataCase, async: true- use Plausible.Teams.Testuse Bamboo.Test- use Plausiblealias Plausible.Teams.Management.Layoutalias Plausible.Teams.Management.Layout.Entrydiff --git a/test/plausible/teams/memberships/leave_test.exs b/test/plausible/teams/memberships/leave_test.exsindex 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 douse Plausible.DataCase, async: true- use Plausibleuse Plausible.Repo- use Plausible.Teams.Testuse Bamboo.Testalias Plausible.Teams.Memberships.Leavediff --git a/test/plausible/teams/memberships/remove_test.exs b/test/plausible/teams/memberships/remove_test.exsindex 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 douse Plausible.DataCase, async: true- use Plausibleuse Plausible.Repo- use Plausible.Teams.Testuse Bamboo.Testalias Plausible.Teams.Memberships.Removediff --git a/test/plausible/teams/memberships/update_role_test.exs b/test/plausible/teams/memberships/update_role_test.exsindex 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 douse Plausible.DataCase, async: trueuse Plausible.Repo- use Plausible.Teams.Testuse Bamboo.Test- use Plausiblealias Plausible.Teams.Memberships.UpdateRolediff --git a/test/plausible/teams/sites/transfer_test.exs b/test/plausible/teams/sites/transfer_test.exsindex 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 Plausiblerequire Plausible.Billing.Subscription.Statususe Plausible.DataCase, async: trueuse Bamboo.Test- use Plausible.Teams.Testalias Plausible.Teams.Sites.Transferdiff --git a/test/plausible/teams_test.exs b/test/plausible/teams_test.exsindex 8fce24325d..8df5bec668 100644--- a/test/plausible/teams_test.exs+++ b/test/plausible/teams_test.exs@@ -1,7 +1,5 @@defmodule Plausible.TeamsTest douse Plausible.DataCase, async: true- use Plausible- use Plausible.Teams.Testalias Plausible.Billing.Subscriptionalias Plausible.Teamsdiff --git a/test/plausible_web/components/billing/billing_test.exs b/test/plausible_web/components/billing/billing_test.exsindex 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 douse Plausible.DataCase- use Plausible.Teams.Testimport Phoenix.Componentimport Phoenix.LiveViewTest, only: [rendered_to_string: 1]- import Plausible.Test.Support.HTMLdescribe "feature_gate/1" dosetup [:create_user]diff --git a/test/plausible_web/components/billing/notice_test.exs b/test/plausible_web/components/billing/notice_test.exsindex 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 douse Plausible.DataCase- use Plausible.Teams.Testimport Phoenix.LiveViewTest, only: [render_component: 2]alias PlausibleWeb.Components.Billing.Noticediff --git a/test/plausible_web/components/flow_progress_test.exs b/test/plausible_web/components/flow_progress_test.exsindex 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 douse Plausible.DataCaseimport Phoenix.LiveViewTest, only: [render_component: 2]- import Plausible.Test.Support.HTMLalias PlausibleWeb.Components.FlowProgressdiff --git a/test/plausible_web/controllers/api/external_controller_test.exs b/test/plausible_web/controllers/api/external_controller_test.exsindex 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 douse PlausibleWeb.ConnCaseuse 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.exsindex 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 Plausibleuse PlausibleWeb.ConnCaseuse Plausible.Repo- use Plausible.Teams.Testuse Bamboo.Teston_ee dodiff --git a/test/plausible_web/controllers/api/external_sites_controller_test.exs b/test/plausible_web/controllers/api/external_sites_controller_test.exsindex 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 doSite CRUD endpoints tests are in ExternalSitesControllerSitesCrudApiTest"""- use Plausibleuse PlausibleWeb.ConnCase, async: falseuse Plausible.Repo- use Plausible.Teams.Testuse Bamboo.Teston_ee dodiff --git a/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs b/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exsindex 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 douse PlausibleWeb.ConnCase- use Plausible.Teams.Test- import Plausible.TestUtilsalias Plausible.Billing.Featuresetup [: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.exsindex 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 douse PlausibleWeb.ConnCase- use Plausible.Teams.Testalias Plausible.Repodiff --git a/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exs b/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exsindex 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 douse PlausibleWeb.ConnCase- use Plausible.Teams.Testalias Plausible.Billing.Featurediff --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.exsindex 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 douse PlausibleWeb.ConnCase- import Plausible.Teams.Testsetup [: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.exsindex 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 douse PlausibleWeb.ConnCaseon_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.exsindex 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 douse 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.exsindex 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 douse PlausibleWeb.ConnCase- use Plausible.Teams.Testsetup [: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.exsindex 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 douse PlausibleWeb.ConnCase- use Plausible.Teams.Testalias Plausible.Billing.Featurediff --git a/test/plausible_web/controllers/api/external_stats_controller/timeseries_test.exs b/test/plausible_web/controllers/api/external_stats_controller/timeseries_test.exsindex 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 douse PlausibleWeb.ConnCase- use Plausible.Teams.Testalias Plausible.Billing.Featuresetup [: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.exsindex 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 douse PlausibleWeb.ConnCase, async: trueuse Plausible.Repo- use Plausible.Teams.Testdescribe "POST /api/:domain/segments" dosetup [: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.exsindex 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 douse PlausibleWeb.ConnCase, async: falseuse Plausible.Repo- use Plausible.Teams.Testdescribe "PUT /api/:domain/disable-feature" dosetup [: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.exsindex 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 douse PlausibleWeb.ConnCase, async: trueuse Plausible.Repo- use Plausible.Teams.Testdescribe "GET /api/sites" dosetup [: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.exsindex 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 dorefute_receive :paddle_queriednew_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.exsindex 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.Testuse PlausibleWeb.ConnCasedescribe "API authorization - as anonymous user" dodiff --git a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs b/test/plausible_web/controllers/api/stats_controller/conversions_test.exsindex 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 douse 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.exsindex 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 douse PlausibleWeb.ConnCase- use Plausible.Teams.Testdescribe "GET /api/stats/:domain/custom-prop-values/:prop_key" dosetup [: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.exsindex 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 douse PlausibleWeb.ConnCase, async: true- use Plausible- use Plausible.Teams.Test@moduletag :ee_onlyon_ee dodiff --git a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exsindex 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 douse 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.exsindex 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 douse 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.exsindex 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.Testuse PlausibleWeb.ConnCasedescribe "GET /api/stats/:domain/regions" dodiff --git a/test/plausible_web/controllers/api/stats_controller/sources_test.exs b/test/plausible_web/controllers/api/stats_controller/sources_test.exsindex 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 douse 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.exsindex 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 douse 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.exsindex 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 douse PlausibleWeb.ConnCase, async: trueuse Bamboo.Test- use Plausible.Teams.Testuse Plausible.Repo- import Plausible.Test.Support.HTMLimport Moxrequire 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())enddefp 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())enddefp mock_captcha_success() dodiff --git a/test/plausible_web/controllers/billing_controller_test.exs b/test/plausible_web/controllers/billing_controller_test.exsindex 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 douse PlausibleWeb.ConnCase, async: true- use Plausible.Teams.Test- import Plausible.Test.Support.HTML+require Plausible.Billing.Subscription.Statusalias Plausible.Billing.Subscriptiondiff --git a/test/plausible_web/controllers/error_report_controller_test.exs b/test/plausible_web/controllers/error_report_controller_test.exsindex 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 douse Bamboo.Testimport Phoenix.View- import Plausible.Test.Support.HTMLalias PlausibleWeb.Endpointalias PlausibleWeb.ErrorViewdiff --git a/test/plausible_web/controllers/google_analytics_controller_test.exs b/test/plausible_web/controllers/google_analytics_controller_test.exsindex 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 douse Oban.Testing, repo: Plausible.Repoimport Mox- import Plausible.Test.Support.HTMLalias Plausible.HTTPClientalias Plausible.Imported.SiteImportdiff --git a/test/plausible_web/controllers/help_scout_controller_test.exs b/test/plausible_web/controllers/help_scout_controller_test.exsindex 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 douse PlausibleWeb.ConnCase, async: true- use Plausible@moduletag :ee_onlyon_ee do- import Plausible.Teams.Test-alias Plausible.HelpScoutdescribe "callback/2" dodiff --git a/test/plausible_web/controllers/invitation_controller_test.exs b/test/plausible_web/controllers/invitation_controller_test.exsindex 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 douse PlausibleWeb.ConnCase, async: trueuse Plausible.Repo- use Plausible.Teams.Testuse Bamboo.Testalias Plausible.Teamsdiff --git a/test/plausible_web/controllers/settings_controller_test.exs b/test/plausible_web/controllers/settings_controller_test.exsindex 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 douse PlausibleWeb.ConnCase, async: trueuse Bamboo.Test- use Plausibleuse Plausible.Repo- use Plausible.Teams.Testimport Mox- import Plausible.Test.Support.HTML+import Ecto.Queryrequire Plausible.Billing.Subscription.Statusdiff --git a/test/plausible_web/controllers/site/membership_controller_test.exs b/test/plausible_web/controllers/site/membership_controller_test.exsindex 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 Plausibleuse PlausibleWeb.ConnCaseuse Plausible.Repouse 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.exsindex 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 douse Plausible.Repouse Bamboo.Testuse Oban.Testing, repo: Plausible.Repo- use Plausible.Teams.Testimport ExUnit.CaptureLogimport Mox- import Plausible.Test.Support.HTMLalias Plausible.Imported.SiteImportalias Plausible.Teams@@ -872,9 +870,7 @@ defmodule PlausibleWeb.SiteControllerTest doassert html_response(conn, 200) =~ "Custom event"assert html_response(conn, 200) =~ "Visit /register"- end- test "goal names are HTML safe", %{conn: conn, site: site} doinsert(: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.exsindex 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_onlyon_ee do- use Plausible.Teams.Test-alias Plausible.Authalias Plausible.Auth.SSOalias Plausible.Repodiff --git a/test/plausible_web/controllers/sso_controller_test.exs b/test/plausible_web/controllers/sso_controller_test.exsindex 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 douse PlausibleWeb.ConnCase, async: true- use Plausible@moduletag :ee_onlyon_ee do- import Plausible.Teams.Test- import Plausible.Test.Support.HTML-alias Plausible.Authalias Plausible.Auth.SSOalias Plausible.Repodiff --git a/test/plausible_web/controllers/stats_controller_test.exs b/test/plausible_web/controllers/stats_controller_test.exsindex 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 douse PlausibleWeb.ConnCase, async: falseuse 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.exsindex 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 douse PlausibleWeb.ConnCase, async: trueuse Plausible.Repo- use Plausible.Teams.Testsetup {PlausibleWeb.FirstLaunchPlug.Test, :skip}diff --git a/test/plausible_web/email_test.exs b/test/plausible_web/email_test.exsindex d2c4e3e61e..2cb31b95ff 100644--- a/test/plausible_web/email_test.exs+++ b/test/plausible_web/email_test.exs@@ -1,9 +1,7 @@defmodule PlausibleWeb.EmailTest douse Plausible.DataCase, async: true- use Plausible.Teams.Testimport Plausible.Factory- import Plausible.Test.Support.HTMLalias PlausibleWeb.Emaildiff --git a/test/plausible_web/live/change_domain_test.exs b/test/plausible_web/live/change_domain_test.exsindex 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 douse PlausibleWeb.ConnCase, async: false- use Plausibleimport Phoenix.LiveViewTest- import Plausible.TestUtils- import Plausible.Test.Support.HTMLon_ee doimport Moxdiff --git a/test/plausible_web/live/choose_plan_test.exs b/test/plausible_web/live/choose_plan_test.exsindex 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 douse PlausibleWeb.ConnCase, async: trueon_ee do- use Plausible.Teams.Test@moduletag :ee_onlyimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTML+require Plausible.Billing.Subscription.Statusalias 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.exsindex 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 douse PlausibleWeb.ConnCase, async: trueimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLalias PlausibleWeb.Live.Components.ComboBoxdiff --git a/test/plausible_web/live/components/form_test.exs b/test/plausible_web/live/components/form_test.exsindex 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 douse PlausibleWeb.ConnCase, async: trueimport Phoenix.LiveViewTest, only: [render_component: 2]- import Plausible.Test.Support.HTMLalias Plausible.Auth.Useralias PlausibleWeb.Live.Components.Formdiff --git a/test/plausible_web/live/components/verification_test.exs b/test/plausible_web/live/components/verification_test.exsindex 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: trueon_ee do- use PlausibleWeb.ConnCase, async: trueimport Phoenix.LiveViewTest, only: [render_component: 2]- import Plausible.Test.Support.HTMLalias 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.exsindex 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_onlyon_ee do- use Plausible.Teams.Test- use Plausibleuse Bamboo.Test, shared: trueimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLdefp open_site(id, opts \\ []) doRoutes.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.exsindex 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 douse PlausibleWeb.ConnCase, async: false- use Plausible.Teams.Test- use Plausible@moduletag :ee_onlyon_ee doimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLalias Plausible.Auth.SSOdiff --git a/test/plausible_web/live/customer_support/users_test.exs b/test/plausible_web/live/customer_support/users_test.exsindex 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 douse PlausibleWeb.ConnCase, async: false- use Plausible.Teams.Test- use Plausible@moduletag :ee_onlyon_ee doimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLdefp open_user(id, qs \\ []) doRoutes.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.exsindex 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 douse 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.HTMLalias Plausible.Auth.SSOdiff --git a/test/plausible_web/live/funnel_settings/form_test.exs b/test/plausible_web/live/funnel_settings/form_test.exsindex 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_onlyimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLdescribe "integration - live rendering" dosetup [: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.exsindex 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 douse PlausibleWeb.ConnCase, async: true- use Plausible.Teams.Test- use Plausible@moduletag :ee_onlyon_ee doimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLdescribe "GET /:domain/settings/funnels" dosetup [: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.exsindex 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 douse PlausibleWeb.ConnCase, async: trueimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLon_ee do- import Plausible.Teams.Testend@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.exsindex 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 douse PlausibleWeb.ConnCase, async: false- use Plausible.Teams.Testimport Phoenix.LiveViewTestdiff --git a/test/plausible_web/live/goal_settings_test.exs b/test/plausible_web/live/goal_settings_test.exsindex 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 douse PlausibleWeb.ConnCase, async: true- use Plausible.Teams.Testimport 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.exsindex 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 douse PlausibleWeb.ConnCase- use Plausibleuse Plausible.Test.Support.DNSimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTML- import Plausible.Teams.Testalias Plausible.Site.TrackerScriptConfigurationdiff --git a/test/plausible_web/live/plugins_api_tokens_test.exs b/test/plausible_web/live/plugins_api_tokens_test.exsindex 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 douse PlausibleWeb.ConnCase, async: trueimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLalias Plausible.Plugins.API.Tokensdiff --git a/test/plausible_web/live/props_settings/form_test.exs b/test/plausible_web/live/props_settings/form_test.exsindex 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 douse PlausibleWeb.ConnCase, async: trueimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLon_ee do- import Plausible.Teams.Testenddescribe "Props submission" dodiff --git a/test/plausible_web/live/props_settings_test.exs b/test/plausible_web/live/props_settings_test.exsindex 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 douse PlausibleWeb.ConnCase, async: true- use Plausible.Teams.Testimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLdescribe "GET /:domain/settings/properties" dosetup [: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.exsindex 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 doimport Moximport Phoenix.LiveViewTest- import Plausible.Test.Support.HTML-- use Plausible.Teams.Testalias Plausible.Auth.Useralias Plausible.Repodiff --git a/test/plausible_web/live/reset_password_form_test.exs b/test/plausible_web/live/reset_password_form_test.exsindex 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 doimport Phoenix.ChannelTestimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLalias Plausible.Auth.Useralias Plausible.Auth.Tokendiff --git a/test/plausible_web/live/shared_link_settings/form_test.exs b/test/plausible_web/live/shared_link_settings/form_test.exsindex 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 douse PlausibleWeb.ConnCase, async: true- use Plausible.Teams.Testimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLdescribe "Shared link form" dosetup [: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.exsindex 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 douse PlausibleWeb.ConnCase, async: true- use Plausible.Teams.Testimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLdescribe "SharedLinkSettings LiveView" dosetup [: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.exsindex 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 douse PlausibleWeb.ConnCase, async: trueimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLalias Plausible.Shieldsdiff --git a/test/plausible_web/live/shields/hostnames_test.exs b/test/plausible_web/live/shields/hostnames_test.exsindex 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 douse PlausibleWeb.ConnCase, async: trueimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLalias Plausible.Shieldsdiff --git a/test/plausible_web/live/shields/ip_addresses_test.exs b/test/plausible_web/live/shields/ip_addresses_test.exsindex 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 douse PlausibleWeb.ConnCase, async: trueimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLalias Plausible.Shieldsdiff --git a/test/plausible_web/live/shields/pages_test.exs b/test/plausible_web/live/shields/pages_test.exsindex 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 douse PlausibleWeb.ConnCase, async: trueimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLalias Plausible.Shieldsdiff --git a/test/plausible_web/live/sites_test.exs b/test/plausible_web/live/sites_test.exsindex 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 douse PlausibleWeb.ConnCase, async: true- use Plausible.Teams.Testimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLalias Plausible.Repodiff --git a/test/plausible_web/live/sso_management_test.exs b/test/plausible_web/live/sso_management_test.exsindex 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 doon_ee douse Bamboo.Test, shared: true- use Plausible.Teams.Testimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLalias Plausible.Authalias Plausible.Auth.SSOdiff --git a/test/plausible_web/live/team_management_test.exs b/test/plausible_web/live/team_management_test.exsindex 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 douse PlausibleWeb.ConnCase, async: falseuse Bamboo.Test, shared: true- use Plausible.Teams.Testimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLdef 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.exsindex 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 douse PlausibleWeb.ConnCase, async: false- use Plausible.Teams.Testuse Bamboo.Test, shared: trueimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTMLalias Plausible.Teamsalias Plausible.Repodiff --git a/test/plausible_web/live/verification_test.exs b/test/plausible_web/live/verification_test.exsindex 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 douse Plausible.Test.Support.DNSimport Phoenix.LiveViewTest- import Plausible.Test.Support.HTML@moduletag :capture_logdiff --git a/test/plausible_web/plugins/api/controllers/capabilities_test.exs b/test/plausible_web/plugins/api/controllers/capabilities_test.exsindex 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 douse PlausibleWeb.PluginsAPICase, async: true- use Plausible.Teams.Testalias PlausibleWeb.Plugins.API.Schemasdescribe "examples" dodiff --git a/test/plausible_web/plugins/api/controllers/custom_props_test.exs b/test/plausible_web/plugins/api/controllers/custom_props_test.exsindex 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 douse PlausibleWeb.PluginsAPICase, async: true- use Plausible.Teams.Testalias PlausibleWeb.Plugins.API.Schemasdescribe "examples" dodiff --git a/test/plausible_web/plugins/api/controllers/funnels_test.exs b/test/plausible_web/plugins/api/controllers/funnels_test.exsindex 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 douse PlausibleWeb.PluginsAPICase, async: true- use Plausible- use Plausible.Teams.Test@moduletag :ee_onlydiff --git a/test/plausible_web/plugins/api/controllers/goals_test.exs b/test/plausible_web/plugins/api/controllers/goals_test.exsindex 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 douse PlausibleWeb.PluginsAPICase, async: true- use Plausible.Teams.Testalias PlausibleWeb.Plugins.API.Schemasdescribe "examples" dodiff --git a/test/plausible_web/plugins/api/controllers/tracker_script_configuration_test.exs b/test/plausible_web/plugins/api/controllers/tracker_script_configuration_test.exsindex 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 douse PlausibleWeb.PluginsAPICase, async: true- use Plausible.Teams.Testimport Plausible.AssertMatchesalias PlausibleWeb.Plugins.API.Schemasdiff --git a/test/plausible_web/plugs/auth_plug_test.exs b/test/plausible_web/plugs/auth_plug_test.exsindex 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 douse PlausibleWeb.ConnCase, async: true- use Plausible.Teams.Testalias PlausibleWeb.AuthPlugdiff --git a/test/plausible_web/plugs/authorize_public_api_test.exs b/test/plausible_web/plugs/authorize_public_api_test.exsindex 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 douse PlausibleWeb.ConnCase, async: false- use Plausible.Teams.Testimport ExUnit.CaptureLogdiff --git a/test/plausible_web/plugs/authorize_site_access_test.exs b/test/plausible_web/plugs/authorize_site_access_test.exsindex 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 douse PlausibleWeb.ConnCase, async: false- use Plausible.Teams.Testalias PlausibleWeb.Plugs.AuthorizeSiteAccesssetup [: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.exsindex 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 douse PlausibleWeb.ConnCase, async: true- use Plausible.Teams.Testalias Plausible.Plugs.AuthorizeTeamAccessimport Plug.Conndiff --git a/test/plausible_web/plugs/handle_expired_session_test.exs b/test/plausible_web/plugs/handle_expired_session_test.exsindex 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 douse PlausibleWeb.ConnCase, async: true- use Plausibleon_ee do- use Plausible.Teams.Test-alias Plausible.Auth.UserSessionsalias Plausible.Plugs.HandleExpiredSessionalias Plausible.Repodiff --git a/test/plausible_web/plugs/require_account_plug_test.exs b/test/plausible_web/plugs/require_account_plug_test.exsindex 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 douse PlausibleWeb.ConnCase, async: true- use Plausible.Teams.Testimport Plug.Conndiff --git a/test/plausible_web/plugs/sso_team_access_test.exs b/test/plausible_web/plugs/sso_team_access_test.exsindex 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 douse PlausibleWeb.ConnCase, async: true- use Plausibleon_ee do- use Plausible.Teams.Test-alias Plausible.Authalias Plausible.Plugs.SSOTeamAccessalias PlausibleWeb.AuthPlugdiff --git a/test/plausible_web/plugs/tracker_plug_test.exs b/test/plausible_web/plugs/tracker_plug_test.exsindex 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 dodo regenerate the files before running tests, so they're up to date."""use PlausibleWeb.ConnCase, async: true- use Plausible.Teams.Testimport Plug.Testalias PlausibleWeb.Trackerdiff --git a/test/plausible_web/tracker_script_cache_test.exs b/test/plausible_web/tracker_script_cache_test.exsindex 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 Plausibleuse Plausible.DataCase, async: true- use Plausible.Teams.Testalias Plausible.Site.TrackerScriptConfigurationalias PlausibleWeb.TrackerScriptCachediff --git a/test/plausible_web/tracker_test.exs b/test/plausible_web/tracker_test.exsindex 78b6bb0530..8c152e4f51 100644--- a/test/plausible_web/tracker_test.exs+++ b/test/plausible_web/tracker_test.exs@@ -1,8 +1,6 @@defmodule PlausibleWeb.TrackerTest douse Plausible.DataCaseuse Oban.Testing, repo: Plausible.Repo- use Plausible- use Plausible.Teams.Testalias Plausible.Site.TrackerScriptConfigurationalias PlausibleWeb.Trackerdiff --git a/test/plausible_web/user_auth_test.exs b/test/plausible_web/user_auth_test.exsindex 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 douse PlausibleWeb.ConnCase, async: true- use Plausible- use Plausible.Teams.Testalias Plausible.Repoalias PlausibleWeb.UserAuthdiff --git a/test/support/audit/test_schema.ex b/test/support/audit/test_schema.exindex 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 Plausibleon_ee dodiff --git a/test/support/conn_case.ex b/test/support/conn_case.exindex 484cd70018..1a0565ee8f 100644--- a/test/support/conn_case.ex+++ b/test/support/conn_case.ex@@ -17,16 +17,18 @@ defmodule PlausibleWeb.ConnCase dousing doquote do- # Import conveniences for testing with connectionsuse Plausible.TestUtilsuse Plausible+ use Plausible.Teams.Test++ import Plausible.Test.Support.HTMLimport Plug.Connimport Phoenix.ConnTest+alias PlausibleWeb.Router.Helpers, as: Routesimport Plausible.Factoryimport Plausible.AssertMatches- # The default endpoint for testing@endpoint PlausibleWeb.Endpointendenddiff --git a/test/support/data_case.ex b/test/support/data_case.exindex 4e245534af..54fc41685a 100644--- a/test/support/data_case.ex+++ b/test/support/data_case.ex@@ -19,6 +19,9 @@ defmodule Plausible.DataCase douse Plausible.Repouse Plausible.TestUtilsuse Plausible+ use Plausible.Teams.Test++ import Plausible.Test.Support.HTMLimport Ecto.Changesetimport Plausible.DataCasediff --git a/test/support/dev/billing/dev_subscriptions.ex b/test/support/dev/billing/dev_subscriptions.exindex 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 Plausibleon_ee dodiff --git a/test/support/plugins_api_case.ex b/test/support/plugins_api_case.exindex 4c6b6cfabf..6eab811344 100644--- a/test/support/plugins_api_case.ex+++ b/test/support/plugins_api_case.ex@@ -8,11 +8,12 @@ defmodule PlausibleWeb.PluginsAPICase dousing doquote do- # The default endpoint for testing@endpoint PlausibleWeb.Endpoint- # Import conveniences for testing with connectionsuse Plausible.TestUtils+ use Plausible.Teams.Test+ use Plausible+import Plug.Connimport Phoenix.ConnTestimport PlausibleWeb.Plugins.API.Spec, only: [spec: 0]diff --git a/test/workers/accept_traffic_until_test.exs b/test/workers/accept_traffic_until_test.exsindex 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 douse Plausible.DataCase, async: true- use Plausible.Teams.Testuse Bamboo.Testalias Plausible.Workers.AcceptTrafficUntildiff --git a/test/workers/check_usage_test.exs b/test/workers/check_usage_test.exsindex 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 douse Plausible.DataCase, async: trueuse Bamboo.Test- use Plausible.Teams.Testimport Doublealias Plausible.Workers.CheckUsagediff --git a/test/workers/clean_invitations_test.exs b/test/workers/clean_invitations_test.exsindex 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 douse Plausible.DataCase- use Plausible.Teams.Testalias Plausible.Workers.CleanInvitationstest "cleans invitations and transfers that are more than 48h old" dodiff --git a/test/workers/clickhouse_clean_sites_test.exs b/test/workers/clickhouse_clean_sites_test.exsindex 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 douse Plausible.DataCase- use Plausible.TestUtils- use Plausibleimport Plausible.Factoryalias Plausible.Workers.ClickhouseCleanSitesdiff --git a/test/workers/import_analytics_test.exs b/test/workers/import_analytics_test.exsindex 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 douse Plausible.DataCaseuse Bamboo.Test- use Plausible.Teams.Testalias Plausible.Imported.SiteImportalias Plausible.Workers.ImportAnalyticsdiff --git a/test/workers/lock_sites_test.exs b/test/workers/lock_sites_test.exsindex 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 douse Plausible.DataCase, async: true- use Plausible.Teams.Testrequire Plausible.Billing.Subscription.Statusalias Plausible.Workers.LockSitesalias Plausible.Billing.Subscriptiondiff --git a/test/workers/notify_annual_renewal_test.exs b/test/workers/notify_annual_renewal_test.exsindex 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 douse Plausible.DataCase, async: trueuse Bamboo.Test- use Plausible.Teams.Testrequire Plausible.Billing.Subscription.Statusalias Plausible.Workers.NotifyAnnualRenewalalias Plausible.Billing.Subscriptiondiff --git a/test/workers/notify_exported_analytics_test.exs b/test/workers/notify_exported_analytics_test.exsindex 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 Plausibleuse Plausible.DataCase- use Plausible.Teams.Testuse Bamboo.Testdescribe "perform/1" dodiff --git a/test/workers/schedule_email_reports_test.exs b/test/workers/schedule_email_reports_test.exsindex 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 douse Plausible.DataCaseuse Oban.Testing, repo: Plausible.Repo- import Plausible.Teams.Test+alias Plausible.Workers.{ScheduleEmailReports, SendEmailReport}describe "weekly reports" dodiff --git a/test/workers/send_check_stats_emails_test.exs b/test/workers/send_check_stats_emails_test.exsindex 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 douse Plausible.DataCase, async: trueuse Oban.Testing, repo: Plausible.Repouse Bamboo.Test- use Plausible.Teams.Testalias Plausible.Workers.SendCheckStatsEmailsdiff --git a/test/workers/send_email_report_test.exs b/test/workers/send_email_report_test.exsindex 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 douse Plausible.DataCaseuse Bamboo.Test- use Plausible.Teams.Testuse 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.exsindex 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 douse Plausible.DataCase, async: trueuse Bamboo.Testuse Oban.Testing, repo: Plausible.Repo- use Plausible.Teams.Testalias Plausible.Workers.SendSiteSetupEmailsdiff --git a/test/workers/send_trial_notifications_test.exs b/test/workers/send_trial_notifications_test.exsindex 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 douse Plausible.DataCaseuse Bamboo.Testuse Oban.Testing, repo: Plausible.Repo- use Plausible.Teams.Testalias Plausible.Workers.SendTrialNotificationstest "does not send a notification if user didn't create a site" dodiff --git a/test/workers/set_legacy_time_on_page_cutoff_test.exs b/test/workers/set_legacy_time_on_page_cutoff_test.exsindex 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 douse Plausible.DataCase- use Plausible.TestUtils- use Plausiblealias Plausible.Workers.SetLegacyTimeOnPageCutoffdiff --git a/test/workers/sso_domain_verification_worker_test.exs b/test/workers/sso_domain_verification_worker_test.exsindex 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 douse Plausible.DataCase- use Plausibleon_ee douse Bamboo.Test, shared: trueuse Oban.Testing, repo: Plausible.Repouse Plausible.Auth.SSO.Domain.Status- use Plausible.Teams.Testalias Plausible.Auth.SSOalias Plausible.Auth.SSO.Domain.Verification.Workerdiff --git a/test/workers/traffic_change_notifier_test.exs b/test/workers/traffic_change_notifier_test.exsindex 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 douse Plausible.DataCase, async: trueuse Bamboo.Test- use Plausible.Teams.Testalias Plausible.Workers.TrafficChangeNotifier@view_dashboard_text "View dashboard"