Merge 69d746a into cdee695

jshmrtn · Dec 2, 2019 · bb8b90b · bb8b90b
2 parents cdee695 + 69d746a
commit bb8b90b
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 22 deletions.
diff --git 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
diff --git a/config/dev.exs b/config/dev.exs
diff --git a/config/docs.exs b/config/docs.exs
diff --git a/config/prod.exs b/config/prod.exs
diff --git a/config/test.exs b/config/test.exs
diff --git 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
@@ -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
@@ -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