Skip to content

Commit 0fa068f

Browse files
izelnakriizelnakri
committed
repo configurations on tests are now loaded lazily
1 parent 8b8f5e2 commit 0fa068f

File tree

4 files changed

+80
-70
lines changed

4 files changed

+80
-70
lines changed

‎test/paper_trail/bang_functions_simple_mode_test.exs

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
88
alias SimplePerson, as: Person
99
alias PaperTrailTest.MultiTenantHelper, as: MultiTenant
1010

11-
@repo PaperTrail.RepoClient.repo()
1211
@create_company_params %{name: "Acme LLC", is_active: true, city: "Greenwich"}
1312
@update_company_params %{
1413
city: "Hong Kong",
@@ -24,7 +23,7 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
2423
Application.put_env(:paper_trail, :originator_type, :integer)
2524
Code.eval_file("lib/paper_trail.ex")
2625
Code.eval_file("lib/version.ex")
27-
MultiTenant.setup_tenant(@repo)
26+
MultiTenant.setup_tenant(repo())
2827
:ok
2928
end
3029

@@ -71,7 +70,7 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
7170
meta: nil
7271
}
7372

74-
assert company == first(Company, :id) |> @repo.one
73+
assert company == first(Company, :id) |> repo().one
7574
end
7675

7776
test "PaperTrail.insert!/2 with an error raises Ecto.InvalidChangesetError" do
@@ -126,7 +125,7 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
126125
meta: nil
127126
}
128127

129-
assert company == first(Company, :id) |> @repo.one |> serialize
128+
assert company == first(Company, :id) |> repo().one |> serialize
130129
end
131130

132131
test "updating a company with originator[user] creates a correct company version" do
@@ -175,7 +174,7 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
175174
meta: nil
176175
}
177176

178-
assert company == first(Company, :id) |> @repo.one |> serialize
177+
assert company == first(Company, :id) |> repo().one |> serialize
179178
end
180179

181180
test "PaperTrail.update!/2 with an error raises Ecto.InvalidChangesetError" do
@@ -195,7 +194,7 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
195194
user = create_user()
196195
inserted_company = create_company_with_version()
197196
updated_company = update_company_with_version(inserted_company)
198-
company_before_deletion = first(Company, :id) |> @repo.one |> serialize
197+
company_before_deletion = first(Company, :id) |> repo().one |> serialize
199198
deleted_company = PaperTrail.delete!(updated_company, originator: user)
200199

201200
company_count = Company.count()
@@ -310,7 +309,7 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
310309
meta: %{"linkname" => "izelnakri"}
311310
}
312311

313-
assert person == first(Person, :id) |> @repo.one |> serialize
312+
assert person == first(Person, :id) |> repo().one |> serialize
314313
end
315314

316315
test "updating a person creates a person version with correct attributes" do
@@ -381,7 +380,7 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
381380
meta: %{"linkname" => "izelnakri"}
382381
}
383382

384-
assert person == first(Person, :id) |> @repo.one |> serialize
383+
assert person == first(Person, :id) |> repo().one |> serialize
385384
end
386385

387386
test "deleting a person creates a person version with correct attributes" do
@@ -412,7 +411,7 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
412411
})
413412
|> PaperTrail.update!(origin: "scraper", meta: %{linkname: "izelnakri"})
414413

415-
person_before_deletion = first(Person, :id) |> @repo.one |> serialize
414+
person_before_deletion = first(Person, :id) |> repo().one |> serialize
416415

