Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances

# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex

1 files changed, 0 insertions, 45 deletions

diff --git a/test/tasks/robots_txt_test.exs b/test/tasks/robots_txt_test.exs
deleted file mode 100644
index 7040a0e4e..000000000
--- a/test/tasks/robots_txt_test.exs
+++ /dev/null
@@ -1,45 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Mix.Tasks.Pleroma.RobotsTxtTest do
-  use ExUnit.Case
-  use Pleroma.Tests.Helpers
-  alias Mix.Tasks.Pleroma.RobotsTxt
-
-  setup do: clear_config([:instance, :static_dir])
-
-  test "creates new dir" do
-    path = "test/fixtures/new_dir/"
-    file_path = path <> "robots.txt"
-    Pleroma.Config.put([:instance, :static_dir], path)
-
-    on_exit(fn ->
-      {:ok, ["test/fixtures/new_dir/", "test/fixtures/new_dir/robots.txt"]} = File.rm_rf(path)
-    end)
-
-    RobotsTxt.run(["disallow_all"])
-
-    assert File.exists?(file_path)
-    {:ok, file} = File.read(file_path)
-
-    assert file == "User-Agent: *\nDisallow: /\n"
-  end
-
-  test "to existance folder" do
-    path = "test/fixtures/"
-    file_path = path <> "robots.txt"
-    Pleroma.Config.put([:instance, :static_dir], path)
-
-    on_exit(fn ->
-      :ok = File.rm(file_path)
-    end)
-
-    RobotsTxt.run(["disallow_all"])
-
-    assert File.exists?(file_path)
-    {:ok, file} = File.read(file_path)
-
-    assert file == "User-Agent: *\nDisallow: /\n"
-  end
-end