This commit is contained in:
Mayel de Borniol 2022-12-13 12:14:35 +13:00
parent 5b73b08bd4
commit 0d107d8464
9 changed files with 93 additions and 19 deletions

View file

@ -428,7 +428,7 @@ test-watch *args='':
test-interactive *args='':
@MIX_ENV=test just mix test.interactive --stale $@
ap_lib := "extensions/activity_pub"
ap_lib := "forks/activity_pub"
ap_integration := "extensions/bonfire_federate_activitypub/test/activity_pub_integration"
ap_boundaries := "extensions/bonfire_federate_activitypub/test/ap_boundaries"
ap_ext := "extensions/*/test/*federat* extensions/*/test/*/*federat* extensions/*/test/*/*/*federat*"
@ -438,7 +438,9 @@ test-federation:
just test-stale {{ ap_lib }}
just test-stale {{ ap_integration }}
just test-stale {{ ap_ext }}
just test-federation-dance-positions
TEST_INSTANCE=yes just test-stale --only test_instance
just test-federation-dance-positions
test-federation-lib *args=ap_lib:
just test-watch $@
@ -449,9 +451,12 @@ test-federation-integration *args=ap_integration:
test-federation-ext *args=ap_ext:
just test-watch $@
test-federation-dance *args='':
TEST_INSTANCE=yes MIX_ENV=test just mix deps.clean bonfire --build
test-federation-dance *args='': test-federation-dance-positions
TEST_INSTANCE=yes just test-watch --only test_instance $@
just test-federation-dance-positions
test-federation-dance-positions:
TEST_INSTANCE=yes MIX_ENV=test just mix deps.clean bonfire --build
# dev-test-watch: init ## Run tests
# docker-compose run --service-ports -e MIX_ENV=test web iex -S mix phx.server

View file

@ -25,7 +25,7 @@ if not Code.ensure_loaded?(Bonfire.Mixer) do
do:
(config[:deps] || config)
# |> IO.inspect(limit: :infinity)
|> Enum.filter(&include_dep?(deps_subtype, &1, config[:deps_prefixes][deps_subtype]))
|> Enum.filter(&include_dep?(deps_subtype, &1, config))
def deps_names_for(type, deps \\ mix_config()) do
deps(deps, type)
@ -274,11 +274,11 @@ if not Code.ensure_loaded?(Bonfire.Mixer) do
# defp include_dep?(:docs = type, dep, deps_prefixes), do: String.starts_with?(dep_name(dep), deps_prefixes || @config[:deps_prefixes][type]) || git_dep?(dep)
def include_dep?(type, dep, config_or_prefixes) do
# IO.inspect(config_or_prefixes)
prefix = config_or_prefixes[:deps_prefixes][type] || config_or_prefixes[type] || "bonfire"
String.starts_with?(
dep_name(dep),
config_or_prefixes[:deps_prefixes][type] || config_or_prefixes[type] || "bonfire"
# || mix_config()[:deps_prefixes][type]
prefix
)
end

View file

@ -1,8 +1,23 @@
defmodule Iconify.HeroiconsSolid.Check do
use Phoenix.Component
def render(assigns) do
~H"""
<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" class={@class} viewBox="0 0 20 20" aria-hidden="true"><path fill="currentColor" fill-rule="evenodd" d="M16.707 5.293a1 1 0 0 1 0 1.414l-8 8a1 1 0 0 1-1.414 0l-4-4a1 1 0 0 1 1.414-1.414L8 12.586l7.293-7.293a1 1 0 0 1 1.414 0Z" clip-rule="evenodd"/></svg>
<svg
xmlns="http://www.w3.org/2000/svg"
aria-hidden="true"
role="img"
class={@class}
viewBox="0 0 20 20"
aria-hidden="true"
>
<path
fill="currentColor"
fill-rule="evenodd"
d="M16.707 5.293a1 1 0 0 1 0 1.414l-8 8a1 1 0 0 1-1.414 0l-4-4a1 1 0 0 1 1.414-1.414L8 12.586l7.293-7.293a1 1 0 0 1 1.414 0Z"
clip-rule="evenodd"
/>
</svg>
"""
end
end

View file

