Fix tests

Author: gBillal

lib/shinkai/config.ex

@@ -30,11 +30,13 @@ defmodule Shinkai.Config do
       doc: "http port"
     ],
     certfile: [
-      type: :string,
+      type: {:or, [:string, nil]},
+      default: nil,
       doc: "https certificate"
     ],
     keyfile: [
-      type: :string,
+      type: {:or, [:string, nil]},
+      default: nil,
       doc: "https private key certificate"
     ]
   ]
@@ -150,20 +152,20 @@ defmodule Shinkai.Config do
     parse_and_validate(rest, [{:rtmp, rtmp_config} | acc])
   end
 
-  defp do_parse_and_validate(config, schame) do
+  defp do_parse_and_validate(config, schema) do
     config = config || []
 
     cond do
       Keyword.keyword?(config) ->
-        NimbleOptions.validate!(config, schame)
+        NimbleOptions.validate!(config, schema)
 
       is_map(config) ->
         config
         |> Keyword.new(fn {k, v} -> {String.to_existing_atom(k), v} end)
-        |> NimbleOptions.validate!(schame)
+        |> NimbleOptions.validate!(schema)
 
       true ->
-        raise "Expected a map or keyword list received: #{inspect(config)}"
+        raise ArgumentError, "Expected a map or keyword list received: #{inspect(config)}"
     end
   end
 

test/shinkai/config_test.exs

@@ -20,13 +20,13 @@ defmodule Shinkai.ConfigTest do
       assert %{
                segment_type: :low_latency,
                segment_duration: 2000,
-               part_duration: 500,
+               part_duration: 300,
                max_segments: 10,
                storage_dir: "/var/shinkai/hls"
              } == Map.new(config[:hls])
 
       assert %{
-               enabled: false,
+               enabled: true,
                port: 8888,
                certfile: nil,
                keyfile: nil
@@ -36,13 +36,13 @@ defmodule Shinkai.ConfigTest do
     test "raise on invalid values" do
       user_config = %{"hls" => %{"segment_type" => "unknown_type"}}
 
-      assert_raise ArgumentError, ~r/Invalid HLS configuration/, fn ->
+      assert_raise NimbleOptions.ValidationError, ~r/invalid value for :segment_type/, fn ->
         Config.validate(user_config)
       end
 
       user_config = %{"hls" => %{"unknown_key" => 1}}
 
-      assert_raise ArgumentError, ~r/Invalid HLS configuration/, fn ->
+      assert_raise ArgumentError, ~r/not an already existing atom/, fn ->
         Config.validate(user_config)
       end
 
@@ -54,7 +54,7 @@ defmodule Shinkai.ConfigTest do
 
       user_config = %{"hls" => "not_a_map"}
 
-      assert_raise ArgumentError, ~r/Invalid HLS configuration format/, fn ->
+      assert_raise ArgumentError, ~r/Expected a map or keyword list received/, fn ->
         Config.validate(user_config)
       end
     end