Skip to content

Commit f64b943

Browse files
authored
fix: removed elixir 1.19 warnings (#823)
1 parent 210117e commit f64b943

7 files changed

Lines changed: 31 additions & 21 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
strategy:
1212
matrix:
13-
elixir-otp: [{otp: 24.x, elixir: 1.12.x}, {otp: 26.x, elixir: 1.16.x}, {otp: 27.x, elixir: 1.17.x}, {otp: 27.x, elixir: 1.18.x}]
13+
elixir-otp: [{otp: 24.x, elixir: 1.12.x}, {otp: 26.x, elixir: 1.16.x}, {otp: 27.x, elixir: 1.17.x}, {otp: 27.x, elixir: 1.18.x}, {otp: 28.x, elixir: 1.19.x}]
1414
fail-fast: false
1515

1616
env:
@@ -46,7 +46,7 @@ jobs:
4646

4747
strategy:
4848
matrix:
49-
elixir-otp: [{otp: 27.x, elixir: 1.18.x}]
49+
elixir-otp: [{otp: 28.x, elixir: 1.19.x}]
5050
fail-fast: false
5151

5252
steps:
@@ -91,7 +91,7 @@ jobs:
9191

9292
strategy:
9393
matrix:
94-
elixir-otp: [{otp: 24.x, elixir: 1.12.x}, {otp: 26.x, elixir: 1.16.x}, {otp: 27.x, elixir: 1.17.x}, {otp: 27.x, elixir: 1.18.x}]
94+
elixir-otp: [{otp: 24.x, elixir: 1.12.x}, {otp: 26.x, elixir: 1.16.x}, {otp: 27.x, elixir: 1.17.x}, {otp: 27.x, elixir: 1.18.x}, {otp: 28.x, elixir: 1.19.x}]
9595
fail-fast: false
9696

9797
env:
@@ -127,7 +127,7 @@ jobs:
127127

128128
strategy:
129129
matrix:
130-
elixir-otp: [{otp: 24.x, elixir: 1.12.x}, {otp: 26.x, elixir: 1.16.x}, {otp: 27.x, elixir: 1.17.x}, {otp: 27.x, elixir: 1.18.x}]
130+
elixir-otp: [{otp: 24.x, elixir: 1.12.x}, {otp: 26.x, elixir: 1.16.x}, {otp: 27.x, elixir: 1.17.x}, {otp: 27.x, elixir: 1.18.x}, {otp: 28.x, elixir: 1.19.x}]
131131
fail-fast: false
132132

133133
env:
@@ -178,7 +178,7 @@ jobs:
178178

179179
strategy:
180180
matrix:
181-
elixir-otp: [{otp: 27.x, elixir: 1.18.x}]
181+
elixir-otp: [{otp: 27.x, elixir: 1.18.x}, {otp: 28.x, elixir: 1.19.x}]
182182
fail-fast: false
183183

184184
steps:

.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
elixir 1.18.1
2-
erlang 27.2
1+
elixir 1.19.1-otp-28
2+
erlang 28.1.1

lib/wallaby/browser.ex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ defmodule Wallaby.Browser do
954954
|> Query.result()
955955

956956
{:error, {:not_found, result}} ->
957-
query = %Query{query | result: result}
957+
query = %{query | result: result}
958958

959959
case validate_html(parent, query) do
960960
{:ok, _} ->
@@ -1008,7 +1008,7 @@ defmodule Wallaby.Browser do
10081008
def all(parent, %Query{} = query) do
10091009
find(
10101010
parent,
1011-
%Query{query | conditions: Keyword.merge(query.conditions, count: nil, minimum: 0)}
1011+
%{query | conditions: Keyword.merge(query.conditions, count: nil, minimum: 0)}
10121012
)
10131013
end
10141014

@@ -1171,7 +1171,7 @@ defmodule Wallaby.Browser do
11711171
error ->
11721172
case error do
11731173
{:error, {:not_found, results}} ->
1174-
query = %Query{query | result: results}
1174+
query = %{query | result: results}
11751175

11761176
raise ExpectationNotMetError,
11771177
Query.ErrorMessage.message(query, :not_found)
@@ -1504,7 +1504,7 @@ defmodule Wallaby.Browser do
15041504
{:ok, elements} <- validate_selected(query, elements),
15051505
{:ok, elements} <- validate_count(query, elements),
15061506
{:ok, elements} <- do_at(query, elements) do
1507-
{:ok, %Query{query | result: elements}}
1507+
{:ok, %{query | result: elements}}
15081508
end
15091509
rescue
15101510
StaleReferenceError ->

lib/wallaby/chrome/chromedriver/server.ex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ defmodule Wallaby.Chrome.Chromedriver.Server do
103103
check_readiness_async(port_number)
104104

105105
{:noreply,
106-
%State{
106+
%{
107107
state
108108
| port_number: port_number,
109109
wrapper_script_port: wrapper_script_port,
@@ -125,13 +125,13 @@ defmodule Wallaby.Chrome.Chromedriver.Server do
125125
GenServer.reply(call, :ok)
126126
end
127127

128-
{:noreply, %State{state | calls_awaiting_readiness: [], ready?: true}}
128+
{:noreply, %{state | calls_awaiting_readiness: [], ready?: true}}
129129
end
130130

131131
def handle_info({port, {:data, output}}, %State{wrapper_script_port: port} = state) do
132132
case analyze_output(output) do
133133
{:os_pid, os_pid} ->
134-
{:noreply, %State{state | chromedriver_os_pid: os_pid}}
134+
{:noreply, %{state | chromedriver_os_pid: os_pid}}
135135

136136
:unknown ->
137137
{:noreply, state}
@@ -161,7 +161,7 @@ defmodule Wallaby.Chrome.Chromedriver.Server do
161161

162162
def handle_call(:wait_until_ready, from, %State{ready?: false} = state) do
163163
%State{calls_awaiting_readiness: calls_awaiting_readiness} = state
164-
{:noreply, %State{state | calls_awaiting_readiness: [from | calls_awaiting_readiness]}}
164+
{:noreply, %{state | calls_awaiting_readiness: [from | calls_awaiting_readiness]}}
165165
end
166166

167167
@spec open_chromedriver_port(String.t(), port_number) :: port

lib/wallaby/element.ex

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,11 @@ defimpl Inspect, for: Wallaby.Element do
286286
[]
287287
end
288288

289-
concat([Inspect.Any.inspect(element, opts)] ++ additional_output)
289+
element
290+
|> Inspect.Any.inspect(opts)
291+
|> maybe_concat(additional_output)
290292
end
293+
294+
defp maybe_concat(inspect_result, []), do: inspect_result
295+
defp maybe_concat(inspect_result, output), do: concat([inspect_result | output])
291296
end

lib/wallaby/query.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,6 @@ defmodule Wallaby.Query do
582582

583583
defp update_condition(%Query{conditions: conditions} = query, key, value) do
584584
updated_conditions = Keyword.put(conditions, key, value)
585-
%Query{query | conditions: updated_conditions}
585+
%{query | conditions: updated_conditions}
586586
end
587587
end

mix.exs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,20 @@ defmodule Wallaby.Mixfile do
2222

2323
# Custom testing
2424
aliases: ["test.all": ["test", "test.drivers"], "test.drivers": &test_drivers/1],
25-
preferred_cli_env: [
26-
"test.all": :test,
27-
"test.drivers": :test
28-
],
2925
test_paths: test_paths(@selected_driver),
3026
dialyzer: dialyzer()
3127
]
3228
end
3329

30+
def cli do
31+
[
32+
preferred_envs: [
33+
"test.all": :test,
34+
"test.drivers": :test
35+
]
36+
]
37+
end
38+
3439
def application do
3540
[extra_applications: [:logger], mod: {Wallaby, []}]
3641
end

0 commit comments

Comments
 (0)