From 69d746aaaa1a6eb8b1f485eb11ac984d60a12498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonatan=20M=C3=A4nnchen?= Date: Mon, 2 Dec 2019 12:33:22 +0100 Subject: [PATCH] Remove Config --- README.md | 2 +- config/config.exs | 3 --- config/dev.exs | 1 - config/docs.exs | 1 - config/prod.exs | 1 - config/test.exs | 4 ---- lib/currency_conversion/application.ex | 13 ++++++------- test/currency_conversion/source/test_test.exs | 8 +++++--- test/currency_conversion_test.exs | 10 +++++++++- 9 files changed, 21 insertions(+), 22 deletions(-) delete mode 100644 config/config.exs delete mode 100644 config/dev.exs delete mode 100644 config/docs.exs delete mode 100644 config/prod.exs delete mode 100644 config/test.exs diff --git a/README.md b/README.md index bb08a2f..39b2d93 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ end - `test_rates` - Configure rates for `CurrencyConversion.Source.Test` source * Type: `{atom, %{atom: float}}` * Default: see `CurrencyConversion.Source.Test.@default_rates` - * Example: `{:EUR, %{CHF: 7}}` + * Example: `{:EUR, %{CHF: 7.0}}` ```elixir config :currency_conversion, diff --git a/config/config.exs b/config/config.exs deleted file mode 100644 index 8233fe9..0000000 --- a/config/config.exs +++ /dev/null @@ -1,3 +0,0 @@ -use Mix.Config - -import_config "#{Mix.env()}.exs" diff --git a/config/dev.exs b/config/dev.exs deleted file mode 100644 index d2d855e..0000000 --- a/config/dev.exs +++ /dev/null @@ -1 +0,0 @@ -use Mix.Config diff --git a/config/docs.exs b/config/docs.exs deleted file mode 100644 index d2d855e..0000000 --- a/config/docs.exs +++ /dev/null @@ -1 +0,0 @@ -use Mix.Config diff --git a/config/prod.exs b/config/prod.exs deleted file mode 100644 index d2d855e..0000000 --- a/config/prod.exs +++ /dev/null @@ -1 +0,0 @@ -use Mix.Config diff --git a/config/test.exs b/config/test.exs deleted file mode 100644 index 832c56e..0000000 --- a/config/test.exs +++ /dev/null @@ -1,4 +0,0 @@ -use Mix.Config - -config :currency_conversion, - source: CurrencyConversion.Source.Test diff --git a/lib/currency_conversion/application.ex b/lib/currency_conversion/application.ex index 23338e4..bca3a87 100644 --- a/lib/currency_conversion/application.ex +++ b/lib/currency_conversion/application.ex @@ -5,17 +5,16 @@ defmodule CurrencyConversion.Application do alias CurrencyConversion.UpdateWorker + case Mix.env() do + :test -> @workers [] + _ -> @workers [{UpdateWorker, Application.get_all_env(:currency_conversion)}] + end + @spec start(Application.start_type(), start_args :: term) :: {:ok, pid} | {:ok, pid, Application.state()} | {:error, reason :: term} def start(_type, _args) do - Supervisor.start_link( - [ - {UpdateWorker, Application.get_all_env(:currency_conversion)} - ], - strategy: :one_for_one, - name: CurrencyConversion.Supervisor - ) + Supervisor.start_link(@workers, strategy: :one_for_one, name: CurrencyConversion.Supervisor) end end diff --git a/test/currency_conversion/source/test_test.exs b/test/currency_conversion/source/test_test.exs index 8a54796..93c17e9 100644 --- a/test/currency_conversion/source/test_test.exs +++ b/test/currency_conversion/source/test_test.exs @@ -1,5 +1,7 @@ defmodule CurrencyConversion.Source.TestTest do - use ExUnit.Case, async: true + @moduledoc false + + use ExUnit.Case, async: false doctest CurrencyConversion.Source.Test, except: [load: 0] import CurrencyConversion.Source.Test @@ -11,14 +13,14 @@ defmodule CurrencyConversion.Source.TestTest do assert default_rates() == rates end - @override_rates %CurrencyConversion.Rates{base: :EUR, rates: %{CHF: 7}} + @override_rates %CurrencyConversion.Rates{base: :EUR, rates: %{CHF: 7.0}} test "when configuration is present" do Application.put_env(:currency_conversion, :test_rates, @override_rates) {:ok, rates} = load() assert @override_rates == rates end - @override_rates_tuple {:EUR, %{CHF: 7}} + @override_rates_tuple {:EUR, %{CHF: 7.0}} test "when configuration is present in tuple style" do Application.put_env(:currency_conversion, :test_rates, @override_rates_tuple) {:ok, rates} = load() diff --git a/test/currency_conversion_test.exs b/test/currency_conversion_test.exs index fff4ada..e7ab640 100644 --- a/test/currency_conversion_test.exs +++ b/test/currency_conversion_test.exs @@ -1,5 +1,13 @@ defmodule CurrencyConversionTest do - use ExUnit.Case, async: true + @moduledoc false + + use ExUnit.Case, async: false + + setup_all do + start_supervised!({CurrencyConversion.UpdateWorker, source: CurrencyConversion.Source.Test}) + :ok + end + doctest CurrencyConversion describe "get_currencies/0" do