417416
deleted_person =
418417
PaperTrail.delete!(
@@ -934,13 +933,13 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
934933
# Functions
935934
defp create_user() do
936935
User.changeset(%User{}, %{token: "fake-token", username: "izelnakri"})
937-
|> @repo.insert!
936+
|> repo().insert!
938937
end
939938

940939
defp create_user(:multitenant) do
941940
User.changeset(%User{}, %{token: "fake-token", username: "izelnakri"})
942941
|> MultiTenant.add_prefix_to_changeset()
943-
|> @repo.insert!
942+
|> repo().insert!
944943
end
945944

946945
defp create_company_with_version(params \\ @create_company_params, options \\ nil) do
@@ -972,11 +971,11 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
972971
end
973972

974973
defp first_company(:multitenant) do
975-
first(Company, :id) |> MultiTenant.add_prefix_to_query() |> @repo.one()
974+
first(Company, :id) |> MultiTenant.add_prefix_to_query() |> repo().one()
976975
end
977976

978977
defp first_person(:multitenant) do
979-
first(Person, :id) |> MultiTenant.add_prefix_to_query() |> @repo.one()
978+
first(Person, :id) |> MultiTenant.add_prefix_to_query() |> repo().one()
980979
end
981980

982981
defp serialize(model) do
@@ -985,24 +984,28 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
985984
end
986985

987986
defp reset_all_data() do
988-
@repo.delete_all(Person)
989-
@repo.delete_all(Company)
990-
@repo.delete_all(Version)
987+
repo().delete_all(Person)
988+
repo().delete_all(Company)
989+
repo().delete_all(Version)
991990

992991
Person
993992
|> MultiTenant.add_prefix_to_query()
994-
|> @repo.delete_all()
993+
|> repo().delete_all()
995994

996995
Company
997996
|> MultiTenant.add_prefix_to_query()
998-
|> @repo.delete_all()
997+
|> repo().delete_all()
999998

1000999
Version
10011000
|> MultiTenant.add_prefix_to_query()
1002-
|> @repo.delete_all()
1001+
|> repo().delete_all()
10031002
end
10041003

10051004
defp convert_to_string_map(map) do
10061005
map |> Jason.encode!() |> Jason.decode!()
10071006
end
1007+
1008+
defp repo() do
1009+
PaperTrail.RepoClient.repo()
1010+
end
10081011
end

‎test/paper_trail/bang_functions_strict_mode_test.exs

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
88
alias StrictPerson, as: Person
99
alias PaperTrailTest.MultiTenantHelper, as: MultiTenant
1010

11-
@repo PaperTrail.RepoClient.repo()
1211
@create_company_params %{name: "Acme LLC", is_active: true, city: "Greenwich"}
1312
@update_company_params %{
1413
city: "Hong Kong",
@@ -24,7 +23,7 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
2423
Application.put_env(:paper_trail, :originator_type, :integer)
2524
Code.eval_file("lib/paper_trail.ex")
2625
Code.eval_file("lib/version.ex")
27-
MultiTenant.setup_tenant(@repo)
26+
MultiTenant.setup_tenant(repo())
2827
:ok
2928
end
3029

@@ -74,7 +73,7 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
7473
meta: nil
7574
}
7675

77-
assert company == first(Company, :id) |> @repo.one |> serialize
76+
assert company == first(Company, :id) |> repo().one |> serialize
7877
end
7978

8079
test "creating a company without changeset creates a company version with correct attributes" do
@@ -168,7 +167,7 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
168167
meta: nil
169168
}
170169

171-
assert company == first(Company, :id) |> @repo.one |> serialize
170+
assert company == first(Company, :id) |> repo().one |> serialize
172171
end
173172

174173
test "PaperTrail.update!/2 with an error raises Ecto.InvalidChangesetError" do
@@ -190,7 +189,7 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
190189
inserted_company_version = PaperTrail.get_version(inserted_company)
191190
updated_company = update_company_with_version(inserted_company)
192191
updated_company_version = PaperTrail.get_version(updated_company)
193-
company_before_deletion = first(Company, :id) |> @repo.one |> serialize
192+
company_before_deletion = first(Company, :id) |> repo().one |> serialize
194193
deleted_company = PaperTrail.delete!(updated_company, user: user)
195194

196195
company_count = Company.count()
@@ -308,7 +307,7 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
308307
meta: %{"linkname" => "izelnakri"}
309308
}
310309

311-
assert person == first(Person, :id) |> @repo.one |> serialize
310+
assert person == first(Person, :id) |> repo().one |> serialize
312311
end
313312

314313
test "updating a person creates a person version with correct attributes" do
@@ -385,7 +384,7 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
385384
meta: %{"linkname" => "izelnakri"}
386385
}
387386

388-
assert person == first(Person, :id) |> @repo.one |> serialize
387+
assert person == first(Person, :id) |> repo().one |> serialize
389388
end
390389

391390
test "deleting a person creates a person version with correct attributes" do
@@ -418,7 +417,7 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
418417
|> PaperTrail.update!(origin: "scraper", meta: %{linkname: "izelnakri"})
419418

420419
updated_person_version = PaperTrail.get_version(updated_person) |> serialize
421-
person_before_deletion = first(Person, :id) |> @repo.one
420+
person_before_deletion = first(Person, :id) |> repo().one
422421

