Skip to content

Commit

Permalink
Update rails test matrix
Browse files Browse the repository at this point in the history
There is some new ActiveSupport::BroadcastLogger in development in rails
7.1 that is not getting assigned to the Loga.logger. This will be
checked in a followup change
  • Loading branch information
bliof-fc committed Feb 12, 2024
1 parent 82c56a4 commit b98a5ee
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 90 deletions.
24 changes: 16 additions & 8 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ appraise 'sidekiq51' do
gem 'sidekiq', '~> 5.1.0'
end

appraise 'rails60' do
gem 'rails', '~> 6.0.0'
end

appraise 'sidekiq60' do
gem 'sidekiq', '~> 6.0.0'
end
Expand All @@ -52,12 +48,24 @@ appraise 'sidekiq65' do
gem 'sidekiq', '~> 6.5.0'
end

appraise 'rails61' do
gem 'rails', '~> 6.1.4.4'
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.2.0')
appraise 'rails60' do
gem 'rails', '~> 6.0.0'
end

appraise 'rails61' do
gem 'rails', '~> 6.1.4.4'
end
end

appraise 'rails70' do
gem 'rails', '~> 7.0.0'
if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('3.0.0')
appraise 'rails70' do
gem 'rails', '~> 7.0.0'
end

appraise 'rails71' do
gem 'rails', '~> 7.1.0'
end
end

appraise 'sidekiq7' do
Expand Down
33 changes: 33 additions & 0 deletions gemfiles/rails71.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", "~> 7.1.0"

group :development do
gem "appraisal"
gem "bundler", ">= 1.6"
gem "byebug"
gem "guard"
gem "guard-rspec"
gem "guard-rubocop"
gem "pry"
gem "rack-test"
gem "rake"
gem "fakeredis"
gem "rspec", "~> 3.7"
gem "rubocop"
gem "rubocop-rspec"
gem "timecop"
gem "psych"
gem "net-smtp"
gem "net-pop"
gem "net-imap"
gem "bigdecimal"
end

group :test do
gem "simplecov", "~> 0.17.0"
end

gemspec path: "../"
80 changes: 0 additions & 80 deletions spec/fixtures/rails42.rb

This file was deleted.

2 changes: 1 addition & 1 deletion spec/fixtures/rails50.rb → spec/fixtures/rails71.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Dummy < Rails::Application
config.eager_load = true
config.filter_parameters += [:password]
config.secret_key_base = '2624599ca9ab3cf3823626240138a128118a87683bf03ab8f155844c33b3cd8cbbfa3ef5e29db6f5bd182f8bd4776209d9577cfb46ac51bfd232b00ab0136b24'
config.session_store :cookie_store, key: '_rails50_session'
config.session_store :cookie_store, key: '_rails70_session'

config.log_tags = [:uuid, 'TEST_TAG']
config.loga = {
Expand Down
6 changes: 5 additions & 1 deletion spec/integration/rails/railtie_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
let(:formatter) { Loga::Formatters::SimpleFormatter }

it 'assign Loga logger to Rails logger' do
expect(Loga.logger).to equal(Rails.logger)
if defined?(ActiveSupport::BroadcastLogger)
expect(Loga.logger).to be_a(Logger)
else
expect(Loga.logger).to equal(Rails.logger)
end
end

it 'configures Loga with a simple formatter' do
Expand Down

0 comments on commit b98a5ee

Please sign in to comment.