@ -1,8 +1,21 @@
defmodule Iconify.MaterialSymbols.CancelRounded do
use Phoenix.Component
def render(assigns) do
~H"""
<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" class={@class} viewBox="0 0 24 24" aria-hidden="true"><path fill="currentColor" d="M7.7 16.3q.275.275.7.275q.425 0 .7-.275l2.9-2.9l2.925 2.925q.275.275.688.262q.412-.012.687-.287q.275-.275.275-.7q0-.425-.275-.7L13.4 12l2.925-2.925q.275-.275.262-.688q-.012-.412-.287-.687q-.275-.275-.7-.275q-.425 0-.7.275L12 10.6L9.075 7.675Q8.8 7.4 8.388 7.412q-.413.013-.688.288q-.275.275-.275.7q0 .425.275.7l2.9 2.9l-2.925 2.925q-.275.275-.262.687q.012.413.287.688ZM12 22q-2.075 0-3.9-.788q-1.825-.787-3.175-2.137q-1.35-1.35-2.137-3.175Q2 14.075 2 12t.788-3.9q.787-1.825 2.137-3.175q1.35-1.35 3.175-2.138Q9.925 2 12 2t3.9.787q1.825.788 3.175 2.138q1.35 1.35 2.137 3.175Q22 9.925 22 12t-.788 3.9q-.787 1.825-2.137 3.175q-1.35 1.35-3.175 2.137Q14.075 22 12 22Z"/></svg>
<svg
xmlns="http://www.w3.org/2000/svg"
aria-hidden="true"
role="img"
class={@class}
viewBox="0 0 24 24"
aria-hidden="true"
>
<path
fill="currentColor"
d="M7.7 16.3q.275.275.7.275q.425 0 .7-.275l2.9-2.9l2.925 2.925q.275.275.688.262q.412-.012.687-.287q.275-.275.275-.7q0-.425-.275-.7L13.4 12l2.925-2.925q.275-.275.262-.688q-.012-.412-.287-.687q-.275-.275-.7-.275q-.425 0-.7.275L12 10.6L9.075 7.675Q8.8 7.4 8.388 7.412q-.413.013-.688.288q-.275.275-.275.7q0 .425.275.7l2.9 2.9l-2.925 2.925q-.275.275-.262.687q.012.413.287.688ZM12 22q-2.075 0-3.9-.788q-1.825-.787-3.175-2.137q-1.35-1.35-2.137-3.175Q2 14.075 2 12t.788-3.9q.787-1.825 2.137-3.175q1.35-1.35 3.175-2.138Q9.925 2 12 2t3.9.787q1.825.788 3.175 2.138q1.35 1.35 2.137 3.175Q22 9.925 22 12t-.788 3.9q-.787 1.825-2.137 3.175q-1.35 1.35-3.175 2.137Q14.075 22 12 22Z"
/>
</svg>
"""
end
end

View file

@ -1,8 +1,21 @@
defmodule Iconify.MaterialSymbols.CheckIndeterminateSmallRounded do
use Phoenix.Component
def render(assigns) do
~H"""
<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" class={@class} viewBox="0 0 24 24" aria-hidden="true"><path fill="currentColor" d="M8 13q-.425 0-.713-.288Q7 12.425 7 12t.287-.713Q7.575 11 8 11h8q.425 0 .712.287q.288.288.288.713t-.288.712Q16.425 13 16 13Z"/></svg>
<svg
xmlns="http://www.w3.org/2000/svg"
aria-hidden="true"
role="img"
class={@class}
viewBox="0 0 24 24"
aria-hidden="true"
>
<path
fill="currentColor"
d="M8 13q-.425 0-.713-.288Q7 12.425 7 12t.287-.713Q7.575 11 8 11h8q.425 0 .712.287q.288.288.288.713t-.288.712Q16.425 13 16 13Z"
/>
</svg>
"""
end
end

View file

@ -1,8 +1,21 @@
defmodule Iconify.MaterialSymbols.CheckSmallRounded do
use Phoenix.Component
def render(assigns) do
~H"""
<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" class={@class} viewBox="0 0 24 24" aria-hidden="true"><path fill="currentColor" d="m10 13.6l5.9-5.9q.275-.275.7-.275q.425 0 .7.275q.275.275.275.7q0 .425-.275.7l-6.6 6.6q-.3.3-.7.3q-.4 0-.7-.3l-2.6-2.6q-.275-.275-.275-.7q0-.425.275-.7q.275-.275.7-.275q.425 0 .7.275Z"/></svg>
<svg
xmlns="http://www.w3.org/2000/svg"
aria-hidden="true"
role="img"
class={@class}
viewBox="0 0 24 24"
aria-hidden="true"
>
<path
fill="currentColor"
d="m10 13.6l5.9-5.9q.275-.275.7-.275q.425 0 .7.275q.275.275.275.7q0 .425-.275.7l-6.6 6.6q-.3.3-.7.3q-.4 0-.7-.3l-2.6-2.6q-.275-.275-.275-.7q0-.425.275-.7q.275-.275.7-.275q.425 0 .7.275Z"
/>
</svg>
"""
end
end

