Skip to content

Do not set role="form" by default #560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Do not set role="form" by default #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

### Bugfixes

* Your contribution here!
* [#560](https://github.com/bootstrap-ruby/bootstrap_form/pull/560): Do not set role="form" by default - [@sharshenov](https://github.com/sharshenov).

## [4.4.0][] (2020-03-08)

Expand Down
1 change: 0 additions & 1 deletion lib/bootstrap_form/form_builder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ def initialize(object_name, object, template, options)

def add_form_role_and_form_inline(options)
options[:html] ||= {}
options[:html][:role] ||= "form"

return unless options[:layout] == :inline

Expand Down
10 changes: 5 additions & 5 deletions test/bootstrap_checkbox_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class BootstrapCheckboxTest < ActionView::TestCase

test "inline checkboxes from form layout" do
expected = <<-HTML.strip_heredoc
<form accept-charset="UTF-8" action="/users" class="new_user form-inline" id="new_user" method="post" role="form">
<form accept-charset="UTF-8" action="/users" class="new_user form-inline" id="new_user" method="post">
#{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
<div class="form-check form-check-inline">
<input name="user[terms]" type="hidden" value="0" />
Expand Down Expand Up @@ -581,7 +581,7 @@ class BootstrapCheckboxTest < ActionView::TestCase
@user.errors.add(:misc, "a box must be checked")

expected = <<-HTML.strip_heredoc
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
#{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
<input id="user_misc" multiple="multiple" name="user[misc][]" type="hidden" value="" />
<div class="form-group">
Expand Down Expand Up @@ -610,7 +610,7 @@ class BootstrapCheckboxTest < ActionView::TestCase
@user.errors.add(:misc, "error for test")
collection = [Address.new(id: 1, street: "Foo"), Address.new(id: 2, street: "Bar")]
expected = <<-HTML.strip_heredoc
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
#{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
<input id="user_misc" multiple="multiple" name="user[misc][]" type="hidden" value="" />
<div class="form-group">
Expand All @@ -637,7 +637,7 @@ class BootstrapCheckboxTest < ActionView::TestCase
test "check_box renders error when asked" do
@user.errors.add(:terms, "You must accept the terms.")
expected = <<-HTML.strip_heredoc
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
#{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
<div class="form-check">
<input name="user[terms]" type="hidden" value="0" />
Expand All @@ -658,7 +658,7 @@ class BootstrapCheckboxTest < ActionView::TestCase
test "check_box with error is wrapped correctly with custom option set" do
@user.errors.add(:terms, "You must accept the terms.")
expected = <<-HTML.strip_heredoc
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
#{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
<div class="custom-control custom-checkbox">
<input name="user[terms]" type="hidden" value="0" />
Expand Down
10 changes: 5 additions & 5 deletions test/bootstrap_fields_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class BootstrapFieldsTest < ActionView::TestCase
test "file fields are wrapped correctly with error" do
@user.errors.add(:misc, "error for test")
expected = <<-HTML.strip_heredoc
<form accept-charset="UTF-8" action="/users" class="new_user" enctype="multipart/form-data" id="new_user" method="post" role="form">
<form accept-charset="UTF-8" action="/users" class="new_user" enctype="multipart/form-data" id="new_user" method="post">
#{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
<div class="form-group">
<label for="user_misc">Misc</label>
Expand Down Expand Up @@ -321,7 +321,7 @@ class BootstrapFieldsTest < ActionView::TestCase
end

expected = <<-HTML.strip_heredoc
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
#{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
<div class="form-group">
<label for="user_address_attributes_street">Street</label>
Expand All @@ -342,7 +342,7 @@ class BootstrapFieldsTest < ActionView::TestCase
end

expected = <<-HTML.strip_heredoc
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
#{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
<div class="form-group">
<label for="user_preferences_favorite_color">Favorite color</label>
Expand All @@ -363,7 +363,7 @@ class BootstrapFieldsTest < ActionView::TestCase
end

expected = <<-HTML.strip_heredoc
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
#{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
<div class="form-group row">
<label class="col-form-label col-sm-2" for="user_address_attributes_street">Street</label>
Expand All @@ -387,7 +387,7 @@ class BootstrapFieldsTest < ActionView::TestCase
end

expected = <<-HTML.strip_heredoc
<form accept-charset="UTF-8" action="/users" class="new_user form-inline" id="new_user" method="post" role="form">
<form accept-charset="UTF-8" action="/users" class="new_user form-inline" id="new_user" method="post">
#{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
<div class="form-group">
<label class="mr-sm-2" for="user_address_attributes_street">Street</label>
Expand Down
8 changes: 4 additions & 4 deletions test/bootstrap_form_group_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ class BootstrapFormGroupTest < ActionView::TestCase
assert @user.invalid?

expected = <<-HTML.strip_heredoc
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
#{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
<div class="form-group">
<label class="required" for="user_email">Email</label>
Expand Down Expand Up @@ -432,7 +432,7 @@ class BootstrapFormGroupTest < ActionView::TestCase
end

expected = <<-HTML.strip_heredoc
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
#{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
<div class="form-group">
<div class="form-check">
Expand Down Expand Up @@ -491,7 +491,7 @@ class BootstrapFormGroupTest < ActionView::TestCase
end

expected = <<-HTML.strip_heredoc
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
#{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
<div class="form-group none-margin">
<label class="required" for="user_email">Email</label>
Expand Down Expand Up @@ -595,7 +595,7 @@ class BootstrapFormGroupTest < ActionView::TestCase

test "custom form group layout option" do
expected = <<-HTML.strip_heredoc
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
#{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
<div class="form-group form-inline">
<label class="mr-sm-2 required" for="user_email">Email</label>
Expand Down
Loading