decidim-dev 0.29.2 → 0.30.0.rc2

data/config/locales/sv.yml

@@ -2,6 +2,9 @@
 sv:
   activemodel:
     attributes:
+      dummy:
+        image: Bild
+      dummy_attribute: Testattribut
       dummy_resource:
         created_at: Skapad
         decidim_scope_id: Indelning
@@ -15,6 +18,7 @@ sv:
       dummy:
         settings:
           global:
+            clear_all: Rensa alla
             guided: Guidad inmatning
             guided_help: Hjälptext
             guided_readonly: Inmatning inaktiverad
@@ -23,6 +27,7 @@ sv:
             guided_rich_readonly_html: HTML <strong>hjälp</strong>-text för inaktiverad inmatning
             readonly_attribute: Skrivskyddat attribut
             test: Ett test
+            test_add: Lägg till test
             test_choices:
               a: Alternativ A
               b: Alternativ B
@@ -47,7 +52,7 @@ sv:
       badges:
         test:
           conditions:
-            - Använd en testmiljö för decidim.
+          - Använd en testmiljö för decidim.
           description: Deltagare får detta märke genom att skapa tester.
           description_another: Deltagaren har skapat %{score} tester.
           description_own: Du har skapat %{score} tester.

data/config/locales/tr-TR.yml

@@ -39,7 +39,7 @@ tr:
       badges:
         test:
           conditions:
-            - Decidim için bir test ortamı kullanın.
+          - Decidim için bir test ortamı kullanın.
           description: Katılımcılar testler oluşturarak bu rozeti alırlar.
           description_another: Bu katılımcı %{score} test oluşturdu.
           description_own: '%{score} test oluşturdunuz.'

data/config/locales/zh-CN.yml

@@ -39,7 +39,7 @@ zh-CN:
       badges:
         test:
           conditions:
-            - 对判定环境使用测试环境。
+          - 对判定环境使用测试环境。
           description: 参与者通过创建测试获得这个徽章。
           description_another: 此参与者已创建了 %{score} 个测试。
           description_own: 您已创建了 %{score} 个测试。

data/config/locales/zh-TW.yml

@@ -47,7 +47,7 @@ zh-TW:
       badges:
         test:
           conditions:
-            - 在Decidim中使用測試環境。
+          - 在Decidim中使用測試環境。
           description: 參與者通過建立測試可獲得此徽章。
           description_another: 此參與者已建立了 %{score} 個測試。
           description_own: 您已建立了 %{score} 個測試。

data/config/rubocop/disabled.yml

@@ -10,9 +10,6 @@ Naming/MemoizedInstanceVariableName:
 RSpec/VerifiedDoubleReference:
   Enabled: false
 
-FactoryBot/ConsistentParenthesesStyle:
-  Enabled: false
-
 FactoryBot/ExcessiveCreateList:
   Enabled: false
 
@@ -43,29 +40,5 @@ FactoryBot/AssociationStyle:
 Rubycw/Rubycw:
   Enabled: false
 
-Lint/SymbolConversion:
-  Enabled: false
-
-Style/RedundantParentheses:
-  Enabled: false
-
-Style/MapIntoArray:
-  Enabled: false
-
-Style/SuperWithArgsParentheses:
-  Enabled: false
-
-Style/ArgumentsForwarding:
-  Enabled: false
-
-Style/SuperArguments:
-  Enabled: false
-
 Lint/SelfAssignment:
   Enabled: false
-
-Style/SendWithLiteralMethodName:
-  Enabled: false
-
-Rails/WhereRange:
-  Enabled: false

data/config/rubocop/faker.yml

@@ -172,7 +172,7 @@ Faker/DeprecatedArguments:
       paragraph_by_chars:
         - characters
         - supplemental
-    Faker::IDNumber:
+    Faker::IdNumber:
       brazilian_citizen_number:
         - formatted
       brazilian_id:

data/config/rubocop/graphql.yml

@@ -0,0 +1,23 @@
+require: rubocop-graphql
+
+GraphQL:
+  Enabled: true
+  Include:
+    - "**/lib/decidim/api/**/*"
+  Exclude:
+    - "**/lib/decidim/api/test/**/*"
+    - "**/lib/decidim/api/functions/*"
+    - "spec/**/*"
+    - "test/**/*"
+
+GraphQL/ObjectDescription:
+  Exclude:
+    - "**/lib/decidim/api/engine.rb"
+    - "**/lib/decidim/api/schema.rb"
+    - "**/lib/decidim/api/graphiql/config.rb"
+    - "**/lib/decidim/api/functions/*"
+    - "spec/**/*"
+    - "test/**/*"
+
+GraphQL/ExtractType:
+  Enabled: false

