rubocop-discourse 3.14.0 → 3.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e722863ce072ee0a4d928e09b36a1e12e3b653618fdc0fe70a2f417d466e0ffa
-  data.tar.gz: bd4a868a26bd7df10e3196c9d9c419f1b4268051d6302b335994eb539ae6e61e
+  metadata.gz: f4d1f21065c28440ac92a435fe615ba1aa71be866decb87a34569b5035b6ab28
+  data.tar.gz: 40738677dd38eb78850b649f223c5e70f86a487821d28ba66ab8e25fb7fe155c
 SHA512:
-  metadata.gz: 0e266174ecceb19102b630bdb01419b0b22580fcadaf5cc5f69a3ba7c7c91a6274ff391a7cf43769c71cb035699e1867d96b0c72ba28cd0706335a5821ce3fe4
-  data.tar.gz: 3e5d42d6aa34bf2eb23daaf91eef254623cd83fe812525c2bda429cd96e9f3ec0b0d0b19129d3faa5e64e749decf0164f012d99755787559d2e715ec3e16441c
+  metadata.gz: 161fab4a916b845fe201a36a7b5cdc6d329a25f4069bdaab7a62a9c0dcd9ed36e0ef3984698de67edf1aac6043351b2201a43550470fff3c86b3e531e132ab0e
+  data.tar.gz: 4a474ac36e50368a4a62fc6e1dba557f2294c9f498a53b28b589eed150a7abc2917a60ba71943d5821c32148876a309f3e4b3ca6eeee1dab9b40fa44d18c45f8

data/config/default.yml

@@ -56,6 +56,11 @@ Discourse/NoMixingMultisiteAndStandardSpecs:
   Include:
     - "**/spec/**/*"
 
+Discourse/NoSystemSpecMetadata:
+  Enabled: true
+  Include:
+    - "**/spec/**/*"
+
 Discourse/Plugins/CallRequiresPlugin:
   Enabled: true
   Include:

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

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Discourse
+      # System spec metadata is inferred from the file path, so explicit
+      # `type: :system` and `system: true` metadata on `RSpec.describe` is redundant.
+      #
+      # @example
+      #   # bad
+      #   RSpec.describe "login", system: true do
+      #   end
+      #
+      #   # good
+      #   RSpec.describe "login" do
+      #   end
+      class NoSystemSpecMetadata < Base
+        extend AutoCorrector
+
+        MSG = "Remove redundant `type: :system` and `system: true` metadata from `RSpec.describe`."
+        RESTRICT_ON_SEND = %i[describe].freeze
+
+        def_node_matcher :describe?, <<~PATTERN
+          (send
+            {nil? (const nil? :RSpec)}
+            :describe
+            ...
+          )
+        PATTERN
+
+        def_node_matcher :system_type_pair?, <<~PATTERN
+          (pair (sym :type) (sym :system))
+        PATTERN
+
+        def_node_matcher :system_true_pair?, <<~PATTERN
+          (pair (sym :system) true)
+        PATTERN
+
+        def on_send(node)
+          return unless describe?(node)
+          return unless node.last_argument&.hash_type?
+
+          hash = node.last_argument
+          offending_pairs =
+            hash.pairs.select { |pair| system_type_pair?(pair) || system_true_pair?(pair) }
+
+          return if offending_pairs.empty?
+
+          add_offense(offending_pairs.first) do |corrector|
+            corrector.replace(node, corrected_send_source(node, hash, offending_pairs))
+          end
+        end
+
+        private
+
+        def corrected_send_source(node, hash, offending_pairs)
+          remaining_pairs = hash.pairs - offending_pairs
+          before_hash = source_for(node.source_range.begin_pos, hash.source_range.begin_pos)
+          after_hash = source_for(hash.source_range.end_pos, node.source_range.end_pos)
+
+          return "#{before_hash.sub(/,\s*\z/m, "")}#{after_hash}" if remaining_pairs.empty?
+
+          "#{before_hash}#{corrected_hash_source(hash, remaining_pairs)}#{after_hash}"
+        end
+
+        def corrected_hash_source(hash, remaining_pairs)
+          body =
+            remaining_pairs
+              .each_with_index
+              .map do |pair, index|
+                separator = index.zero? ? "" : pair_separator(hash, pair)
+                "#{separator}#{pair.source}"
+              end
+              .join
+
+          return body unless hash.braces?
+
+          return "{ #{body} }" unless hash.multiline?
+
+          indentation = " " * remaining_pairs.first.loc.expression.column
+          closing_indentation = " " * hash.loc.end.column
+
+          "{\n#{indentation}#{body}\n#{closing_indentation}}"
+        end
+
+        def pair_separator(hash, pair)
+          return ", " unless hash.multiline?
+
+          ",\n#{" " * pair.loc.expression.column}"
+        end
+
+        def source_for(begin_pos, end_pos)
+          processed_source.buffer.source[begin_pos...end_pos]
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/discourse/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Discourse
-    VERSION = "3.14.0"
+    VERSION = "3.16.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-discourse
 version: !ruby/object:Gem::Version
-  version: 3.14.0
+  version: 3.16.0
 platform: ruby
 authors:
 - Discourse Team
@@ -167,6 +167,7 @@ files:
 - lib/rubocop/cop/discourse/no_mocking_jobs.rb
 - lib/rubocop/cop/discourse/no_nokogiri_html_fragment.rb
 - lib/rubocop/cop/discourse/no_reset_column_information_in_migrations.rb
+- lib/rubocop/cop/discourse/no_system_spec_metadata.rb
 - lib/rubocop/cop/discourse/no_time_new_without_args.rb
 - lib/rubocop/cop/discourse/no_uri_escape_encode.rb
 - lib/rubocop/cop/discourse/only_top_level_multisite_specs.rb