View file

@ -1,8 +1,22 @@
defmodule Iconify.Octicon.X16 do
use Phoenix.Component
def render(assigns) do
~H"""
<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" class={@class} viewBox="0 0 16 16" aria-hidden="true"><path fill="currentColor" fill-rule="evenodd" d="M3.72 3.72a.75.75 0 0 1 1.06 0L8 6.94l3.22-3.22a.75.75 0 1 1 1.06 1.06L9.06 8l3.22 3.22a.75.75 0 1 1-1.06 1.06L8 9.06l-3.22 3.22a.75.75 0 0 1-1.06-1.06L6.94 8L3.72 4.78a.75.75 0 0 1 0-1.06z"/></svg>
<svg
xmlns="http://www.w3.org/2000/svg"
aria-hidden="true"
role="img"
class={@class}
viewBox="0 0 16 16"
aria-hidden="true"
>
<path
fill="currentColor"
fill-rule="evenodd"
d="M3.72 3.72a.75.75 0 0 1 1.06 0L8 6.94l3.22-3.22a.75.75 0 1 1 1.06 1.06L9.06 8l3.22 3.22a.75.75 0 1 1-1.06 1.06L8 9.06l-3.22 3.22a.75.75 0 0 1-1.06-1.06L6.94 8L3.72 4.78a.75.75 0 0 1 0-1.06z"
/>
</svg>
"""
end
end

View file

