rubocop-discourse 3.7.0 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d347009b4a77b64450a20ef3afc5ca102dd361c60e3fbde2e5fd0ea976469cd
-  data.tar.gz: c98b24bd73f783f154320e337e44f6859e050c43ff9219cfa0be6f63a891fc13
+  metadata.gz: e5b75497583add89cff544cd40ac534768c6694e53ff350469e6a4a83bf5e285
+  data.tar.gz: 840195a9bbe85b1fc5d83c3d87af5b137418fe037e1890997de40bb3a1b61692
 SHA512:
-  metadata.gz: 98c56b4b42703f8fc1fe0b3f68344507e2001d7a71d5530c89b8f21a29b5276fc518542b445e9dd9a902cb30be38ce0d4df18218b2cf08bfb50465411d7c7d77
-  data.tar.gz: f7f5f50325374fe530a26c20ed113b4cb827ed7541a8a9f6dbae1a81c0dca29be2cc7073c8f543b5200dab2e2238617984a7f4dbd87d838ff8a1d4cfa8da0db6
+  metadata.gz: f082de2cc3cad1becdb56cceb6576d653337a93d3912012be3fbb2fe9b18dcfde6c8182051b3a71389f9c943f36122817e7f52bc5c409357c98d0d077796d4b5
+  data.tar.gz: c3eaf22eb291495aae7ee022585892e451361b30e59b59c176d37ffee91fa53e3c57d650189a543e591166a4759ff5c90c531e4a4779f3a1e765474576d8b82b

data/lib/rubocop/cop/discourse/fabricator_shorthand.rb

@@ -26,9 +26,12 @@ module RuboCop
       # # good
       # fab!(:another_user) { Fabricate(:user) }
       class FabricatorShorthand < Base
+        extend AutoCorrector
+        include IgnoredNode
+
         def_node_matcher :offending_fabricator?, <<-MATCHER
           (block
-            (send nil? :fab!
+            $(send nil? :fab!
               (sym $_identifier))
             (args)
             (send nil? :Fabricate
@@ -36,15 +39,22 @@ module RuboCop
         MATCHER
 
         def on_block(node)
-          offending_fabricator?(node) do |identifier|
-            add_offense(node, message: message(identifier))
+          offending_fabricator?(node) do |expression, _identifier|
+            add_offense(
+              node,
+              message: message(expression.source)
+            ) do |corrector|
+              next if part_of_ignored_node?(node)
+              corrector.replace(node, expression.source)
+            end
+            ignore_node(node)
           end
         end
 
         private
 
-        def message(identifier)
-          "Use the fabricator shorthand: `fab!(:#{identifier})`"
+        def message(expression)
+          "Use the fabricator shorthand: `#{expression}`"
         end
       end
     end

data/rubocop-discourse.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rubocop-discourse"
-  s.version = "3.7.0"
+  s.version = "3.8.0"
   s.summary = "Custom rubocop cops used by Discourse"
   s.authors = ["Discourse Team"]
   s.license = "MIT"
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "rubocop-rspec", ">= 2.25.0"
   s.add_runtime_dependency "rubocop-factory_bot", ">= 2.0.0"
   s.add_runtime_dependency "rubocop-capybara", ">= 2.0.0"
+  s.add_runtime_dependency "rubocop-rails", ">= 2.25.0"
 
   s.add_development_dependency "rake", "~> 13.1.0"
   s.add_development_dependency "rspec", "~> 3.12.0"

data/rubocop-rails.yml

@@ -0,0 +1,11 @@
+require:
+  - rubocop-rails
+
+Rails:
+  Enabled: false
+
+Rails/EnumHash:
+  Enabled: true
+
+Rails/EnumUniqueness:
+  Enabled: true

data/rubocop-rspec.yml

@@ -226,5 +226,5 @@ RSpec/Yield:
 RSpec/Capybara/FeatureMethods:
   Enabled: true
 
-RSpec/Rails/HttpStatus:
+RSpecRails/HttpStatus:
   Enabled: true

data/spec/lib/rubocop/cop/fabricator_shorthand_spec.rb

@@ -31,4 +31,19 @@ describe RuboCop::Cop::Discourse::FabricatorShorthand, :config do
       end
     RUBY
   end
+
+  it "supports autocorrect" do
+    expect_offense(<<~RUBY)
+      RSpec.describe "Foo" do
+        fab!(:foo) { Fabricate(:foo) }
+        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Discourse/FabricatorShorthand: Use the fabricator shorthand: `fab!(:foo)`
+      end
+    RUBY
+
+    expect_correction(<<~RUBY)
+      RSpec.describe "Foo" do
+        fab!(:foo)
+      end
+    RUBY
+  end
 end

data/stree-compat.yml

@@ -6,6 +6,7 @@ inherit_from:
   - ./rubocop-capybara.yml
   - ./rubocop-factory_bot.yml
   - ./rubocop-rspec.yml
+  - ./rubocop-rails.yml
 
 AllCops:
   TargetRubyVersion: 3.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-discourse
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.8.0
 platform: ruby
 authors:
 - Discourse Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-28 00:00:00.000000000 Z
+date: 2024-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.25.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.25.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +165,7 @@ files:
 - rubocop-discourse.gemspec
 - rubocop-factory_bot.yml
 - rubocop-layout.yml
+- rubocop-rails.yml
 - rubocop-rspec.yml
 - spec/fixtures/controllers/bad_controller.rb
 - spec/fixtures/controllers/base_controller.rb