diff --git a/Appraisals b/Appraisals index 7bac302..a5dd337 100644 --- a/Appraisals +++ b/Appraisals @@ -18,7 +18,7 @@ appraise 'rails-7.0' do gem 'sqlite3', '~> 1.4.0' end appraise 'rails-7.1' do - gem 'actionpack', '~> 7.0.0' - gem 'activerecord', '~> 7.0.0' + gem 'actionpack', '~> 7.1.0' + gem 'activerecord', '~> 7.q.0' gem 'sqlite3', '~> 1.4.0' end diff --git a/Rakefile b/Rakefile index 07e03de..f9604e0 100644 --- a/Rakefile +++ b/Rakefile @@ -8,11 +8,8 @@ Rake::TestTask.new(:test) do |t| t.test_files = FileList["test/**/*_test.rb"] end -begin - require File.expand_path("test/dummy/config/application", __dir__) - Rails.application.load_tasks -rescue LoadError -end +require File.expand_path("test/dummy/config/application", __dir__) +Rails.application.load_tasks desc "Running Tests" task default: :test diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index fbe91c9..303131d 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -9,8 +9,8 @@ gem "cells-rails" gem "reform-rails" gem "trailblazer" gem "trailblazer-cells" -gem "actionpack", "~> 7.0.0" -gem "activerecord", "~> 7.0.0" +gem "actionpack", "~> 7.1.0" +gem "activerecord", "~> 7.q.0" gem "sqlite3", "~> 1.4.0" gemspec path: "../" diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb index 086004e..5d47e4e 100644 --- a/test/dummy/config/application.rb +++ b/test/dummy/config/application.rb @@ -11,7 +11,7 @@ module TrailblazerTestApp class Application < Rails::Application config.load_defaults Rails.gem_version.to_s.split(".")[0..1].join(".") - config.active_record.legacy_connection_handling = false if Rails.gem_version >= Gem::Version.new("6.1") + config.active_record.legacy_connection_handling = false if config.active_record.respond_to?(:legacy_connection_handling=) config.cache_classes = true config.eager_load = false config.serve_static_files = false diff --git a/test/song/operation_test.rb b/test/song/operation_test.rb index d661382..0f493d3 100644 --- a/test/song/operation_test.rb +++ b/test/song/operation_test.rb @@ -1,7 +1,7 @@ require "test_helper" require "trailblazer/activity/testing" -class SongOperationTest < Minitest::TrailblazerSpec +class SongOperationTest < Minitest::Spec it "what" do song = Song.create(title: "Bright Eyes") diff --git a/test/test_helper.rb b/test/test_helper.rb index 4670848..6938605 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -3,4 +3,3 @@ require "minitest/autorun" require "capybara/rails" -require 'minitest/trailblazer_spec' diff --git a/trailblazer-rails.gemspec b/trailblazer-rails.gemspec index 1743996..dedb783 100644 --- a/trailblazer-rails.gemspec +++ b/trailblazer-rails.gemspec @@ -13,12 +13,11 @@ Gem::Specification.new do |spec| spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test)/}) } spec.require_paths = ["lib"] - spec.add_dependency "railties", ">= 5.2.0" + spec.add_dependency "railties", ">= 6.0.0" spec.add_dependency "trailblazer", ">= 2.1.0", "< 2.2.0" spec.add_development_dependency "bundler" spec.add_development_dependency "minitest" spec.add_development_dependency "rake" spec.add_development_dependency "capybara" - spec.add_development_dependency "minitest-trailblazer" end