Merge pull request #563 from lcreid/master

Update supported Ruby and Rails versions

Author: donv

.rubocop.yml

@@ -5,7 +5,7 @@ require: rubocop-rails
 AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
   Exclude:
     - "bin/*"
     - Capfile

.travis.yml

@@ -1,12 +1,9 @@
 language: ruby
 rvm:
-  - 2.7
+  - 2.7.1
   - 2.6.5
   - 2.5.7
-  - 2.4.9
 gemfile:
-  - gemfiles/5.0.gemfile
-  - gemfiles/5.1.gemfile
   - gemfiles/5.2.gemfile
   - gemfiles/6.0.gemfile
 cache:
@@ -15,21 +12,17 @@ script:
   - bundle exec rake test
 
 matrix:
-  exclude:
-    - rvm: 2.4.9
-      gemfile: gemfiles/6.0.gemfile
-
   include:
     # Bleeding edge Ruby
     - rvm: ruby-head
       gemfile: gemfiles/6.0.gemfile
 
     # Next version of Rails
-    - rvm: 2.5.7
+    - rvm: 2.7.1
       gemfile: gemfiles/edge.gemfile
 
     # Running one job to execute DANGER bot and linting
-    - rvm: 2.5.7
+    - rvm: 2.7.1
       gemfile: gemfiles/6.0.gemfile
       script:
         - gem install danger
@@ -38,5 +31,5 @@ matrix:
 
   allow_failures:
     - rvm: ruby-head
-    - rvm: 2.5.7
+    - rvm: 2.7.1
       gemfile: gemfiles/edge.gemfile

Gemfile

@@ -11,16 +11,13 @@ group :development do
   gem "htmlbeautifier"
   gem "rubocop-rails", require: false
   gem "sassc-rails"
-  gem "webpacker", ">= 4.0.0.rc.3"
+  gem "webpacker"
 end
 
 group :test do
   # can relax version requirement for Rails 5.2.beta3+
-  gem "minitest", "~> 5.10.3"
-
   gem "diffy"
   gem "equivalent-xml"
   gem "mocha"
   gem "sqlite3"
-  gem "timecop", "~> 0.7.1"
 end

README.md

@@ -31,8 +31,8 @@ Some other nice things that `bootstrap_form` does for you are:
 
 `bootstrap_form` supports at a minimum the currently supported versions of Ruby and Rails:
 
-* Ruby 2.4+
-* Rails 5.0+ (Rails 5.1+ for `bootstrap_form_with`)
+* Ruby 2.5+
+* Rails 5.2+
 * Bootstrap 4.0+
 
 ## Installation
