Merge pull request #1546 from viralpraxis/change-rails-duplicate-scope-cop-description

Change `Rails/DuplicateScope` cop description

Author: koic

config/default.yml

@@ -408,7 +408,7 @@ Rails/DuplicateAssociation:
   VersionChanged: '2.18'
 
 Rails/DuplicateScope:
-  Description: 'Multiple scopes share this same where clause.'
+  Description: 'Multiple scopes share this same expression.'
   Enabled: pending
   Severity: warning
   VersionAdded: '2.14'

lib/rubocop/cop/rails/duplicate_scope.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Rails
-      # Checks for multiple scopes in a model that have the same `where` clause. This
+      # Checks for multiple scopes in a model that have the same expression. This
       # often means you copy/pasted a scope, updated the name, and forgot to change the condition.
       #
       # @example
@@ -19,7 +19,7 @@ module Rails
       class DuplicateScope < Base
         include ClassSendNodeHelper
 
-        MSG = 'Multiple scopes share this same where clause.'
+        MSG = 'Multiple scopes share this same expression.'
 
         def_node_matcher :scope, <<~PATTERN
           (send nil? :scope _ $...)

spec/rubocop/cop/rails/duplicate_scope_spec.rb

@@ -1,19 +1,32 @@
 # frozen_string_literal: true
 
 RSpec.describe RuboCop::Cop::Rails::DuplicateScope, :config do
-  it 'registers an offense when a duplicate scope is detected' do
+  it 'registers an offense when a duplicate scope with the same `where` clauses is detected' do
     expect_offense(<<~RUBY)
       class Post < ApplicationRecord
         scope :visible, -> { where(visible: true) }
-        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Multiple scopes share this same where clause.
+        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Multiple scopes share this same expression.
         scope :hidden, -> { where(visible: true) }
-        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Multiple scopes share this same where clause.
+        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Multiple scopes share this same expression.
         scope :new, -> { where(created_at: 1.week.ago..Date.current) }
         scope :popular, -> { where(comments_count: 1000..Float::INFINITY) }
       end
     RUBY
   end
 
+  it 'registers an offense when a duplicate scope with the same expression is detected' do
+    expect_offense(<<~RUBY)
+      class Post < ApplicationRecord
+        scope :with_visibility, ->(value) { where(visible: value) }
+
+        scope :visible, -> { with_visibility(true) }
+        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Multiple scopes share this same expression.
+        scope :hidden, -> { with_visibility(true) }
+        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Multiple scopes share this same expression.
+      end
+    RUBY
+  end
+
   it 'does not register an offense when there are no duplicates' do
     expect_no_offenses(<<~RUBY)
       class Post < ApplicationRecord