Only use async: true for ConnCase error tests on Postgres/no-Ecto

installer/lib/phx_new/generator.ex

@@ -326,7 +326,8 @@ defmodule Phx.New.Generator do
       elixir_install_bin_path: from_elixir_install && elixir_install_bin_path(),
       inside_docker_env?: inside_docker_env?,
       agents_md: agents_md,
-      config_regex_E: Version.match?(System.version(), "~> 1.19.3 or ~> 1.20") && "E" || ""
+      config_regex_E: Version.match?(System.version(), "~> 1.19.3 or ~> 1.20") && "E" || "",
+      test_case_options: test_case_options(adapter_module)
     ]
 
     %{project | binding: binding}
@@ -410,6 +411,10 @@ defmodule Phx.New.Generator do
     Mix.raise("Unknown database #{inspect(db)}")
   end
 
+  defp test_case_options(Ecto.Adapters.Postgres), do: ", async: true"
+  defp test_case_options(nil), do: ", async: true"
+  defp test_case_options(adapter) when is_atom(adapter), do: ""
+
   defp get_web_adapter("cowboy"),
     do:
       {:plug_cowboy, "~> 2.7", Phoenix.Endpoint.Cowboy2Adapter,

installer/templates/phx_test/controllers/error_html_test.exs.eex

@@ -1,5 +1,5 @@
 defmodule <%= @web_namespace %>.ErrorHTMLTest do
-  use <%= @web_namespace %>.ConnCase, async: true
+  use <%= @web_namespace %>.ConnCase<%= @test_case_options %>
 
   # Bring render_to_string/4 for testing custom views
   import Phoenix.Template, only: [render_to_string: 4]

installer/templates/phx_test/controllers/error_json_test.exs.eex

@@ -1,5 +1,5 @@
 defmodule <%= @web_namespace %>.ErrorJSONTest do
-  use <%= @web_namespace %>.ConnCase, async: true
+  use <%= @web_namespace %>.ConnCase<%= @test_case_options %>
 
   test "renders 404" do
     assert <%= @web_namespace %>.ErrorJSON.render("404.json", %{}) == %{errors: %{detail: "Not Found"}}

installer/test/phx_new_test.exs

@@ -89,8 +89,8 @@ defmodule Mix.Tasks.Phx.NewTest do
       end)
 
       assert_file("phx_blog/test/phx_blog_web/controllers/page_controller_test.exs")
-      assert_file("phx_blog/test/phx_blog_web/controllers/error_html_test.exs")
-      assert_file("phx_blog/test/phx_blog_web/controllers/error_json_test.exs")
+      assert_file("phx_blog/test/phx_blog_web/controllers/error_html_test.exs", "async: true")
+      assert_file("phx_blog/test/phx_blog_web/controllers/error_json_test.exs", "async: true")
       assert_file("phx_blog/test/support/conn_case.ex")
       assert_file("phx_blog/test/test_helper.exs")
 
@@ -557,6 +557,9 @@ defmodule Mix.Tasks.Phx.NewTest do
         assert file =~ "inputs: [\"*.{heex,ex,exs}\", \"{config,lib,test}/**/*.{heex,ex,exs}\"]"
         refute file =~ "subdirectories:"
       end)
+
+      assert_file("phx_blog/test/phx_blog_web/controllers/error_html_test.exs", "async: true")
+      assert_file("phx_blog/test/phx_blog_web/controllers/error_json_test.exs", "async: true")
     end)
   end
 
@@ -686,6 +689,14 @@ defmodule Mix.Tasks.Phx.NewTest do
         "custom_path/test/support/data_case.ex",
         "Ecto.Adapters.SQL.Sandbox.start_owner"
       )
+
+      assert_file("custom_path/test/custom_path_web/controllers/error_html_test.exs", fn file ->
+        refute file =~ "async: true"
+      end)
+
+      assert_file("custom_path/test/custom_path_web/controllers/error_json_test.exs", fn file ->
+        refute file =~ "async: true"
+      end)
     end)
   end
 
@@ -716,8 +727,18 @@ defmodule Mix.Tasks.Phx.NewTest do
         "Ecto.Adapters.SQL.Sandbox.start_owner"
       )
 
-      assert_file("custom_path/.gitignore", "*.db")
-      assert_file("custom_path/.gitignore", "*.db-*")
+      assert_file("custom_path/test/custom_path_web/controllers/error_html_test.exs", fn file ->
+        refute file =~ "async: true"
+      end)
+
+      assert_file("custom_path/test/custom_path_web/controllers/error_json_test.exs", fn file ->
+        refute file =~ "async: true"
+      end)
+
+      assert_file("custom_path/.gitignore", fn file ->
+        assert file =~ "*.db"
+        assert file =~ "*.db-*"
+      end)
     end)
   end
 
