diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-09-13 19:42:53 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-09-13 19:42:53 +0300 |
| commit | ba70a8cae6c0d00963dc1d9e80f915186397ad06 (patch) | |
| tree | d0cfb4e9b6c8771b84f38b9d6175b47fbf4e442d /test/web/admin_api/admin_api_controller_test.exs | |
| parent | ac4a748fad34c02647bf72e802cd9d74205681fe (diff) | |
| parent | 53a3ad60435d4f7eab2dbf1235e5974bac275aa0 (diff) | |
| download | pleroma-ba70a8cae6c0d00963dc1d9e80f915186397ad06.tar.gz pleroma-ba70a8cae6c0d00963dc1d9e80f915186397ad06.zip | |
Merge branch 'develop' into feature/delivery-tracking
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"]} ] } ] |