Detect top-level const in ExpandPathArguments

Detect `::File.expand_path`, `::Pathname.new` in Style/ExpandPathArguments cop.
rubocop · Jul 6, 2020 · 91820ea · 91820ea
1 parent bc268f8
commit 91820ea
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/lib/rubocop/cop/style/expand_path_arguments.rb b/lib/rubocop/cop/style/expand_path_arguments.rb
@@ -53,7 +53,7 @@ class ExpandPathArguments < Cop
 
         def_node_matcher :file_expand_path, <<~PATTERN
           (send
-            (const nil? :File) :expand_path
+            (const {nil? cbase} :File) :expand_path
             $_
             $_)
         PATTERN
@@ -69,7 +69,7 @@ class ExpandPathArguments < Cop
           (send
             (send
               (send
-                (const nil? :Pathname) :new
+                (const {nil? cbase} :Pathname) :new
                 $_) :parent) :expand_path)
         PATTERN
 

diff --git a/spec/rubocop/cop/style/expand_path_arguments_spec.rb b/spec/rubocop/cop/style/expand_path_arguments_spec.rb
@@ -70,6 +70,18 @@
     RUBY
   end
 
+  it 'registers an offense when using ' \
+     "`::File.expand_path('./../..', __FILE__)`" do
+    expect_offense(<<~RUBY)
+      ::File.expand_path('./../..', __FILE__)
+             ^^^^^^^^^^^ Use `expand_path('..', __dir__)` instead of `expand_path('./../..', __FILE__)`.
+    RUBY
+
+    expect_correction(<<~RUBY)
+      ::File.expand_path('..', __dir__)
+    RUBY
+  end
+
   it 'registers an offense when using ' \
      '`Pathname(__FILE__).parent.expand_path`' do
     expect_offense(<<~RUBY)
@@ -94,14 +106,26 @@
     RUBY
   end
 
+  it 'registers an offense when using ' \
+     '`::Pathname.new(__FILE__).parent.expand_path`' do
+    expect_offense(<<~RUBY)
+      ::Pathname.new(__FILE__).parent.expand_path
+      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use `Pathname.new(__dir__).expand_path` instead of `Pathname.new(__FILE__).parent.expand_path`.
+    RUBY
+
+    expect_correction(<<~RUBY)
+      ::Pathname.new(__dir__).expand_path
+    RUBY
+  end
+
   it 'does not register an offense when using `File.expand_path(__dir__)`' do
     expect_no_offenses(<<~RUBY)
       File.expand_path(__dir__)
     RUBY
   end
 
   it 'does not register an offense when using ' \
-     '`File.expand_path('..', __dir__)`' do
+     "`File.expand_path('..', __dir__)`" do
     expect_no_offenses(<<~RUBY)
       File.expand_path('..', __dir__)
     RUBY