expand repo config mapping tests

Author: magnetised

config/test.exs

@@ -28,6 +28,4 @@ config :phoenix_sync, Support.ConfigTestRepo,
   # port: 54321,
   stacktrace: true,
   show_sensitive_data_on_connection_error: true,
-  ssl: true,
-  socket_options: [:inet6],
   pool_size: 10

test/phoenix/sync/application_test.exs

@@ -15,15 +15,34 @@ defmodule Phoenix.Sync.ApplicationTest do
       hostname: "localhost",
       database: "electric",
       port: 5432,
-      sslmode: :require,
-      ipv6: true
+      sslmode: :disable
     ]
 
     expected_opts = Keyword.merge(base_opts, overrides)
 
     assert Enum.sort(connection_opts) == Enum.sort(expected_opts)
   end
 
+  defp with_modified_config(repo_config_overrides, fun) do
+    original_config = Application.get_env(:phoenix_sync, Support.ConfigTestRepo, [])
+
+    try do
+      Application.put_env(
+        :phoenix_sync,
+        Support.ConfigTestRepo,
+        Keyword.merge(original_config, repo_config_overrides)
+      )
+
+      fun.()
+    after
+      Application.put_env(
+        :phoenix_sync,
+        Support.ConfigTestRepo,
+        original_config
+      )
+    end
+  end
+
   describe "children/1" do
     test "invalid mode" do
       assert {:error, _} = App.children(mode: :nonsense)
@@ -79,33 +98,40 @@ defmodule Phoenix.Sync.ApplicationTest do
              } = Map.new(opts)
     end
 
-    test "with defined port" do
-      original_config = Application.get_env(:phoenix_sync, Support.ConfigTestRepo, [])
+    test "passes repo pg port to electric" do
+      config = [
+        env: :dev,
+        repo: Support.ConfigTestRepo
+      ]
 
-      override_port = 6543
+      repo_override = [port: 6543]
 
+      with_modified_config(repo_override, fn ->
+        assert {:ok, [{Electric.StackSupervisor, opts}]} = App.children(config)
+
+        validate_repo_connection_opts!(opts, repo_override)
+      end)
+    end
+
+    test "maps repo ssl and ipv6 settings to electric" do
       config = [
         env: :dev,
         repo: Support.ConfigTestRepo
       ]
 
-      try do
-        Application.put_env(
-          :phoenix_sync,
-          Support.ConfigTestRepo,
-          Keyword.put(original_config, :port, override_port)
-        )
+      repo_override = [
+        ssl: true,
+        socket_options: [:inet6]
+      ]
 
+      with_modified_config(repo_override, fn ->
         assert {:ok, [{Electric.StackSupervisor, opts}]} = App.children(config)
 
-        validate_repo_connection_opts!(opts, port: override_port)
-      after
-        Application.put_env(
-          :phoenix_sync,
-          Support.ConfigTestRepo,
-          original_config
+        validate_repo_connection_opts!(opts,
+          sslmode: :require,
+          ipv6: true
         )
-      end
+      end)
     end
 
     test "only repo config given and electric installed defaults to embedded" do