@ -48,6 +48,7 @@ defmodule Bonfire.Umbrella.MixProject do
# {:floki, ">= 0.0.0", only: [:dev, :test]},
{:mock, "~> 0.3", only: :test},
# {:mox, "~> 1.0", only: :test},
{:ex_machina, "~> 2.7", only: [:dev, :test]},
{:zest, "~> 0.1.0"},
{:grumble, "~> 0.1.3", only: [:test], override: true},
{:mix_test_watch, "~> 1.1", only: :test, runtime: false, override: true},
@ -118,7 +119,7 @@ defmodule Bonfire.Umbrella.MixProject do
test: [
"bonfire",
"pointers",
"paginator",
# "paginator",
"ecto_shorts",
"ecto_sparkles",
"activity_pub",

View file

@ -5,7 +5,7 @@
"absinthe_phoenix": {:hex, :absinthe_phoenix, "2.0.2", "e607b438db900049b9b3760f8ecd0591017a46122fffed7057bf6989020992b5", [:mix], [{:absinthe, "~> 1.5", [hex: :absinthe, repo: "hexpm", optional: false]}, {:absinthe_plug, "~> 1.5", [hex: :absinthe_plug, repo: "hexpm", optional: false]}, {:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.5", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.13 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}], "hexpm", "d36918925c380dc7d2ed7d039c9a3b4182ec36723f7417a68745ade5aab22f8d"},
"absinthe_plug": {:hex, :absinthe_plug, "1.5.8", "38d230641ba9dca8f72f1fed2dfc8abd53b3907d1996363da32434ab6ee5d6ab", [:mix], [{:absinthe, "~> 1.5", [hex: :absinthe, repo: "hexpm", optional: false]}, {:plug, "~> 1.4", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "bbb04176647b735828861e7b2705465e53e2cf54ccf5a73ddd1ebd855f996e5a"},
"acceptor_pool": {:hex, :acceptor_pool, "1.0.0", "43c20d2acae35f0c2bcd64f9d2bde267e459f0f3fd23dab26485bf518c281b21", [:rebar3], [], "hexpm", "0cbcd83fdc8b9ad2eee2067ef8b91a14858a5883cb7cd800e6fcd5803e158788"},
"activity_pub": {:git, "https://github.com/bonfire-networks/activity_pub", "7ca0a0f926551608a0a05f1601ae82a419fc549e", [branch: "develop"]},
"activity_pub": {:git, "https://github.com/bonfire-networks/activity_pub", "d1358083cde7e9d48bf6dad770e5c8bb4817d596", [branch: "develop"]},
"argon2_elixir": {:hex, :argon2_elixir, "3.0.0", "fd4405f593e77b525a5c667282172dd32772d7c4fa58cdecdaae79d2713b6c5f", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "8b753b270af557d51ba13fcdebc0f0ab27a2a6792df72fd5a6cf9cfaffcedc57"},
"arrows": {:git, "https://github.com/bonfire-networks/arrows", "2482f0b33f966db602fcbad68c756aa643f0f8af", [branch: "main"]},
"bamboo": {:hex, :bamboo, "2.2.0", "f10a406d2b7f5123eb1f02edfa043c259db04b47ab956041f279eaac776ef5ce", [:mix], [{:hackney, ">= 1.15.2", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.4", [hex: :mime, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "8c3b14ba7d2f40cb4be04128ed1e2aff06d91d9413d38bafb4afccffa3ade4fc"},
@ -16,10 +16,10 @@
"benchee_json": {:hex, :benchee_json, "1.0.0", "cc661f4454d5995c08fe10dd1f2f72f229c8f0fb1c96f6b327a8c8fc96a91fe5", [:mix], [{:benchee, ">= 0.99.0 and < 2.0.0", [hex: :benchee, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "da05d813f9123505f870344d68fb7c86a4f0f9074df7d7b7e2bb011a63ec231c"},
"bonfire": {:git, "https://github.com/bonfire-networks/bonfire_spark", "85ebb7e9be2803b7f59d101dbf8b2e4ef5c3e166", [branch: "main"]},
"bonfire_api_graphql": {:git, "https://github.com/bonfire-networks/bonfire_api_graphql", "4bd0bc7297ceda80704b72eaeb1d682bd6ef865a", [branch: "main"]},
"bonfire_boundaries": {:git, "https://github.com/bonfire-networks/bonfire_boundaries", "6eb7d3acab4a2fd99644683ef5ef00bc7129e970", [branch: "main"]},
"bonfire_boundaries": {:git, "https://github.com/bonfire-networks/bonfire_boundaries", "67588621bfc62b7420d8b7bf28d0c7fab3a1a2c2", [branch: "main"]},
"bonfire_breadpub": {:git, "https://github.com/bonfire-networks/bonfire_breadpub", "521cec8dbe51aac67085415dfc0557f1e93a6028", [branch: "main"]},
"bonfire_classify": {:git, "https://github.com/bonfire-networks/bonfire_classify", "38c4d776fb19cbfca3254300963c707f500f64f9", [branch: "main"]},
"bonfire_common": {:git, "https://github.com/bonfire-networks/bonfire_common", "632e627c1b0ff7fb8d5ec8bff0af5b7e029e1dac", [branch: "main"]},
"bonfire_common": {:git, "https://github.com/bonfire-networks/bonfire_common", "131e87a8b1935f16b977fcc42a40927c8d8519cb", [branch: "main"]},
"bonfire_data_access_control": {:git, "https://github.com/bonfire-networks/bonfire_data_access_control", "63f9881a6446dcd8ff5d079a95b52c8a8d76d8bc", [branch: "main"]},
"bonfire_data_activity_pub": {:git, "https://github.com/bonfire-networks/bonfire_data_activity_pub", "59ca6db48cf2b5168bd82b1910214fd220f5fb1d", [branch: "main"]},
"bonfire_data_assort": {:git, "https://github.com/bonfire-networks/bonfire_data_assort", "9f90819b48e523776008a0c1e3197807b2d2ff6c", [branch: "master"]},
@ -33,7 +33,7 @@
"bonfire_encrypt": {:git, "https://github.com/bonfire-networks/bonfire_encrypt", "89cc9d788f1e7c90bc6b00bf99b61a6d9f105b91", [branch: "main"]},
"bonfire_epics": {:git, "https://github.com/bonfire-networks/bonfire_epics", "312f9ece05314f88ce7da70e85acbb2984670202", [branch: "main"]},
"bonfire_fail": {:git, "https://github.com/bonfire-networks/bonfire_fail", "88686a00be6fef9d5a6dd30fe26fcd842ab3d7a3", [branch: "main"]},
"bonfire_federate_activitypub": {:git, "https://github.com/bonfire-networks/bonfire_federate_activitypub", "06a5a46317a1b87fc54515fad8e78747c8e660f0", [branch: "main"]},
"bonfire_federate_activitypub": {:git, "https://github.com/bonfire-networks/bonfire_federate_activitypub", "5edcb9ddbd9d0e538965decdecd2ae965624f956", [branch: "main"]},
"bonfire_files": {:git, "https://github.com/bonfire-networks/bonfire_files", "aaaf9aae887a6b8df27ccea85463877591f9aabe", [branch: "main"]},
"bonfire_geolocate": {:git, "https://github.com/bonfire-networks/bonfire_geolocate", "c27942e70308c03526cb475876cac369de2aa274", [branch: "main"]},
"bonfire_invite_links": {:git, "https://github.com/bonfire-networks/bonfire_invite_links", "6242bb91e2dd3b399944136253d1380a932e42fa", [branch: "main"]},
@ -48,7 +48,7 @@
"bonfire_ui_coordination": {:git, "https://github.com/bonfire-networks/bonfire_ui_coordination", "2fd412764bfa82aebede8e0b97e8715a834a8db1", [branch: "main"]},
"bonfire_ui_kanban": {:git, "https://github.com/bonfire-networks/bonfire_ui_kanban", "22b3378bb7d57105743e7541b777078663636a75", [branch: "main"]},
"bonfire_ui_me": {:git, "https://github.com/bonfire-networks/bonfire_ui_me", "96cce9bc3258340e577ff81f9143b4436752f896", [branch: "main"]},
"bonfire_ui_social": {:git, "https://github.com/bonfire-networks/bonfire_ui_social", "90ca938f6348d77211da891ca537ca7dcfa4afa4", [branch: "main"]},
"bonfire_ui_social": {:git, "https://github.com/bonfire-networks/bonfire_ui_social", "9243daa4a1c60151d8e78bf21d0427c1294c8bee", [branch: "main"]},
"bonfire_ui_valueflows": {:git, "https://github.com/bonfire-networks/bonfire_ui_valueflows", "c709e2baf0009e315f8e224c8320595808c4f9bc", [branch: "main"]},
"bonfire_upcycle": {:git, "https://gitlab.com/bonfire-networks/bonfire_upcycle", "d769fc800728e105e637d2644ef2e28a1fb8ff58", [branch: "main"]},
"bonfire_valueflows": {:git, "https://github.com/bonfire-networks/bonfire_valueflows", "a5a031abb7ddd84b74874eed5c8ffeb0d48ad9e2", [branch: "main"]},
@ -81,7 +81,7 @@
"ecto_psql_extras": {:hex, :ecto_psql_extras, "0.7.4", "5d43fd088d39a158c860b17e8d210669587f63ec89ea122a4654861c8c6e2db4", [:mix], [{:ecto_sql, "~> 3.4", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:postgrex, ">= 0.15.7", [hex: :postgrex, repo: "hexpm", optional: false]}, {:table_rex, "~> 3.1.1", [hex: :table_rex, repo: "hexpm", optional: false]}], "hexpm", "311db02f1b772e3d0dc7f56a05044b5e1499d78ed6abf38885e1ca70059449e5"},
"ecto_ranked": {:hex, :ecto_ranked, "0.5.0", "0e428901fe4586f6561b039b90b44940383e90da534b1842a728b56b076fdd68", [:mix], [{:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: false]}], "hexpm", "7f9e119539aca2cf6d98916409e592c884f89069014b7731db1f42483da7e192"},
"ecto_shorts": {:git, "https://github.com/bonfire-networks/ecto_shorts", "4e3c20b859e1b2af2e5c2415f3eee73204d368dc", [branch: "refactor/attempt1"]},
"ecto_sparkles": {:git, "https://github.com/bonfire-networks/ecto_sparkles", "4c1e66a4191bd461369c47c507de3adbce0f45e2", [branch: "main"]},
"ecto_sparkles": {:git, "https://github.com/bonfire-networks/ecto_sparkles", "cd24220dd2c9b225b654ea350d728deb3cde5b9e", [branch: "main"]},
"ecto_sql": {:hex, :ecto_sql, "3.9.0", "2bb21210a2a13317e098a420a8c1cc58b0c3421ab8e3acfa96417dab7817918c", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.9.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a8f3f720073b8b1ac4c978be25fa7960ed7fd44997420c304a4a2e200b596453"},
"elixir_make": {:hex, :elixir_make, "0.6.3", "bc07d53221216838d79e03a8019d0839786703129599e9619f4ab74c8c096eac", [:mix], [], "hexpm", "f5cbd651c5678bcaabdbb7857658ee106b12509cd976c2c2fca99688e1daf716"},
"email_checker": {:hex, :email_checker, "0.2.4", "2bf246646678c8a366f2f6d2394845facb87c025ceddbd699019d387726548aa", [:mix], [{:socket, "~> 0.3.1", [hex: :socket, repo: "hexpm", optional: true]}], "hexpm", "e4ac0e5eb035dce9c8df08ebffdb525a5d82e61dde37390ac2469222f723e50a"},