decidim-dev 0.31.3 → 0.32.0.rc1

data/decidim-dev.gemspec

@@ -2,12 +2,9 @@
 
 $LOAD_PATH.push File.expand_path("lib", __dir__)
 
-# Maintain your gem's version:
-require "decidim/dev/version"
-
-# Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
-  s.version = Decidim::Dev.version
+  version = "0.32.0.rc1"
+  s.version = version
   s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
   s.license = "AGPL-3.0-or-later"
@@ -19,7 +16,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.3.0"
+  s.required_ruby_version = "~> 3.4.0"
 
   s.name = "decidim-dev"
   s.summary = "Decidim dev tools"
@@ -33,42 +30,43 @@ Gem::Specification.new do |s|
   end
 
   s.add_dependency "capybara", "~> 3.39"
-  s.add_dependency "decidim-admin", Decidim::Dev.version
-  s.add_dependency "decidim-api", Decidim::Dev.version
-  s.add_dependency "decidim-comments", Decidim::Dev.version
-  s.add_dependency "decidim-core", Decidim::Dev.version
-  s.add_dependency "decidim-generators", Decidim::Dev.version
-  s.add_dependency "decidim-verifications", Decidim::Dev.version
+  s.add_dependency "decidim-admin", version
+  s.add_dependency "decidim-api", version
+  s.add_dependency "decidim-comments", version
+  s.add_dependency "decidim-core", version
+  s.add_dependency "decidim-generators", version
+  s.add_dependency "decidim-verifications", version
   s.add_dependency "factory_bot_rails", "~> 6.2"
   s.add_dependency "faker", "~> 3.2"
 
-  s.add_dependency "bullet", "~> 8.0.0"
-  s.add_dependency "byebug", "~> 11.0"
-  s.add_dependency "erb_lint", "~> 0.8.0"
+  s.add_dependency "bullet", "~> 8.1.0"
+  s.add_dependency "byebug", ">= 11", "< 14"
+  s.add_dependency "erb_lint", ">= 0.8", "< 0.10"
   s.add_dependency "i18n-tasks", "~> 1.0"
   s.add_dependency "nokogiri", "~> 1.16", ">= 1.16.2"
-  s.add_dependency "parallel_tests", "~> 4.2"
-  s.add_dependency "puma", "~> 6.5"
+  s.add_dependency "parallel_tests", ">= 4.2", "< 6.0"
+  s.add_dependency "puma", ">= 6.5", "< 8.0"
   s.add_dependency "rails-controller-testing", "~> 1.0"
   s.add_dependency "rspec", "~> 3.12"
   s.add_dependency "rspec-cells", "~> 0.3.7"
   s.add_dependency "rspec-html-matchers", "~> 0.10"
   s.add_dependency "rspec_junit_formatter", "~> 0.6.0"
-  s.add_dependency "rspec-rails", "~> 6.0"
+  s.add_dependency "rspec-rails", ">= 6", "< 9"
   s.add_dependency "rspec-retry", "~> 0.6.2"
-  s.add_dependency "rubocop", "~> 1.78.0"
+  s.add_dependency "rubocop", ">= 1.78", "< 1.87"
   s.add_dependency "rubocop-capybara", "~> 2.22.0", ">= 2.22.1"
-  s.add_dependency "rubocop-factory_bot", "~> 2.27.0"
+  s.add_dependency "rubocop-factory_bot", ">= 2.27", "< 2.29"
   s.add_dependency "rubocop-faker", "~> 1.3", ">= 1.3.0"
   s.add_dependency "rubocop-graphql", "~> 1.5", ">= 1.5.6"
   s.add_dependency "rubocop-performance", "~> 1.25", ">= 1.25.0"
-  s.add_dependency "rubocop-rails", "~> 2.32.0", ">= 2.32.0"
+  s.add_dependency "rubocop-rails", ">= 2.32", "< 2.35"
   s.add_dependency "rubocop-rspec", "~> 3.0", ">= 3.6.0"
