Skip to content

Commit

Permalink
pleases the formatting gods
Browse files Browse the repository at this point in the history
  • Loading branch information
mneudert committed Feb 18, 2018
1 parent 79788d7 commit aa1ce01
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 53 deletions.
12 changes: 5 additions & 7 deletions test/plug/accesslog/dontlog_test.exs
Expand Up @@ -15,18 +15,16 @@ defmodule Plug.AccessLog.DontlogTest do
defmodule Router do
use Plug.Router

plug(
Plug.AccessLog,
plug Plug.AccessLog,
dontlog: &DontLog.maybe_skip/1,
format: "dontlog equals false",
fun: &DontLog.log/1
)

plug(:match)
plug(:dispatch)
plug :match
plug :dispatch

get("/", do: send_resp(conn, 200, "OK"))
get("/dontlog", do: send_resp(conn, 200, "OK"))
get "/", do: send_resp(conn, 200, "OK")
get "/dontlog", do: send_resp(conn, 200, "OK")
end

test "dontlog true" do
Expand Down
10 changes: 5 additions & 5 deletions test/plug/accesslog/file_handling/recreation_test.exs
Expand Up @@ -13,13 +13,13 @@ defmodule Plug.AccessLog.FileHandling.RecreationTest do
defmodule Router do
use Plug.Router

plug(Plug.AccessLog, file: Logfile.path())
plug Plug.AccessLog, file: Logfile.path()

plug(:match)
plug(:dispatch)
plug :match
plug :dispatch

get("/first", do: send_resp(conn, 200, "OK"))
get("/second", do: send_resp(conn, 200, "OK"))
get "/first", do: send_resp(conn, 200, "OK")
get "/second", do: send_resp(conn, 200, "OK")
end

test "log recreation" do
Expand Down
8 changes: 4 additions & 4 deletions test/plug/accesslog/file_handling/rotation_test.exs
Expand Up @@ -15,12 +15,12 @@ defmodule Plug.AccessLog.FileHandling.RotationTest do
defmodule Router do
use Plug.Router

plug(Plug.AccessLog, file: Logfiles.original())
plug Plug.AccessLog, file: Logfiles.original()

plug(:match)
plug(:dispatch)
plug :match
plug :dispatch

get("/", do: send_resp(conn, 200, "OK"))
get "/", do: send_resp(conn, 200, "OK")
end

test "log rotation" do
Expand Down
16 changes: 8 additions & 8 deletions test/plug/accesslog/file_handling/system_env_test.exs
Expand Up @@ -19,12 +19,12 @@ defmodule Plug.AccessLog.FileHandling.SystemEnvTest do
defmodule Router do
use Plug.Router

plug(Plug.AccessLog, file: {:system, Logfiles.var()})
plug Plug.AccessLog, file: {:system, Logfiles.var()}

plug(:match)
plug(:dispatch)
plug :match
plug :dispatch

get("/", do: send_resp(conn, 200, "OK"))
get "/", do: send_resp(conn, 200, "OK")
end

# actual test
Expand All @@ -42,12 +42,12 @@ defmodule Plug.AccessLog.FileHandling.SystemEnvTest do
defmodule RouterDefaults do
use Plug.Router

plug(Plug.AccessLog, file: {:system, Logfiles.var(), Logfiles.path()})
plug Plug.AccessLog, file: {:system, Logfiles.var(), Logfiles.path()}

plug(:match)
plug(:dispatch)
plug :match
plug :dispatch

get("/", do: send_resp(conn, 200, "OK"))
get "/", do: send_resp(conn, 200, "OK")
end

# actual test
Expand Down
8 changes: 4 additions & 4 deletions test/plug/accesslog/file_handling/unopenable_test.exs
Expand Up @@ -9,12 +9,12 @@ defmodule Plug.AccessLog.FileHandling.UnopenableTest do
defmodule Router do
use Plug.Router

plug(Plug.AccessLog, file: "..")
plug Plug.AccessLog, file: ".."

plug(:match)
plug(:dispatch)
plug :match
plug :dispatch

get("/", do: send_resp(conn, 200, "OK"))
get "/", do: send_resp(conn, 200, "OK")
end

test "unopenable files are ignored" do
Expand Down
18 changes: 6 additions & 12 deletions test/plug/accesslog/formatter_test.exs
Expand Up @@ -35,30 +35,24 @@ defmodule Plug.AccessLog.FormatterTest do
defmodule Router do
use Plug.Router

plug(
Plug.AccessLog,
plug Plug.AccessLog,
format: "%U",
file: Logfiles.formatter_default()
)

plug(
Plug.AccessLog,
plug Plug.AccessLog,
format: "%U",
formatters: [],
file: Logfiles.formatter_nil()
)

plug(
Plug.AccessLog,
plug Plug.AccessLog,
format: "%U",
formatters: [CustomFormatter, DefaultFormatter],
file: Logfiles.formatter_override()
)

plug(:match)
plug(:dispatch)
plug :match
plug :dispatch

get("/format_me", do: send_resp(conn, 200, "OK"))
get "/format_me", do: send_resp(conn, 200, "OK")
end

test "no format means default format" do
Expand Down
8 changes: 4 additions & 4 deletions test/plug/accesslog/logfunctions_test.exs
Expand Up @@ -13,12 +13,12 @@ defmodule Plug.AccessLog.LogfunctionsTest do
defmodule Router do
use Plug.Router

plug(Plug.AccessLog, format: "logger fun", fun: &LogProxy.log/1)
plug Plug.AccessLog, format: "logger fun", fun: &LogProxy.log/1

plug(:match)
plug(:dispatch)
plug :match
plug :dispatch

get("/", do: send_resp(conn, 200, "OK"))
get "/", do: send_resp(conn, 200, "OK")
end

test "functions log requests" do
Expand Down
18 changes: 9 additions & 9 deletions test/plug/accesslog_test.exs
Expand Up @@ -43,17 +43,17 @@ defmodule Plug.AccessLogTest do
defmodule Router do
use Plug.Router

plug(Plug.AccessLog, format: :agent, file: Logfiles.logfile_agent())
plug(Plug.AccessLog, format: :clf, file: Logfiles.logfile_clf())
plug(Plug.AccessLog, format: :clf_vhost, file: Logfiles.logfile_clf_vhost())
plug(Plug.AccessLog, format: :combined, file: Logfiles.logfile_combined())
plug(Plug.AccessLog, format: :combined_vhost, file: Logfiles.logfile_combined_vhost())
plug(Plug.AccessLog, format: :referer, file: Logfiles.logfile_referer())
plug Plug.AccessLog, format: :agent, file: Logfiles.logfile_agent()
plug Plug.AccessLog, format: :clf, file: Logfiles.logfile_clf()
plug Plug.AccessLog, format: :clf_vhost, file: Logfiles.logfile_clf_vhost()
plug Plug.AccessLog, format: :combined, file: Logfiles.logfile_combined()
plug Plug.AccessLog, format: :combined_vhost, file: Logfiles.logfile_combined_vhost()
plug Plug.AccessLog, format: :referer, file: Logfiles.logfile_referer()

plug(:match)
plug(:dispatch)
plug :match
plug :dispatch

get("/", do: send_resp(conn, 200, "OK"))
get "/", do: send_resp(conn, 200, "OK")
end

@opts Router.init([])
Expand Down

0 comments on commit aa1ce01

Please sign in to comment.