decidim-core 0.9.3 → 0.10.0

data/lib/decidim/core/test.rb

@@ -4,6 +4,7 @@ require "decidim/core/test/shared_examples/authorable"
 require "decidim/core/test/shared_examples/publicable"
 require "decidim/core/test/shared_examples/localised_email"
 require "decidim/core/test/shared_examples/has_attachments"
+require "decidim/core/test/shared_examples/has_attachment_collections"
 require "decidim/core/test/shared_examples/has_feature"
 require "decidim/core/test/shared_examples/has_scope"
 require "decidim/core/test/shared_examples/has_category"
@@ -19,3 +20,4 @@ require "decidim/core/test/shared_examples/scope_helper_examples"
 require "decidim/core/test/shared_examples/user_localised_email_examples"
 require "decidim/core/test/shared_examples/follows_examples"
 require "decidim/core/test/shared_examples/simple_event"
+require "decidim/core/test/shared_examples/component_type"

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

@@ -31,6 +31,10 @@ FactoryBot.define do
     "#{Faker::Lorem.characters(4).upcase}-#{n}"
   end
 
+  sequence(:area_name) do |n|
+    "#{Faker::Lorem.sentence(1, true, 3)} #{n}"
+  end
+
   factory :category, class: "Decidim::Category" do
     name { Decidim::Faker::Localized.sentence(3) }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
@@ -105,15 +109,10 @@ FactoryBot.define do
 
     trait :officialized do
       officialized_at { Time.zone.now }
+      officialized_as { Decidim::Faker::Localized.sentence(3) }
     end
   end
 
-  factory :participatory_process_user_role, class: "Decidim::ParticipatoryProcessUserRole" do
-    user
-    participatory_process { create :participatory_process, organization: user.organization }
-    role "admin"
-  end
-
   factory :user_group, class: "Decidim::UserGroup" do
     name { Faker::Educator.course }
     document_number { Faker::Number.number(8) + "X" }
@@ -181,10 +180,19 @@ FactoryBot.define do
     end
   end
 
