Add Ruby 3.0 support (#16046)
* Fix issues with POSIX::Spawn, Terrapin and Ruby 3.0 Also improve the Terrapin monkey-patch for the stderr/stdout issue. * Fix keyword argument handling throughout the codebase * Monkey-patch Paperclip to fix keyword arguments handling in validators * Change validation_extensions to please CodeClimate * Bump microformats from 4.2.1 to 4.3.1 * Allow Ruby 3.0 * Add Ruby 3.0 test target to CircleCI * Add test for admin dashboard warnings * Fix admin dashboard warnings on Ruby 3.0
This commit is contained in:
parent
0a3fa034fc
commit
566fc90913
19 changed files with 178 additions and 75 deletions
|
@ -3,9 +3,19 @@
|
|||
require 'rails_helper'
|
||||
|
||||
describe Admin::DashboardController, type: :controller do
|
||||
render_views
|
||||
|
||||
describe 'GET #index' do
|
||||
it 'returns 200' do
|
||||
before do
|
||||
allow(Admin::SystemCheck).to receive(:perform).and_return([
|
||||
Admin::SystemCheck::Message.new(:database_schema_check),
|
||||
Admin::SystemCheck::Message.new(:rules_check, nil, admin_rules_path),
|
||||
Admin::SystemCheck::Message.new(:sidekiq_process_check, 'foo, bar'),
|
||||
])
|
||||
sign_in Fabricate(:user, admin: true)
|
||||
end
|
||||
|
||||
it 'returns 200' do
|
||||
get :index
|
||||
|
||||
expect(response).to have_http_status(200)
|
||||
|
|
|
@ -10,12 +10,12 @@ RSpec.describe NotificationMailer, type: :mailer do
|
|||
it 'renders subject localized for the locale of the receiver' do
|
||||
locale = %i(de en).sample
|
||||
receiver.update!(locale: locale)
|
||||
expect(mail.subject).to eq I18n.t(*args, kwrest.merge(locale: locale))
|
||||
expect(mail.subject).to eq I18n.t(*args, **kwrest.merge(locale: locale))
|
||||
end
|
||||
|
||||
it 'renders subject localized for the default locale if the locale of the receiver is unavailable' do
|
||||
receiver.update!(locale: nil)
|
||||
expect(mail.subject).to eq I18n.t(*args, kwrest.merge(locale: I18n.default_locale))
|
||||
expect(mail.subject).to eq I18n.t(*args, **kwrest.merge(locale: I18n.default_locale))
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -9,12 +9,12 @@ describe UserMailer, type: :mailer do
|
|||
it 'renders subject localized for the locale of the receiver' do
|
||||
locale = I18n.available_locales.sample
|
||||
receiver.update!(locale: locale)
|
||||
expect(mail.subject).to eq I18n.t(*args, kwrest.merge(locale: locale))
|
||||
expect(mail.subject).to eq I18n.t(*args, **kwrest.merge(locale: locale))
|
||||
end
|
||||
|
||||
it 'renders subject localized for the default locale if the locale of the receiver is unavailable' do
|
||||
receiver.update!(locale: nil)
|
||||
expect(mail.subject).to eq I18n.t(*args, kwrest.merge(locale: I18n.default_locale))
|
||||
expect(mail.subject).to eq I18n.t(*args, **kwrest.merge(locale: I18n.default_locale))
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -74,13 +74,13 @@ RSpec.describe SessionActivation, type: :model do
|
|||
let(:options) { { user: Fabricate(:user), session_id: '1' } }
|
||||
|
||||
it 'calls create! and purge_old' do
|
||||
expect(described_class).to receive(:create!).with(options)
|
||||
expect(described_class).to receive(:create!).with(**options)
|
||||
expect(described_class).to receive(:purge_old)
|
||||
described_class.activate(options)
|
||||
described_class.activate(**options)
|
||||
end
|
||||
|
||||
it 'returns an instance of SessionActivation' do
|
||||
expect(described_class.activate(options)).to be_kind_of SessionActivation
|
||||
expect(described_class.activate(**options)).to be_kind_of SessionActivation
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ RSpec.describe AccountRelationshipsPresenter do
|
|||
allow(Account).to receive(:domain_blocking_map).with(account_ids, current_account_id).and_return(default_map)
|
||||
end
|
||||
|
||||
let(:presenter) { AccountRelationshipsPresenter.new(account_ids, current_account_id, options) }
|
||||
let(:presenter) { AccountRelationshipsPresenter.new(account_ids, current_account_id, **options) }
|
||||
let(:current_account_id) { Fabricate(:account).id }
|
||||
let(:account_ids) { [Fabricate(:account).id] }
|
||||
let(:default_map) { { 1 => true } }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue