techhub/mastodon
2
0
Fork 0
Code Activity

Fix Rails/RootPathnameMethods cop (#31582)

Browse Source
This commit is contained in:
Matt Jankowski
2024-08-26 03:35:07 -04:00
committed by GitHub
parent 5bcfe8d421
commit bcc4b1078c
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/seeds.rb
View File

@@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
Chewy.strategy(:mastodon) do Chewy.strategy(:mastodon) do
Dir[Rails.root.join('db', 'seeds', '*.rb')].each do |seed| Rails.root.glob('db/seeds/*.rb').each do |seed|
load seed load seed
end end
end end

2
lib/tasks/branding.rake
View File

@@ -15,7 +15,7 @@ namespace :branding do
output_dest = Rails.root.join('app', 'javascript', 'images', 'mailer') output_dest = Rails.root.join('app', 'javascript', 'images', 'mailer')
# Displayed size is 64px, at 3x it's 192px # Displayed size is 64px, at 3x it's 192px
Dir[Rails.root.join('app', 'javascript', 'images', 'icons', '*.svg')].each do |path| Rails.root.glob('app/javascript/images/icons/*.svg').each do |path|
rsvg_convert.run(input: path, size: 192, output: output_dest.join("#{File.basename(path, '.svg')}.png")) rsvg_convert.run(input: path, size: 192, output: output_dest.join("#{File.basename(path, '.svg')}.png"))
end end

2
lib/tasks/icons.rake
View File

@@ -20,7 +20,7 @@ end
def find_used_icons def find_used_icons
icons_by_weight_and_size = {} icons_by_weight_and_size = {}
Dir[Rails.root.join('app', 'javascript', '**', '*.*s*')].map do |path| Rails.root.glob('app/javascript/**/*.*s*').map do |path|
File.open(path, 'r') do |file| File.open(path, 'r') do |file|
pattern = %r{\Aimport .* from '@/material-icons/(?<weight>[0-9]+)-(?<size>[0-9]+)px/(?<icon>[^-]*)(?<fill>-fill)?.svg\?react';} pattern = %r{\Aimport .* from '@/material-icons/(?<weight>[0-9]+)-(?<size>[0-9]+)px/(?<icon>[^-]*)(?<fill>-fill)?.svg\?react';}
file.each_line do |line| file.each_line do |line|

2
lib/tasks/repo.rake
View File

@@ -98,7 +98,7 @@ namespace :repo do
missing_yaml_files = I18n.available_locales.reject { |locale| Rails.root.join('config', 'locales', "#{locale}.yml").exist? } missing_yaml_files = I18n.available_locales.reject { |locale| Rails.root.join('config', 'locales', "#{locale}.yml").exist? }
missing_json_files = I18n.available_locales.reject { |locale| Rails.root.join('app', 'javascript', 'mastodon', 'locales', "#{locale}.json").exist? } missing_json_files = I18n.available_locales.reject { |locale| Rails.root.join('app', 'javascript', 'mastodon', 'locales', "#{locale}.json").exist? }
locales_in_files = Dir[Rails.root.join('config', 'locales', '*.yml')].map do |path| locales_in_files = Rails.root.glob('config/locales/*.yml').map do |path|
file_name = File.basename(path, '.yml') file_name = File.basename(path, '.yml')
file_name.gsub(/\A(doorkeeper|devise|activerecord|simple_form)\./, '').to_sym file_name.gsub(/\A(doorkeeper|devise|activerecord|simple_form)\./, '').to_sym
end.uniq.compact end.uniq.compact

2
spec/rails_helper.rb
View File

@@ -44,7 +44,7 @@ require 'chewy/rspec'
require 'email_spec/rspec' require 'email_spec/rspec'
require 'test_prof/recipes/rspec/before_all' require 'test_prof/recipes/rspec/before_all'
Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f } Rails.root.glob('spec/support/**/*.rb').each { |f| require f }
ActiveRecord::Migration.maintain_test_schema! ActiveRecord::Migration.maintain_test_schema!
WebMock.disable_net_connect!( WebMock.disable_net_connect!(

2
spec/spec_helper.rb
View File

@@ -28,7 +28,7 @@ RSpec.configure do |config|
end end
config.after :suite do config.after :suite do
FileUtils.rm_rf(Dir[Rails.root.join('spec', 'test_files')]) FileUtils.rm_rf(Rails.root.glob('spec/test_files'))
end end
# Use the GitHub Annotations formatter for CI # Use the GitHub Annotations formatter for CI