Pull over other differences

Author: lcreid

.yarnrc

@@ -2,4 +2,4 @@
 # yarn lockfile v1
 
 
-lastUpdateCheck 1761786460258
+lastUpdateCheck 1762373771610

Rakefile

@@ -4,8 +4,8 @@ begin
   require "minitest/test_task"
   require "rdoc/task"
   require "rubocop/rake_task"
-rescue LoadError
-  puts "You must run `bundle install` to run rake tasks"
+rescue LoadError => e
+  puts "You must run `bundle install` to run rake tasks (#{e.message})"
 end
 
 RDoc::Task.new(:rdoc) do |rdoc|
@@ -17,7 +17,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
 end
 
 Minitest::TestTask.create(:test) do |t|
-  t.warning = false
+  t.warning = true
   t.test_globs = ["test/**/*_test.rb"]
 end
 
@@ -33,15 +33,17 @@ namespace :test do
     gemfiles = Dir.glob("gemfiles/*.gemfile").reject { |f| File.basename(f) == "common.gemfile" }
     gemfiles.each do |f|
       ENV["BUNDLE_GEMFILE"] = f
+      system("bundle update --bundler")
       system("bundle check") || system("bundle install")
-      system("bundle exec rake test")
+      system("rake test")
     end
 
     original_directory = Dir.pwd
     Dir.chdir("demo")
     ENV.delete("BUNDLE_GEMFILE")
+    system("bundle update --bundler")
     system("bundle check") || system("bundle install")
-    system("bundle exec rake test:all")
+    system("rake test:all")
   ensure
     original_gemfile.nil? ? ENV.delete("BUNDLE_GEMFILE") : ENV["BUNDLE_GEMFILE"] = original_gemfile
     Dir.chdir(original_directory) unless original_directory.nil?

demo/Gemfile

@@ -14,11 +14,11 @@ gem "sqlite3", ">= 2.1"
 gem "stimulus-rails"
 gem "thruster", require: false
 gem "turbo-rails"
-gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
+gem "tzinfo-data", platforms: %i[windows jruby]
 
 group :development, :test do
   gem "brakeman", require: false
-  gem "debug", platforms: %i[mri mingw x64_mingw]
+  gem "debug", platforms: %i[mri windows]
 end
 
 group :development do

demo/Gemfile.lock

@@ -310,4 +310,4 @@ DEPENDENCIES
   web-console
 
 BUNDLED WITH
-   2.5.9
+   2.7.2

gemfiles/common.gemfile

@@ -20,6 +20,7 @@ end
 group :development, :test do
   gem "debug"
   gem "ostruct" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.5.0")
+  gem "warning"
 end
 
 group :ci do

lib/bootstrap_form/form_builder.rb

@@ -69,7 +69,7 @@ def initialize(object_name, object, template, options)
 
     def add_default_form_attributes_and_form_inline(options)
       options[:html] ||= {}
-      options[:html].reverse_merge!(BootstrapForm.configuration.default_form_attributes)
+      options[:html].reverse_merge!(BootstrapForm.config.default_form_attributes)
 
       return unless options[:layout] == :inline
 

test/test_helper.rb

@@ -1,5 +1,12 @@
 ENV["RAILS_ENV"] ||= "test"
 
+puts "BUNDLE_GEMFILE: #{ENV.fetch('BUNDLE_GEMFILE', nil)}" # rubocop/ignore Rails/Output
+
+require "warning"
+mail_gem_path = Gem::Specification.find_by_name("mail").full_gem_path
+Warning.ignore(:not_reached, mail_gem_path)
+Warning.ignore(/warning: assigned but unused variable - testEof/, mail_gem_path)
+
 require "diffy"
 require "nokogiri"
 require "equivalent-xml"