diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38f1c11..73b3184 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,7 @@ jobs: gemfile: - "6.1" - "7.0" + - "7.1" ruby: - "3.0.0" - "3.1.0" @@ -37,7 +38,9 @@ jobs: bundler-cache: true - name: "Reset app database" - run: bundle exec rake fake:db:reset + run: | + bundle exec rake fake:db:reset + bundle exec rake fake:db:test:prepare - name: "Run tests without acceptance" run: | diff --git a/.gitignore b/.gitignore index 550d0d7..eb7bfd2 100644 --- a/.gitignore +++ b/.gitignore @@ -86,6 +86,8 @@ fabric.properties # Ignore the default SQLite database. /db/*.sqlite3 /db/*.sqlite3-journal +/db/*.sqlite3-shm +/db/*.sqlite3-wal # Ignore all logfiles and tempfiles. /log/* diff --git a/Appraisals b/Appraisals index 96c7a89..ec2ef06 100644 --- a/Appraisals +++ b/Appraisals @@ -12,3 +12,7 @@ end appraise "rails_7.0" do gem "rails", "~> 7.0" end + +appraise "rails_7.1" do + gem "rails", "~> 7.1.0" +end diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile new file mode 100644 index 0000000..86411e5 --- /dev/null +++ b/gemfiles/rails_7.1.gemfile @@ -0,0 +1,14 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "appraisal" +gem "break" +gem "pry", require: false +gem "rake" +gem "rspec-rails" +gem "sqlite3" +gem "standard" +gem "rails", "~> 7.1.0" + +gemspec name: "monarch_migrate", path: "../" diff --git a/test/fake/application.rb b/test/fake/application.rb index 83d9d80..2777f1f 100644 --- a/test/fake/application.rb +++ b/test/fake/application.rb @@ -28,10 +28,6 @@ class Application < Rails::Application config.paths.add "config/routes.rb", with: "#{APP_ROOT}/config/routes.rb" config.secret_key_base = "SECRET_KEY_BASE" - if Rails::VERSION::MAJOR > 6 - config.active_record.legacy_connection_handling = false - end - if config.active_record.sqlite3.respond_to?(:represent_boolean_as_integer) if Rails::VERSION::MAJOR < 6 config.active_record.sqlite3.represent_boolean_as_integer = true