+  factory :attachment_collection, class: "Decidim::AttachmentCollection" do
+    name { Decidim::Faker::Localized.sentence(1) }
+    description { Decidim::Faker::Localized.sentence(2) }
+    weight { Faker::Number.number(1) }
+
+    association :collection_for, factory: :participatory_process
+  end
+
   factory :attachment, class: "Decidim::Attachment" do
     title { Decidim::Faker::Localized.sentence(3) }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
     file { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
+    weight { Faker::Number.number(1) }
     attached_to { build(:participatory_process) }
     content_type { "image/jpeg" }
     file_size { 108_908 }
@@ -240,6 +248,17 @@ FactoryBot.define do
     end
   end
 
+  factory :area_type, class: "Decidim::AreaType" do
+    name { Decidim::Faker::Localized.word }
+    plural { Decidim::Faker::Localized.literal(name.values.first.pluralize) }
+    organization
+  end
+
+  factory :area, class: "Decidim::Area" do
+    name { Decidim::Faker::Localized.literal(generate(:area_name)) }
+    organization
+  end
+
   factory :dummy_resource, class: "Decidim::DummyResources::DummyResource" do
     title { generate(:name) }
     feature { create(:feature, manifest_name: "dummy") }
@@ -258,6 +277,10 @@ FactoryBot.define do
 
     subject { Decidim::Faker::Localized.sentence(3) }
     body { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
+
+    trait :sent do
+      sent_at { Time.current }
+    end
   end
 
   factory :moderation, class: "Decidim::Moderation" do
@@ -307,4 +330,37 @@ FactoryBot.define do
       }
     end
   end
+
+  factory :action_log, class: "Decidim::ActionLog" do
+    transient do
+      extra_data { {} }
+    end
+
+    organization { user.organization }
+    user
+    participatory_space { build :participatory_process, organization: organization }
+    feature { build :feature, participatory_space: participatory_space }
+    resource { build(:dummy_resource, feature: feature) }
+    action { "create" }
+    extra do
+      {
+        feature: {
+          manifest_name: feature.try(:manifest_name),
+          title: feature.try(:name) || feature.try(:title)
+        }.compact,
+        participatory_space: {
+          manifest_name: participatory_space.try(:class).try(:participatory_space_manifest).try(:name),
+          title: participatory_space.try(:name) || participatory_space.try(:title)
+        }.compact,
+        resource: {
+          title: resource.try(:name) || resource.try(:title)
+        }.compact,
+        user: {
+          ip: user.try(:current_sign_in_ip),
+          name: user.try(:name),
+          nickname: user.try(:nickname)
+        }.compact
+      }.deep_merge(extra_data)
+    end
+  end
 end

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

@@ -23,7 +23,7 @@ shared_examples "manage announcements" do
 
   context "when the general announcement is set" do
     before do
-      current_feature.update_attributes!(
+      current_feature.update!(
         settings: {
           announcement: {
             en: "An important announcement",

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

@@ -94,20 +94,22 @@ shared_examples "comments" do
       let!(:comment_author) { create(:user, :confirmed, organization: organization) }
       let!(:comment) { create(:comment, commentable: commentable, author: comment_author) }
 
-      before do
+      it "shows reply to the user" do
         visit resource_path
 
         expect(page).to have_selector(".comment__reply")
 
         within "#comments #comment_#{comment.id}" do
           click_button "Reply"
-          expect(page).to have_selector(".add-comment")
-          fill_in "add-comment-Decidim::Comments::Comment-#{comment.id}", with: "This is a reply"
+        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"
+        within ".comment-thread .add-comment" do
           click_button "Send"
         end
-      end
 
-      it "shows reply to the user" do
+        expect(page).to have_selector(".comment-thread .comment--nested")
         expect(page).to have_reply_to(comment, "This is a reply")
       end
     end
@@ -172,5 +174,45 @@ shared_examples "comments" do
         end
       end
     end
+
+    describe "mentions" do
+      before do
+        visit resource_path
+
+        within ".add-comment form" do
+          fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: content
+          click_button "Send"
+        end
+      end
+
+      context "when mentioning a valid user" do
+        let!(:mentioned_user) { create(:user, :confirmed, organization: organization) }
+        let(:content) { "A valid user mention: @#{mentioned_user.nickname}" }
+
+        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}")
+          expect(page).to have_link "@#{mentioned_user.nickname}", href: "/profiles/#{mentioned_user.nickname}"
+        end
+      end
+
+      context "when mentioning an existing user outside current organization" do
+        let!(:mentioned_user) { create(:user, :confirmed, organization: create(:organization)) }
+        let(:content) { "This text mentions a user outside current organization: @#{mentioned_user.nickname}" }
+
+        it "ignores the mention" do
+          expect(page).to have_comment_from(user, "This text mentions a user outside current organization: @#{mentioned_user.nickname}")
+          expect(page).not_to have_link "@#{mentioned_user.nickname}"
+        end
+      end
+
+      context "when mentioning a non valid user" do
+        let(:content) { "This text mentions a @nonexistent user" }
+
+        it "ignores the mention" do
+          expect(page).to have_comment_from(user, "This text mentions a @nonexistent user")
+          expect(page).not_to have_link "@nonexistent"
+        end
+      end
+    end
   end
 end

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+shared_examples_for "a component query type" do
+  it "implements ComponentInterface" do
+    expect(subject.interfaces).to include(Decidim::Core::ComponentInterface)
+  end
+end

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

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples_for "has attachment collections" do
+  context "when it has attachment collections", processing_uploads_for: Decidim::AttachmentUploader 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) }
+
+    before do
+      visit current_path
+    end
+
+    it "shows them" do
+      within ".attachments .documents" do
+        expect(page).to have_content(/#{translated(attachment_collection.name, locale: :en)}/i)
+      end
+    end
+
+    it "show their documents" do
+      within ".attachments .documents #docs-collection-#{attachment_collection.id}", visible: false do
+        expect(page).to have_content(:all, /#{translated(document.title, locale: :en)}/i)
+        expect(page).not_to have_content(:all, /#{translated(other_document.title, locale: :en)}/i)
+      end
+    end
+  end
+
+  context "that are ordered by weight", processing_uploads_for: Decidim::AttachmentUploader 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) }
+
+    let!(:first_attachment_collection) { create(:attachment_collection, collection_for: collection_for, weight: 1) }
+    let!(:document_two) { create(:attachment, :with_pdf, attached_to: attached_to, attachment_collection: first_attachment_collection) }
+
+    before do
+      visit current_path
+    end
+
+    it "shows them ordered" do
+      within ".attachments .documents" do
+        expect(translated(first_attachment_collection.name, locale: :en)).to appear_before(translated(last_attachment_collection.name, locale: :en))
+      end
+    end
+  end
+
+  context "when collection is empty", processing_uploads_for: Decidim::AttachmentUploader 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) }
+
+    before do
+      visit current_path
+    end
+
+    it "is not present" do
+      within ".attachments .documents" do
+        expect(page).to have_content(/#{translated(attachment_collection.name, locale: :en)}/i)
+        expect(page).not_to have_content(/#{translated(empty_attachment_collection.name, locale: :en)}/i)
+      end
+    end
+  end
+end

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

@@ -22,4 +22,25 @@ shared_examples_for "has attachments" do
       end
     end
   end
+
+  context "that are ordered by weight", processing_uploads_for: Decidim::AttachmentUploader 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) }
+    let!(:fist_image) { create(:attachment, attached_to: attached_to, weight: 1) }
+
+    before do
+      visit current_path
+    end
+
+    it "shows them ordered" do
+      within "div.wrapper .documents" do
+        expect(translated(first_document.title, locale: :en)).to appear_before(translated(last_document.title, locale: :en))
+      end
+
+      within "div.wrapper .images" do
+        expect(strip_tags(translated(fist_image.description, locale: :en))).to appear_before(strip_tags(translated(last_image.description, locale: :en)))
+      end
+    end
+  end
 end

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

@@ -14,7 +14,7 @@ shared_examples_for "has reference" do
 
     context "when there is a custom resource reference generator present" do
       before do
-        allow(Decidim).to receive(:resource_reference_generator).and_return(->(resource, _feature) { "1234-#{resource.id}" })
+        allow(Decidim).to receive(:reference_generator).and_return(->(resource, _feature) { "1234-#{resource.id}" })
       end
 
       it "generates a valid reference" do

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

@@ -26,11 +26,14 @@ shared_context "simple event" do
   let(:resource_title) { resource.title["en"] }
   let(:participatory_space) { resource.participatory_space }
   let(:participatory_space_title) { participatory_space.title["en"] }
+  let(:participatory_space_path) { Decidim::ResourceLocatorPresenter.new(participatory_space).path }
+  let(:participatory_space_url) { Decidim::ResourceLocatorPresenter.new(participatory_space).url }
   let(:author) { resource.author }
   let(:author_presenter) { Decidim::UserPresenter.new(author) }
+  let(:i18n_scope) { event_name }
 end
 
-shared_examples_for "a simple event" do
+shared_examples_for "a simple event" do |skip_space_checks|
   describe "types" do
     subject { described_class }
 
@@ -85,4 +88,27 @@ shared_examples_for "a simple event" do
       expect(subject.resource_url).to start_with("http")
     end
   end
+
+  unless skip_space_checks
+    describe "participatory_space_url" do
+      it "is generated correctly" do
+        expect(subject.participatory_space_url).to be_kind_of(String)
+        expect(subject.participatory_space_url).to start_with("http")
+      end
+    end
+  end
+
+  describe "i18n_options" do
+    subject { super().i18n_options }
+
+    it { is_expected.to include(resource_path: satisfy(&:present?)) }
+    it { is_expected.to include(resource_title: satisfy(&:present?)) }
+    it { is_expected.to include(resource_url: start_with("http")) }
+    it { is_expected.to include(scope: i18n_scope) }
+
+    unless skip_space_checks
+      it { is_expected.to include(participatory_space_title: satisfy(&:present?)) }
+      it { is_expected.to include(participatory_space_url: start_with("http")) }
+    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.9.3"
+      "0.10.0"
     end
   end
 end

data/lib/decidim/events/author_event.rb

@@ -30,7 +30,7 @@ module Decidim
 
         def author_presenter
           return unless author
-          @author ||= Decidim::UserPresenter.new(author)
+          @author_presenter ||= Decidim::UserPresenter.new(author)
         end
 
         def author

data/lib/decidim/events/base_event.rb

@@ -86,7 +86,7 @@ module Decidim
       end
 
       def participatory_space
-        return feature.participatory_space if feature
+        feature&.participatory_space
       end
 
       def resource_title

data/lib/decidim/events/simple_event.rb

@@ -10,6 +10,7 @@ module Decidim
     class SimpleEvent < BaseEvent
       include Decidim::Events::EmailEvent
       include Decidim::Events::NotificationEvent
+      include Decidim::FeaturePathHelper
 
       class_attribute :i18n_interpolations
       self.i18n_interpolations = []
@@ -58,6 +59,25 @@ module Decidim
         default_i18n_options.merge(event_interpolations)
       end
 
+      # Caches the path for the given resource when it's a Decidim::Feature.
+      def resource_path
+        return super unless resource.is_a?(Decidim::Feature)
+        @resource_path ||= main_feature_path(resource)
+      end
+
+      # Caches the URL for the given resource when it's a Decidim::Feature.
+      def resource_url
+        return super unless resource.is_a?(Decidim::Feature)
+        @resource_url ||= main_feature_url(resource)
+      end
+
+      # Caches the URL for the resource's participatory space.
+      def participatory_space_url
+        return unless participatory_space
+
+        @participatory_space_url ||= ResourceLocatorPresenter.new(participatory_space).url
+      end
+
       private
 
       def event_interpolations
@@ -72,6 +92,7 @@ module Decidim
           resource_title: resource_title,
           resource_url: resource_url,
           participatory_space_title: participatory_space_title,
+          participatory_space_url: participatory_space_url,
           scope: i18n_scope
         }
       end

data/lib/decidim/exporters/excel.rb

@@ -36,7 +36,7 @@ module Decidim
         end
 
         processed_collection.each_with_index do |resource, index|
-          sheet.row(index + 1).replace headers.map { |header| resource[header] }
+          sheet.row(index + 1).replace(headers.map { |header| resource[header] })
         end
 
         output = StringIO.new