1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-01 00:08:39 +09:00

Fix Rails/I18nLocaleTexts cop (#27779)

This commit is contained in:
Matt Jankowski 2023-11-09 04:46:39 -05:00 committed by GitHub
parent c875dfc90b
commit c9204b792c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 11 deletions

View File

@ -149,11 +149,6 @@ Rails/HasManyOrHasOneDependent:
- 'app/models/user.rb' - 'app/models/user.rb'
- 'app/models/web/push_subscription.rb' - 'app/models/web/push_subscription.rb'
Rails/I18nLocaleTexts:
Exclude:
- 'lib/tasks/mastodon.rake'
- 'spec/helpers/flashes_helper_spec.rb'
# Configuration parameters: Include. # Configuration parameters: Include.
# Include: app/controllers/**/*.rb, app/mailers/**/*.rb # Include: app/controllers/**/*.rb, app/mailers/**/*.rb
Rails/LexicallyScopedActionFilter: Rails/LexicallyScopedActionFilter:

View File

@ -427,7 +427,11 @@ namespace :mastodon do
from: env['SMTP_FROM_ADDRESS'], from: env['SMTP_FROM_ADDRESS'],
} }
mail = ActionMailer::Base.new.mail to: send_to, subject: 'Test', body: 'Mastodon SMTP configuration works!' mail = ActionMailer::Base.new.mail(
to: send_to,
subject: 'Test', # rubocop:disable Rails/I18nLocaleTexts
body: 'Mastodon SMTP configuration works!'
)
mail.deliver mail.deliver
break break
rescue => e rescue => e

View File

@ -4,16 +4,23 @@ require 'rails_helper'
describe FlashesHelper do describe FlashesHelper do
describe 'user_facing_flashes' do describe 'user_facing_flashes' do
it 'returns user facing flashes' do before do
# rubocop:disable Rails/I18nLocaleTexts
flash[:alert] = 'an alert' flash[:alert] = 'an alert'
flash[:error] = 'an error' flash[:error] = 'an error'
flash[:notice] = 'a notice' flash[:notice] = 'a notice'
flash[:success] = 'a success' flash[:success] = 'a success'
flash[:not_user_facing] = 'a not user facing flash' flash[:not_user_facing] = 'a not user facing flash'
expect(helper.user_facing_flashes).to eq 'alert' => 'an alert', # rubocop:enable Rails/I18nLocaleTexts
end
it 'returns user facing flashes' do
expect(helper.user_facing_flashes).to eq(
'alert' => 'an alert',
'error' => 'an error', 'error' => 'an error',
'notice' => 'a notice', 'notice' => 'a notice',
'success' => 'a success' 'success' => 'a success'
)
end end
end end
end end