decidim-core 0.23.5 → 0.24.2

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,33 @@
+# frozen_string_literal: true
+
+shared_context "with controller rendering the view" do
+  # Fix "No route matches" errors with the view.
+  before do
+    controller.view_context_class.class_eval do
+      # 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
+
+  after do
+    # Ensure that the customized view context class is not being kept in the
+    # cache variable. Otherwise we might mess up the following specs using the
+    # same controller in the same run.
+    controller.class.remove_instance_variable(:@view_context_class)
+  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/localised_email.rb

@@ -22,4 +22,12 @@ shared_examples "localised email" do
       expect(mail.body.encoded).to match(default_body)
     end
   end
+
+  context "when the user doesn't have an email" do
+    let(:user) { create(:user, :deleted) }
+
+    it "does nothing" do
+      expect(mail.deliver_now).to be_nil
+    end
+  end
 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

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

@@ -36,5 +36,51 @@ shared_examples "searchable results" do
         end
       end
     end
+
+    context "when participatory space is not visible" do
+      shared_examples_for "no searchs found" do
+        it "not contains these searchables" do
+          expect(searchables).not_to be_empty
+          expect(term).not_to be_empty
+
+          fill_in "term", with: term
+          find("input#term").native.send_keys :enter
+
+          expect(page).to have_current_path decidim.search_path, ignore_query: true
+          expect(page).to have_content(/results for the search: "#{term}"/i)
+          expect(page).to have_selector(".filters__section")
+          expect(page.find("#search-count .section-heading").text.to_i).not_to be_positive
+        end
+
+        it "doesn't find content by hashtag" do
+          if respond_to?(:hashtag)
+            fill_in "term", with: hashtag
+            find("input#term").native.send_keys :enter
+
+            expect(page.find("#search-count .section-heading").text.to_i).not_to be_positive
+
+            within "#results" do
+              expect(page).not_to have_content(hashtag)
+            end
+          end
+        end
+      end
+
+      context "when participatory space is unpublished" do
+        before do
+          perform_enqueued_jobs { participatory_space.update!(published_at: nil) }
+        end
+
+        it_behaves_like "no searchs found"
+      end
+
+      context "when participatory space is private" do
+        before do
+          perform_enqueued_jobs { participatory_space.update!(private_space: true) }
+        end
+
+        it_behaves_like "no searchs found"
+      end
+    end
   end
 end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples "accessible static pages" do
+  let(:organization) do
+    create(
+      :organization,
+      create_static_pages: false,
+      force_users_to_authenticate_before_access_organization: true
+    )
+  end
+  let!(:public_pages) { create_list(:static_page, 5, organization: organization, allow_public_access: true) }
+  let!(:private_pages) { create_list(:static_page, 5, organization: organization) }
+  let(:actual_page_ids) { [] }
+
+  def expect_correct_accessible_static_pages
+    expect(actual_page_ids).to match_array(expected_page_ids)
+  end
+
+  context "with a user" do
+    let(:user) { create(:user, organization: organization) }
+    let(:expected_page_ids) { public_pages.pluck(:id) + private_pages.pluck(:id) }
+
+    it { expect_correct_accessible_static_pages }
+  end
+
+  context "without a user" do
+    let(:user) { nil }
+    let(:expected_page_ids) { public_pages.pluck(:id) }
+
+    it { expect_correct_accessible_static_pages }
+
+    context "when the organization does not force users to authenticate" do
+      let(:organization) { create(:organization, create_static_pages: false) }
+      let(:expected_page_ids) do
+        public_pages.pluck(:id) + private_pages.pluck(:id)
+      end
+
+      it { expect_correct_accessible_static_pages }
+    end
+  end
+end

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.23.5"
+      "0.24.2"
     end
   end
 end

data/lib/decidim/diffy_extension.rb

@@ -36,11 +36,11 @@ module Decidim
       end
 
       def unescaped_split_left
-        @diff.gsub(%r{<li class="ins">([\s\S]*?)<\/li>}, "")
+        @diff.gsub(%r{<li class="ins">([\s\S]*?)</li>}, "")
       end
 
       def unescaped_split_right
-        @diff.gsub(%r{<li class="del">([\s\S]*?)<\/li>}, "")
+        @diff.gsub(%r{<li class="del">([\s\S]*?)</li>}, "")
       end
     end
   end

data/lib/decidim/exporters/csv.rb

@@ -43,7 +43,7 @@ module Decidim
       def headers
         return [] if processed_collection.empty?
 
-        processed_collection.first.keys
+        processed_collection.inject([]) { |keys, resource| keys | resource.keys }
       end
 
       def processed_collection
@@ -53,12 +53,13 @@ module Decidim
       end
 
       def flatten(object, key = nil)
-        if object.is_a? Hash
+        case object
+        when Hash
           object.inject({}) do |result, (subkey, value)|
             new_key = key ? "#{key}/#{subkey}" : subkey.to_s
             result.merge(flatten(value, new_key))
           end
-        elsif object.is_a?(Array)
+        when Array
           { key.to_s => object.compact.map(&:to_s).join(", ") }
         else
           { key.to_s => object }

data/lib/decidim/exporters/export_data.rb

@@ -28,7 +28,7 @@ module Decidim
       # Returns a String with the filename of the export.
       def filename(prefix = "export", options = {})
         options[:extension] = !options[:extension].nil? ? options[:extension] : true
-        result = "#{prefix}-#{I18n.localize(Time.zone.today, format: :default)}-#{Time.now.seconds_since_midnight.to_i}"
+        result = "#{prefix}-#{I18n.l(Time.zone.today, format: :default)}-#{Time.now.seconds_since_midnight.to_i}"
         result += ".#{extension}" if options[:extension]
         result
       end

data/lib/decidim/faker/internet.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "faker"
+
+module Decidim
+  module Faker
+    # A Custom Faker wrapper to modify Faker::Internet#slug
+    class Internet < ::Faker::Internet
+      # Fakes a slug, using EN locale to allow ASCII only
+      def self.slug(...)
+        with_locale(:en) do
+          ::Faker::Internet.slug(...)
+        end
+      end
+    end
+  end
+end