Skip to content

Commit 126a98c

Browse files
Update CI (#199)
1 parent 86e4887 commit 126a98c

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

.github/workflows/rspec.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ jobs:
2727
"gemfiles/jruby.gemfile",
2828
"gemfiles/rails_7_0.gemfile",
2929
"gemfiles/rails_7_1.gemfile",
30-
"gemfiles/rails_7_2.gemfile"
30+
"gemfiles/rails_7_2.gemfile",
31+
"gemfiles/rails_8_0.gemfile"
3132
]
3233

3334
enable_parent_assignment: ["true", "false"]
@@ -42,12 +43,17 @@ jobs:
4243
gemfile: gemfiles/rails_7_1.gemfile
4344
- ruby: "jruby-9.4.8.0"
4445
gemfile: gemfiles/rails_7_2.gemfile
46+
- ruby: "jruby-9.4.8.0"
47+
gemfile: gemfiles/rails_8_0.gemfile
4548
- ruby: "jruby-9.4.8.0"
4649
gemfile: gemfiles/railsmaster.gemfile
4750

4851
- ruby: "3.4"
4952
gemfile: gemfiles/rails_7_0.gemfile
5053

54+
- ruby: 3.1
55+
gemfile: gemfiles/rails_8_0.gemfile
56+
5157
- ruby: "3.0"
5258
gemfile: gemfiles/jruby.gemfile
5359
- ruby: 3.1

gemfiles/rails_8_0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org"
22

3-
gem "sqlite3", "~> 1.4.4"
3+
gem "sqlite3", "~> 2.1"
44
gem "activerecord", "~> 8.0.0"
55

66
gemspec path: "../"

spec/store_model/combine_error_strategies/merge_error_strategy_spec.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@
4949
it "keeps parent validation messages" do
5050
described_class.new.call(:configuration, record.errors, record.configuration.errors)
5151

52-
if Rails::VERSION::MAJOR < 6 || Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR.zero?
53-
expect(record.errors.messages).to eq(name: ["can't be blank"], color: ["can't be blank"])
54-
expect(record.errors.full_messages).to eq(["Name can't be blank", "Color can't be blank"])
55-
elsif Rails::VERSION::MAJOR == 7
52+
if Rails::VERSION::MAJOR == 7 || Rails::VERSION::MAJOR == 8
5653
expect(record.errors.messages).to eq(
5754
name: ["can't be blank"], configuration: ["is invalid", "Color can't be blank"]
5855
)

0 commit comments

Comments
 (0)