data/config/rubocop/rspec.yml

@@ -25,6 +25,7 @@ RSpec/ContextWording:
 RSpec/DescribeClass:
   Exclude:
     - spec/gemfiles_spec.rb
+    - spec/gemspecs_spec.rb
     - spec/webpacker_spec.rb
     - spec/version_files_spec.rb
     - spec/spellcheck_spec.rb

data/config/rubocop/ruby.yml

@@ -66,7 +66,7 @@ AllCops:
   # If a value is specified for TargetRubyVersion then it is used.
   # Else if .ruby-version exists and it contains an MRI version it is used.
   # Otherwise we fallback to the oldest officially supported Ruby version (2.0).
-  TargetRubyVersion: 3.2
+  TargetRubyVersion: 3.3
 
 # Indent private/protected/public as deep as method definitions
 Layout/AccessModifierIndentation:

data/decidim-dev.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.2.0"
+  s.required_ruby_version = "~> 3.3.0"
 
   s.name = "decidim-dev"
   s.summary = "Decidim dev tools"
@@ -33,17 +33,22 @@ Gem::Specification.new do |s|
   end
 
   s.add_dependency "capybara", "~> 3.39"
-  s.add_dependency "decidim", Decidim::Dev.version
+  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 "factory_bot_rails", "~> 6.2"
   s.add_dependency "faker", "~> 3.2"
 
-  s.add_dependency "bullet", "~> 7.1.6"
+  s.add_dependency "bullet", "~> 8.0.0"
   s.add_dependency "byebug", "~> 11.0"
-  s.add_dependency "erb_lint", "~> 0.4.0"
+  s.add_dependency "erb_lint", "~> 0.8.0"
   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.2", ">= 6.3.1"
+  s.add_dependency "puma", "~> 6.5"
   s.add_dependency "rails-controller-testing", "~> 1.0"
   s.add_dependency "rspec", "~> 3.12"
   s.add_dependency "rspec-cells", "~> 0.3.7"
@@ -51,10 +56,11 @@ Gem::Specification.new do |s|
   s.add_dependency "rspec_junit_formatter", "~> 0.6.0"
   s.add_dependency "rspec-rails", "~> 6.0"
   s.add_dependency "rspec-retry", "~> 0.6.2"
-  s.add_dependency "rubocop", "~> 1.65.0"
+  s.add_dependency "rubocop", "~> 1.69.0"
   s.add_dependency "rubocop-capybara", "~> 2.21"
   s.add_dependency "rubocop-factory_bot", "~> 2.26"
   s.add_dependency "rubocop-faker", "~> 1.1"
+  s.add_dependency "rubocop-graphql", "~> 1.5"
   s.add_dependency "rubocop-performance", "~> 1.21"
   s.add_dependency "rubocop-rails", "~> 2.25"
   s.add_dependency "rubocop-rspec", "~> 3.0"

data/lib/decidim/dev/auth_engine.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "decidim/dev/needs_development_tools"
+
 module Decidim
   module Dev
     # Example engine overriding the core authentication routes.

data/lib/decidim/dev/component.rb

@@ -11,8 +11,7 @@ Decidim.register_component(:dummy) do |component|
   component.permissions_class_name = "Decidim::Dev::Permissions"
 
   component.settings(:global) do |settings|
-    settings.attribute :scopes_enabled, type: :boolean, default: false
-    settings.attribute :scope_id, type: :scope
+    settings.attribute :taxonomy_filters, type: :taxonomy_filters, default: []
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :comments_max_length, type: :integer, required: false
     settings.attribute :resources_permissions_enabled, type: :boolean, default: true

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

@@ -32,6 +32,8 @@ end
 
 1.step do
   port = rand(5000..6999)
+  next if port == 6379 # Reserved for Redis
+
   begin
     redis = Redis.new
     reserved_ports = (redis.get("decidim_test_capybara_reserved_ports") || "").split(",").map(&:to_i)
@@ -66,6 +68,13 @@ Capybara.register_driver :headless_chrome do |app|
                     "--window-size=1920,1080"
                   end
   options.args << "--ignore-certificate-errors" if ENV["TEST_SSL"]
