Skip to content

Prefer __dir__ over File.dirname(__FILE__) #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hsbt merged 1 commit into from
Sep 15, 2021
Merged

Prefer __dir__ over File.dirname(__FILE__) #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions test/assets/mof.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ----

Expand Down
2 changes: 1 addition & 1 deletion test/case.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions test/regress/mof
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/test_chk_y.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/test_grammar_file_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/test_racc_command.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/test_scan_y.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down