activeadmin
diff --git a/‎lib/active_admin/views/components/active_admin_form.rb
Lines changed: 14 additions & 2 deletions b/‎lib/active_admin/views/components/active_admin_form.rb
Lines changed: 14 additions & 2 deletions
diff --git a/‎spec/unit/form_builder_spec.rb
Lines changed: 5 additions & 1 deletion b/‎spec/unit/form_builder_spec.rb
Lines changed: 5 additions & 1 deletion
@@ -131,12 +131,24 @@ def build(form_builder, *args, &block)
         html_options[:class] ||= "inputs"
         legend = args.shift if args.first.is_a?(::String)
         legend = html_options.delete(:name) if html_options.key?(:name)
-        legend_tag = legend ? "<legend class=\"fieldset-title\">#{ERB::Util.html_escape(legend)}</legend>" : ""
-        fieldset_attrs = html_options.map { |k, v| %Q{#{k}="#{v}"} }.join(" ")
+        legend_tag = legend ? tag.legend(legend, class: "fieldset-title") : ""
+        fieldset_attrs = tag_attributes html_options
         @opening_tag = "<fieldset #{fieldset_attrs}>#{legend_tag}<ol>"
         @closing_tag = "</ol></fieldset>"
         super(*(args << html_options), &block)
       end
+
+      private
+
+      def tag_attributes(html_options)
+        if Rails::VERSION::MAJOR <= 6
+          # Reimplement tag.attributes to backport support for Rails 6.1.
+          # TODO: this can be removed when support for Rails 6.x is dropped
+          tag.tag_options(html_options.to_h).to_s.strip.html_safe
+        else
+          tag.attributes html_options
+        end
+      end
     end
 
     class SemanticActionsProxy < FormtasticProxy
 
@@ -62,7 +62,7 @@ def build_form(options = {}, form_object = Post.new, &block)
     context "with custom settings" do
       let :body do
         build_form do |f|
-          f.inputs class: "custom_class", name: "custom_name", custom_attr: "custom_attr" do
+          f.inputs class: "custom_class", name: "custom_name", custom_attr: "custom_attr", data: { test: "custom" } do
             f.input :title
             f.input :body
           end
@@ -80,6 +80,10 @@ def build_form(options = {}, form_object = Post.new, &block)
       it "should generate a fieldset with a custom attributes" do
         expect(body).to have_css("fieldset[custom_attr='custom_attr']")
       end
+
+      it "should use the rails helper for rendering attributes" do
+        expect(body).to have_css("fieldset[data-test='custom']")
+      end
     end
 
     context "with XSS payload as name" do