@@ -747,6 +768,14 @@ defmodule Mix.Tasks.Phx.NewTest do
         "custom_path/test/support/data_case.ex",
         "Ecto.Adapters.SQL.Sandbox.start_owner"
       )
+
+      assert_file("custom_path/test/custom_path_web/controllers/error_html_test.exs", fn file ->
+        refute file =~ "async: true"
+      end)
+
+      assert_file("custom_path/test/custom_path_web/controllers/error_json_test.exs", fn file ->
+        refute file =~ "async: true"
+      end)
     end)
   end
 

installer/test/phx_new_umbrella_test.exs

@@ -150,8 +150,17 @@ defmodule Mix.Tasks.Phx.New.UmbrellaTest do
       )
 
       assert_file(web_path(@app, "test/#{@app}_web/controllers/page_controller_test.exs"))
-      assert_file(web_path(@app, "test/#{@app}_web/controllers/error_html_test.exs"))
-      assert_file(web_path(@app, "test/#{@app}_web/controllers/error_json_test.exs"))
+
+      assert_file(
+        web_path(@app, "test/#{@app}_web/controllers/error_html_test.exs"),
+        "async: true"
+      )
+
+      assert_file(
+        web_path(@app, "test/#{@app}_web/controllers/error_json_test.exs"),
+        "async: true"
+      )
+
       assert_file(web_path(@app, "test/support/conn_case.ex"))
       assert_file(web_path(@app, "test/test_helper.exs"))
 
@@ -625,6 +634,16 @@ defmodule Mix.Tasks.Phx.New.UmbrellaTest do
       assert_file(root_path(app, "config/runtime.exs"), [~r/url: database_url/])
 
       assert_file(web_path(app, "test/support/conn_case.ex"), "DataCase.setup_sandbox(tags)")
+
+      assert_file(
+        web_path(app, "test/custom_path_web/controllers/error_html_test.exs"),
+        fn file -> refute file =~ "async: true" end
+      )
+
+      assert_file(
+        web_path(app, "test/custom_path_web/controllers/error_json_test.exs"),
+        fn file -> refute file =~ "async: true" end
+      )
     end)
   end
 
@@ -652,6 +671,16 @@ defmodule Mix.Tasks.Phx.New.UmbrellaTest do
 
       assert_file(web_path(app, "test/support/conn_case.ex"), "DataCase.setup_sandbox(tags)")
 
+      assert_file(
+        web_path(app, "test/custom_path_web/controllers/error_html_test.exs"),
+        fn file -> refute file =~ "async: true" end
+      )
+
+      assert_file(
+        web_path(app, "test/custom_path_web/controllers/error_json_test.exs"),
+        fn file -> refute file =~ "async: true" end
+      )
+
       assert_file(root_path(app, ".gitignore"), "*.db")
       assert_file(root_path(app, ".gitignore"), "*.db-*")
     end)
@@ -679,6 +708,16 @@ defmodule Mix.Tasks.Phx.New.UmbrellaTest do
       assert_file(root_path(app, "config/runtime.exs"), [~r/url: database_url/])
 
       assert_file(web_path(app, "test/support/conn_case.ex"), "DataCase.setup_sandbox(tags)")
+
+      assert_file(
+        web_path(app, "test/custom_path_web/controllers/error_html_test.exs"),
+        fn file -> refute file =~ "async: true" end
+      )
+
+      assert_file(
+        web_path(app, "test/custom_path_web/controllers/error_json_test.exs"),
+        fn file -> refute file =~ "async: true" end
+      )
     end)
   end
 
@@ -822,8 +861,8 @@ defmodule Mix.Tasks.Phx.New.UmbrellaTest do
         assert_file("another/lib/another/endpoint.ex", ~r/defmodule Another.Endpoint do/)
 
         assert_file("another/test/another/controllers/page_controller_test.exs")
-        assert_file("another/test/another/controllers/error_html_test.exs")
-        assert_file("another/test/another/controllers/error_json_test.exs")
+        assert_file("another/test/another/controllers/error_html_test.exs", "async: true")
+        assert_file("another/test/another/controllers/error_json_test.exs", "async: true")
         assert_file("another/test/support/conn_case.ex")
         assert_file("another/test/test_helper.exs")