Cleaning up following a rubocop upgrade

This commit is contained in:
echarp 2018-03-17 15:43:39 +01:00
parent 6724cccf0e
commit 034e313eb9
7 changed files with 6 additions and 7 deletions

View File

@ -2,6 +2,6 @@
# for example lib/tasks/capistrano.rake, and they will automatically be
# available to Rake.
require File.expand_path('../config/application', __FILE__)
require File.expand_path('config/application', __dir__)
AgendaDuLibreRails::Application.load_tasks

View File

@ -1,3 +1,3 @@
#!/usr/bin/env ruby
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
load Gem.bin_path('bundler', 'bundle')

View File

@ -3,7 +3,7 @@ require 'pathname'
require 'fileutils'
# path to your application root.
APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
APP_ROOT = Pathname.new File.expand_path('../', __dir__)
def system!(*args)
system(*args) || abort("\n== Command #{args} failed ==")

View File

@ -3,7 +3,7 @@ require 'pathname'
require 'fileutils'
# path to your application root.
APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
APP_ROOT = Pathname.new File.expand_path('./', __dir__)
def system!(*args)
system(*args) || abort("\n== Command #{args} failed ==")

View File

@ -1,4 +1,4 @@
require File.expand_path('../boot', __FILE__)
require File.expand_path('boot', __dir__)
require 'rails/all'
require 'action_view/encoded_mail_to/mail_to_with_encoding'

View File

@ -411,4 +411,3 @@ Ces recommandations de modération sont à discuter et à améliorer au fur et
]
)
# rubocop:enable Metrics/LineLength
# rubocop:enable Layout/EmptyLinesAroundArguments

View File

@ -1,5 +1,5 @@
ENV['RAILS_ENV'] ||= 'test'
require File.expand_path('../../config/environment', __FILE__)
require File.expand_path('../config/environment', __dir__)
require 'rails/test_help'
# require 'simplecov'