summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-07-30 08:41:46 +0000
committerlain <lain@soykaf.club>2020-07-30 08:41:46 +0000
commitd39b72c8fa8b338d6afd02af3d0870ccca391aba (patch)
tree6feb5123a80af8bc2cee8f10288ce3bde0ed8729 /test
parenta0623c5db226a54998923ebab01703a7cee3dad5 (diff)
parent20d89472e3b48453b5e2e71cce0f6d97cddbbf53 (diff)
downloadpleroma-d39b72c8fa8b338d6afd02af3d0870ccca391aba.tar.gz
pleroma-d39b72c8fa8b338d6afd02af3d0870ccca391aba.zip
Merge branch 'feature/captcha-expose-timeout' into 'develop'
Expose seconds_valid in Pleroma Captcha API endpoint Closes #1954 See merge request pleroma/pleroma!2812
Diffstat (limited to 'test')
-rw-r--r--test/captcha_test.exs6
-rw-r--r--test/support/captcha_mock.ex3
2 files changed, 6 insertions, 3 deletions
diff --git a/test/captcha_test.exs b/test/captcha_test.exs
index 1ab9019ab..1b9f4a12f 100644
--- a/test/captcha_test.exs
+++ b/test/captcha_test.exs
@@ -41,7 +41,8 @@ defmodule Pleroma.CaptchaTest do
answer_data: answer,
token: ^token,
url: ^url,
- type: :kocaptcha
+ type: :kocaptcha,
+ seconds_valid: 300
} = new
assert Kocaptcha.validate(token, "7oEy8c", answer) == :ok
@@ -56,7 +57,8 @@ defmodule Pleroma.CaptchaTest do
answer_data: answer,
token: token,
type: :native,
- url: "data:image/png;base64," <> _
+ url: "data:image/png;base64," <> _,
+ seconds_valid: 300
} = new
assert is_binary(answer)
diff --git a/test/support/captcha_mock.ex b/test/support/captcha_mock.ex
index 7b0c1d5af..2ed2ba3b4 100644
--- a/test/support/captcha_mock.ex
+++ b/test/support/captcha_mock.ex
@@ -16,7 +16,8 @@ defmodule Pleroma.Captcha.Mock do
type: :mock,
token: "afa1815e14e29355e6c8f6b143a39fa2",
answer_data: @solution,
- url: "https://example.org/captcha.png"
+ url: "https://example.org/captcha.png",
+ seconds_valid: 300
}
@impl Service