From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Wed, 24 Jun 2020 11:11:05 +0000 (+0300)
Subject: updates after rebase
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=e33782455d468a867484e30fdeef4c28c2c2aa01;p=akkoma

updates after rebase
---

diff --git a/test/application_requirements_test.exs b/test/pleroma/application_requirements_test.exs
similarity index 81%
rename from test/application_requirements_test.exs
rename to test/pleroma/application_requirements_test.exs
index 21d24ddd0..c505ae229 100644
--- a/test/application_requirements_test.exs
+++ b/test/pleroma/application_requirements_test.exs
@@ -4,9 +4,12 @@
 
 defmodule Pleroma.ApplicationRequirementsTest do
   use Pleroma.DataCase
+
   import ExUnit.CaptureLog
   import Mock
 
+  alias Pleroma.ApplicationRequirements
+  alias Pleroma.Config
   alias Pleroma.Repo
 
   describe "check_welcome_message_config!/1" do
@@ -70,42 +73,42 @@ defmodule Pleroma.ApplicationRequirementsTest do
     setup do: clear_config([:database, :rum_enabled])
 
     test "raises if rum is enabled and detects unapplied rum migrations" do
-      Pleroma.Config.put([:database, :rum_enabled], true)
+      Config.put([:database, :rum_enabled], true)
 
       with_mocks([{Repo, [:passthrough], [exists?: fn _, _ -> false end]}]) do
-        assert_raise Pleroma.ApplicationRequirements.VerifyError,
+        assert_raise ApplicationRequirements.VerifyError,
                      "Unapplied RUM Migrations detected",
                      fn ->
-                       capture_log(&Pleroma.ApplicationRequirements.verify!/0)
+                       capture_log(&ApplicationRequirements.verify!/0)
                      end
       end
     end
 
     test "raises if rum is disabled and detects rum migrations" do
-      Pleroma.Config.put([:database, :rum_enabled], false)
+      Config.put([:database, :rum_enabled], false)
 
       with_mocks([{Repo, [:passthrough], [exists?: fn _, _ -> true end]}]) do
-        assert_raise Pleroma.ApplicationRequirements.VerifyError,
+        assert_raise ApplicationRequirements.VerifyError,
                      "RUM Migrations detected",
                      fn ->
-                       capture_log(&Pleroma.ApplicationRequirements.verify!/0)
+                       capture_log(&ApplicationRequirements.verify!/0)
                      end
       end
     end
 
     test "doesn't do anything if rum enabled and applied migrations" do
-      Pleroma.Config.put([:database, :rum_enabled], true)
+      Config.put([:database, :rum_enabled], true)
 
       with_mocks([{Repo, [:passthrough], [exists?: fn _, _ -> true end]}]) do
-        assert Pleroma.ApplicationRequirements.verify!() == :ok
+        assert ApplicationRequirements.verify!() == :ok
       end
     end
 
     test "doesn't do anything if rum disabled" do
-      Pleroma.Config.put([:database, :rum_enabled], false)
+      Config.put([:database, :rum_enabled], false)
 
       with_mocks([{Repo, [:passthrough], [exists?: fn _, _ -> false end]}]) do
-        assert Pleroma.ApplicationRequirements.verify!() == :ok
+        assert ApplicationRequirements.verify!() == :ok
       end
     end
   end
@@ -130,17 +133,17 @@ defmodule Pleroma.ApplicationRequirementsTest do
     setup do: clear_config([:i_am_aware_this_may_cause_data_loss, :disable_migration_check])
 
     test "raises if it detects unapplied migrations" do
-      assert_raise Pleroma.ApplicationRequirements.VerifyError,
+      assert_raise ApplicationRequirements.VerifyError,
                    "Unapplied Migrations detected",
                    fn ->
-                     capture_log(&Pleroma.ApplicationRequirements.verify!/0)
+                     capture_log(&ApplicationRequirements.verify!/0)
                    end
     end
 
     test "doesn't do anything if disabled" do
-      Pleroma.Config.put([:i_am_aware_this_may_cause_data_loss, :disable_migration_check], true)
+      Config.put([:i_am_aware_this_may_cause_data_loss, :disable_migration_check], true)
 
-      assert :ok == Pleroma.ApplicationRequirements.verify!()
+      assert :ok == ApplicationRequirements.verify!()
     end
   end
 end
diff --git a/test/http/tzdata_test.exs b/test/pleroma/http/tzdata_test.exs
similarity index 100%
rename from test/http/tzdata_test.exs
rename to test/pleroma/http/tzdata_test.exs
diff --git a/test/web/activity_pub/transmogrifier/user_update_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/user_update_handling_test.exs
similarity index 100%
rename from test/web/activity_pub/transmogrifier/user_update_handling_test.exs
rename to test/pleroma/web/activity_pub/transmogrifier/user_update_handling_test.exs