Support rails 7.1 (#21)

and use bundler-multilock
instructure · Oct 6, 2023 · 34111d7 · 34111d7
1 parent 85c6536
commit 34111d7
Show file tree

Hide file tree

Showing 13 changed files with 1,063 additions and 74 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,22 +5,20 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.6, 2.7, 3.0]
-        gemfile:
-          - rspec_3.9_ar_6.0_dc_2.0
-          - rspec_3.9_ar_6.1_dc_2.0
-          - rspec_3.9_ar_7.0_dc_2.0
-        exclude:
-          - ruby: 2.6
-            gemfile: rspec_3.9_ar_7.0_dc_2.0
+        ruby: [2.7, 3.0, 3.1, 3.2]
+        lockfile:
+          - Gemfile.activerecord-6.0.lock
+          - Gemfile.activerecord-6.1.lock
+          - Gemfile.activerecord-7.0.lock
+          - Gemfile.activerecord-7.1.lock
+    env: 
+      BUNDLE_LOCKFILE: ${{ matrix.lockfile }}
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby
-        uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: '${{ matrix.ruby }}'
-      - run: bundle config gemfile gemfiles/${{ matrix.gemfile }}.gemfile
-      - run: bundle config without development
       - name: Install dependencies
         run: bundle install
       - name: Run tests

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,3 @@
-/gemfiles/.bundle
 /*.gem
-/Gemfile.lock
-*gemfile.lock
 *.gem
+/.bundle
diff --git a/Appraisals b/Appraisals
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,23 @@
+# frozen_string_literal: true
+
 source 'http://rubygems.org'
 
+plugin 'bundler-multilock', '1.1.2'
+return unless Plugin.installed?('bundler-multilock')
+
+Plugin.send(:load_plugin, 'bundler-multilock')
+
 gemspec
 
 group :test do
-  gem 'rake'
+end
+
+%w[6.0 6.1 7.0 7.1].each do |ar|
+  lockfile "activerecord-#{ar}" do
+    # rspec-rails depends on basically all of rails, so just use all of rails here
+    gem 'rails', "~> #{ar}.0"
+    if ar == "6.0"
+      gem 'rspec-rails', "~> 5.1.2"
+    end
+  end
 end
diff --git a/Gemfile.activerecord-6.0.lock b/Gemfile.activerecord-6.0.lock
@@ -0,0 +1,212 @@
+PATH
+  remote: .
+  specs:
+    once-ler (2.0.1)
+      activerecord (>= 6.0, < 7.2)
+      rspec (>= 3.6)
+      rspec-rails (>= 4.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actioncable (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      actionview (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    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)
+    actiontext (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
+      nokogiri (>= 1.8.5)
+    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)
+    activejob (6.0.6.1)
+      activesupport (= 6.0.6.1)
+      globalid (>= 0.3.6)
+    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)
+    activestorage (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      marcel (~> 1.0)
+    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.3.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    builder (3.2.4)
+    concurrent-ruby (1.2.2)
+    crass (1.0.6)
+    database_cleaner (2.0.2)
+      database_cleaner-active_record (>= 2, < 3)
+    database_cleaner-active_record (2.1.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    date (3.3.3)
+    debug (1.8.0)
+      irb (>= 1.5.0)
+      reline (>= 0.3.1)
+    diff-lcs (1.5.0)
+    erubi (1.12.0)
+    globalid (1.1.0)
+      activesupport (>= 5.0)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    io-console (0.6.0)
+    irb (1.8.1)
+      rdoc
+      reline (>= 0.3.8)
+    loofah (2.21.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.2)
+    method_source (1.0.0)
+    mini_mime (1.1.2)
+    minitest (5.20.0)
+    net-imap (0.3.6)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nio4r (2.5.9)
+    nokogiri (1.15.4-arm64-darwin)
+      racc (~> 1.4)
+    psych (5.1.0)
+      stringio
+    racc (1.7.1)
+    rack (2.2.8)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails (6.0.6.1)
+      actioncable (= 6.0.6.1)
+      actionmailbox (= 6.0.6.1)
+      actionmailer (= 6.0.6.1)
+      actionpack (= 6.0.6.1)
+      actiontext (= 6.0.6.1)
+      actionview (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activemodel (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
+      bundler (>= 1.3.0)
+      railties (= 6.0.6.1)
+      sprockets-rails (>= 2.0.0)
+    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 (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)
+    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-rails (5.1.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.12.1)
+    sprockets (4.2.1)
+      concurrent-ruby (~> 1.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.4.4)
+    stringio (3.0.8)
+    thor (1.2.2)
+    thread_safe (0.3.6)
+    timeout (0.4.0)
+    tzinfo (1.2.11)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.12)
+
+PLATFORMS
+  arm64-darwin-22
+
+DEPENDENCIES
+  appraisal (~> 2.3.0)
+  database_cleaner (~> 2.0)
+  database_cleaner-active_record (~> 2.0)
+  debug
+  once-ler!
+  rails (~> 6.0.0)
+  rake
+  rspec-rails (~> 5.1.2)
+  sqlite3 (~> 1.4.2)
+
+BUNDLED WITH
+   2.4.20