Merge remote-tracking branch 'origin/develop' into matrixmatrix

2 files changed, 0 insertions, 257 deletions

diff --git a/test/web/instances/instance_test.exs b/test/web/instances/instance_test.exs
deleted file mode 100644
index dc6ace843..000000000
--- a/test/web/instances/instance_test.exs
+++ /dev/null
@@ -1,133 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Instances.InstanceTest do
-  alias Pleroma.Instances.Instance
-  alias Pleroma.Repo
-
-  use Pleroma.DataCase
-
-  import ExUnit.CaptureLog
-  import Pleroma.Factory
-
-  setup_all do: clear_config([:instance, :federation_reachability_timeout_days], 1)
-
-  describe "set_reachable/1" do
-    test "clears `unreachable_since` of existing matching Instance record having non-nil `unreachable_since`" do
-      unreachable_since = NaiveDateTime.to_iso8601(NaiveDateTime.utc_now())
-      instance = insert(:instance, unreachable_since: unreachable_since)
-
-      assert {:ok, instance} = Instance.set_reachable(instance.host)
-      refute instance.unreachable_since
-    end
-
-    test "keeps nil `unreachable_since` of existing matching Instance record having nil `unreachable_since`" do
-      instance = insert(:instance, unreachable_since: nil)
-
-      assert {:ok, instance} = Instance.set_reachable(instance.host)
-      refute instance.unreachable_since
-    end
-
-    test "does NOT create an Instance record in case of no existing matching record" do
-      host = "domain.org"
-      assert nil == Instance.set_reachable(host)
-
-      assert [] = Repo.all(Ecto.Query.from(i in Instance))
-      assert Instance.reachable?(host)
-    end
-  end
-
-  describe "set_unreachable/1" do
-    test "creates new record having `unreachable_since` to current time if record does not exist" do
-      assert {:ok, instance} = Instance.set_unreachable("https://domain.com/path")
-
-      instance = Repo.get(Instance, instance.id)
-      assert instance.unreachable_since
-      assert "domain.com" == instance.host
-    end
-
-    test "sets `unreachable_since` of existing record having nil `unreachable_since`" do
-      instance = insert(:instance, unreachable_since: nil)
-      refute instance.unreachable_since
-
-      assert {:ok, _} = Instance.set_unreachable(instance.host)
-
-      instance = Repo.get(Instance, instance.id)
-      assert instance.unreachable_since
-    end
-
-    test "does NOT modify `unreachable_since` value of existing record in case it's present" do
-      instance =
-        insert(:instance, unreachable_since: NaiveDateTime.add(NaiveDateTime.utc_now(), -10))
-
-      assert instance.unreachable_since
-      initial_value = instance.unreachable_since
-
-      assert {:ok, _} = Instance.set_unreachable(instance.host)
-
-      instance = Repo.get(Instance, instance.id)
-      assert initial_value == instance.unreachable_since
-    end
-  end
-
-  describe "set_unreachable/2" do
-    test "sets `unreachable_since` value of existing record in case it's newer than supplied value" do
-      instance =
-        insert(:instance, unreachable_since: NaiveDateTime.add(NaiveDateTime.utc_now(), -10))
-
-      assert instance.unreachable_since
-
-      past_value = NaiveDateTime.add(NaiveDateTime.utc_now(), -100)
-      assert {:ok, _} = Instance.set_unreachable(instance.host, past_value)
-
-      instance = Repo.get(Instance, instance.id)
-      assert past_value == instance.unreachable_since
-    end
-
-    test "does NOT modify `unreachable_since` value of existing record in case it's equal to or older than supplied value" do
-      instance =
-        insert(:instance, unreachable_since: NaiveDateTime.add(NaiveDateTime.utc_now(), -10))
-
-      assert instance.unreachable_since
-      initial_value = instance.unreachable_since
-
-      assert {:ok, _} = Instance.set_unreachable(instance.host, NaiveDateTime.utc_now())
-
-      instance = Repo.get(Instance, instance.id)
-      assert initial_value == instance.unreachable_since
-    end
-  end
-
-  test "Scrapes favicon URLs" do
-    Tesla.Mock.mock(fn %{url: "https://favicon.example.org/"} ->
-      %Tesla.Env{
-        status: 200,
-        body: ~s[<html><head><link rel="icon" href="/favicon.png"></head></html>]
-      }
-    end)
-
-    assert "https://favicon.example.org/favicon.png" ==
-             Instance.get_or_update_favicon(URI.parse("https://favicon.example.org/"))
-  end
-
-  test "Returns nil on too long favicon URLs" do
-    long_favicon_url =
-      "https://Lorem.ipsum.dolor.sit.amet/consecteturadipiscingelit/Praesentpharetrapurusutaliquamtempus/Mauriseulaoreetarcu/atfacilisisorci/Nullamporttitor/nequesedfeugiatmollis/dolormagnaefficiturlorem/nonpretiumsapienorcieurisus/Nullamveleratsem/Maecenassedaccumsanexnam/favicon.png"
-
-    Tesla.Mock.mock(fn %{url: "https://long-favicon.example.org/"} ->
-      %Tesla.Env{
-        status: 200,
-        body: ~s[<html><head><link rel="icon" href="] <> long_favicon_url <> ~s["></head></html>]
-      }
-    end)
-
-    assert capture_log(fn ->
-             assert nil ==
-                      Instance.get_or_update_favicon(
-                        URI.parse("https://long-favicon.example.org/")
-                      )
-           end) =~
-             "Instance.get_or_update_favicon(\"long-favicon.example.org\") error: %Postgrex.Error{"
-  end
-end
diff --git a/test/web/instances/instances_test.exs b/test/web/instances/instances_test.exs
deleted file mode 100644
index d2618025c..000000000
--- a/test/web/instances/instances_test.exs
+++ /dev/null
@@ -1,124 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.InstancesTest do
-  alias Pleroma.Instances
-
-  use Pleroma.DataCase
-
-  setup_all do: clear_config([:instance, :federation_reachability_timeout_days], 1)
-
-  describe "reachable?/1" do
-    test "returns `true` for host / url with unknown reachability status" do
-      assert Instances.reachable?("unknown.site")
-      assert Instances.reachable?("http://unknown.site")
-    end
-
-    test "returns `false` for host / url marked unreachable for at least `reachability_datetime_threshold()`" do
-      host = "consistently-unreachable.name"
-      Instances.set_consistently_unreachable(host)
-
-      refute Instances.reachable?(host)
-      refute Instances.reachable?("http://#{host}/path")
-    end
-
-    test "returns `true` for host / url marked unreachable for less than `reachability_datetime_threshold()`" do
-      url = "http://eventually-unreachable.name/path"
-
-      Instances.set_unreachable(url)
-
-      assert Instances.reachable?(url)
-      assert Instances.reachable?(URI.parse(url).host)
-    end
-
-    test "returns true on non-binary input" do
-      assert Instances.reachable?(nil)
-      assert Instances.reachable?(1)
-    end
-  end
-
-  describe "filter_reachable/1" do
-    setup do
-      host = "consistently-unreachable.name"
-      url1 = "http://eventually-unreachable.com/path"
-      url2 = "http://domain.com/path"
-
-      Instances.set_consistently_unreachable(host)
-      Instances.set_unreachable(url1)
-
-      result = Instances.filter_reachable([host, url1, url2, nil])
-      %{result: result, url1: url1, url2: url2}
-    end
-
-    test "returns a map with keys containing 'not marked consistently unreachable' elements of supplied list",
-         %{result: result, url1: url1, url2: url2} do
-      assert is_map(result)
-      assert Enum.sort([url1, url2]) == result |> Map.keys() |> Enum.sort()
-    end
-
-    test "returns a map with `unreachable_since` values for keys",
-         %{result: result, url1: url1, url2: url2} do
-      assert is_map(result)
-      assert %NaiveDateTime{} = result[url1]
-      assert is_nil(result[url2])
-    end
-
-    test "returns an empty map for empty list or list containing no hosts / url" do
-      assert %{} == Instances.filter_reachable([])
-      assert %{} == Instances.filter_reachable([nil])
-    end
-  end
-
-  describe "set_reachable/1" do
-    test "sets unreachable url or host reachable" do
-      host = "domain.com"
-      Instances.set_consistently_unreachable(host)
-      refute Instances.reachable?(host)
-
-      Instances.set_reachable(host)
-      assert Instances.reachable?(host)
-    end
-
-    test "keeps reachable url or host reachable" do
-      url = "https://site.name?q="
-      assert Instances.reachable?(url)
-
-      Instances.set_reachable(url)
-      assert Instances.reachable?(url)
-    end
-
-    test "returns error status on non-binary input" do
-      assert {:error, _} = Instances.set_reachable(nil)
-      assert {:error, _} = Instances.set_reachable(1)
-    end
-  end
-
-  # Note: implementation-specific (e.g. Instance) details of set_unreachable/1
-  # should be tested in implementation-specific tests
-  describe "set_unreachable/1" do
-    test "returns error status on non-binary input" do
-      assert {:error, _} = Instances.set_unreachable(nil)
-      assert {:error, _} = Instances.set_unreachable(1)
-    end
-  end
-
-  describe "set_consistently_unreachable/1" do
-    test "sets reachable url or host unreachable" do
-      url = "http://domain.com?q="
-      assert Instances.reachable?(url)
-
-      Instances.set_consistently_unreachable(url)
-      refute Instances.reachable?(url)
-    end
-
-    test "keeps unreachable url or host unreachable" do
-      host = "site.name"
-      Instances.set_consistently_unreachable(host)
-      refute Instances.reachable?(host)
-
-      Instances.set_consistently_unreachable(host)
-      refute Instances.reachable?(host)
-    end
-  end
-end