Update Ruby and Rails versions in CI

DmitryTsepelev · Jun 12, 2022 · 5831196 · 5831196
1 parent 90b2349
commit 5831196
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
@@ -20,37 +20,42 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [jruby, 2.6, 2.7]
+        ruby: [jruby, 2.6, 2.7, 3.0, 3.1]
 
         gemfile: [
           "gemfiles/jruby.gemfile",
-          "gemfiles/rails_5_2.gemfile",
           "gemfiles/rails_6_0.gemfile",
-          "gemfiles/rails_6_2.gemfile"
+          "gemfiles/rails_6_2.gemfile",
+          "gemfiles/rails_7_0.gemfile"
         ]
 
         allow_failures:
           - false
 
         exclude:
-          - ruby: jruby
-            gemfile: gemfiles/rails_5_2.gemfile
           - ruby: jruby
             gemfile: gemfiles/rails_6_0.gemfile
           - ruby: jruby
             gemfile: gemfiles/rails_6_2.gemfile
+          - ruby: jruby
+            gemfile: gemfiles/rails_7_0.gemfile
           - ruby: jruby
             gemfile: gemfiles/railsmaster.gemfile
 
-          - ruby: 2.5
-            gemfile: gemfiles/jruby.gemfile
           - ruby: 2.6
             gemfile: gemfiles/jruby.gemfile
           - ruby: 2.7
             gemfile: gemfiles/jruby.gemfile
-          - ruby: ruby-head
+          - ruby: 3.0
+            gemfile: gemfiles/jruby.gemfile
+          - ruby: 3.1
             gemfile: gemfiles/jruby.gemfile
 
+          - ruby: 2.6
+            gemfile: gemfiles/rails_7_0.gemfile
+          - ruby: 2.6
+            gemfile: gemfiles/railsmaster.gemfile
+
         include:
           - ruby: ruby-head
             gemfile: gemfiles/railsmaster.gemfile

diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile
diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile
@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.4.0"
+gem "activerecord", "~> 7.0.3"
+
+gemspec path: "../"
diff --git a/spec/store_model/combine_error_strategies/merge_error_strategy_spec.rb b/spec/store_model/combine_error_strategies/merge_error_strategy_spec.rb
@@ -52,6 +52,13 @@
       if Rails::VERSION::MAJOR < 6 || Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR.zero?
         expect(record.errors.messages).to eq(name: ["can't be blank"], color: ["can't be blank"])
         expect(record.errors.full_messages).to eq(["Name can't be blank", "Color can't be blank"])
+      elsif Rails::VERSION::MAJOR == 7
+        expect(record.errors.messages).to eq(
+          name: ["can't be blank"], configuration: ["is invalid", "Color can't be blank"]
+        )
+        expect(record.errors.full_messages).to eq(
+          ["Name can't be blank", "Configuration is invalid", "Configuration Color can't be blank"]
+        )
       else
         expect(record.errors.messages).to eq(
           name: ["can't be blank"], configuration: ["Color can't be blank"]