@@ -107,7 +107,7 @@ If your form is not backed by a model, use the `bootstrap_form_tag`. Usage of th
 <% end %>
 ```
 
-### bootstrap_form_with (Rails 5.1+)
+### bootstrap_form_with
 
 Note that `form_with` in Rails 5.1 does not add IDs to form elements and labels by default, which are both important to Bootstrap markup. This behaviour is corrected in Rails 5.2.
 

bootstrap_form.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
   s.bindir        = "exe"
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = ">= 2.3"
+  s.required_ruby_version = ">= 2.5"
 
-  s.add_dependency("actionpack", ">= 5.0")
-  s.add_dependency("activemodel", ">= 5.0")
+  s.add_dependency("actionpack", ">= 5.2")
+  s.add_dependency("activemodel", ">= 5.2")
 end

gemfiles/5.0.gemfile

@@ -18,15 +18,15 @@ class BootstrapConfigurationTest < ActionView::TestCase
     config = BootstrapForm::Configuration.new
     config.default_form_attributes = nil
 
-    assert_equal({ }, config.default_form_attributes)
+    assert_equal({}, config.default_form_attributes)
   end
 
   test "does not allow to set default_form_attributes with unsupported value" do
     config = BootstrapForm::Configuration.new
 
     exception = assert_raises ArgumentError do
-      config.default_form_attributes = [1,2,3]
+      config.default_form_attributes = [1, 2, 3]
     end
-    assert_equal('Unsupported default_form_attributes [1, 2, 3]', exception.message)
+    assert_equal("Unsupported default_form_attributes [1, 2, 3]", exception.message)
   end
 end

gemfiles/5.1.gemfile

@@ -456,13 +456,12 @@ class BootstrapFormTest < ActionView::TestCase
   end
 
   test "label error messages use humanized attribute names" do
-    begin
-      I18n.backend.store_translations(:en, activerecord: { attributes: { user: { email: "Your e-mail address" } } })
+    I18n.backend.store_translations(:en, activerecord: { attributes: { user: { email: "Your e-mail address" } } })
 
-      @user.email = nil
-      assert @user.invalid?
+    @user.email = nil
+    assert @user.invalid?
 
-      expected = <<-HTML.strip_heredoc
+    expected = <<-HTML.strip_heredoc
         <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
           #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
           <div class="form-group">
@@ -471,11 +470,10 @@ class BootstrapFormTest < ActionView::TestCase
             <div class="invalid-feedback">can't be blank, is too short (minimum is 5 characters)</div>
           </div>
         </form>
-      HTML
-      assert_equivalent_xml expected, bootstrap_form_for(@user, label_errors: true, inline_errors: true) { |f| f.text_field :email }
-    ensure
-      I18n.backend.store_translations(:en, activerecord: { attributes: { user: { email: nil } } })
-    end
+    HTML
+    assert_equivalent_xml expected, bootstrap_form_for(@user, label_errors: true, inline_errors: true) { |f| f.text_field :email }
+  ensure
+    I18n.backend.store_translations(:en, activerecord: { attributes: { user: { email: nil } } })
   end
 
   test "alert message is wrapped correctly" do
@@ -759,14 +757,13 @@ class BootstrapFormTest < ActionView::TestCase
   end
 
   test "help translations do not escape HTML when _html is appended to the name" do
-    begin
-      I18n.backend.store_translations(:en, activerecord: { help: { user: { email_html: "This is <strong>useful</strong> help" } } })
+    I18n.backend.store_translations(:en, activerecord: { help: { user: { email_html: "This is <strong>useful</strong> help" } } })
 
-      output = bootstrap_form_for(@user) do |f|
-        f.text_field(:email)
-      end
+    output = bootstrap_form_for(@user) do |f|
+      f.text_field(:email)
+    end
 
-      expected = <<-HTML.strip_heredoc
+    expected = <<-HTML.strip_heredoc
         <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
           #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
           <div class="form-group">
@@ -775,11 +772,10 @@ class BootstrapFormTest < ActionView::TestCase
             <small class="form-text text-muted">This is <strong>useful</strong> help</small>
           </div>
         </form>
-      HTML
-      assert_equivalent_xml expected, output
-    ensure
-      I18n.backend.store_translations(:en, activerecord: { help: { user: { email_html: nil } } })
-    end
+    HTML
+    assert_equivalent_xml expected, output
+  ensure
+    I18n.backend.store_translations(:en, activerecord: { help: { user: { email_html: nil } } })
   end
 
   test "allows the form object to be nil" do

test/bootstrap_configuration_test.rb

@@ -294,7 +294,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
   end
 
   test "date selects are wrapped correctly" do
-    Timecop.freeze(Time.utc(2012, 2, 3)) do
+    travel_to(Time.utc(2012, 2, 3)) do
       expected = <<-HTML.strip_heredoc
         <div class="form-group">
           <label for="user_misc">Misc</label>
@@ -316,7 +316,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
   end
 
   test "date selects are wrapped correctly with wrapper class" do
-    Timecop.freeze(Time.utc(2012, 2, 3)) do
+    travel_to(Time.utc(2012, 2, 3)) do
       expected = <<-HTML.strip_heredoc
         <div class="form-group none-margin">
           <label for="user_misc">Misc</label>
@@ -338,7 +338,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
   end
 
   test "date selects inline when layout is horizontal" do
-    Timecop.freeze(Time.utc(2012, 2, 3)) do
+    travel_to(Time.utc(2012, 2, 3)) do
       expected = <<-HTML.strip_heredoc
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
         #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
@@ -366,7 +366,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
 
   test "date selects are wrapped correctly with error" do
     @user.errors.add(:misc, "error for test")
-    Timecop.freeze(Time.utc(2012, 2, 3)) do
+    travel_to(Time.utc(2012, 2, 3)) do
       expected = <<-HTML.strip_heredoc
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
         #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
@@ -392,7 +392,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
   end
 
   test "date selects with options are wrapped correctly" do
-    Timecop.freeze(Time.utc(2012, 2, 3)) do
+    travel_to(Time.utc(2012, 2, 3)) do
       expected = <<-HTML.strip_heredoc
         <div class="form-group">
           <label for="user_misc">Misc</label>
@@ -418,7 +418,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
   end
 
   test "date selects with options and html_options are wrapped correctly" do
-    Timecop.freeze(Time.utc(2012, 2, 3)) do
+    travel_to(Time.utc(2012, 2, 3)) do
       expected = <<-HTML.strip_heredoc
         <div class="form-group">
           <label for="user_misc">Misc</label>
@@ -443,7 +443,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
   end
 
   test "time selects are wrapped correctly" do
-    Timecop.freeze(Time.utc(2012, 2, 3, 12, 0, 0)) do
+    travel_to(Time.utc(2012, 2, 3, 12, 0, 0)) do
       expected = <<-HTML.strip_heredoc
         <div class="form-group">
           <label for="user_misc">Misc</label>
@@ -467,7 +467,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
 
   test "time selects are wrapped correctly with error" do
     @user.errors.add(:misc, "error for test")
-    Timecop.freeze(Time.utc(2012, 2, 3, 12, 0, 0)) do
+    travel_to(Time.utc(2012, 2, 3, 12, 0, 0)) do
       expected = <<-HTML.strip_heredoc
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
         #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
@@ -494,7 +494,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
   end
 
   test "time selects with options are wrapped correctly" do
-    Timecop.freeze(Time.utc(2012, 2, 3, 12, 0, 0)) do
+    travel_to(Time.utc(2012, 2, 3, 12, 0, 0)) do
       expected = <<-HTML.strip_heredoc
         <div class="form-group">
           <label for="user_misc">Misc</label>
@@ -519,7 +519,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
   end
 
   test "time selects with options and html_options are wrapped correctly" do
-    Timecop.freeze(Time.utc(2012, 2, 3, 12, 0, 0)) do
+    travel_to(Time.utc(2012, 2, 3, 12, 0, 0)) do
       expected = <<-HTML.strip_heredoc
         <div class="form-group">
           <label for="user_misc">Misc</label>
@@ -544,7 +544,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
   end
 
   test "datetime selects are wrapped correctly" do
-    Timecop.freeze(Time.utc(2012, 2, 3, 12, 0, 0)) do
+    travel_to(Time.utc(2012, 2, 3, 12, 0, 0)) do
       expected = <<-HTML.strip_heredoc
         <div class="form-group">
           <label for="user_misc">Misc</label>
@@ -575,7 +575,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
 
   test "datetime selects are wrapped correctly with error" do
     @user.errors.add(:misc, "error for test")
-    Timecop.freeze(Time.utc(2012, 2, 3, 12, 0, 0)) do
+    travel_to(Time.utc(2012, 2, 3, 12, 0, 0)) do
       expected = <<-HTML.strip_heredoc
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
         #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
@@ -609,7 +609,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
   end
 
   test "datetime selects with options are wrapped correctly" do
-    Timecop.freeze(Time.utc(2012, 2, 3, 12, 0, 0)) do
+    travel_to(Time.utc(2012, 2, 3, 12, 0, 0)) do
       expected = <<-HTML.strip_heredoc
         <div class="form-group">
           <label for="user_misc">Misc</label>
@@ -644,7 +644,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
   end
 
   test "datetime selects with options and html_options are wrapped correctly" do
-    Timecop.freeze(Time.utc(2012, 2, 3, 12, 0, 0)) do
+    travel_to(Time.utc(2012, 2, 3, 12, 0, 0)) do
       expected = <<-HTML.strip_heredoc
         <div class="form-group">
           <label for="user_misc">Misc</label>