diff --git a/Gemfile.lock b/Gemfile.lock index c2eda96b..bcdb6e12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -239,10 +239,6 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) - rubocop-capybara (2.21.0) - rubocop (~> 1.41) - rubocop-factory_bot (2.26.0) - rubocop (~> 1.41) rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) @@ -251,13 +247,8 @@ GEM rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rspec (2.31.0) - rubocop (~> 1.40) - rubocop-capybara (~> 2.17) - rubocop-factory_bot (~> 2.22) - rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.29.0) - rubocop (~> 1.40) + rubocop-rspec (3.0.3) + rubocop (~> 1.61) ruby-progressbar (1.13.0) rubyzip (2.3.2) sass-rails (6.0.0) diff --git a/config/application.rb b/config/application.rb index d1407928..e0e77836 100644 --- a/config/application.rb +++ b/config/application.rb @@ -22,12 +22,12 @@ class Application < Rails::Application config.load_defaults 7.0 - config.mailer = YAML.load_file("#{Rails.root}/config/mailer.yml")[Rails.env] + config.mailer = YAML.load_file(Rails.root.join('config/mailer.yml').to_s)[Rails.env] config.autoload_paths += %W[#{config.root}/lib/utils] config.disable_animations = false - config.autoload_paths += %W[#{Rails.root}/app/presenters] - config.eager_load_paths += %W[#{Rails.root}/app/presenters] + config.autoload_paths += %W[#{Rails.root.join('app/presenters')}] + config.eager_load_paths += %W[#{Rails.root.join('app/presenters')}] # Enabling the behaviour where 'belongs_to' associations are required by default. # (https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#active-record-belongs-to-required-by-default-option)