-  s.add_dependency "rubocop-rspec_rails", "~> 2.31.0"
+  s.add_dependency "rubocop-rspec_rails", ">= 2.31", "< 2.33"
   s.add_dependency "rubocop-rubycw", "~> 0.2.0"
+  s.add_dependency "rubocop-yard", ">= 1.0", "< 1.2"
   s.add_dependency "selenium-webdriver", "~> 4.9"
   s.add_dependency "simplecov", "~> 0.22.0"
-  s.add_dependency "simplecov-cobertura", "~> 2.1.0"
+  s.add_dependency "simplecov-cobertura", "~> 3.1.0"
   s.add_dependency "spring", "~> 4.0"
   s.add_dependency "spring-watcher-listen", "~> 2.0"
   s.add_dependency "w3c_rspec_validators", "~> 0.3.0"

data/lib/decidim/dev/assets/assemblies.json

@@ -47,6 +47,7 @@
       "es": "Incidunt provident doloremque."
     },
     "decidim_scope_id": null,
+    "access_mode": "open",
     "paticipatory_scope": {
       "ca": "Assumenda.",
       "en": "Quidem.",
@@ -58,7 +59,6 @@
       "es": "Et molestiae."
     },
     "scopes_enabled": true,
-    "private_space": false,
     "reference": "PhD-ASSE-2020-01-1",
     "purpose_of_action": {
       "ca": "<p>Velit a qui. Debitis rem occaecati. Id minus est.</p>",
@@ -90,7 +90,6 @@
       "en": "<p>Optio ducimus velit. Facilis omnis asperiores. Corporis ipsa non.</p>",
       "es": "<p>Est dolorum et. Quo sed ut. Corporis quos sit.</p>"
     },
-    "is_transparent": true,
     "special_features": {
       "ca": "<p>Dolor et reprehenderit. Unde soluta eum. Omnis occaecati omnis.</p>",
       "en": "<p>Et atque perspiciatis. Quas impedit corporis. Nesciunt blanditiis ipsa.</p>",
@@ -106,7 +105,6 @@
       "en": "ut",
       "es": "rerum"
     },
-    "decidim_assemblies_type_id": 1,
     "area": {
       "id": null,
       "name": {
@@ -514,7 +512,6 @@
           "geocoding_enabled": false,
           "attachments_allowed": false,
           "resources_permissions_enabled": true,
-          "collaborative_drafts_enabled": true,
           "participatory_texts_enabled": false,
           "amendments_enabled": false,
           "amendments_wizard_help_text": {
@@ -578,23 +575,6 @@
         "permissions": null,
         "published_at": "2020-01-22 07:55:05 UTC"
       },
-      {
-        "manifest_name": "sortitions",
-        "id": 26,
-        "name": {
-          "ca": "Sortejos",
-          "en": "Sortitions",
-          "es": "Sorteos"
-        },
-        "participatory_space_id": 1,
-        "participatory_space_type": "Decidim::Assembly",
-        "settings": {
-          "comments_enabled": true
-        },
-        "weight": 0,
-        "permissions": null,
-        "published_at": "2020-01-22 07:55:19 UTC"
-      },
       {
         "manifest_name": "surveys",
         "id": 23,

data/lib/decidim/dev/assets/assemblies_with_null.json

@@ -58,7 +58,7 @@
       "es": "Et molestiae."
     },
     "scopes_enabled": true,
-    "private_space": false,
+    "access_mode": "open",
     "reference": "PhD-ASSE-2020-01-1",
     "purpose_of_action": {
       "ca": "<p>Velit a qui. Debitis rem occaecati. Id minus est.</p>",
@@ -106,7 +106,6 @@
       "en": "ut",
       "es": "rerum"
     },
-    "decidim_assemblies_type_id": 1,
     "area": {
       "id": null,
       "name": {

data/lib/decidim/dev/assets/participatory_processes.json

@@ -87,7 +87,7 @@
         "es": "South Carolina"
       }
     },
-    "private_space": false,
+    "access_mode": "open",
     "promoted": true,
     "scopes_enabled": true,
     "participatory_process_steps": [
@@ -105,9 +105,6 @@
         },
         "start_date": "2019-09-02",
         "end_date": "2019-12-02",
-        "cta_path": null,
-        "cta_text": {
-        },
         "active": true,
         "position": 0
       }

data/lib/decidim/dev/assets/participatory_processes_with_null.json

@@ -87,7 +87,7 @@
         "es": "South Carolina"
       }
     },
