Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/wallaby/chrome/logger.ex
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
defmodule Wallaby.Chrome.Logger do
@moduledoc false
@log_regex ~r/^(?<url>\S+) (?<line>\d+):(?<column>\d+) (?<message>.*)$/s
@string_regex ~r/^"(?<string>.+)"$/

def parse_log(%{"level" => "SEVERE", "source" => "javascript", "message" => msg}) do
if Wallaby.js_errors?() do
Expand All @@ -10,8 +8,10 @@ defmodule Wallaby.Chrome.Logger do
end

def parse_log(%{"level" => "INFO", "source" => "console-api", "message" => msg}) do
log_regex = ~r/^(?<url>\S+) (?<line>\d+):(?<column>\d+) (?<message>.*)$/s

if Wallaby.js_logger() do
case Regex.named_captures(@log_regex, msg) do
case Regex.named_captures(log_regex, msg) do
%{"message" => message} -> print_message(message)
end
end
Expand All @@ -20,8 +20,10 @@ defmodule Wallaby.Chrome.Logger do
def parse_log(_), do: nil

defp print_message(message) do
string_regex = ~r/^"(?<string>.+)"$/

message =
case Regex.named_captures(@string_regex, message) do
case Regex.named_captures(string_regex, message) do
%{"string" => string} -> format_string(string)
nil -> message
end
Expand Down
5 changes: 3 additions & 2 deletions lib/wallaby/metadata.ex
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ defmodule Wallaby.Metadata do
# test can then be extracted in the application.

@prefix "BeamMetadata"
@regex ~r{#{@prefix} \((.*?)\)}

def append(user_agent, nil), do: user_agent

Expand All @@ -31,12 +30,14 @@ defmodule Wallaby.Metadata do
end

def extract(str) do
regex = ~r{#{@prefix} \((.*?)\)}

ua =
str
|> String.split("/")
|> List.last()

case Regex.run(@regex, ua) do
case Regex.run(regex, ua) do
[_, metadata] -> parse(metadata)
_ -> %{}
end
Expand Down
Loading