decidim-core 0.23.3 → 0.24.0.rc1

data/lib/decidim/core/test.rb

@@ -63,3 +63,5 @@ require "decidim/core/test/shared_examples/manage_component_share_tokens"
 require "decidim/core/test/shared_examples/metric_manage_shared_context"
 require "decidim/core/test/shared_examples/embed_resource_examples"
 require "decidim/core/test/shared_examples/resource_search_examples"
+require "decidim/core/test/shared_examples/static_pages_examples"
+require "decidim/core/test/shared_examples/controller_render_views"

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/faker/localized"
+require "decidim/faker/internet"
 require "decidim/dev"
 
 require "decidim/participatory_processes/test/factories"
@@ -13,7 +14,7 @@ end
 
 FactoryBot.define do
   sequence(:title) do |n|
-    "#{Faker::Lorem.sentence(3)} #{n}".delete("'")
+    "#{Faker::Lorem.sentence(word_count: 3)} #{n}".delete("'")
   end
 
   sequence(:name) do |n|
@@ -21,11 +22,11 @@ FactoryBot.define do
   end
 
   sequence(:nickname) do |n|
-    "#{Faker::Lorem.characters(rand(1..10))}_#{n}".gsub("'", "_")
+    "#{Faker::Lorem.characters(number: rand(1..10))}_#{n}".gsub("'", "_")
   end
 
   sequence(:hashtag_name) do |n|
-    "#{Faker::Lorem.characters(rand(1..10))}_#{n}".gsub("'", "_")
+    "#{Faker::Lorem.characters(number: rand(1..10))}_#{n}".gsub("'", "_")
   end
 
   sequence(:email) do |n|
@@ -37,19 +38,19 @@ FactoryBot.define do
   end
 
   sequence(:slug) do |n|
-    "#{Faker::Internet.slug(nil, "-")}-#{n}".gsub("'", "_")
+    "#{Decidim::Faker::Internet.slug(words: nil, glue: "-")}-#{n}".gsub("'", "_")
   end
 
   sequence(:scope_name) do |n|
-    "#{Faker::Lorem.sentence(1, true, 3)} #{n}".gsub("s", "z").gsub("S", "Z")
+    "#{Faker::Lorem.sentence(word_count: 1, supplemental: true, random_words_to_add: 3)} #{n}".gsub("s", "z").gsub("S", "Z")
   end
 
   sequence(:scope_code) do |n|
-    "#{Faker::Lorem.characters(4).upcase}-#{n}"
+    "#{Faker::Lorem.characters(number: 4).upcase}-#{n}"
   end
 
   sequence(:area_name) do |n|
-    "#{Faker::Lorem.sentence(1, true, 3)} #{n}"
+    "#{Faker::Lorem.sentence(word_count: 1, supplemental: true, random_words_to_add: 3)} #{n}"
   end
 
   factory :category, class: "Decidim::Category" do
@@ -67,6 +68,10 @@ FactoryBot.define do
   end
 
   factory :organization, class: "Decidim::Organization" do
+    transient do
+      create_static_pages { true }
+    end
+
     name { Faker::Company.unique.name }
     reference_prefix { Faker::Name.suffix }
     time_zone { "UTC" }
@@ -104,9 +109,15 @@ FactoryBot.define do
     end
     file_upload_settings { Decidim::OrganizationSettings.default(:upload) }
 
-    after(:create) do |organization|
-      tos_page = Decidim::StaticPage.find_by(slug: "terms-and-conditions", organization: organization)
-      create(:static_page, :tos, organization: organization) if tos_page.nil?
+    trait :secure_context do
+      host { "localhost" }
+    end
+
+    after(:create) do |organization, evaluator|
+      if evaluator.create_static_pages
+        tos_page = Decidim::StaticPage.find_by(slug: "terms-and-conditions", organization: organization)
+        create(:static_page, :tos, organization: organization) if tos_page.nil?
+      end
     end
   end
 
