decidim-core 0.29.5 → 0.30.0.rc1

data/lib/decidim/command.rb

@@ -22,7 +22,7 @@ module Decidim
     end
 
     def evaluate(&block)
-      @caller = eval("self", block.binding, __FILE__, __LINE__)
+      @caller = block.binding.receiver
       instance_eval(&block)
     end
 
@@ -42,10 +42,10 @@ module Decidim
       @caller.respond_to?(method_name, include_private)
     end
 
-    def with_events(with_transaction: false, &block)
+    def with_events(with_transaction: false, &)
       ActiveSupport::Notifications.publish("#{event_namespace}:before", **event_arguments)
 
-      with_transaction ? transaction(&block) : yield
+      with_transaction ? transaction(&) : yield
 
       ActiveSupport::Notifications.publish("#{event_namespace}:after", **event_arguments)
     end

data/lib/decidim/commands/destroy_resource.rb

@@ -40,7 +40,11 @@ module Decidim
           current_user,
           **extra_params
         ) do
-          resource.destroy!
+          if resource.respond_to?(:really_destroy!)
+            resource.really_destroy!
+          else
+            resource.destroy!
+          end
         end
       end
 

data/lib/decidim/commands/resource_handler.rb

@@ -22,7 +22,7 @@ module Decidim
         end
 
         def form_attribute_values
-          raise "You need to define the list of attributes to be fetched from form object fetch_form_attributes" unless defined?(:form_attributes)
+          raise "You need to define the list of attributes to be fetched from form object fetch_form_attributes" if form_attributes.empty?
 
           form_attributes.index_with do |field|
             form.send(field)
@@ -30,7 +30,7 @@ module Decidim
         end
 
         def file_attribute_values
-          return {} unless defined?(:file_attributes)
+          return {} if file_attributes.empty?
 
           attachment_attributes(*file_attributes)
         end

data/lib/decidim/commands/restore_resource.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Commands
+    class RestoreResource < ::Decidim::Command
+      # Initializes the command.
+      #
+      # @param resource [ActiveRecord::Base] the resource to restore.
+      # @param current_user [Decidim::User] the current user.
+      def initialize(resource, current_user)
+        @resource = resource
+        @current_user = current_user
+      end
+
+      # Restores the resource.
+      #
+      # Broadcasts :ok if successful, :invalid otherwise.
+      def call
+        return broadcast(:invalid) if invalid?
+
+        restore_resource
+
+        broadcast(:ok, resource)
+      rescue Decidim::Commands::HookError, StandardError
+        broadcast(:invalid)
+      end
+
+      protected
+
+      attr_reader :resource, :current_user
+
+      def invalid? = false
+
+      def restore_resource
+        Decidim.traceability.perform_action!(
+          "restore",
+          resource,
+          current_user
+        ) do
+          resource.restore
+        end
+      end
+    end
+  end
+end

data/lib/decidim/commands/soft_delete_resource.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Commands
+    class SoftDeleteResource < ::Decidim::Command
+      # Initializes the command.
+      #
+      # @param resource [ActiveRecord::Base] the resource to soft delete.
+      # @param current_user [Decidim::User] the current user.
+      def initialize(resource, current_user)
+        @resource = resource
+        @current_user = current_user
+      end
+
+      # Soft deletes the resource.
+      #
+      # Broadcasts :ok if successful, :invalid otherwise.
+      def call
+        return broadcast(:invalid) if invalid?
+
+        soft_delete_resource
+        send_notification_to_authors
+
+        broadcast(:ok, resource)
+      rescue Decidim::Commands::HookError, StandardError
+        broadcast(:invalid)
+      end
+
+      protected
+
+      attr_reader :resource, :current_user
+
+      def invalid? = false
+
+      def soft_delete_resource
+        Decidim.traceability.perform_action!(
+          "soft_delete",
+          resource,
+          current_user
+        ) do
+          resource.destroy!
+        end
+      end
+
+      def send_notification_to_authors
+        coauthors = resource.try(:coauthorships)&.map do |coauthorship|
+          coauthorship.decidim_author_type.constantize.find(coauthorship.decidim_author_id)
+        end || []
+
+        recipients = (resource.try(:authors) || [resource.try(:author)]).compact + coauthors
+
+        return if recipients.empty?
+
+        Decidim::EventsManager.publish(
+          event: "decidim.events.resources.soft_deleted",
+          event_class: Decidim::SoftDeleteResourceEvent,
+          resource:,
+          affected_users: recipients.uniq
+        )
+      end
+    end
+  end
+end

