diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-02 18:50:37 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-02 18:50:37 +0400 |
| commit | 68cb152a0861618035ac48a0e0b455f74d9b767c (patch) | |
| tree | cb2f14ed088efa0ab5b6952ee7d74d69f524387a /test/plugs | |
| parent | cbcd592300673582e38d0bf539dcdb9a2c1985a1 (diff) | |
| parent | 879304dcd94c778b3cdaa2b82f69fccf2b37090c (diff) | |
| download | pleroma-68cb152a0861618035ac48a0e0b455f74d9b767c.tar.gz pleroma-68cb152a0861618035ac48a0e0b455f74d9b767c.zip | |
Merge branch 'develop' into openapi/admin/relay
Diffstat (limited to 'test/plugs')
| -rw-r--r-- | test/plugs/authentication_plug_test.exs | 1 | ||||
| -rw-r--r-- | test/plugs/http_security_plug_test.exs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/test/plugs/authentication_plug_test.exs b/test/plugs/authentication_plug_test.exs index 3c70c1747..777ae15ae 100644 --- a/test/plugs/authentication_plug_test.exs +++ b/test/plugs/authentication_plug_test.exs @@ -68,6 +68,7 @@ defmodule Pleroma.Plugs.AuthenticationPlugTest do assert "$pbkdf2" <> _ = user.password_hash end + @tag :skip_on_mac test "with a crypt hash, it updates to a pkbdf2 hash", %{conn: conn} do user = insert(:user, diff --git a/test/plugs/http_security_plug_test.exs b/test/plugs/http_security_plug_test.exs index 84e4c274f..63b4d3f31 100644 --- a/test/plugs/http_security_plug_test.exs +++ b/test/plugs/http_security_plug_test.exs @@ -67,7 +67,7 @@ defmodule Pleroma.Web.Plugs.HTTPSecurityPlugTest do [csp] = Conn.get_resp_header(conn, "content-security-policy") - assert csp =~ ~r|report-uri https://endpoint.com; report-to csp-endpoint;| + assert csp =~ ~r|report-uri https://endpoint.com;report-to csp-endpoint;| [reply_to] = Conn.get_resp_header(conn, "reply-to") |