+
+  options.add_preference(:download,
+                         directory_upgrade: true,
+                         prompt_for_download: false,
+                         default_directory: DownloadHelper::PATH.to_s)
+  options.add_preference(:browser, set_download_behavior: { behavior: "allow" })
+
   Capybara::Selenium::Driver.new(
     app,
     browser: :chrome,
@@ -111,7 +120,7 @@ Capybara.register_driver :iphone do |app|
   options.args << "--no-sandbox"
   # Do not limit browser resources
   options.args << "--disable-dev-shm-usage"
-  options.add_emulation(device_name: "iPhone 6")
+  options.add_emulation(device_name: "iPhone XR")
 
   Capybara::Selenium::Driver.new(
     app,
@@ -139,33 +148,9 @@ Capybara.save_path = Rails.root.join("tmp/screenshots")
 Capybara.default_max_wait_time = 10
 
 RSpec.configure do |config|
-  config.before :all, type: :system do
-    if ENV["BIG_SCREEN_SIZE"].present?
-      warn "[DECIDIM] ChromeDriver Workaround is being active: Setting window size to 1920x3000."
-    else
-      warn "[DECIDIM] ChromeDriver Workaround is being active: Setting window size to 1920x1080."
-    end
-  end
-
   config.before :each, type: :system do
     driven_by(:headless_chrome)
 
-    # Workaround for flaky spec related to resolution change
-    #
-    # For some unknown reason, depending on the order run for these specs, the resolution is changed to
-    # 800x600, which breaks the drag and drop. This forces the resolution to be 1920x1080.
-    # One possible culprit for the screen resolution change is the alert error intercepting which messes with the window focus.
-    # This has been reported to SeleniumHQ, https://github.com/SeleniumHQ/selenium/issues/13553
-    # and to the chromedriver project, https://bugs.chromium.org/p/chromedriver/issues/detail?id=4709
-    #
-    # Note to future maintainers: If you remove this workaround, please make sure to check if the issue has been fixed.
-    # If that is the case, please remove this comment, workaround, and the above warning that starts with "[DECIDIM] ChromeDriver Workaround".
-    if ENV["BIG_SCREEN_SIZE"].present?
-      current_window.resize_to(1920, 3000)
-    else
-      current_window.resize_to(1920, 1080)
-    end
-
     switch_to_default_host
     domain = (try(:organization) || try(:current_organization))&.host
     if domain

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

@@ -16,6 +16,7 @@ RSpec.configure do |config|
           t.float :latitude
           t.float :longitude
           t.datetime :published_at
+          t.datetime :deleted_at
           t.integer :coauthorships_count, null: false, default: 0
           t.integer :endorsements_count, null: false, default: 0
           t.integer :comments_count, null: false, default: 0
@@ -50,6 +51,7 @@ RSpec.configure do |config|
           t.float :latitude
           t.float :longitude
           t.datetime :published_at
+          t.datetime :deleted_at
           t.integer :coauthorships_count, null: false, default: 0
           t.integer :endorsements_count, null: false, default: 0
           t.integer :comments_count, null: false, default: 0

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

@@ -22,7 +22,7 @@ end
 
 shared_context "with a component" do
   let(:manifest) { Decidim.find_component_manifest(manifest_name) }
-  let(:user) { create :user, :confirmed, organization: }
+  let(:user) { create(:user, :confirmed, organization:) }
 
   let!(:organization) { create(:organization, *organization_traits, available_authorizations: %w(dummy_authorization_handler another_dummy_authorization_handler)) }
 
@@ -38,8 +38,14 @@ shared_context "with a component" do
            participatory_space:)
   end
 
-  let!(:category) { create :category, participatory_space: }
-  let!(:scope) { create :scope, organization: }
+  let!(:category) { create(:category, participatory_space:) }
+  let!(:scope) { create(:scope, organization:) }
+  let(:root_taxonomy) { create(:taxonomy, organization:) }
+  let!(:taxonomy) { create(:taxonomy, organization:, parent: root_taxonomy) }
+  let(:taxonomy_filter) { create(:taxonomy_filter, internal_name:, name:, participatory_space_manifests: [participatory_space.manifest.name], root_taxonomy:) }
+  let!(:taxonomy_filter_item) { create(:taxonomy_filter_item, taxonomy_filter:, taxonomy_item: taxonomy) }
+  let(:internal_name) { { "en" => "Internal taxonomy filter name" } }
+  let(:name) { { "en" => "Public taxonomy filter name" } }
 
   let(:organization_traits) { [] }
 
@@ -91,10 +97,10 @@ shared_context "when managing a component as an admin" do
   let(:admin_component_organization_traits) { [] }
 
   let(:user) do
-    create :user,
+    create(:user,
            :admin,
            :confirmed,
-           organization:
+           organization:)
   end
 end
 
@@ -102,9 +108,9 @@ shared_context "when managing a component as a process admin" do
   include_context "when managing a component"
 
   let(:user) do
-    create :process_admin,
+    create(:process_admin,
            :confirmed,
            organization:,
-           participatory_process:
+           participatory_process:)
   end
 end

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

@@ -47,15 +47,15 @@ module ConfirmationHelpers
   # Used to accept the "onbeforeunload" event's normal browser confirm modal
   # as this cannot be overridden. Original confirm dismiss implementation in
   # Capybara.
-  def accept_page_unload(text = nil, **options, &)
-    page.send(:accept_modal, :confirm, text, options, &)
+  def accept_page_unload(text = nil, **, &)
+    accept_confirm(text, &)
   end
 
   # Used to dismiss the "onbeforeunload" event's normal browser confirm modal
   # as this cannot be overridden. Original confirm dismiss implementation in
   # Capybara.
-  def dismiss_page_unload(text = nil, **options, &)
-    page.send(:dismiss_modal, :confirm, text, options, &)
+  def dismiss_page_unload(text = nil, **, &)
+    dismiss_confirm(text, &)
   end
 end
 

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

@@ -19,6 +19,14 @@ module Decidim
         end
       end
     end
+
+    def process(action, method: "GET", params: nil, session: nil, body: nil, flash: {}, format: nil, xhr: false, as: nil) # rubocop:disable Metrics/ParameterLists
+      params = (params || {}).symbolize_keys
+
+      params.merge!(use_route: request.env["decidim.current_component"]&.mounted_engine) if request.env["decidim.current_component"].present?
+
+      super
+    end
   end
 end
 

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

@@ -14,6 +14,19 @@ module GeocoderHelpers
     )
   end
 
