From c859cd1d61d81db4999c594ef61164d752d76145 Mon Sep 17 00:00:00 2001 From: Ekaterina Vaartis Date: Sat, 15 Dec 2018 23:39:23 +0300 Subject: [PATCH] Fix style --- config/test.exs | 3 ++- test/captcha_test.ex | 31 ++++++++++++++----------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/config/test.exs b/config/test.exs index f5348bd46..5670e11a0 100644 --- a/config/test.exs +++ b/config/test.exs @@ -9,7 +9,8 @@ # Disable captha for tests config :pleroma, Pleroma.Captcha, enabled: true, - method: Pleroma.Captcha.Mock # A fake captcha service for tests + # A fake captcha service for tests + method: Pleroma.Captcha.Mock # Print only warnings and errors during test config :logger, level: :warn diff --git a/test/captcha_test.ex b/test/captcha_test.ex index 3942cb051..98e8da79b 100644 --- a/test/captcha_test.ex +++ b/test/captcha_test.ex @@ -6,36 +6,33 @@ defmodule Pleroma.CaptchaTest do @ets_options [:ordered_set, :private, :named_table, {:read_concurrency, true}] describe "Kocaptcha" do - setup do ets_name = Pleroma.Captcha.Kocaptcha.Ets ^ets_name = :ets.new(ets_name, @ets_options) - mock fn + mock(fn %{method: :get, url: "http://localhost:9093/new"} -> - json( - %{ - md5: "63615261b77f5354fb8c4e4986477555", - token: "afa1815e14e29355e6c8f6b143a39fa2", - url: "/captchas/afa1815e14e29355e6c8f6b143a39fa2.png" - } - ) - end + json(%{ + md5: "63615261b77f5354fb8c4e4986477555", + token: "afa1815e14e29355e6c8f6b143a39fa2", + url: "/captchas/afa1815e14e29355e6c8f6b143a39fa2.png" + }) + end) :ok end test "new and validate" do assert Pleroma.Captcha.Kocaptcha.new() == %{ - type: :kocaptcha, - token: "afa1815e14e29355e6c8f6b143a39fa2", - url: "http://localhost:9093/captchas/afa1815e14e29355e6c8f6b143a39fa2.png" - } + type: :kocaptcha, + token: "afa1815e14e29355e6c8f6b143a39fa2", + url: "http://localhost:9093/captchas/afa1815e14e29355e6c8f6b143a39fa2.png" + } assert Pleroma.Captcha.Kocaptcha.validate( - "afa1815e14e29355e6c8f6b143a39fa2", - "7oEy8c" - ) + "afa1815e14e29355e6c8f6b143a39fa2", + "7oEy8c" + ) end end end