Bootstrap 5.x updates

.github/workflows/rspec.yml

@@ -0,0 +1,30 @@
+name: RSpec
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        gemfile: [ rails-5.2, rails-6.0, rails-6.1 ]
+        ruby: [ '2.7' ]
+        include:
+          - gemfile: rails-6.1
+            ruby: '3.0'
+          - gemfile: rails-7.0
+            ruby: '2.7'
+          - gemfile: rails-7.0
+            ruby: '3.0'
+          - gemfile: rails-7.1
+            ruby: '3.2'
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake

.gitignore

@@ -12,3 +12,5 @@
 /spec/dummy/*.sqlite3-journal
 /spec/dummy/log/*.log
 /spec/dummy/tmp/*
+*.sqlite3-shm
+*.sqlite3-wal

Gemfile

@@ -4,10 +4,11 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem "rspec-rails", "~> 5.0"
+  gem "rspec-rails"
   gem "capybara"
 end
 
+gem "rails", "~> 7.1.0"
 gem "sqlite3", "~> 1.4"
 
 gem "trestle", github: "TrestleAdmin/trestle"

app/views/trestle/search/_search.html.erb

@@ -1,9 +1,7 @@
 <div class="searchbox">
   <%= form_tag admin.path, method: :get do %>
     <div class="input-group">
-      <div class="input-group-prepend">
-        <span class="input-group-text"><icon class="fa fa-search"></icon></span>
-      </div>
+      <span class="input-group-text"><icon class="fa fa-search"></icon></span>
       <%= link_to icon("fa fa-times"), admin.path, class: "clear-search" if params[:q].present? %>
       <%= search_field_tag :q, params[:q], class: "form-control", autocomplete: "off", placeholder: admin.t("search.placeholder", default: "Search") %>
     </div>

gemfiles/rails-5.2.gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 group :test do
   gem "rspec-rails", "~> 5.0"
 
-  gem "coveralls", require: false
+  gem "coveralls_reborn", require: false
   gem "capybara"
 
   gem "sqlite3", "~> 1.3.13"

gemfiles/rails-6.0.gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 group :test do
   gem "rspec-rails", "~> 5.0"
 
-  gem "coveralls", require: false
+  gem "coveralls_reborn", require: false
 
   gem "capybara"
   gem "sqlite3", "~> 1.4"

gemfiles/rails-6.1.gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 group :test do
   gem "rspec-rails", "~> 5.0"
 
-  gem "coveralls", require: false
+  gem "coveralls_reborn", require: false
 
   gem "capybara"
   gem "sqlite3", "~> 1.4"

gemfiles/rails-7.0.gemfile

@@ -1,9 +1,9 @@
 source 'https://rubygems.org'
 
 group :test do
-  gem "rspec-rails", "~> 5.0"
+  gem "rspec-rails"
 
-  gem "coveralls", require: false
+  gem "coveralls_reborn", require: false
 
   gem "capybara"
   gem "sqlite3", "~> 1.4"

gemfiles/rails-4.2.gemfile → gemfiles/rails-7.1.gemfile

@@ -1,15 +1,15 @@
 source 'https://rubygems.org'
 
 group :test do
-  gem "rspec-rails", "~> 4.1.2"
+  gem "rspec-rails"
 
-  gem "coveralls", require: false
-  gem "capybara"
+  gem "coveralls_reborn", require: false
 
-  gem "sqlite3", "~> 1.3.13"
+  gem "capybara"
+  gem "sqlite3", "~> 1.4"
 end
 
-gem "rails", "~> 4.2.0"
+gem "rails", "~> 7.1.0"
 
 gem "trestle", github: "TrestleAdmin/trestle"
 

spec/dummy/config/application.rb

@@ -17,14 +17,7 @@
 module Dummy
   class Application < Rails::Application
     # Initialize configuration defaults for current Rails version.
-    case Rails.version.split(".").first(2).join(".")
-    when '6.0'
-      config.load_defaults 6.0
-    when '5.2'
-      config.load_defaults 5.2
-    when '5.1'
-      config.load_defaults 5.1
-    end
+    config.load_defaults Rails::VERSION::STRING.to_f
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers

spec/feature/basic_search_spec.rb

@@ -53,9 +53,6 @@
 private
   def search_for(query)
     visit "/admin/continents"
-    fill_in "Search", with: query
-
-    form = page.find("#q").ancestor("form")
-    Capybara::RackTest::Form.new(page.driver, form.native).submit({})
+    fill_in "Search", with: "#{query}\n"
   end
 end

spec/rails_helper.rb

@@ -17,9 +17,6 @@
 end
 
 RSpec.configure do |config|
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
   # instead of true.