decidim-core 0.24.3 → 0.25.0.rc1

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

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+shared_examples "comments_reports" do
+  context "when the user is not logged in" do
+    it "gives the option to sign in" do
+      visit reportable_path
+
+      expect(page).to have_no_css("html.is-reveal-open")
+
+      within ".comment__header__context-menu" do
+        page.find(".icon--ellipses").click
+      end
+
+      click_button "Report"
+
+      expect(page).to have_css("html.is-reveal-open")
+    end
+  end
+
+  context "when the user is logged in" do
+    before do
+      login_as user, scope: :user
+    end
+
+    context "and the user has not reported the resource yet" do
+      it "reports the resource" do
+        visit reportable_path
+
+        expect(page).to have_selector(".comment__header__context-menu")
+
+        within ".comment__header__context-menu" do
+          page.find(".icon--ellipses").click
+          click_button "Report"
+        end
+
+        expect(page).to have_css(".flag-modal", visible: :visible)
+
+        within ".flag-modal" do
+          click_button "Report"
+        end
+
+        expect(page).to have_content "report has been created"
+      end
+    end
+
+    context "and the user has reported the resource previously" do
+      before do
+        moderation = create(:moderation, reportable: reportable, participatory_space: participatory_process)
+        create(:report, moderation: moderation, user: user, reason: "spam")
+      end
+
+      it "cannot report it twice" do
+        visit reportable_path
+
+        expect(page).to have_selector(".comment__header__context-menu")
+
+        within ".comment__header__context-menu" do
+          page.find(".icon--ellipses").click
+          click_button "Report"
+        end
+
+        expect(page).to have_css(".flag-modal", visible: :visible)
+
+        expect(page).to have_content "already reported"
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 require "spec_helper"
 
 shared_examples_for "has attachment collections" do
-  context "when it has attachment collections", processing_uploads_for: Decidim::AttachmentUploader do
+  context "when it has attachment collections" do
     let(:attachment_collection) { create(:attachment_collection, collection_for: collection_for) }
     let!(:document) { create(:attachment, :with_pdf, attached_to: attached_to, attachment_collection: attachment_collection) }
     let!(:other_document) { create(:attachment, :with_pdf, attached_to: attached_to, attachment_collection: nil) }
@@ -26,7 +26,7 @@ shared_examples_for "has attachment collections" do
     end
   end
 
-  context "when are ordered by weight", processing_uploads_for: Decidim::AttachmentUploader do
+  context "when are ordered by weight" do
     let!(:last_attachment_collection) { create(:attachment_collection, collection_for: collection_for, weight: 2) }
     let!(:document_one) { create(:attachment, :with_pdf, attached_to: attached_to, attachment_collection: last_attachment_collection) }
 
@@ -44,7 +44,7 @@ shared_examples_for "has attachment collections" do
     end
   end
 
-  context "when collection is empty", processing_uploads_for: Decidim::AttachmentUploader do
+  context "when collection is empty" do
     let(:attachment_collection) { create(:attachment_collection, collection_for: collection_for) }
     let!(:document) { create(:attachment, :with_pdf, attached_to: attached_to, attachment_collection: attachment_collection) }
     let(:empty_attachment_collection) { create(:attachment_collection, collection_for: collection_for) }

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

@@ -3,7 +3,7 @@
 require "spec_helper"
 
 shared_examples_for "has attachments" do
-  context "when it has attachments", processing_uploads_for: Decidim::AttachmentUploader do
+  context "when it has attachments" do
     let!(:document) { create(:attachment, :with_pdf, attached_to: attached_to) }
 
     let!(:image) { create(:attachment, attached_to: attached_to) }
@@ -23,7 +23,7 @@ shared_examples_for "has attachments" do
     end
   end
 
-  context "when are ordered by weight", processing_uploads_for: Decidim::AttachmentUploader do
+  context "when are ordered by weight" do
     let!(:last_document) { create(:attachment, :with_pdf, attached_to: attached_to, weight: 2) }
     let!(:first_document) { create(:attachment, :with_pdf, attached_to: attached_to, weight: 1) }
     let!(:last_image) { create(:attachment, attached_to: attached_to, weight: 2) }

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

@@ -7,14 +7,15 @@ shared_examples "email with logo" do
     let(:organization_logo) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
     let(:organization) { create(:organization, logo: organization_logo) }
     let(:mail) { described_class.event_received(event, event_class_name, resource, user, :follower, extra) }
+    let(:logo_path) { Rails.application.routes.url_helpers.rails_representation_path(organization.logo.variant(resize_to_fit: [600, 160]), only_path: true) }
 
     it "includes organization logo" do
-      expect(mail.body).to include(organization.logo.medium.url)
+      expect(mail.body).to include(logo_path)
     end
 
     it "includes organization logo with full link" do
       expect(mail.body).to include("alt=\"#{organization.name}\"")