@@ -121,15 +132,23 @@ FactoryBot.define do
     tos_agreement { "1" }
     avatar { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
     personal_url { Faker::Internet.url }
-    about { "<script>alert(\"ABOUT\");</script>" + Faker::Lorem.paragraph(2) }
+    about { "<script>alert(\"ABOUT\");</script>#{Faker::Lorem.paragraph(sentence_count: 2)}" }
     confirmation_sent_at { Time.current }
     accepted_tos_version { organization.tos_version }
     email_on_notification { true }
+    email_on_moderations { true }
 
     trait :confirmed do
       confirmed_at { Time.current }
     end
 
+    trait :blocked do
+      blocked { true }
+      blocked_at { Time.current }
+      extended_data { { "user_name": generate(:name) } }
+      name { "Blocked user" }
+    end
+
     trait :deleted do
       email { "" }
       deleted_at { Time.current }
@@ -175,7 +194,7 @@ FactoryBot.define do
 
   factory :user_group, class: "Decidim::UserGroup" do
     transient do
-      document_number { Faker::Number.number(8) + "X" }
+      document_number { "#{Faker::Number.number(digits: 8)}X" }
       phone { Faker::PhoneNumber.phone_number }
       rejected_at { nil }
       verified_at { nil }
@@ -184,7 +203,7 @@ FactoryBot.define do
     sequence(:name) { |n| "#{Faker::Company.name} #{n}" }
     email { generate(:user_group_email) }
     nickname { generate(:nickname) }
-    about { "<script>alert(\"ABOUT\");</script>" + Faker::Lorem.paragraph(2) }
+    about { "<script>alert(\"ABOUT\");</script>#{Faker::Lorem.paragraph(sentence_count: 2)}" }
     organization
     avatar { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") } # Keep after organization
 
@@ -259,6 +278,7 @@ FactoryBot.define do
     title { generate_localized_title }
     content { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     organization { build(:organization) }
+    allow_public_access { false }
 
     trait :default do
       slug { Decidim::StaticPage::DEFAULT_PAGES.sample }
@@ -290,7 +310,7 @@ FactoryBot.define do
   factory :attachment_collection, class: "Decidim::AttachmentCollection" do
     name { generate_localized_title }
     description { generate_localized_title }
-    weight { Faker::Number.number(1) }
+    weight { Faker::Number.number(digits: 1) }
 
     association :collection_for, factory: :participatory_process
   end
@@ -298,7 +318,7 @@ FactoryBot.define do
   factory :attachment, class: "Decidim::Attachment" do
     title { generate_localized_title }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    weight { Faker::Number.number(1) }
+    weight { Faker::Number.number(digits: 1) }
     attached_to { build(:participatory_process) }
     content_type { "image/jpeg" }
     file { Decidim::Dev.test_file("city.jpeg", "image/jpeg") } # Keep after attached_to
@@ -402,6 +422,14 @@ FactoryBot.define do
         }
       end
     end
+
+    trait :with_comments_disabled do
+      settings do
+        {
+          comments_enabled: false
+        }
+      end
+    end
   end
 
   factory :scope_type, class: "Decidim::ScopeType" do
@@ -681,6 +709,16 @@ FactoryBot.define do
     end
   end
 
+  factory :user_report, class: "Decidim::UserReport" do
+    reason { "spam" }
+    moderation { build(:user_moderation) }
+    user { build(:user, organization: moderation.organization) }
+  end
+
+  factory :user_moderation, class: "Decidim::UserModeration" do
+    user { build(:user) }
+  end
+
   factory :endorsement, class: "Decidim::Endorsement" do
     resource { build(:dummy_resource) }
     author { resource.try(:creator_author) || resource.try(:author) || build(:user, organization: resource.organization) }

data/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb

@@ -59,7 +59,7 @@ shared_examples "admin manages resource gallery" do
       let!(:image1) { create(:attachment, :with_image, attached_to: resource) }
       let!(:image2) { create(:attachment, :with_image, attached_to: resource) }
       let(:uploaded_photos) { [] }
-      let(:current_photos) { [image1.id.to_s] }
+      let(:current_photos) { [image1] }
 
       it "to decrease the number of photos in the gallery" do
         expect(resource.attachments.count).to eq(2)

data/lib/decidim/core/test/shared_examples/amendable/amendment_accepted_event_examples.rb

@@ -37,7 +37,7 @@ shared_examples "amendment accepted event" do
   describe "notification_title" do
     it "is generated correctly" do
       expect(subject.notification_title)
-        .to eq("The <a href=\"#{emendation_path}\">amendment</a> created by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a> has been accepted for <a href=\"#{amendable_path}\">#{amendable_title}</a>.") # rubocop:disable Metrics/LineLength
+        .to eq("The <a href=\"#{emendation_path}\">amendment</a> created by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a> has been accepted for <a href=\"#{amendable_path}\">#{amendable_title}</a>.") # rubocop:disable Layout/LineLength
     end
   end
 end

data/lib/decidim/core/test/shared_examples/amendable/amendment_promoted_event_examples.rb

@@ -37,7 +37,7 @@ shared_examples "amendment promoted event" do
   describe "notification_title" do
     it "is generated correctly" do
       expect(subject.notification_title)
-        .to eq("A <a href=\"#{emendation_path}\">rejected amendment</a> for <a href=\"#{amendable_path}\">#{amendable_title}</a> has been published as a new #{amendable_type} by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a>.") # rubocop:disable Metrics/LineLength
+        .to eq("A <a href=\"#{emendation_path}\">rejected amendment</a> for <a href=\"#{amendable_path}\">#{amendable_title}</a> has been published as a new #{amendable_type} by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a>.") # rubocop:disable Layout/LineLength
     end
   end
 end

data/lib/decidim/core/test/shared_examples/amendable/amendment_rejected_event_examples.rb

@@ -37,7 +37,7 @@ shared_examples "amendment rejected event" do
   describe "notification_title" do
     it "is generated correctly" do
       expect(subject.notification_title)
-        .to eq("The <a href=\"#{emendation_path}\">amendment</a> created by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a> has been rejected for <a href=\"#{amendable_path}\">#{amendable_title}</a>.") # rubocop:disable Metrics/LineLength
+        .to eq("The <a href=\"#{emendation_path}\">amendment</a> created by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a> has been rejected for <a href=\"#{amendable_path}\">#{amendable_title}</a>.") # rubocop:disable Layout/LineLength
     end
   end
 end

data/lib/decidim/core/test/shared_examples/comments_examples.rb

@@ -97,13 +97,14 @@ shared_examples "comments" do
     context "when user adds a new comment" do
       before do
         within ".add-comment form" do
-          fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: "This is a new comment"
+          fill_in "add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}", with: "This is a new comment"
           click_button "Send"
         end
       end
 
-      it "shows comment to the user" do
+      it "shows comment to the user and updates the comments counter" do
         expect(page).to have_comment_from(user, "This is a new comment", wait: 20)
+        expect(page).to have_selector("span.comments-count", text: "#{commentable.comments.count} COMMENTS")
       end
     end
 
@@ -120,7 +121,7 @@ shared_examples "comments" do
         expect(page).to have_selector(".add-comment form")
 
         within ".add-comment form" do
-          fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: "This is a new comment"
+          fill_in "add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}", with: "This is a new comment"
           select user_group.name, from: "Comment as"
           click_button "Send"
         end
@@ -144,7 +145,7 @@ shared_examples "comments" do
         end
 
         expect(page).to have_selector("#comment_#{comment.id} .add-comment")
-        fill_in "add-comment-Decidim::Comments::Comment-#{comment.id}", with: "This is a reply"
+        fill_in "add-comment-Comment-#{comment.id}", with: "This is a reply"
         within ".comment-thread .add-comment" do
           click_button "Send"
         end
@@ -152,6 +153,7 @@ shared_examples "comments" do
         expect(page).to have_selector(".comment-thread .comment--nested", wait: 20)
         expect(page).to have_selector(".comment__additionalreply")
         expect(page).to have_reply_to(comment, "This is a reply")
+        expect(page).to have_selector("span.comments-count", text: "#{commentable.comments.count} COMMENTS")
       end
     end
 
@@ -184,7 +186,7 @@ shared_examples "comments" do
             page.find(".opinion-toggle--ok").click
 
             within ".add-comment form" do
-              fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: "I am in favor about this!"
+              fill_in "add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}", with: "I am in favor about this!"
               click_button "Send"
             end
 
@@ -237,7 +239,7 @@ shared_examples "comments" do
         visit resource_path
 
         within ".add-comment form" do
-          fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: content
+          fill_in "add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}", with: content
         end
       end
 
@@ -284,7 +286,7 @@ shared_examples "comments" do
         visit resource_path
 
         within ".add-comment form" do
-          fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: content
+          fill_in "add-comment-#{commentable.commentable_type.demodulize.demodulize}-#{commentable.id}", with: content
           click_button "Send"
         end
       end
@@ -296,7 +298,7 @@ shared_examples "comments" do
 
         it "replaces the mention with a link to the user's profile" do
           expect(page).to have_comment_from(user, "A valid user mention: @#{mentioned_user.nickname}", wait: 20)
-          expect(page).to have_link "@#{mentioned_user.nickname}", href: "/profiles/#{mentioned_user.nickname}"
+          expect(page).to have_link "@#{mentioned_user.nickname}", href: "http://#{mentioned_user.organization.host}/profiles/#{mentioned_user.nickname}"
         end
       end
 
@@ -327,7 +329,7 @@ shared_examples "comments" do
         visit resource_path
 
         within ".add-comment form" do
-          fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: content
+          fill_in "add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}", with: content
           click_button "Send"
         end
       end

data/lib/decidim/core/test/shared_examples/component_type.rb

@@ -2,6 +2,6 @@
 
 shared_examples_for "a component query type" do
   it "implements ComponentInterface" do
-    expect(subject.interfaces).to include(Decidim::Core::ComponentInterface)
+    expect(described_class.ancestors).to include(Decidim::Core::ComponentInterface)
   end
 end

data/lib/decidim/core/test/shared_examples/controller_render_views.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+shared_context "with controller rendering the view" do
+  # Fix "No route matches" errors with the view.
+  before do
+    controller.class_eval do
+      helper_method :polymorphic_path, :url_for
+
+      # Needed for the form_for to work (through decidim_form_for)
+      # The path shouldn't matter in the controller specs.
+      def polymorphic_path(_record, _options)
+        "/"
+      end
+
+      # Needed for the head and link_to helpers to work
+      # The URL shouldn't matter in the controller specs.
+      def url_for(_options)
+        "/"
+      end
+    end
+  end
+
+  # Rendering of the view is necessary to see the view renders correctly
+  # when there are errors on the form. This is hard to test with a
+  # system test because there is some JS blocking us to submit the form
+  # with errors (e.g. too short title).
+  render_views
+end

data/lib/decidim/core/test/shared_examples/follows_examples.rb

@@ -44,7 +44,7 @@ shared_examples "follows" do
       it "makes the user follow the followable" do
         visit followable_path
         expect do
-          click_button "Already following #{translated(followable.participatory_space.title)}"
+          click_button "Following #{translated(followable.participatory_space.title)}"
           expect(page).to have_content "Stop following"
         end.to change(Decidim::Follow, :count).by(1)
       end

data/lib/decidim/core/test/shared_examples/logo_email.rb

@@ -14,7 +14,7 @@ shared_examples "email with logo" do
 
     it "includes organization logo with full link" do
       expect(mail.body).to include("alt=\"#{organization.name}\"")
-      expect(mail.body).to match(%r{http[s]{0,1}:\/\/#{organization.host}#{organization.logo.medium.url}})
+      expect(mail.body).to match(%r{https{0,1}://#{organization.host}#{organization.logo.medium.url}})
     end
   end
 end

data/lib/decidim/core/test/shared_examples/map_examples.rb

@@ -26,7 +26,7 @@ shared_context "with frontend map builder" do
   let(:organization) { create(:organization) }
   let(:template) { template_class.new }
   let(:options) { {} }
-  let(:js_options) { options.map { |k, v| [k.to_s.camelize(:lower), v] }.to_h }
+  let(:js_options) { options.transform_keys { |k| k.to_s.camelize(:lower) }.to_h }
 
   before do
     allow(template).to receive(:current_organization).and_return(organization)

data/lib/decidim/core/test/shared_examples/process_announcements_examples.rb

@@ -3,7 +3,7 @@
 shared_examples "manage processes announcements" do
   let!(:participatory_process) { create(:participatory_process, organization: organization) }
 
-  it "customize an general announcement for the process" do
+  it "can customize a general announcement for the process" do
     click_link translated(participatory_process.title)
 
     fill_in_i18n_editor(

data/lib/decidim/core/test/shared_examples/reportable.rb

@@ -29,6 +29,10 @@ shared_examples_for "reportable" do
       context "when the resource has been hidden" do
         let(:moderation) { create(:moderation, reportable: subject, participatory_space: participatory_space, report_count: 1, hidden_at: Time.current) }
 
+        before do
+          subject.reload
+        end
+
         it { expect(subject).to be_hidden }
       end
     end
@@ -42,6 +46,10 @@ shared_examples_for "reportable" do
       end
 
       context "when the report count is greater than 0" do
+        before do
+          subject.reload
+        end
+
         it { expect(subject).to be_reported }
       end
     end

data/lib/decidim/core/test/shared_examples/rich_text_editor_examples.rb

@@ -9,7 +9,7 @@ shared_examples "having a rich text editor" do |css, toolbar|
 end
 
 shared_context "with rich text editor content" do
-  let(:content) { "<p>" + safe_tags + "</p>" + script }
+  let(:content) { "<p>#{safe_tags}</p>#{script}" }
   let(:safe_tags) { em + u + strong }
   let(:em) { "<em>em</em>" }
   let(:u) { "<u>u</u>" }

data/lib/decidim/core/test/shared_examples/searchable_participatory_space_examples.rb

@@ -36,7 +36,7 @@ shared_examples "global search of participatory spaces" do
         it "updates the associated SearchableResource after published ParticipatorySpace update" do
           searchable = ::Decidim::SearchableResource.find_by(resource_type: participatory_space.class.name, resource_id: participatory_space.id)
           created_at = searchable.created_at
-          updated_title = { "en" => "Brand new title" }
+          updated_title = { "en" => "Brand new title", "machine_translations" => {} }
           participatory_space.update(title: updated_title)
 
           participatory_space.save!
@@ -130,7 +130,7 @@ shared_examples "global search of participatory spaces" do
   end
 
   def expected_searchable_resource_attrs(space, locale)
-    h = {
+    {
       "locale" => locale,
       "decidim_organization_id" => space.organization.id,
       "decidim_participatory_space_id" => space.id,
@@ -139,6 +139,5 @@ shared_examples "global search of participatory spaces" do
       "resource_id" => space.id,
       "resource_type" => space.class.name
     }.merge(searchable_resource_attrs_mapper.call(space, locale))
-    h
   end
 end