Make form_with_generates_ids default in Rails 5.2

When the defaults being loaded are the 5.0 or 5.1 we disable generation
of ids with form_with.

2 files changed, 8 insertions, 5 deletions

diff --git a/actionview/lib/action_view/railtie.rb b/actionview/lib/action_view/railtie.rb
index 6ac332acbb..73dfb267bb 100644
--- a/actionview/lib/action_view/railtie.rb
+++ b/actionview/lib/action_view/railtie.rb
@@ -22,9 +22,7 @@ module ActionView
     initializer "action_view.form_with_generates_remote_forms" do |app|
       ActiveSupport.on_load(:action_view) do
         form_with_generates_remote_forms = app.config.action_view.delete(:form_with_generates_remote_forms)
-        unless form_with_generates_remote_forms.nil?
-          ActionView::Helpers::FormHelper.form_with_generates_remote_forms = form_with_generates_remote_forms
-        end
+        ActionView::Helpers::FormHelper.form_with_generates_remote_forms = form_with_generates_remote_forms
       end
     end
 
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 7f23203e8b..a1023e5d6e 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -72,6 +72,9 @@ module Rails
 
           self.ssl_options = { hsts: { subdomains: true } }
 
+          if respond_to?(:action_view)
+            action_view.form_with_generates_ids = false
+          end
         when "5.1"
           load_defaults "5.0"
 
@@ -81,9 +84,7 @@ module Rails
 
           if respond_to?(:action_view)
             action_view.form_with_generates_remote_forms = true
-            action_view.form_with_generates_ids = true
           end
-
         when "5.2"
           load_defaults "5.1"
 
@@ -107,6 +108,10 @@ module Rails
             action_controller.default_protect_from_forgery = true
           end
 
+          if respond_to?(:action_view)
+            action_view.form_with_generates_remote_forms = true
+            action_view.form_with_generates_ids = true
+          end
         else
           raise "Unknown version #{target_version.to_s.inspect}"
         end