X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fpleroma%2Fweb%2Fplugs%2Fremote_ip_test.exs;h=b77fa25f2f5465e82e1b16857fe069aba2250f1f;hb=9464d505628d9f9dc20e54055d8853bea1d6722b;hp=4d98de2bd73059ca49ee2b74c61b64d4a6907a78;hpb=5f336991699c8cc22814e8dae5ec1636cc93bea6;p=akkoma

diff --git a/test/pleroma/web/plugs/remote_ip_test.exs b/test/pleroma/web/plugs/remote_ip_test.exs
index 4d98de2bd..b77fa25f2 100644
--- a/test/pleroma/web/plugs/remote_ip_test.exs
+++ b/test/pleroma/web/plugs/remote_ip_test.exs
@@ -10,28 +10,32 @@ defmodule Pleroma.Web.Plugs.RemoteIpTest do
 
   import Pleroma.Tests.Helpers, only: [clear_config: 2]
 
-  setup do:
-          clear_config(RemoteIp,
-            enabled: true,
-            headers: ["x-forwarded-for"],
-            proxies: [],
-            reserved: [
-              "127.0.0.0/8",
-              "::1/128",
-              "fc00::/7",
-              "10.0.0.0/8",
-              "172.16.0.0/12",
-              "192.168.0.0/16"
-            ]
-          )
+  setup do
+    clear_config([RemoteIp, :enabled], true)
+    clear_config([RemoteIp, :headers], ["x-forwarded-for"])
+    clear_config([RemoteIp, :proxies], [])
+
+    clear_config(
+      [RemoteIp, :reserved],
+      [
+        "127.0.0.0/8",
+        "::1/128",
+        "fc00::/7",
+        "10.0.0.0/8",
+        "172.16.0.0/12",
+        "192.168.0.0/16"
+      ]
+    )
+  end
 
   test "disabled" do
-    clear_config(RemoteIp, enabled: false)
+    clear_config([RemoteIp, :enabled], false)
 
     %{remote_ip: remote_ip} = conn(:get, "/")
 
     conn =
-      conn(:get, "/")
+      :get
+      |> conn("/")
       |> put_req_header("x-forwarded-for", "1.1.1.1")
       |> RemoteIp.call(nil)
 
@@ -40,7 +44,8 @@ defmodule Pleroma.Web.Plugs.RemoteIpTest do
 
   test "enabled" do
     conn =
-      conn(:get, "/")
+      :get
+      |> conn("/")
       |> put_req_header("x-forwarded-for", "1.1.1.1")
       |> RemoteIp.call(nil)
 
@@ -48,17 +53,20 @@ defmodule Pleroma.Web.Plugs.RemoteIpTest do
   end
 
   test "custom headers" do
-    clear_config(RemoteIp, enabled: true, headers: ["cf-connecting-ip"])
+    clear_config([RemoteIp, :enabled], true)
+    clear_config([RemoteIp, :headers], ["cf-connecting-ip"])
 
     conn =
-      conn(:get, "/")
+      :get
+      |> conn("/")
       |> put_req_header("x-forwarded-for", "1.1.1.1")
       |> RemoteIp.call(nil)
 
     refute conn.remote_ip == {1, 1, 1, 1}
 
     conn =
-      conn(:get, "/")
+      :get
+      |> conn("/")
       |> put_req_header("cf-connecting-ip", "1.1.1.1")
       |> RemoteIp.call(nil)
 
@@ -67,7 +75,8 @@ defmodule Pleroma.Web.Plugs.RemoteIpTest do
 
   test "custom proxies" do
     conn =
-      conn(:get, "/")
+      :get
+      |> conn("/")
       |> put_req_header("x-forwarded-for", "173.245.48.1, 1.1.1.1, 173.245.48.2")
       |> RemoteIp.call(nil)
 
@@ -76,7 +85,8 @@ defmodule Pleroma.Web.Plugs.RemoteIpTest do
     clear_config([RemoteIp, :proxies], ["173.245.48.0/20"])
 
     conn =
-      conn(:get, "/")
+      :get
+      |> conn("/")
       |> put_req_header("x-forwarded-for", "173.245.48.1, 1.1.1.1, 173.245.48.2")
       |> RemoteIp.call(nil)
 
@@ -87,7 +97,8 @@ defmodule Pleroma.Web.Plugs.RemoteIpTest do
     clear_config([RemoteIp, :proxies], ["173.245.48.1"])
 
     conn =
-      conn(:get, "/")
+      :get
+      |> conn("/")
       |> put_req_header("x-forwarded-for", "173.245.48.1, 1.1.1.1")
       |> RemoteIp.call(nil)
 
@@ -99,7 +110,8 @@ defmodule Pleroma.Web.Plugs.RemoteIpTest do
     clear_config([RemoteIp, :proxies], ["10.0.0.3/24"])
 
     conn =
-      conn(:get, "/")
+      :get
+      |> conn("/")
       |> put_req_header("x-forwarded-for", "10.0.0.3, 1.1.1.1")
       |> RemoteIp.call(nil)