diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-15 14:07:07 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-15 14:22:15 +0300 |
| commit | 8751809e1e96644a4d38694504622d2115966230 (patch) | |
| tree | 3e1a969100bbf8a75f37c7e10d48ca97eb381db2 /test/web/admin_api/admin_api_controller_test.exs | |
| parent | 39f99dc6cd9295e1b62b27ed1566d53c8c0291fc (diff) | |
| parent | 9c64a25713790fefa8b5c419aeadf55113c17073 (diff) | |
| download | pleroma-8751809e1e96644a4d38694504622d2115966230.tar.gz | |
Merge branch 'develop' into support/tests
Diffstat (limited to 'test/web/admin_api/admin_api_controller_test.exs')
| -rw-r--r-- | test/web/admin_api/admin_api_controller_test.exs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index 4e2c27431..3b6d75a4c 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -1779,7 +1779,11 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do %{"tuple" => [":seconds_valid", 60]}, %{"tuple" => [":path", ""]}, %{"tuple" => [":key1", nil]}, - %{"tuple" => [":partial_chain", "&:hackney_connect.partial_chain/1"]} + %{"tuple" => [":partial_chain", "&:hackney_connect.partial_chain/1"]}, + %{"tuple" => [":regex1", "~r/https:\/\/example.com/"]}, + %{"tuple" => [":regex2", "~r/https:\/\/example.com/u"]}, + %{"tuple" => [":regex3", "~r/https:\/\/example.com/i"]}, + %{"tuple" => [":regex4", "~r/https:\/\/example.com/s"]} ] } ] @@ -1796,7 +1800,11 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do %{"tuple" => [":seconds_valid", 60]}, %{"tuple" => [":path", ""]}, %{"tuple" => [":key1", nil]}, - %{"tuple" => [":partial_chain", "&:hackney_connect.partial_chain/1"]} + %{"tuple" => [":partial_chain", "&:hackney_connect.partial_chain/1"]}, + %{"tuple" => [":regex1", "~r/https:\\/\\/example.com/"]}, + %{"tuple" => [":regex2", "~r/https:\\/\\/example.com/u"]}, + %{"tuple" => [":regex3", "~r/https:\\/\\/example.com/i"]}, + %{"tuple" => [":regex4", "~r/https:\\/\\/example.com/s"]} ] } ] |