-      expect(mail.body).to match(%r{https{0,1}://#{organization.host}#{organization.logo.medium.url}})
+      expect(mail.body).to match(%r{https{0,1}://#{organization.host}#{logo_path}})
     end
   end
 end

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

@@ -12,7 +12,7 @@ RSpec.shared_examples "manage component share tokens" do
       share_window = window_opened_by { click_link "Share", wait: 2 }
 
       within_window share_window do
-        expect(page).to have_current_path(component.share_tokens.reload.last.url)
+        expect(current_url).to include(component.share_tokens.reload.last.url)
       end
     end
   end

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

@@ -24,7 +24,7 @@ shared_context "with frontend map builder" do
     end
   end
   let(:organization) { create(:organization) }
-  let(:template) { template_class.new }
+  let(:template) { template_class.new(ActionView::LookupContext.new(nil)) }
   let(:options) { {} }
   let(:js_options) { options.transform_keys { |k| k.to_s.camelize(:lower) }.to_h }
 
@@ -67,20 +67,26 @@ shared_context "with frontend map elements" do
         <html lang="en">
         <head>
           <title>Map Test</title>
-          #{stylesheet_link_tag "application"}
-          #{javascript_include_tag "application"}
+          #{stylesheet_pack_tag "decidim_core"}
+          #{javascript_pack_tag "decidim_core"}
           #{builder.stylesheet_snippets}
           #{builder.javascript_snippets}
           #{head_extra}
         </head>
         <body>
-          #{document_inner}
+          <header>
+            <a href="#content">Skip to main content</a>
+          </header>
+          <main id="content">
+            <h1>Map Test</h1>
+            #{document_inner}
+          </main>
           <script type="text/javascript">
             // This is just to indicate to Capybara that the page has fully
             // finished loading.
-            $(document).ready(function() {
+            window.$(document).ready(function() {
               setTimeout(function() {
-                $("body").append('<div id="ready_indicator">Document ready</div>');
+                window.$("body").append('<div id="ready_indicator">Document ready</div>');
               }, 1000);
             });
           </script>
@@ -119,16 +125,27 @@ shared_examples "a page with dynamic map" do
     let(:html_body) do
       builder = subject
       template.instance_eval do
-        builder.map_element(id: "map", class: "google-map") do
-          content_tag(:span, "", id: "map_inner")
+        # Create two separate map elements to make sure generating multiple
+        # map elements won't produce any HTML or accessibility validation
+        # errors.
+        content = builder.map_element(id: "map1", class: "google-map") do
+          content_tag(:span, "", id: "map1_inner")
         end
+        content += builder.map_element(id: "map2", class: "google-map") do
+          content_tag(:span, "", id: "map2_inner")
+        end
+        content
       end
     end
   end
 
-  it "displays the map" do
-    expect(page).to have_selector("#map.google-map", visible: :all)
-    expect(page).to have_selector("#map_inner", visible: :all)
+  it_behaves_like "accessible page"
+
+  it "displays the maps" do
+    expect(page).to have_selector("#map1.google-map", visible: :all)
+    expect(page).to have_selector("#map1_inner", visible: :all)
+    expect(page).to have_selector("#map2.google-map", visible: :all)
+    expect(page).to have_selector("#map2_inner", visible: :all)
   end
 end
 

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

@@ -20,6 +20,7 @@ shared_examples "a paginated resource" do
       click_link "50"
     end
 
+    sleep 2
     expect(page).to have_css(resource_selector, count: collection_size)
     expect(page).to have_no_css(".pagination")
   end

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+shared_examples "share link" do
+  it "allows copying the share link from the share modal" do
+    expect(page).to have_css(".share-link", text: "Share")
+    find(".share-link", text: "Share").click
+
+    # This overrides document.execCommand in order to ensure it was called.
+    page.execute_script(
+      <<~JS
+        var origExec = document.execCommand;
+        document.execCommand = function(cmd) {
+          if (cmd === "copy") {
+            var $test = $('<div id="urlShareTest" />');
+            $("#urlShare").append($test);
+
+            var selObj = window.getSelection();
+            $test.text(
+              "The following text was copied to clipboard: " + selObj.toString()
+            );
+            return true;
+          } else {
+            return Reflect.apply(origExec, document, arguments)
+          }
+        };
+      JS
+    )
+
+    within "#socialShare" do
+      expect(page).to have_content("Share:")
+      expect(page).to have_content("Share link")
+
+      find("a[data-open='urlShare']").click
+    end
+
+    within "#urlShare" do
+      expect(page).to have_content("Share link:")
+      find("button[data-clipboard-copy]").click
+
+      expect(find("button[data-clipboard-copy]")).to have_content("Copied!")
+
+      input = find("#urlShareLink")
+      expect(page).to have_content("The following text was copied to clipboard: #{input.value}")
+
+      # Check that the screen reader announcement is properly added.
+      announcement = find(".clipboard-announcement")
+      expect(announcement).to have_content("The link was successfully copied to clipboard.")
+    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.24.3"
+      "0.25.0.rc1"
     end
   end
 end

data/lib/decidim/data_portability_serializers/data_portability_conversation_serializer.rb

@@ -24,6 +24,7 @@ module Decidim
       private
 
       attr_reader :conversation
+      alias resource conversation
 
       def messages
         conversation.messages.map do |message|

data/lib/decidim/diffy_extension.rb

@@ -11,7 +11,7 @@ module Decidim
 
       def to_s
         str = wrap_lines(@diff.map { |line| wrap_line(line) })
-        ActionView::Base.new.sanitize(str, tags: TAGS)
+        ActionView::Base.new(ActionView::LookupContext.new(nil), {}, nil).sanitize(str, tags: TAGS)
       end
     end
 

data/lib/decidim/events/email_event.rb

@@ -33,6 +33,18 @@ module Decidim
         def email_outro
           I18n.t("decidim.events.email_event.email_outro", resource_title: resource_title)
         end
+
+        def has_button?
+          button_text.present? && button_url.present?
+        end
+
+        def button_text
+          nil
+        end
+
+        def button_url
+          nil
+        end
       end
     end
   end

data/lib/decidim/exporters/csv.rb

@@ -48,7 +48,7 @@ module Decidim
 
       def processed_collection
         @processed_collection ||= collection.map do |resource|
-          flatten(@serializer.new(resource).serialize)
+          flatten(@serializer.new(resource).run)
         end
       end
 

data/lib/decidim/exporters/excel.rb

@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
-require "spreadsheet"
+require "rubyXL"
+
+require "rubyXL/convenience_methods/cell"
+require "rubyXL/convenience_methods/font"
+require "rubyXL/convenience_methods/workbook"
+require "rubyXL/convenience_methods/worksheet"
 
 module Decidim
   module Exporters
@@ -18,31 +23,30 @@ module Decidim
       #
       # Returns an ExportData instance.
       def export
-        book = Spreadsheet::Workbook.new
-        sheet = book.create_worksheet
-        sheet.name = "Export"
-
-        sheet.row(0).default_format = Spreadsheet::Format.new(
-          weight: :bold,
-          pattern: 1,
-          pattern_fg_color: :xls_color_14,
-          horizontal_align: :center
-        )
-
-        sheet.row(0).replace headers
+        workbook = RubyXL::Workbook.new
+        worksheet = workbook[0]
 
-        headers.length.times.each do |index|
-          sheet.column(index).width = 20
+        headers.each_with_index.map do |header, index|
+          worksheet.change_column_width(index, 20)
+          worksheet.add_cell(0, index, header)
         end
 
+        worksheet.change_row_fill(0, "c0c0c0")
+        worksheet.change_row_bold(0, true)
+        worksheet.change_row_horizontal_alignment(0, "center")
+
         processed_collection.each_with_index do |resource, index|
-          sheet.row(index + 1).replace(headers.map { |header| custom_sanitize(resource[header]) })
+          headers.each_with_index do |header, j|
+            if resource[header].respond_to?(:strftime)
+              cell = worksheet.add_cell(index + 1, j, custom_sanitize(resource[header]))
+              resource[header].is_a?(Date) ? cell.set_number_format("dd.mm.yyyy") : cell.set_number_format("dd.mm.yyyy HH:MM:SS")
+              next
+            end
+            worksheet.add_cell(index + 1, j, custom_sanitize(resource[header]))
+          end
         end
 
-        output = StringIO.new
-        book.write output
-
-        ExportData.new(output.string, "xls")
+        ExportData.new(workbook.stream.string, "xlsx")
       end
     end
   end

data/lib/decidim/exporters/json.rb

@@ -13,7 +13,7 @@ module Decidim
       # Returns an ExportData with the export.
       def export
         data = ::JSON.pretty_generate(@collection.map do |resource|
-          @serializer.new(resource).serialize
+          @serializer.new(resource).run
         end)
 
         ExportData.new(data, "json")

data/lib/decidim/file_validator_humanizer.rb

@@ -21,7 +21,7 @@ module Decidim
     end
 
     def uploader
-      @uploader ||= passthru_uploader || record.send(attribute)
+      @uploader ||= passthru_uploader || record.attached_uploader(attribute) || record.send(attribute)
     end
 
     def messages
@@ -94,7 +94,8 @@ module Decidim
     def passthru_uploader
       return unless passthru_record
 
-      passthru_record.send(passthru_validator.target_attribute(attribute))
+      passthru_attribute = passthru_validator.target_attribute(attribute)
+      passthru_record.attached_uploader(passthru_attribute) || passthru_record.send(passthru_attribute)
     end
   end
 end

data/lib/decidim/filter_form_builder.rb

@@ -55,9 +55,9 @@ module Decidim
     end
 
     # Wrap the areas select in a custom fieldset.
-    def areas_select(method, collection, options = {})
+    def areas_select(method, collection, options = {}, html_options = {})
       fieldset_wrapper(options[:legend_title], "#{method}_areas_select_filter") do
-        super(method, collection, options)
+        super(method, collection, options, html_options)
       end
     end
 

data/lib/decidim/fingerprintable.rb

@@ -53,8 +53,8 @@ module Decidim
       if options[:block]
         options[:block].call(self)
       elsif options[:fields]
-        options[:fields].each_with_object({}) do |field, result|
-          result[field] = send(field)
+        options[:fields].index_with do |field|
+          send(field)
         end
       else
         raise "Fingerprinting needs to be set up via the `fingerprint` class method."