Skip to content

Commit c03384e

Browse files
committed
Simplify SystemEnvBehaviour
1 parent 009ba24 commit c03384e

File tree

7 files changed

+8
-25
lines changed

7 files changed

+8
-25
lines changed

lib/system_env_behaviour.ex renamed to lib/behaviours/system_env_behaviour.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
defmodule SystemEnvBehaviour do
1+
defmodule ElixirScript.Behaviours.SystemEnvBehaviour do
22
@moduledoc """
3-
The abstract behaviour of SystemEnvBehaviour
3+
The abstract behaviour of System get_env functions
44
"""
55
@callback get_env() :: %{optional(String.t()) => String.t()}
66
@callback get_env(String.t(), String.t() | nil) :: String.t() | nil

lib/context.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,5 @@ defmodule ElixirScript.Context do
6262
defp parse_int(nil), do: nil
6363
defp parse_int(value), do: String.to_integer(value)
6464

65-
defp system_env_impl, do: Application.get_env(:context, :system_env, SystemEnvImpl)
65+
defp system_env_impl, do: Application.get_env(:context, :system_env, System)
6666
end

lib/system_env_impl.ex

Lines changed: 0 additions & 17 deletions
This file was deleted.

test/context_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ defmodule ElixirScript.ContextTest do
99

1010
describe "from_github_environment/0" do
1111
test "returns a Context struct with default values when environment variables are not set" do
12-
stub(SystemEnvBehaviourMock, :get_env, fn varname, default ->
12+
stub(SystemEnvMock, :get_env, fn varname, default ->
1313
GitHubWorkflowRun.env()[varname] || default
1414
end)
1515

test/e2e_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ defmodule ElixirScript.E2eTest do
5656

5757
describe "end-to-end tests" do
5858
test "run e2e tests" do
59-
stub(SystemEnvBehaviourMock, :get_env, fn varname, default ->
59+
stub(SystemEnvMock, :get_env, fn varname, default ->
6060
GitHubWorkflowRun.env()[varname] || default
6161
end)
6262

test/script_runner_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ defmodule ElixirScript.ScriptRunnerTest do
77
alias Test.Fixtures.GitHubWorkflowRun
88

99
setup do
10-
stub(SystemEnvBehaviourMock, :get_env, fn varname, default ->
10+
stub(SystemEnvMock, :get_env, fn varname, default ->
1111
GitHubWorkflowRun.env()[varname] || default
1212
end)
1313

test/test_helper.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Mox.defmock(SystemEnvBehaviourMock, for: SystemEnvBehaviour)
2-
Application.put_env(:context, :system_env, SystemEnvBehaviourMock)
1+
Mox.defmock(SystemEnvMock, for: ElixirScript.Behaviours.SystemEnvBehaviour)
2+
Application.put_env(:context, :system_env, SystemEnvMock)
33

44
ExUnit.start()

0 commit comments

Comments
 (0)