Ver código fonte

Testing: Don't federate in testing.

tags/v1.1.4
lain 5 anos atrás
pai
commit
abe2e8881f
9 arquivos alterados com 70 adições e 10 exclusões
  1. +2
    -1
      config/test.exs
  2. +10
    -7
      lib/pleroma/web/activity_pub/utils.ex
  3. +10
    -0
      test/conversation_test.exs
  4. +7
    -0
      test/web/activity_pub/activity_pub_controller_test.exs
  5. +7
    -0
      test/web/federator_test.exs
  6. +7
    -0
      test/web/ostatus/ostatus_controller_test.exs
  7. +11
    -2
      test/web/plugs/federating_plug_test.exs
  8. +6
    -0
      test/web/web_finger/web_finger_controller_test.exs
  9. +10
    -0
      test/web/websub/websub_controller_test.exs

+ 2
- 1
config/test.exs Ver arquivo

@@ -28,7 +28,8 @@ config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test
config :pleroma, :instance,
email: "admin@example.com",
notify_email: "noreply@example.com",
skip_thread_containment: false
skip_thread_containment: false,
federating: false

# Configure your database
config :pleroma, Pleroma.Repo,


+ 10
- 7
lib/pleroma/web/activity_pub/utils.ex Ver arquivo

@@ -170,14 +170,17 @@ defmodule Pleroma.Web.ActivityPub.Utils do
Enqueues an activity for federation if it's local
"""
def maybe_federate(%Activity{local: true} = activity) do
priority =
case activity.data["type"] do
"Delete" -> 10
"Create" -> 1
_ -> 5
end
if Pleroma.Config.get!([:instance, :federating]) do
priority =
case activity.data["type"] do
"Delete" -> 10
"Create" -> 1
_ -> 5
end

Pleroma.Web.Federator.publish(activity, priority)
end

Pleroma.Web.Federator.publish(activity, priority)
:ok
end



+ 10
- 0
test/conversation_test.exs Ver arquivo

@@ -11,6 +11,16 @@ defmodule Pleroma.ConversationTest do

import Pleroma.Factory

setup_all do
config_path = [:instance, :federating]
initial_setting = Pleroma.Config.get(config_path)

Pleroma.Config.put(config_path, true)
on_exit(fn -> Pleroma.Config.put(config_path, initial_setting) end)

:ok
end

test "it goes through old direct conversations" do
user = insert(:user)
other_user = insert(:user)


+ 7
- 0
test/web/activity_pub/activity_pub_controller_test.exs Ver arquivo

@@ -15,6 +15,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do

setup_all do
Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)

config_path = [:instance, :federating]
initial_setting = Pleroma.Config.get(config_path)

Pleroma.Config.put(config_path, true)
on_exit(fn -> Pleroma.Config.put(config_path, initial_setting) end)

:ok
end



+ 7
- 0
test/web/federator_test.exs Ver arquivo

@@ -12,6 +12,13 @@ defmodule Pleroma.Web.FederatorTest do

setup_all do
Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)

config_path = [:instance, :federating]
initial_setting = Pleroma.Config.get(config_path)

Pleroma.Config.put(config_path, true)
on_exit(fn -> Pleroma.Config.put(config_path, initial_setting) end)

:ok
end



+ 7
- 0
test/web/ostatus/ostatus_controller_test.exs Ver arquivo

@@ -12,6 +12,13 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do

setup_all do
Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)

config_path = [:instance, :federating]
initial_setting = Pleroma.Config.get(config_path)

Pleroma.Config.put(config_path, true)
on_exit(fn -> Pleroma.Config.put(config_path, initial_setting) end)

:ok
end



+ 11
- 2
test/web/plugs/federating_plug_test.exs Ver arquivo

@@ -5,6 +5,15 @@
defmodule Pleroma.Web.FederatingPlugTest do
use Pleroma.Web.ConnCase

setup_all do
config_path = [:instance, :federating]
initial_setting = Pleroma.Config.get(config_path)

on_exit(fn -> Pleroma.Config.put(config_path, initial_setting) end)

:ok
end

test "returns and halt the conn when federating is disabled" do
Pleroma.Config.put([:instance, :federating], false)

@@ -14,11 +23,11 @@ defmodule Pleroma.Web.FederatingPlugTest do

assert conn.status == 404
assert conn.halted

Pleroma.Config.put([:instance, :federating], true)
end

test "does nothing when federating is enabled" do
Pleroma.Config.put([:instance, :federating], true)

conn =
build_conn()
|> Pleroma.Web.FederatingPlug.call(%{})


+ 6
- 0
test/web/web_finger/web_finger_controller_test.exs Ver arquivo

@@ -10,6 +10,12 @@ defmodule Pleroma.Web.WebFinger.WebFingerControllerTest do

setup do
mock(fn env -> apply(HttpRequestMock, :request, [env]) end)

config_path = [:instance, :federating]
initial_setting = Pleroma.Config.get(config_path)

Pleroma.Config.put(config_path, true)
on_exit(fn -> Pleroma.Config.put(config_path, initial_setting) end)
:ok
end



+ 10
- 0
test/web/websub/websub_controller_test.exs Ver arquivo

@@ -9,6 +9,16 @@ defmodule Pleroma.Web.Websub.WebsubControllerTest do
alias Pleroma.Web.Websub
alias Pleroma.Web.Websub.WebsubClientSubscription

setup_all do
config_path = [:instance, :federating]
initial_setting = Pleroma.Config.get(config_path)

Pleroma.Config.put(config_path, true)
on_exit(fn -> Pleroma.Config.put(config_path, initial_setting) end)

:ok
end

test "websub subscription request", %{conn: conn} do
user = insert(:user)



Carregando…
Cancelar
Salvar