+  def stub_geocoding_coordinates(coordinates)
+    geocoder_request_url = "https://nominatim.openstreetmap.org/reverse?accept-language=en&addressdetails=1&format=json&lat=#{coordinates[0]}&lon=#{coordinates[1]}"
+    geocoder_response = File.read(Decidim::Dev.asset("geocoder_result_here.json"))
+
+    stub_request(:get, geocoder_request_url).with(
+      headers: {
+        "Accept" => "*/*",
+        "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
+        "User-Agent" => "Ruby"
+      }
+    ).to_return(body: geocoder_response)
+  end
+
   # Waits for the front-end geocoding request to finish in order to ensure there
   # are no pending requests when proceeding.
   def fill_in_geocoding(attribute, options = {})

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

@@ -21,8 +21,8 @@ module ActionDispatch
 
         # Add the file URI scheme so terminal emulators can open one click
         def display_image
-          message = +"[Screenshot Image]: file://#{image_path}\n"
-          message << +"[Screenshot HTML]: file://#{html_path}\n" if save_html?
+          message = "[Screenshot Image]: file://#{image_path}\n"
+          message << "[Screenshot HTML]: file://#{html_path}\n" if save_html?
 
           case output_type
           when "artifact"

data/lib/decidim/dev/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-dev version.
   module Dev
     def self.version
-      "0.29.2"
+      "0.30.0.rc2"
     end
   end
 end

data/lib/tasks/generators.rake

@@ -53,7 +53,8 @@ namespace :decidim do
         "--profiling",
         "--locales",
         "en,ca,es",
-        "--dev_ssl"
+        "--dev_ssl",
+        "--queue=sidekiq"
       )
     end
   end

data/lib/tasks/lighthouse_report.rake

@@ -42,9 +42,9 @@ namespace :decidim do
 
     def lighthouse_paths
       ["/"].tap do |urls|
-        urls << Decidim::ResourceLocatorPresenter.new(Decidim::ParticipatoryProcess.published.first).path
-        urls << Decidim::ResourceLocatorPresenter.new(Decidim::Meetings::Meeting.published.not_hidden.first).path
-        urls << Decidim::ResourceLocatorPresenter.new(Decidim::Proposals::Proposal.published.not_hidden.first).path
+        urls << Decidim::ResourceLocatorPresenter.new(Decidim::ParticipatoryProcess.published.first).path if Decidim.module_installed?(:participatory_processes)
+        urls << Decidim::ResourceLocatorPresenter.new(Decidim::Meetings::Meeting.published.not_hidden.first).path if Decidim.module_installed?(:meetings)
+        urls << Decidim::ResourceLocatorPresenter.new(Decidim::Proposals::Proposal.published.not_hidden.first).path if Decidim.module_installed?(:proposals)
       end
     end
   end

data/rubocop-decidim.yml

@@ -16,4 +16,5 @@ inherit_from:
   - config/rubocop/rails.yml
   - config/rubocop/rspec.yml
   - config/rubocop/faker.yml
+  - config/rubocop/graphql.yml
   - config/rubocop/disabled.yml