423422
deleted_person =
424423
PaperTrail.delete!(
@@ -961,13 +960,13 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
961960
# Functions
962961
defp create_user() do
963962
User.changeset(%User{}, %{token: "fake-token", username: "izelnakri"})
964-
|> @repo.insert!
963+
|> repo().insert!
965964
end
966965

967966
defp create_user(:multitenant) do
968967
User.changeset(%User{}, %{token: "fake-token", username: "izelnakri"})
969968
|> MultiTenant.add_prefix_to_changeset()
970-
|> @repo.insert!
969+
|> repo().insert!
971970
end
972971

973972
defp create_company_with_version(params \\ @create_company_params, options \\ nil) do
@@ -999,11 +998,11 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
999998
end
1000999

10011000
defp first_company(:multitenant) do
1002-
first(Company, :id) |> MultiTenant.add_prefix_to_query() |> @repo.one()
1001+
first(Company, :id) |> MultiTenant.add_prefix_to_query() |> repo().one()
10031002
end
10041003

10051004
defp first_person(:multitenant) do
1006-
first(Person, :id) |> MultiTenant.add_prefix_to_query() |> @repo.one()
1005+
first(Person, :id) |> MultiTenant.add_prefix_to_query() |> repo().one()
10071006
end
10081007

10091008
defp serialize(model) do
@@ -1012,24 +1011,28 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
10121011
end
10131012

10141013
defp reset_all_data() do
1015-
@repo.delete_all(Person)
1016-
@repo.delete_all(Company)
1017-
@repo.delete_all(Version)
1014+
repo().delete_all(Person)
1015+
repo().delete_all(Company)
1016+
repo().delete_all(Version)
10181017

10191018
Person
10201019
|> MultiTenant.add_prefix_to_query()
1021-
|> @repo.delete_all()
1020+
|> repo().delete_all()
10221021

10231022
Company
10241023
|> MultiTenant.add_prefix_to_query()
1025-
|> @repo.delete_all()
1024+
|> repo().delete_all()
10261025

10271026
Version
10281027
|> MultiTenant.add_prefix_to_query()
1029-
|> @repo.delete_all()
1028+
|> repo().delete_all()
10301029
end
10311030

10321031
defp convert_to_string_map(map) do
10331032
map |> Jason.encode!() |> Jason.decode!()
10341033
end
1034+
1035+
defp repo() do
1036+
PaperTrail.RepoClient.repo()
1037+
end
10351038
end

‎test/paper_trail/paper_trail_version_test.exs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,29 @@ defmodule PaperTrailTest.Version do
1414
}
1515
@invalid_attrs %{}
1616

17-
@repo PaperTrail.RepoClient.repo()
18-
1917
setup_all do
2018
Application.put_env(:paper_trail, :strict_mode, false)
2119
Application.put_env(:paper_trail, :repo, PaperTrail.Repo)
2220
Application.put_env(:paper_trail, :originator_type, :integer)
2321
Code.eval_file("lib/paper_trail.ex")
2422
Code.eval_file("lib/version.ex")
25-
MultiTenant.setup_tenant(@repo)
23+
MultiTenant.setup_tenant(repo())
2624
:ok
2725
end
2826

2927
setup do
30-
@repo.delete_all(Version)
28+
repo().delete_all(Version)
3129

3230
Version
3331
|> MultiTenant.add_prefix_to_query()
34-
|> @repo.delete_all()
32+
|> repo().delete_all()
3533

3634
on_exit(fn ->
37-
@repo.delete_all(Version)
35+
repo().delete_all(Version)
3836

3937
Version
4038
|> MultiTenant.add_prefix_to_query()
41-
|> @repo.delete_all()
39+
|> repo().delete_all()
4240
end)
4341

4442
:ok
@@ -142,7 +140,7 @@ defmodule PaperTrailTest.Version do
142140
end
143141

144142
def add_three_versions(prefix \\ nil) do
145-
@repo.insert_all(
143+
repo().insert_all(
146144
Version,
147145
[
148146
@valid_attrs,
@@ -175,4 +173,8 @@ defmodule PaperTrailTest.Version do
175173
relationships = resource.__struct__.__schema__(:associations)
176174
Map.drop(resource, [:__meta__, :__struct__] ++ relationships)
177175
end
176+
177+
defp repo() do
178+
PaperTrail.RepoClient.repo()
179+
end
178180
end

0 commit comments

Comments
 (0)