Merge pull request #169 from olleolleolle/dir-everywhere

Prefer __dir__ over File.dirname(__FILE__)
ruby · Sep 15, 2021 · d697d0f · d697d0f
2 parents c5f516b + c49df40
commit d697d0f
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/test/assets/mof.y b/test/assets/mof.y
@@ -563,9 +563,9 @@ end # class Parser
 require 'strscan'
 require 'rubygems'
 require 'cim'
-require File.join(File.dirname(__FILE__), 'result')
-require File.join(File.dirname(__FILE__), 'scanner')
-require File.join(File.dirname(__FILE__), 'case')
+require File.join(__dir__, 'result')
+require File.join(__dir__, 'scanner')
+require File.join(__dir__, 'case')
 
 ---- inner ----
 

diff --git a/test/case.rb b/test/case.rb
@@ -10,7 +10,7 @@
 
 module Racc
   class TestCase < Test::Unit::TestCase
-    PROJECT_DIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+    PROJECT_DIR = File.expand_path(File.join(__dir__, '..'))
 
     test_dir = File.join(PROJECT_DIR, 'test')
     test_dir = File.join(PROJECT_DIR, 'racc') unless File.exist?(test_dir)

diff --git a/test/regress/mof b/test/regress/mof
@@ -12,9 +12,9 @@ require 'racc/parser.rb'
 require 'strscan'
 require 'rubygems'
 require 'cim'
-require File.join(File.dirname(__FILE__), 'result')
-require File.join(File.dirname(__FILE__), 'scanner')
-require File.join(File.dirname(__FILE__), 'case')
+require File.join(__dir__, 'result')
+require File.join(__dir__, 'scanner')
+require File.join(__dir__, 'case')
 
 module MOF
   class Parser < Racc::Parser

diff --git a/test/test_chk_y.rb b/test/test_chk_y.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'case'))
+require File.expand_path(File.join(__dir__, 'case'))
 
 module Racc
   class TestChkY < TestCase

diff --git a/test/test_grammar_file_parser.rb b/test/test_grammar_file_parser.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'case'))
+require File.expand_path(File.join(__dir__, 'case'))
 
 module Racc
   class TestGrammarFileParser < TestCase

diff --git a/test/test_racc_command.rb b/test/test_racc_command.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'case'))
+require File.expand_path(File.join(__dir__, 'case'))
 
 module Racc
   class TestRaccCommand < TestCase

diff --git a/test/test_scan_y.rb b/test/test_scan_y.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'case'))
+require File.expand_path(File.join(__dir__, 'case'))
 
 module Racc
   class TestScanY < TestCase