From c8b327270d9d5bc581d9d295984cd4fc5d9cdafb Mon Sep 17 00:00:00 2001 From: Vasily Fedoseyev Date: Mon, 23 Oct 2023 20:31:41 +0300 Subject: [PATCH 1/2] Allow rails 7.1 --- .github/workflows/test.yml | 12 +-- Appraisals | 12 ++- Gemfile | 14 ++-- delayed_job.gemspec | 4 +- gemfiles/rails_52.gemfile | 9 +-- gemfiles/rails_52.gemfile.lock | 129 ++++++++++++++----------------- gemfiles/rails_60.gemfile | 9 +-- gemfiles/rails_60.gemfile.lock | 131 ++++++++++++++----------------- gemfiles/rails_61.gemfile | 9 +-- gemfiles/rails_61.gemfile.lock | 133 ++++++++++++++------------------ gemfiles/rails_70.gemfile | 9 +-- gemfiles/rails_70.gemfile.lock | 135 ++++++++++++++------------------ gemfiles/rails_71.gemfile | 10 +++ gemfiles/rails_71.gemfile.lock | 137 +++++++++++++++++++++++++++++++++ spec/database_helper.rb | 2 +- spec/spec_helper.rb | 6 +- 16 files changed, 415 insertions(+), 346 deletions(-) create mode 100644 gemfiles/rails_71.gemfile create mode 100644 gemfiles/rails_71.gemfile.lock diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 52bf1c6..b2050c8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,14 +6,14 @@ jobs: strategy: matrix: - ruby-version: [2.7.5, 3.0.4, 3.1.2] - rails-version: [70] + ruby-version: [3.2.2] + rails-version: [70, 71] include: - - ruby-version: 2.6.6 + - ruby-version: 2.6.10 rails-version: 52 - - ruby-version: 2.7.5 + - ruby-version: 2.7.8 rails-version: 60 - - ruby-version: 2.7.5 + - ruby-version: 2.7.8 rails-version: 61 env: @@ -39,4 +39,4 @@ jobs: - name: Run tests run: | - bundle exec appraisal rails_${{ matrix.rails-version }} rspec + bundle exec rspec diff --git a/Appraisals b/Appraisals index 3331b34..7bdac1f 100644 --- a/Appraisals +++ b/Appraisals @@ -1,17 +1,21 @@ # frozen_string_literal: true appraise 'rails_52' do - gem 'activerecord', '~> 5.2.6' + gem 'activerecord', '~>5.2.8' end appraise 'rails_60' do - gem 'activerecord', '~> 6.0.4.4' + gem 'activerecord', '~> 6.0.6' end appraise 'rails_61' do - gem 'activerecord', '~>6.1.4.4' + gem 'activerecord', '~>6.1.7' end appraise 'rails_70' do - gem 'activerecord', '~>7.0.0' + gem 'activerecord', '~>7.0.8' +end + +appraise 'rails_71' do + gem 'activerecord', '~>7.1.1' end diff --git a/Gemfile b/Gemfile index dec6552..da8fc9a 100644 --- a/Gemfile +++ b/Gemfile @@ -4,13 +4,15 @@ source 'http://rubygems.org' gemspec -gem 'pg', '~> 1.1.4' +gem 'pg', '~> 1.1' gem 'sqlite3' gem 'rspec' -gem 'awesome_print' -gem 'pry' -gem 'pry-byebug' -gem 'pry-doc' +unless defined?(Appraisal) + gem 'appraisal', require: false -gem 'appraisal', require: false + gem 'awesome_print' + gem 'pry' + gem 'pry-byebug' + gem 'pry-doc' +end diff --git a/delayed_job.gemspec b/delayed_job.gemspec index 2b25696..27ed86c 100644 --- a/delayed_job.gemspec +++ b/delayed_job.gemspec @@ -10,10 +10,10 @@ Gem::Specification.new do |s| s.description = "Delated_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks." s.authors = ["Tobias Lütke"] - s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) } + s.files = `git ls-files -z`.split("\x0").reject { |file| file.start_with?('.') || file.match(%r{^spec/}) } s.require_paths = ['lib'] - s.add_dependency 'activerecord', '>= 3.2', '< 7.1' + s.add_dependency 'activerecord', '>= 3.2', '< 7.2' s.add_dependency 'railties' s.add_development_dependency 'bundler' diff --git a/gemfiles/rails_52.gemfile b/gemfiles/rails_52.gemfile index 373d0f9..ef5767a 100644 --- a/gemfiles/rails_52.gemfile +++ b/gemfiles/rails_52.gemfile @@ -2,14 +2,9 @@ source "http://rubygems.org" -gem "pg", "~> 1.1.4" +gem "pg", "~> 1.1" gem "sqlite3" gem "rspec" -gem "awesome_print" -gem "pry" -gem "pry-byebug" -gem "pry-doc" -gem "appraisal", require: false -gem "activerecord", "~> 5.2.6" +gem "activerecord", "~>5.2.8" gemspec path: "../" diff --git a/gemfiles/rails_52.gemfile.lock b/gemfiles/rails_52.gemfile.lock index 8bc73f0..ea5db3e 100644 --- a/gemfiles/rails_52.gemfile.lock +++ b/gemfiles/rails_52.gemfile.lock @@ -2,125 +2,108 @@ PATH remote: .. specs: delayed_job (1.7.0) - activerecord (>= 3.2, < 7.1) + activerecord (>= 3.2, < 7.2) railties GEM remote: http://rubygems.org/ specs: - actionpack (5.2.7) - actionview (= 5.2.7) - activesupport (= 5.2.7) + actionpack (5.2.8.1) + actionview (= 5.2.8.1) + activesupport (= 5.2.8.1) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.7) - activesupport (= 5.2.7) + actionview (5.2.8.1) + activesupport (= 5.2.8.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activemodel (5.2.7) - activesupport (= 5.2.7) - activerecord (5.2.7) - activemodel (= 5.2.7) - activesupport (= 5.2.7) + activemodel (5.2.8.1) + activesupport (= 5.2.8.1) + activerecord (5.2.8.1) + activemodel (= 5.2.8.1) + activesupport (= 5.2.8.1) arel (>= 9.0) - activesupport (5.2.7) + activesupport (5.2.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - appraisal (2.4.1) - bundler - rake - thor (>= 0.14.0) arel (9.0.0) - awesome_print (1.9.2) builder (3.2.4) - byebug (11.1.3) - coderay (1.1.3) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) crass (1.0.6) diff-lcs (1.5.0) - erubi (1.10.0) - i18n (1.10.0) + erubi (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - loofah (2.16.0) + loofah (2.21.4) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.15.0) - nokogiri (1.13.4-x86_64-darwin) + minitest (5.20.0) + nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) - nokogiri (1.13.4-x86_64-linux) + nokogiri (1.15.4-x86_64-darwin) racc (~> 1.4) - pg (1.1.4) - pry (0.14.1) - coderay (~> 1.1) - method_source (~> 1.0) - pry-byebug (3.8.0) - byebug (~> 11.0) - pry (~> 0.10) - pry-doc (1.3.0) - pry (~> 0.11) - yard (~> 0.9.11) - racc (1.6.0) - rack (2.2.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + nokogiri (1.15.4-x86_64-linux) + racc (~> 1.4) + pg (1.5.4) + racc (1.7.1) + rack (2.2.8) + rack-test (2.1.0) + rack (>= 1.3) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) - loofah (~> 2.3) - railties (5.2.7) - actionpack (= 5.2.7) - activesupport (= 5.2.7) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (5.2.8.1) + actionpack (= 5.2.8.1) + activesupport (= 5.2.8.1) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rake (13.0.6) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-support (3.11.0) - sqlite3 (1.4.2) - thor (1.2.1) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + sqlite3 (1.6.7-arm64-darwin) + sqlite3 (1.6.7-x86_64-darwin) + sqlite3 (1.6.7-x86_64-linux) + thor (1.3.0) thread_safe (0.3.6) - tzinfo (1.2.9) + tzinfo (1.2.11) thread_safe (~> 0.1) - webrick (1.7.0) - yard (0.9.27) - webrick (~> 1.7.0) PLATFORMS + arm64-darwin-22 x86_64-darwin-21 x86_64-linux DEPENDENCIES - activerecord (~> 5.2.6) - appraisal - awesome_print + activerecord (~> 5.2.8) bundler delayed_job! - pg (~> 1.1.4) - pry - pry-byebug - pry-doc + pg (~> 1.1) rake rspec sqlite3 BUNDLED WITH - 2.3.10 + 2.4.19 diff --git a/gemfiles/rails_60.gemfile b/gemfiles/rails_60.gemfile index 18c556d..4556fae 100644 --- a/gemfiles/rails_60.gemfile +++ b/gemfiles/rails_60.gemfile @@ -2,14 +2,9 @@ source "http://rubygems.org" -gem "pg", "~> 1.1.4" +gem "pg", "~> 1.1" gem "sqlite3" gem "rspec" -gem "awesome_print" -gem "pry" -gem "pry-byebug" -gem "pry-doc" -gem "appraisal", require: false -gem "activerecord", "~> 6.0.4.4" +gem "activerecord", "~> 6.0.6" gemspec path: "../" diff --git a/gemfiles/rails_60.gemfile.lock b/gemfiles/rails_60.gemfile.lock index e12a24a..fb13f36 100644 --- a/gemfiles/rails_60.gemfile.lock +++ b/gemfiles/rails_60.gemfile.lock @@ -2,125 +2,108 @@ PATH remote: .. specs: delayed_job (1.7.0) - activerecord (>= 3.2, < 7.1) + activerecord (>= 3.2, < 7.2) railties GEM remote: http://rubygems.org/ specs: - actionpack (6.0.4.7) - actionview (= 6.0.4.7) - activesupport (= 6.0.4.7) + actionpack (6.0.6.1) + actionview (= 6.0.6.1) + activesupport (= 6.0.6.1) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.0.4.7) - activesupport (= 6.0.4.7) + actionview (6.0.6.1) + activesupport (= 6.0.6.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (6.0.4.7) - activesupport (= 6.0.4.7) - activerecord (6.0.4.7) - activemodel (= 6.0.4.7) - activesupport (= 6.0.4.7) - activesupport (6.0.4.7) + activemodel (6.0.6.1) + activesupport (= 6.0.6.1) + activerecord (6.0.6.1) + activemodel (= 6.0.6.1) + activesupport (= 6.0.6.1) + activesupport (6.0.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - appraisal (2.4.1) - bundler - rake - thor (>= 0.14.0) - awesome_print (1.9.2) builder (3.2.4) - byebug (11.1.3) - coderay (1.1.3) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) crass (1.0.6) diff-lcs (1.5.0) - erubi (1.10.0) - i18n (1.10.0) + erubi (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - loofah (2.16.0) + loofah (2.21.4) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.15.0) - nokogiri (1.13.4-x86_64-darwin) + minitest (5.20.0) + nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) - nokogiri (1.13.4-x86_64-linux) + nokogiri (1.15.4-x86_64-darwin) racc (~> 1.4) - pg (1.1.4) - pry (0.14.1) - coderay (~> 1.1) - method_source (~> 1.0) - pry-byebug (3.8.0) - byebug (~> 11.0) - pry (~> 0.10) - pry-doc (1.3.0) - pry (~> 0.11) - yard (~> 0.9.11) - racc (1.6.0) - rack (2.2.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + nokogiri (1.15.4-x86_64-linux) + racc (~> 1.4) + pg (1.5.4) + racc (1.7.1) + rack (2.2.8) + rack-test (2.1.0) + rack (>= 1.3) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) - loofah (~> 2.3) - railties (6.0.4.7) - actionpack (= 6.0.4.7) - activesupport (= 6.0.4.7) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (6.0.6.1) + actionpack (= 6.0.6.1) + activesupport (= 6.0.6.1) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rake (13.0.6) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-support (3.11.0) - sqlite3 (1.4.2) - thor (1.2.1) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + sqlite3 (1.6.7-arm64-darwin) + sqlite3 (1.6.7-x86_64-darwin) + sqlite3 (1.6.7-x86_64-linux) + thor (1.3.0) thread_safe (0.3.6) - tzinfo (1.2.9) + tzinfo (1.2.11) thread_safe (~> 0.1) - webrick (1.7.0) - yard (0.9.27) - webrick (~> 1.7.0) - zeitwerk (2.5.4) + zeitwerk (2.6.12) PLATFORMS + arm64-darwin-22 x86_64-darwin-21 x86_64-linux DEPENDENCIES - activerecord (~> 6.0.4.4) - appraisal - awesome_print + activerecord (~> 6.0.6) bundler delayed_job! - pg (~> 1.1.4) - pry - pry-byebug - pry-doc + pg (~> 1.1) rake rspec sqlite3 BUNDLED WITH - 2.3.10 + 2.4.19 diff --git a/gemfiles/rails_61.gemfile b/gemfiles/rails_61.gemfile index c751f28..fd634d2 100644 --- a/gemfiles/rails_61.gemfile +++ b/gemfiles/rails_61.gemfile @@ -2,14 +2,9 @@ source "http://rubygems.org" -gem "pg", "~> 1.1.4" +gem "pg", "~> 1.1" gem "sqlite3" gem "rspec" -gem "awesome_print" -gem "pry" -gem "pry-byebug" -gem "pry-doc" -gem "appraisal", require: false -gem "activerecord", "~>6.1.4.4" +gem "activerecord", "~>6.1.7" gemspec path: "../" diff --git a/gemfiles/rails_61.gemfile.lock b/gemfiles/rails_61.gemfile.lock index 676ec26..793fd26 100644 --- a/gemfiles/rails_61.gemfile.lock +++ b/gemfiles/rails_61.gemfile.lock @@ -2,124 +2,107 @@ PATH remote: .. specs: delayed_job (1.7.0) - activerecord (>= 3.2, < 7.1) + activerecord (>= 3.2, < 7.2) railties GEM remote: http://rubygems.org/ specs: - actionpack (6.1.4.7) - actionview (= 6.1.4.7) - activesupport (= 6.1.4.7) + actionpack (6.1.7.6) + actionview (= 6.1.7.6) + activesupport (= 6.1.7.6) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.4.7) - activesupport (= 6.1.4.7) + actionview (6.1.7.6) + activesupport (= 6.1.7.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (6.1.4.7) - activesupport (= 6.1.4.7) - activerecord (6.1.4.7) - activemodel (= 6.1.4.7) - activesupport (= 6.1.4.7) - activesupport (6.1.4.7) + activemodel (6.1.7.6) + activesupport (= 6.1.7.6) + activerecord (6.1.7.6) + activemodel (= 6.1.7.6) + activesupport (= 6.1.7.6) + activesupport (6.1.7.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - appraisal (2.4.1) - bundler - rake - thor (>= 0.14.0) - awesome_print (1.9.2) builder (3.2.4) - byebug (11.1.3) - coderay (1.1.3) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) crass (1.0.6) diff-lcs (1.5.0) - erubi (1.10.0) - i18n (1.10.0) + erubi (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - loofah (2.16.0) + loofah (2.21.4) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.15.0) - nokogiri (1.13.4-x86_64-darwin) + minitest (5.20.0) + nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) - nokogiri (1.13.4-x86_64-linux) + nokogiri (1.15.4-x86_64-darwin) racc (~> 1.4) - pg (1.1.4) - pry (0.14.1) - coderay (~> 1.1) - method_source (~> 1.0) - pry-byebug (3.8.0) - byebug (~> 11.0) - pry (~> 0.10) - pry-doc (1.3.0) - pry (~> 0.11) - yard (~> 0.9.11) - racc (1.6.0) - rack (2.2.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + nokogiri (1.15.4-x86_64-linux) + racc (~> 1.4) + pg (1.5.4) + racc (1.7.1) + rack (2.2.8) + rack-test (2.1.0) + rack (>= 1.3) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) - loofah (~> 2.3) - railties (6.1.4.7) - actionpack (= 6.1.4.7) - activesupport (= 6.1.4.7) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (6.1.7.6) + actionpack (= 6.1.7.6) + activesupport (= 6.1.7.6) method_source - rake (>= 0.13) + rake (>= 12.2) thor (~> 1.0) rake (13.0.6) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-support (3.11.0) - sqlite3 (1.4.2) - thor (1.2.1) - tzinfo (2.0.4) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + sqlite3 (1.6.7-arm64-darwin) + sqlite3 (1.6.7-x86_64-darwin) + sqlite3 (1.6.7-x86_64-linux) + thor (1.3.0) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) - webrick (1.7.0) - yard (0.9.27) - webrick (~> 1.7.0) - zeitwerk (2.5.4) + zeitwerk (2.6.12) PLATFORMS + arm64-darwin-22 x86_64-darwin-21 x86_64-linux DEPENDENCIES - activerecord (~> 6.1.4.4) - appraisal - awesome_print + activerecord (~> 6.1.7) bundler delayed_job! - pg (~> 1.1.4) - pry - pry-byebug - pry-doc + pg (~> 1.1) rake rspec sqlite3 BUNDLED WITH - 2.3.10 + 2.4.19 diff --git a/gemfiles/rails_70.gemfile b/gemfiles/rails_70.gemfile index d69e807..18bbc4e 100644 --- a/gemfiles/rails_70.gemfile +++ b/gemfiles/rails_70.gemfile @@ -2,14 +2,9 @@ source "http://rubygems.org" -gem "pg", "~> 1.1.4" +gem "pg", "~> 1.1" gem "sqlite3" gem "rspec" -gem "awesome_print" -gem "pry" -gem "pry-byebug" -gem "pry-doc" -gem "appraisal", require: false -gem "activerecord", "~>7.0.0" +gem "activerecord", "~>7.0.8" gemspec path: "../" diff --git a/gemfiles/rails_70.gemfile.lock b/gemfiles/rails_70.gemfile.lock index 8bbdd49..d4bd9e6 100644 --- a/gemfiles/rails_70.gemfile.lock +++ b/gemfiles/rails_70.gemfile.lock @@ -2,123 +2,106 @@ PATH remote: .. specs: delayed_job (1.7.0) - activerecord (>= 3.2, < 7.1) + activerecord (>= 3.2, < 7.2) railties GEM remote: http://rubygems.org/ specs: - actionpack (7.0.2.3) - actionview (= 7.0.2.3) - activesupport (= 7.0.2.3) - rack (~> 2.0, >= 2.2.0) + actionpack (7.0.8) + actionview (= 7.0.8) + activesupport (= 7.0.8) + rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.2.3) - activesupport (= 7.0.2.3) + actionview (7.0.8) + activesupport (= 7.0.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.2.3) - activesupport (= 7.0.2.3) - activerecord (7.0.2.3) - activemodel (= 7.0.2.3) - activesupport (= 7.0.2.3) - activesupport (7.0.2.3) + activemodel (7.0.8) + activesupport (= 7.0.8) + activerecord (7.0.8) + activemodel (= 7.0.8) + activesupport (= 7.0.8) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - appraisal (2.4.1) - bundler - rake - thor (>= 0.14.0) - awesome_print (1.9.2) builder (3.2.4) - byebug (11.1.3) - coderay (1.1.3) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) crass (1.0.6) diff-lcs (1.5.0) - erubi (1.10.0) - i18n (1.10.0) + erubi (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - loofah (2.16.0) + loofah (2.21.4) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) method_source (1.0.0) - mini_portile2 (2.8.0) - minitest (5.15.0) - nokogiri (1.13.4) - mini_portile2 (~> 2.8.0) + mini_portile2 (2.8.5) + minitest (5.20.0) + nokogiri (1.15.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) + nokogiri (1.15.4-x86_64-linux) racc (~> 1.4) - pg (1.1.4) - pry (0.13.1) - coderay (~> 1.1) - method_source (~> 1.0) - pry-byebug (3.9.0) - byebug (~> 11.0) - pry (~> 0.13.0) - pry-doc (1.3.0) - pry (~> 0.11) - yard (~> 0.9.11) - racc (1.6.0) - rack (2.2.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + pg (1.5.4) + racc (1.7.1) + rack (2.2.8) + rack-test (2.1.0) + rack (>= 1.3) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) - loofah (~> 2.3) - railties (7.0.2.3) - actionpack (= 7.0.2.3) - activesupport (= 7.0.2.3) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rake (13.0.6) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-support (3.11.0) - sqlite3 (1.4.2) - thor (1.2.1) - tzinfo (2.0.4) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + sqlite3 (1.6.7) + mini_portile2 (~> 2.8.0) + sqlite3 (1.6.7-x86_64-linux) + thor (1.3.0) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) - webrick (1.7.0) - yard (0.9.27) - webrick (~> 1.7.0) - zeitwerk (2.5.4) + zeitwerk (2.6.12) PLATFORMS ruby + x86_64-linux DEPENDENCIES - activerecord (~> 7.0.0) - appraisal - awesome_print + activerecord (~> 7.0.8) bundler delayed_job! - pg (~> 1.1.4) - pry - pry-byebug - pry-doc + pg (~> 1.1) rake rspec sqlite3 BUNDLED WITH - 2.3.10 + 2.4.19 diff --git a/gemfiles/rails_71.gemfile b/gemfiles/rails_71.gemfile new file mode 100644 index 0000000..1b33ed7 --- /dev/null +++ b/gemfiles/rails_71.gemfile @@ -0,0 +1,10 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "pg", "~> 1.1" +gem "sqlite3" +gem "rspec" +gem "activerecord", "~>7.1.1" + +gemspec path: "../" diff --git a/gemfiles/rails_71.gemfile.lock b/gemfiles/rails_71.gemfile.lock new file mode 100644 index 0000000..495b77c --- /dev/null +++ b/gemfiles/rails_71.gemfile.lock @@ -0,0 +1,137 @@ +PATH + remote: .. + specs: + delayed_job (1.7.0) + activerecord (>= 3.2, < 7.2) + railties + +GEM + remote: http://rubygems.org/ + specs: + actionpack (7.1.1) + actionview (= 7.1.1) + activesupport (= 7.1.1) + nokogiri (>= 1.8.5) + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actionview (7.1.1) + activesupport (= 7.1.1) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activemodel (7.1.1) + activesupport (= 7.1.1) + activerecord (7.1.1) + activemodel (= 7.1.1) + activesupport (= 7.1.1) + timeout (>= 0.4.0) + activesupport (7.1.1) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + base64 (0.1.1) + bigdecimal (3.1.4) + builder (3.2.4) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) + crass (1.0.6) + diff-lcs (1.5.0) + drb (2.1.1) + ruby2_keywords + erubi (1.12.0) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + io-console (0.6.0) + irb (1.8.3) + rdoc + reline (>= 0.3.8) + loofah (2.21.4) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + minitest (5.20.0) + mutex_m (0.1.2) + nokogiri (1.15.4-arm64-darwin) + racc (~> 1.4) + nokogiri (1.15.4-x86_64-linux) + racc (~> 1.4) + pg (1.5.4) + psych (5.1.1.1) + stringio + racc (1.7.1) + rack (3.0.8) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.1.1) + actionpack (= 7.1.1) + activesupport (= 7.1.1) + irb + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) + rake (13.0.6) + rdoc (6.5.0) + psych (>= 4.0.0) + reline (0.3.9) + io-console (~> 0.5) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + ruby2_keywords (0.0.5) + sqlite3 (1.6.7-arm64-darwin) + sqlite3 (1.6.7-x86_64-linux) + stringio (3.0.8) + thor (1.3.0) + timeout (0.4.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + webrick (1.8.1) + zeitwerk (2.6.12) + +PLATFORMS + arm64-darwin-22 + x86_64-linux + +DEPENDENCIES + activerecord (~> 7.1.1) + bundler + delayed_job! + pg (~> 1.1) + rake + rspec + sqlite3 + +BUNDLED WITH + 2.4.19 diff --git a/spec/database_helper.rb b/spec/database_helper.rb index b42617c..a27c807 100644 --- a/spec/database_helper.rb +++ b/spec/database_helper.rb @@ -15,7 +15,7 @@ class TestApplication < Rails::Application; end port: 5432 ) ActiveRecord::Base.connection.try(:ping) -rescue ActiveRecord::ConnectionNotEstablished, PG::ConnectionBad +rescue ActiveRecord::ConnectionNotEstablished, PG::ConnectionBad, ActiveRecord::NoDatabaseError puts "Cannot connect to postgres, trying in-memory sqlite3 instead" ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:') end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index d955fbd..ed87958 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,9 @@ require 'rubygems' -require 'pry' +begin + require 'pry' +rescue LoadError + # no pry in CI +end require 'active_record' require 'pg' From 3858036b6f5d607f63d1ff1f38361412effafd46 Mon Sep 17 00:00:00 2001 From: Vasily Fedoseyev Date: Mon, 23 Oct 2023 20:44:30 +0300 Subject: [PATCH 2/2] Drop ruby 2.6 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b2050c8..4b7718b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ jobs: ruby-version: [3.2.2] rails-version: [70, 71] include: - - ruby-version: 2.6.10 + - ruby-version: 2.7.8 rails-version: 52 - ruby-version: 2.7.8 rails-version: 60