Merge pull request #4248 from DavidKang/feature/rubocop/style_cop

Rubocop is your friend part 8
openSUSE · Dec 20, 2017 · 10800d8 · 10800d8
2 parents 2f66b8a + 1bd3cf0
commit 10800d8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -382,12 +382,6 @@ Style/DateTime:
     - 'src/api/spec/features/webui/requests_spec.rb'
     - 'src/api/test/functional/maintenance_test.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/Dir:
-  Exclude:
-    - 'src/api/script/start_test_backend'
-
 # Offense count: 631
 Style/Documentation:
   Enabled: false

diff --git a/src/api/script/start_test_backend b/src/api/script/start_test_backend
@@ -21,7 +21,7 @@ end
 backendtempdir = ENV['OBS_BACKEND_TEMP'] || "#{Rails.root}/tmp"
 backend_config = "#{backendtempdir}/config#{backend_dir_suffix}"
 backend_data   = "#{backendtempdir}/data#{backend_dir_suffix}"
-require File.expand_path(File.dirname(__FILE__)) + '/../test/test_helper'
+require __dir__ + '/../test/test_helper'
 
 Backend::Test.do_not_start_test_backend