Use expand_path with __dir__ instead of __FILE__

sferik · Jun 11, 2018 · fdea594 · fdea594
1 parent 38f6aaa
commit fdea594
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -51,5 +51,8 @@ Style/FrozenStringLiteralComment:
 Style/NumericPredicate:
   Enabled: false
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: 'comma'
+
+Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: 'comma'
diff --git a/spec/helper.rb b/spec/helper.rb
@@ -59,7 +59,7 @@ def stub_put(path)
 end
 
 def fixture_path
-  File.expand_path('../fixtures', __FILE__)
+  File.expand_path('fixtures', __dir__)
 end
 
 def fixture(file)

diff --git a/twitter.gemspec b/twitter.gemspec
@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'twitter/version'