Skip to content

Commit

Permalink
chore(dep): update rspec version for each rails ver
Browse files Browse the repository at this point in the history
  • Loading branch information
bivanalhar committed Jun 28, 2024
1 parent b037b0e commit 621c2c4
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
matrix:
ruby-version: ['3.0', '3.1']
activerecord: ['6.0', '6.1', '7.0', '7.1']
activerecord: ['6.1', '7.0', '7.1']
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.activerecord }}.gemfile
steps:
Expand Down
7 changes: 3 additions & 4 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
appraise "rails-6.0" do
gem 'rails', '~> 6.0'
end

appraise "rails-6.1" do
gem 'rails', '~> 6.1'
gem "rspec-rails", '>= 6'
end

appraise "rails-7.0" do
gem 'rails', '~> 7.0'
gem "rspec-rails", '>= 6'
end

appraise "rails-7.1" do
gem 'rails', '~> 7.1'
gem "rspec-rails", '>= 6'
end
1 change: 0 additions & 1 deletion activerecord-userstamp.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ Gem::Specification.new do |s|
s.add_development_dependency 'tzinfo-data' if RUBY_PLATFORM =~ /mswin|mingw/
s.add_development_dependency 'rake'
s.add_development_dependency 'rdoc'
s.add_development_dependency 'rspec-rails', '>= 6'
s.add_development_dependency 'simplecov'
s.add_development_dependency 'coveralls'
s.add_development_dependency 'codeclimate-test-reporter'
Expand Down
7 changes: 0 additions & 7 deletions gemfiles/rails_6.0.gemfile

This file was deleted.

1 change: 1 addition & 0 deletions gemfiles/rails_6.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
source "https://rubygems.org"

gem "rails", "~> 6.1"
gem "rspec-rails", ">= 6"

gemspec path: "../"
1 change: 1 addition & 0 deletions gemfiles/rails_7.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
source "https://rubygems.org"

gem "rails", "~> 7.0"
gem "rspec-rails", ">= 6"

gemspec path: "../"
1 change: 1 addition & 0 deletions gemfiles/rails_7.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
source "https://rubygems.org"

gem "rails", "~> 7.1"
gem "rspec-rails", ">= 6"

gemspec path: "../"
11 changes: 5 additions & 6 deletions spec/lib/migration_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,15 @@ class self::DefaultRandom < ActiveRecord::Base
end

context 'when overridden attribute names are used' do
before(:all) do
before(:each) do
ActiveRecord::Userstamp.configure do |config|
config.creator_attribute = :created_by
config.updater_attribute = :updated_by
config.deleter_attribute = :deleted_by
end
end

class self::OverriddenRandom < ActiveRecord::Base
stampable
class self::OverriddenRandom < ActiveRecord::Base
stampable
end
end

subject { self.class::OverriddenRandom.new }
Expand All @@ -50,7 +49,7 @@ class self::OverriddenRandom < ActiveRecord::Base
t.userstamps
end

after(:all) do
after(:each) do
ActiveRecord::Userstamp.configure do |config|
config.creator_attribute = :creator_id
config.updater_attribute = :updater_id
Expand Down

0 comments on commit 621c2c4

Please sign in to comment.