-    "private_space": false,
+    "access_mode": "open",
     "promoted": true,
     "scopes_enabled": true,
     "participatory_process_steps": null,

data/lib/decidim/dev/dummy_translator.rb

@@ -20,7 +20,7 @@ module Decidim
       def translate
         translated_text = "#{target_locale} - #{text}"
 
-        MachineTranslationSaveJob.perform_later(
+        Decidim::MachineTranslationSaveJob.perform_later(
           resource,
           field_name,
           target_locale,

data/lib/decidim/dev/rubocop/cop/decidim/message_antipattern.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require "rubocop"
+
+module RuboCop
+  module Cop
+    module Decidim
+      class MessageAntipattern < RuboCop::Cop::Base
+        SINGLE_WORD_ANTI_PATTERNS = %w(
+          successfully
+          problem
+          error
+          warning
+          done
+          complete
+          finished
+          ok
+          okay
+          saved
+          updated
+          created
+          deleted
+          removed
+          published
+          unpublished
+        ).freeze
+
+        MSG = "Anti-pattern detected: avoid generic single-word text in have_callout/have_admin_callout/have_content. " \
+              "Use the full admin flash message, e.g. 'Meeting successfully published'. " \
+              "Exception: when used inside `within` blocks (e.g., for checking `.label` elements)."
+
+        def on_send(node)
+          return unless [:have_callout, :have_admin_callout, :have_content].include?(node.method_name)
+          return if within_block?(node)
+
+          first_argument = node.first_argument
+          return unless first_argument
+
+          if first_argument.nil_type?
+            add_offense(first_argument, message: MSG)
+            return
+          end
+          return unless first_argument.str_type?
+
+          text = first_argument.value
+          return unless antipattern_text?(text)
+
+          add_offense(first_argument, message: MSG)
+        end
+
+        private
+
+        def within_block?(node)
+          node.each_ancestor(:block).any? do |ancestor|
+            ancestor.send_node&.method_name == :within
+          end
+        end
+
+        def antipattern_text?(text)
+          return true if text.nil?
+          return true if text.empty?
+
+          stripped_text = text.gsub(/[[:punct:]\s]/, "")
+          return true if stripped_text.empty?
+
+          single_word = text.strip !~ /\s/
+          return false unless single_word
+
+          return true if SINGLE_WORD_ANTI_PATTERNS.include?(stripped_text.downcase)
+
+          false
+        end
+      end
+    end
+  end
+end

data/lib/decidim/dev/test/rspec_support/active_job.rb

@@ -14,6 +14,11 @@ end
 RSpec.configure do |config|
   config.include ActiveJob::TestHelper
   config.include DecidimActiveJobExtensions
+
+  config.before do
+    clear_enqueued_jobs
+    clear_performed_jobs
+  end
 end
 
 ActiveJob::Base.queue_adapter = :test

data/lib/decidim/dev/test/rspec_support/component_context.rb

@@ -58,7 +58,7 @@ shared_context "with a component" do
   end
 
   def visit_component
-    page.visit main_component_path(component)
+    page.visit main_component_path(component, locale: I18n.locale)
   end
 end
 

data/lib/decidim/dev/test/rspec_support/helpers.rb

@@ -33,8 +33,8 @@ module Decidim
     end
 
     def within_language_menu(options = {})
-      within(options[:admin] ? ".language-choose" : "footer") do
-        find(options[:admin] ? "#admin-menu-trigger" : "#trigger-dropdown-language-chooser").click
+      within(options[:admin] ? ".language-choose" : "header") do
+        find(options[:admin] ? "#admin-menu-trigger" : "#trigger-dropdown-menu-language-chooser-desktop").click
         yield
       end
     end
@@ -53,12 +53,18 @@ module Decidim
       expect(page).to have_css(".main-bar #trigger-dropdown-account")
     end
 
-    def have_admin_callout(text)
+    def have_callout(text)
       within_flash_messages do
         have_content text
       end
     end
 
+    # Fallback for legacy usage of this helper
+    # It actually works the same, as the markup is the same too
+    def have_admin_callout(text)
+      have_callout(text)
+    end
+
     def stub_get_request_with_format(rq_url, rs_format)
       stub_request(:get, rq_url)
         .with(

data/lib/decidim/dev/test/rspec_support/tom_select.rb

@@ -9,11 +9,14 @@ module Capybara
     # a better way, we could try actually interacting with the on-screen tom-select-provided UI,
     # but we are taking the easy way out for now.
     #
-    # @param option_id can be the `id` value of an option in the select, OR for select multiple inputs,
-    #   can be an array of such IDs.
+    # @param select_selector [String] The CSS selector of the select element.
+    # @param option_id [String, Array<String>] The `id` value of an option in the select.
+    #   For selects with the `multiple` attribute, this can be an array of such IDs.
     #
-    # @example tom_select("#select_id", option_id: "2")
-    # @example tom_select("#select_id", option_id: ["2", "10"]) # `multiple` input.
+    # @example
+    #   tom_select("#select_id", option_id: "2")
+    # @example
+    #   tom_select("#select_id", option_id: ["2", "10"]) # For a `multiple` select input.
     def tom_select(select_selector, option_id:)
       js_str = %(document.querySelector("#{select_selector}").tomselect.setValue(#{option_id.inspect}))
       execute_script(js_str)

data/lib/decidim/dev/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-dev version.
   module Dev
     def self.version
-      "0.31.3"
+      "0.32.0.rc1"
     end
   end
 end

data/lib/decidim/dev.rb

@@ -22,7 +22,6 @@ module Decidim
   # create external libraries that create test apps and test themselves against
   # them.
   module Dev
-    include ActiveSupport::Configurable
     autoload :DummyTranslator, "decidim/dev/dummy_translator"
 
     # Public: Finds an asset.

data/lib/erb_lint/linters/admin_page_title_linter.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require "erb_lint"
+require "erb_lint/linter"
+require "erb_lint/linter_config"
+require "erb_lint/linter_registry"
+require "erb_lint/offense"
+
+module ERBLint
+  module Linters
+    class AdminPageTitleLinter < Linter
+      include LinterRegistry
+
+      TITLE_SNIPPET = '<% add_decidim_page_title(t(".title")) %>'
+      TITLE_SNIPPET_REGEX = /\A<%\s*add_decidim_page_title\(t\(".title".*?\)\)\s*%>/
+
+      def run(processed_source)
+        return unless admin_view?(processed_source.filename)
+
+        first_line = processed_source.file_content.to_s.lines.first
+        return if first_line&.match?(TITLE_SNIPPET_REGEX)
+
+        add_offense(
+          processed_source.to_source_range(0...0),
+          "Admin views must start with: #{TITLE_SNIPPET}"
+        )
+      end
+
+      private
+
+      def admin_view?(filename)
+        return false unless filename.include?("/app/views/")
+        return false unless filename.include?("/admin/")
+        return false if filename.include?("/layouts/")
+        return false if mailer_view?(filename)
+        return false unless filename.end_with?(".html.erb")
+
+        File.basename(filename).start_with?("_") == false
+      end
+
+      def mailer_view?(filename)
+        filename.include?("/mailer/") || filename =~ %r{/\w+_mailer/}
+      end
+    end
+  end
+end

data/lib/erb_lint/linters/partial_path_linter.rb

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+require "erb_lint"
+require "erb_lint/linter"
+require "erb_lint/linter_config"
+require "erb_lint/linter_registry"
+require "erb_lint/offense"
+
+module ERBLint
+  module Linters
+    # Lint ERB partial paths.
+    #
+    # This linter ensures that partials are rendered with their full path
+    # relative to the views directory. For example, in app/views/posts/index.html.erb,
+    # it will flag `render "post"` and suggest `render "posts/post"`.
+    #
+    # It allows configuring prefixes that are exempt from this rule via
+    # the `allowed_prefixes` configuration option.
+    class PartialPath < Linter
+      include LinterRegistry
+
+      # Configuration schema for the PartialPath linter.
+      #
+      # @!attribute allowed_prefixes
+      #   @return [Array<String>] List of prefixes that are allowed to be used without full path
+      class ConfigSchema < LinterConfig
+        property :allowed_prefixes, accepts: Array
+      end
+      self.config_schema = ConfigSchema
+
+      # Runs the linter on the given processed source.
+      #
+      # This method scans the source code for ERB render calls and checks if they
+      # are using the full path for partials. If not, it adds an offense.
+      #
+      # @param processed_source [ERBLint::ProcessedSource] The processed source to lint
+      # @return [void]
+      def run(processed_source)
+        file_path = processed_source.filename
+
+        return unless file_path =~ %r{app/views/(.+?)/_?([^/]+)\.html\.erb$}
+        return if file_path.include?("/cells/")
+
+        current_directory = Regexp.last_match(1)
+        source = processed_source.file_content
+
+        source.scan(/<%=\s*render\s+"([^"]+)"[^%]*%>/) do
+          partial_path = Regexp.last_match(1)
+          start_pos = Regexp.last_match.begin(1)
+
+          next if partial_path.start_with?("layouts/")
+          next if partial_path.start_with?("/")
+          next if partial_path.include?("/")
+
+          next if allowed_prefix?(partial_path)
+
+          full_path = "#{current_directory}/#{partial_path}"
+          range = processed_source.to_source_range(
+            start_pos...(start_pos + partial_path.length)
+          )
+
+          add_offense(
+            range,
+            "Use the full path for partials. Replace `render \"#{partial_path}\"` with `render \"#{full_path}\"`"
+          )
+        end
+      end
+
+      # Checks if the given path starts with any of the allowed prefixes.
+      #
+      # @param path [String] The partial path to check
+      # @return [Boolean] true if the path starts with an allowed prefix, false otherwise
+      def allowed_prefix?(path)
+        return false unless @config.allowed_prefixes
+
+        @config.allowed_prefixes.any? { |prefix| path.start_with?(prefix) }
+      end
+
+      # Generates the autocorrection lambda for the given offense.
+      #
+      # This method creates a lambda that will replace the partial path with its
+      # full path when the linter's autocorrect feature is used.
+      #
+      # @param processed_source [ERBLint::ProcessedSource] The processed source containing the offense
+      # @param offense [ERBLint::Offense] The offense to generate a correction for
+      # @return [Proc, nil] A lambda that performs the correction, or nil if correction is not possible
+      def autocorrect(processed_source, offense)
+        return unless processed_source.filename =~ %r{app/views/(.+?)/_?([^/]+)\.html\.erb$}
+        return if processed_source.filename.include?("/cells/")
+
+        current_directory = Regexp.last_match(1)
+
+        lambda do |corrector|
+          partial_path = offense.source_range.source
+          full_path = "#{current_directory}/#{partial_path}"
+          corrector.replace(offense.source_range, full_path)
+        end
+      end
+    end
+  end
+end

data/rubocop-decidim.yml

@@ -25,4 +25,6 @@ inherit_from:
   - config/rubocop/graphql/disabled.yml
   - config/rubocop/factory_bot/configuration.yml
   - config/rubocop/factory_bot/disabled.yml
+  - config/rubocop/yard/configuration.yml
   - config/rubocop/disabled.yml
+  - config/rubocop/decidim-linters/configuration.yml