data/lib/decidim/component_manifest.rb

@@ -142,6 +142,13 @@ module Decidim
       @seeds&.call(participatory_space)
     end
 
+    # The name of the named Rails route to create the url to the resource.
+    #
+    # Returns a String.
+    def route_name
+      "component"
+    end
+
     # Public: Adds configurable attributes for this component, scoped to a name. It
     # uses the DSL specified under `Decidim::SettingsManifest`.
     #

data/lib/decidim/content_parsers/blob_parser.rb

@@ -20,19 +20,19 @@ module Decidim
       # https://github.com/rails/rails/blob/a7e379896552ce43b822385c03c37f2bd47739d3/activestorage/config/routes.rb#L5-L14
       BLOB_REGEX = %r{
         # Group 1: Host part
-        (?<host_part>
+        (
           # Group 2: Domain and subpath part
-          #{URI::DEFAULT_PARSER.make_regexp(%w(https http))}
+          https?://((?!/rails).)+
         )?
         /rails/active_storage
         # Group 3: Blob path, representation path or disk service path
-        /(?<type_part>blobs/redirect|blobs/proxy|blobs|representations/redirect|representations/proxy|representations|disk)
+        /(blobs/redirect|blobs/proxy|blobs|representations/redirect|representations/proxy|representations|disk)
         # Group 4: Signed ID for blobs or encoded key for disk service
-        /(?<key_part>[^/]+)
+        /([^/]+)
         # Group 5: Variation part (only for representations)
         (
           # Group 6: Variation key for representations
-          /(?<variation_part>[\w.=-]+)
+          /([\w.=-]+)
         )?
         # Group 7: Filename
         /([\w.=-]+)
@@ -46,10 +46,8 @@ module Decidim
 
       def replace_blobs(text)
         text.gsub(BLOB_REGEX) do |match|
-          named_captures = Regexp.last_match.named_captures
-
-          type_part = named_captures["type_part"]
-          key_part = named_captures["key_part"]
+          type_part = Regexp.last_match(3)
+          key_part = Regexp.last_match(4)
 
           variation_key = nil
           blob =
@@ -61,7 +59,7 @@ module Decidim
               # Representation or blob
               if type_part.start_with?("representations")
                 # Representation
-                variation_part = named_captures["variation_part"]
+                variation_part = Regexp.last_match(6)
                 variation_key = generate_variation_key(variation_part)
               end
 

data/lib/decidim/content_parsers/user_parser.rb

@@ -49,7 +49,7 @@ module Decidim
 
       def existing_mentionables
         @existing_mentionables ||= mentionable_class.where(
-          "decidim_organization_id = ? AND nickname IN (?)",
+          "decidim_organization_id = ? AND LOWER(nickname) IN (?)",
           current_organization.id,
           content_nicknames
         )

data/lib/decidim/core/api.rb

@@ -18,6 +18,7 @@ module Decidim
     autoload :AreaTypeType, "decidim/api/types/area_type_type"
     autoload :AttachmentType, "decidim/api/types/attachment_type"
     autoload :CategoryType, "decidim/api/types/category_type"
+    autoload :TaxonomyType, "decidim/api/types/taxonomy_type"
     autoload :ComponentType, "decidim/api/types/component_type"
     autoload :CoordinatesType, "decidim/api/types/coordinates_type"
     autoload :DecidimType, "decidim/api/types/decidim_type"
@@ -64,6 +65,7 @@ module Decidim
     autoload :AuthorableInterface, "decidim/api/interfaces/authorable_interface"
     autoload :CoauthorableInterface, "decidim/api/interfaces/coauthorable_interface"
     autoload :CategoriesContainerInterface, "decidim/api/interfaces/categories_container_interface"
+    autoload :TaxonomizableInterface, "decidim/api/interfaces/taxonomizable_interface"
     autoload :CategorizableInterface, "decidim/api/interfaces/categorizable_interface"
     autoload :ScopableInterface, "decidim/api/interfaces/scopable_interface"
     autoload :AttachableInterface, "decidim/api/interfaces/attachable_interface"

data/lib/decidim/core/engine.rb

@@ -11,7 +11,6 @@ require "acts_as_list"
 require "devise"
 require "devise-i18n"
 require "devise_invitable"
-require "foundation_rails_helper"
 require "active_link_to"
 require "rails-i18n"
 require "date_validator"
@@ -37,6 +36,7 @@ require "mime-types"
 require "diffy"
 require "ransack"
 require "wisper"
+require "chartkick"
 require "shakapacker"
 
 require "decidim/api"
@@ -56,7 +56,8 @@ module Decidim
 
       initializer "decidim_core.register_icons", after: "decidim_core.add_social_share_services" do
         Decidim.icons.register(name: "phone-line", icon: "phone-line", category: "system", description: "", engine: :core)
-
+        Decidim.icons.register(name: "more-2-fill", icon: "more-2-fill", category: "system", description: "Resource Action button", engine: :core)
+        Decidim.icons.register(name: "more-fill", icon: "more-fill", category: "system", description: "Resource Action button", engine: :core)
         Decidim.icons.register(name: "upload-cloud-2-line", icon: "upload-cloud-2-line", category: "system",
                                description: "Upload cloud 2 line used in attachments form", engine: :core)
         Decidim.icons.register(name: "arrow-right-line", icon: "arrow-right-line", category: "system",
@@ -104,6 +105,7 @@ module Decidim
         Decidim.icons.register(name: "account-pin-circle-line", icon: "account-pin-circle-line", category: "system", description: "", engine: :core)
         Decidim.icons.register(name: "award-line", icon: "award-line", category: "system", description: "", engine: :core)
         Decidim.icons.register(name: "eye-2-line", icon: "eye-2-line", category: "system", description: "", engine: :core)
+        Decidim.icons.register(name: "eye-close", icon: "eye-close-line", category: "system", description: "", engine: :core)
         Decidim.icons.register(name: "group-line", icon: "group-line", category: "system", description: "", engine: :core)
         Decidim.icons.register(name: "team-line", icon: "team-line", category: "system", description: "", engine: :core)
         Decidim.icons.register(name: "apps-2-line", icon: "apps-2-line", category: "system", description: "", engine: :core)
@@ -151,6 +153,8 @@ module Decidim
         Decidim.icons.register(name: "arrow-up-s-fill", icon: "arrow-up-s-fill", category: "system", description: "", engine: :core)
         Decidim.icons.register(name: "treasure-map-line", icon: "treasure-map-line", category: "system", description: "", engine: :core)
         Decidim.icons.register(name: "chat-new-line", icon: "chat-new-line", category: "system", description: "", engine: :core)
+        Decidim.icons.register(name: "history", icon: "history-line", category: "system", description: "History timeline", engine: :core)
+        Decidim.icons.register(name: "survey-line", icon: "survey-line", category: "system", description: "Survey line", engine: :core)
         Decidim.icons.register(name: "draft-line", icon: "draft-line", category: "system", description: "", engine: :core)
         Decidim.icons.register(name: "user-voice-line", icon: "user-voice-line", category: "system", description: "", engine: :core)
 
@@ -169,19 +173,22 @@ module Decidim
         Decidim.icons.register(name: "calendar-todo-line", icon: "calendar-todo-line", category: "system", description: "", engine: :core)
         Decidim.icons.register(name: "home-8-line", icon: "home-8-line", category: "system", description: "", engine: :core)
 
-        Decidim.icons.register(name: "like", icon: "heart-add-line", description: "Like", category: "action", engine: :core)
-        Decidim.icons.register(name: "dislike", icon: "dislike-line", description: "Dislike", category: "action", engine: :core)
+        Decidim.icons.register(name: "like", icon: "heart-line", description: "Like", category: "action", engine: :core)
+        Decidim.icons.register(name: "dislike", icon: "heart-fill", description: "Dislike", category: "action", engine: :core)
         Decidim.icons.register(name: "drag-move-2-line", icon: "drag-move-2-line", category: "system", description: "", engine: :core)
         Decidim.icons.register(name: "drag-move-2-fill", icon: "drag-move-2-fill", category: "system", description: "", engine: :core)
+        Decidim.icons.register(name: "draggable", icon: "draggable", category: "system", description: "", engine: :core)
         Decidim.icons.register(name: "login-circle-line", icon: "login-circle-line", category: "system", description: "", engine: :core)
         Decidim.icons.register(name: "list-check", icon: "list-check", category: "system", description: "", engine: :core)
         Decidim.icons.register(name: "add-fill", icon: "add-fill", category: "system", description: "", engine: :core)
         Decidim.icons.register(name: "clipboard-line", icon: "clipboard-line", category: "system", description: "", engine: :initiatives)
+        Decidim.icons.register(name: "user-forbid-line", icon: "user-forbid-line", category: "system", description: "", engine: :core)
 
         # Refactor later: Some of the icons here are duplicated, and it would be a greater refactor to remove the duplicates
         Decidim.icons.register(name: "Decidim::Amendment", icon: "git-branch-line", category: "activity", description: "Amendment", engine: :core)
         Decidim.icons.register(name: "Decidim::Category", icon: "price-tag-3-line", description: "Category", category: "activity", engine: :core)
         Decidim.icons.register(name: "Decidim::Scope", icon: "scan-line", description: "Scope", category: "activity", engine: :core)
+        Decidim.icons.register(name: "Decidim::Taxonomy", icon: "scan-line", description: "Taxonomy", category: "activity", engine: :core)
         Decidim.icons.register(name: "Decidim::User", icon: "user-line", description: "User", category: "activity", engine: :core)
         Decidim.icons.register(name: "Decidim::UserGroup", icon: "group-line", description: "User Group", category: "activity", engine: :core)
         Decidim.icons.register(name: "follow", icon: "notification-3-line", description: "Follow", category: "action", engine: :core)
@@ -192,6 +199,7 @@ module Decidim
         Decidim.icons.register(name: "profile", icon: "team-line", description: "Groups", category: "profile", engine: :core)
         Decidim.icons.register(name: "user_group", icon: "team-line", description: "Groups", category: "profile", engine: :core)
         Decidim.icons.register(name: "link", icon: "link", description: "web / URL", category: "profile", engine: :core)
+        Decidim.icons.register(name: "unlink", icon: "link-unlink-m", description: "Unlink", category: "profile", engine: :core)
         Decidim.icons.register(name: "following", icon: "eye-2-line", description: "Following", category: "profile", engine: :core)
         Decidim.icons.register(name: "activity", icon: "bubble-chart-line", description: "Activity", category: "profile", engine: :core)
         Decidim.icons.register(name: "followers", icon: "group-line", description: "Followers", category: "profile", engine: :core)
@@ -335,10 +343,14 @@ module Decidim
           value_presence = ->(v) { v.present? }
           minute_start = ->(v) { v.to_time.strftime("%Y-%m-%dT%H:%M:00") }
           minute_end = ->(v) { v.to_time.strftime("%Y-%m-%dT%H:%M:59") }
+          integer_presence = ->(v) { v.to_i.positive? }
+          array_cast = ->(v) { Arel.sql("ARRAY[#{v.to_i}]") }
           config.add_predicate("dtgt", arel_predicate: "gt", formatter: minute_start, validator: value_presence, type: :datetime)
           config.add_predicate("dtlt", arel_predicate: "lt", formatter: minute_end, validator: value_presence, type: :datetime)
           config.add_predicate("dtgteq", arel_predicate: "gteq", formatter: minute_start, validator: value_presence, type: :datetime)
           config.add_predicate("dtlteq", arel_predicate: "lteq", formatter: minute_end, validator: value_presence, type: :datetime)
+          # this allows to search for an integer inside a column that is an array
+          config.add_predicate("contains", arel_predicate: "contains", formatter: array_cast, validator: integer_presence)
         end
       end
 
@@ -415,8 +427,8 @@ module Decidim
         Decidim.stats.register :processes_count, priority: StatsRegistry::HIGH_PRIORITY do |organization, start_at, end_at|
           processes = ParticipatoryProcesses::OrganizationPrioritizedParticipatoryProcesses.new(organization)
 
-          processes = processes.where("created_at >= ?", start_at) if start_at.present?
-          processes = processes.where("created_at <= ?", end_at) if end_at.present?
+          processes = processes.where(created_at: start_at..) if start_at.present?
+          processes = processes.where(created_at: ..end_at) if end_at.present?
           processes.count
         end
       end
@@ -764,7 +776,9 @@ module Decidim
       end
 
       config.to_prepare do
-        FoundationRailsHelper::FlashHelper.include Decidim::FlashHelperExtensions
+        ActiveSupport.on_load(:action_view) do
+          include Decidim::FlashHelperExtensions
+        end
       end
     end
   end

data/lib/decidim/core/menu.rb

@@ -56,11 +56,6 @@ module Decidim
                           position: 1.3
           end
 
-          menu.add_item :user_interests,
-                        t("my_interests", scope: "layouts.decidim.user_profile"),
-                        decidim.user_interests_path,
-                        position: 1.4
-
           menu.add_item :download_your_data,
                         t("my_data", scope: "layouts.decidim.user_profile"),
                         decidim.download_your_data_path,

data/lib/decidim/core/seeds.rb

@@ -14,10 +14,50 @@ module Decidim
         Rails.application.reloader.reload! if Rails.application.reloader.check!
         reset_column_information
 
-        ActiveJob::Base.queue_adapter = :inline
-
         organization = create_organization!
 
+        if organization.taxonomies.none?
+          taxonomy = create_taxonomy!(name: "Scopes", parent: nil)
+          3.times do
+            sub_taxonomy = create_taxonomy!(name: ::Faker::Address.state, parent: taxonomy)
+
+            5.times do
+              create_taxonomy!(name: ::Faker::Address.city, parent: sub_taxonomy)
+            end
+          end
+          # filters for all participatory spaces
+          create_taxonomy_filter!(root_taxonomy: taxonomy,
+                                  taxonomies: taxonomy.all_children,
+                                  participatory_space_manifests: Decidim.participatory_space_manifests.pluck(:name))
+
+          taxonomy = create_taxonomy!(name: "Areas", parent: nil)
+          sub_taxonomy = create_taxonomy!(name: "Territorial", parent: taxonomy)
+          3.times do
+            create_taxonomy!(name: ::Faker::Lorem.word, parent: sub_taxonomy)
+          end
+
+          sub_taxonomy = create_taxonomy!(name: "Sectorial", parent: taxonomy)
+          5.times do
+            create_taxonomy!(name: ::Faker::Lorem.word, parent: sub_taxonomy)
+          end
+          # filters for all participatory except conferences
+          create_taxonomy_filter!(root_taxonomy: taxonomy,
+                                  taxonomies: taxonomy.all_children,
+                                  participatory_space_manifests: Decidim.participatory_space_manifests.pluck(:name) - [:conferences])
+
+          taxonomy = create_taxonomy!(name: "Categories", parent: nil)
+          3.times do
+            sub_taxonomy = create_taxonomy!(name: ::Faker::Lorem.sentence(word_count: 5), parent: taxonomy)
+
+            5.times do
+              create_taxonomy!(name: ::Faker::Lorem.sentence(word_count: 5), parent: sub_taxonomy)
+            end
+          end
+          # filters not available for participatory spaces
+          create_taxonomy_filter!(root_taxonomy: taxonomy,
+                                  taxonomies: taxonomy.all_children)
+        end
+
         if organization.top_scopes.none?
           province = create_scope_type!(name: "province", plural: "provinces")
           municipality = create_scope_type!(name: "municipality", plural: "municipalities")

data/lib/decidim/core/test/factories.rb

@@ -127,8 +127,8 @@ FactoryBot.define do
     sequence(:host) { |n| "#{n}.lvh.me" }
     description { generate_localized_description(:organization_description, skip_injection:) }
     favicon { Decidim::Dev.test_file("icon.png", "image/png") }
-    default_locale { "en" }
-    available_locales { %w(en ca es) }
+    default_locale { Decidim.default_locale }
+    available_locales { Decidim.available_locales }
     users_registration_mode { :enabled }
     official_img_footer { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
     official_url { Faker::Internet.url }
@@ -202,6 +202,7 @@ FactoryBot.define do
     accepted_tos_version { organization.tos_version }
     notifications_sending_frequency { "real_time" }
     email_on_moderations { true }
+    email_on_assigned_proposals { true }
     password_updated_at { Time.current }
     previous_passwords { [] }
     extended_data { {} }
@@ -250,6 +251,15 @@ FactoryBot.define do
       managed { true }
     end
 
+    trait :tos_not_accepted do
+      accepted_tos_version { nil }
+    end
+
+    trait :ephemeral do
+      managed
+      extended_data { { ephemeral: true } }
+    end
+
     trait :officialized do
       officialized_at { Time.current }
       officialized_as { generate_localized_title(:officialized_as, skip_injection:) }
@@ -269,6 +279,16 @@ FactoryBot.define do
     end
     user
     privatable_to { create(:participatory_process, organization: user.organization, skip_injection:) }
+
+    role { generate_localized_title(:role, skip_injection:) }
+
+    trait :unpublished do
+      published { false }
+    end
+
+    trait :published do
+      published { true }
+    end
   end
 
   factory :assembly_private_user, class: "Decidim::ParticipatorySpacePrivateUser" do
@@ -421,6 +441,10 @@ FactoryBot.define do
       slug { Decidim::StaticPage::DEFAULT_PAGES.sample }
     end
 
+    trait :public do
+      allow_public_access { true }
+    end
+
     trait :tos do
       slug { "terms-of-service" }
       after(:create) do |tos_page|
@@ -497,6 +521,7 @@ FactoryBot.define do
     participatory_space { create(:participatory_process, organization:, skip_injection:) }
     manifest_name { "dummy" }
     published_at { Time.current }
+    deleted_at { nil }
     settings do
       {
         dummy_global_translatable_text: generate_localized_title(:dummy_global_translatable_text, skip_injection:),
@@ -527,6 +552,10 @@ FactoryBot.define do
       published_at { Time.current }
     end
 
+    trait :trashed do
+      deleted_at { Time.current }
+    end
+
     trait :with_amendments_enabled do
       settings do
         {
@@ -634,6 +663,56 @@ FactoryBot.define do
     organization
   end
 
+  factory :taxonomy, class: "Decidim::Taxonomy" do
+    transient do
+      skip_injection { false }
+    end
+
+    name { generate_localized_title(:taxonomy_name, skip_injection:) }
+    organization
+    parent { nil }
+    weight { nil }
+
+    trait :with_parent do
+      parent { create(:taxonomy, organization:, skip_injection:) }
+    end
+
+    trait :with_children do
+      transient do
+        children_count { 3 }
+      end
+
+      after(:create) do |taxonomy, evaluator|
+        create_list(:taxonomy, evaluator.children_count, parent: taxonomy, organization: taxonomy.organization)
+      end
+    end
+  end
+
+  factory :taxonomization, class: "Decidim::Taxonomization" do
+    taxonomy { association(:taxonomy, :with_parent) }
+    taxonomizable { association(:dummy_resource) }
+  end
+
+  factory :taxonomy_filter, class: "Decidim::TaxonomyFilter" do
+    root_taxonomy { association(:taxonomy) }
+    participatory_space_manifests { ["participatory_processes"] }
+
+    trait :with_items do
+      transient do
+        items_count { 3 }
+      end
+
+      after(:create) do |taxonomy_filter, evaluator|
+        create_list(:taxonomy_filter_item, evaluator.items_count, taxonomy_filter:)
+      end
+    end
+  end
+
+  factory :taxonomy_filter_item, class: "Decidim::TaxonomyFilterItem" do
+    taxonomy_filter
+    taxonomy_item { association(:taxonomy, parent: taxonomy_filter.root_taxonomy) }
+  end
+
   factory :coauthorship, class: "Decidim::Coauthorship" do
     transient do
       skip_injection { false }
@@ -743,6 +822,11 @@ FactoryBot.define do
         some_extra_data: "1"
       }
     end
+
+    trait :proposal_coauthor_invite do
+      event_name { "decidim.events.proposals.coauthor_invited" }
+      event_class { "Decidim::Proposals::CoauthorInvitedEvent" }
+    end
   end
 
   factory :conversation, class: "Decidim::Messaging::Conversation" do
@@ -858,7 +942,6 @@ FactoryBot.define do
     organization { resource.component.organization }
     decidim_participatory_space { resource.component.participatory_space }
     locale { I18n.locale }
-    scope { resource.scope }
     content_a { Faker::Lorem.sentence }
     datetime { Time.current }
   end
@@ -917,6 +1000,22 @@ FactoryBot.define do
     end
   end
 
+  factory :user_block, class: "Decidim::UserBlock" do
+    transient do
+      organization { create(:organization) }
+      blocked_at { Time.current }
+    end
+    justification { generate(:title) }
+    blocking_user { create(:user, :admin, :confirmed, organization:) }
+    user { create(:user, :blocked, :confirmed, organization:) }
+
+    after(:create) do |object, evaluator|
+      object.user.block_id = object.id
+      object.user.blocked_at = evaluator.blocked_at
+      object.user.save!
+    end
+  end
+
   factory :user_report, class: "Decidim::UserReport" do
     transient do
       skip_injection { false }
@@ -930,7 +1029,7 @@ FactoryBot.define do
     transient do
       skip_injection { false }
     end
-    user { build(:user) }
+    user { create(:user, :confirmed) }
   end
 
   factory :endorsement, class: "Decidim::Endorsement" do
@@ -961,6 +1060,10 @@ FactoryBot.define do
       object.organization ||= object.token_for.organization
     end
 
+    trait :with_token do
+      token { SecureRandom.hex(32) }
+    end
+
     trait :expired do
       expires_at { 1.day.ago }
     end