decidim-core 0.15.2 → 0.16.0

data/lib/decidim/core/engine.rb

@@ -38,6 +38,7 @@ require "doorkeeper-i18n"
 require "nobspw"
 require "kaminari"
 require "batch-loader"
+require "etherpad-lite"
 
 require "decidim/api"
 
@@ -55,7 +56,7 @@ module Decidim
       end
 
       initializer "decidim.middleware" do |app|
-        app.config.middleware.use Decidim::CurrentOrganization
+        app.config.middleware.insert_before Warden::Manager, Decidim::CurrentOrganization
         app.config.middleware.use BatchLoader::Middleware
       end
 
@@ -135,7 +136,7 @@ module Decidim
                     position: 1,
                     active: :exclusive
 
-          menu.item I18n.t("menu.more_information", scope: "decidim"),
+          menu.item I18n.t("menu.help", scope: "decidim"),
                     decidim.pages_path,
                     position: 7,
                     active: :inclusive
@@ -159,15 +160,19 @@ module Decidim
                       position: 1.2
           end
 
-          if user_groups.any?
+          if current_organization.user_groups_enabled? && user_groups.any?
             menu.item t("user_groups", scope: "layouts.decidim.user_profile"),
                       decidim.own_user_groups_path,
                       position: 1.3
           end
 
+          menu.item t("my_interests", scope: "layouts.decidim.user_profile"),
+                    decidim.user_interests_path,
+                    position: 1.4
+
           menu.item t("my_data", scope: "layouts.decidim.user_profile"),
                     decidim.data_portability_path,
-                    position: 1.4
+                    position: 1.5
 
           menu.item t("delete_my_account", scope: "layouts.decidim.user_profile"),
                     decidim.delete_account_path,
@@ -182,14 +187,16 @@ module Decidim
             event_name,
             data[:event_class],
             data[:resource],
-            data[:recipient_ids],
+            data[:followers],
+            data[:affected_users],
             data[:extra]
           )
           NotificationGeneratorJob.perform_later(
             event_name,
             data[:event_class],
             data[:resource],
-            data[:recipient_ids],
+            data[:followers],
+            data[:affected_users],
             data[:extra]
           )
         end
@@ -207,6 +214,7 @@ module Decidim
 
       initializer "add_cells_view_paths" do
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Core::Engine.root}/app/cells")
+        Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Core::Engine.root}/app/cells/amendable")
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Core::Engine.root}/app/views") # for partials
       end
 
@@ -270,6 +278,7 @@ module Decidim
         Decidim.register_resource(:user) do |resource|
           resource.model_class_name = "Decidim::User"
           resource.card = "decidim/user_profile"
+          resource.searchable = true
         end
 
         Decidim.register_resource(:user_group) do |resource|
@@ -279,12 +288,37 @@ module Decidim
       end
 
       initializer "decidim.core.register_metrics" do
-        Decidim.metrics_registry.register(
-          :users,
-          "Decidim::Metrics::UsersMetricManage",
-          Decidim::MetricRegistry::HIGHLIGHTED,
-          1
-        )
+        Decidim.metrics_registry.register(:users) do |metric_registry|
+          metric_registry.manager_class = "Decidim::Metrics::UsersMetricManage"
+
+          metric_registry.settings do |settings|
+            settings.attribute :highlighted, type: :boolean, default: true
+            settings.attribute :scopes, type: :array, default: %w(home)
+            settings.attribute :weight, type: :integer, default: 1
+          end
+        end
+
+        Decidim.metrics_registry.register(:participants) do |metric_registry|
+          metric_registry.manager_class = "Decidim::Metrics::ParticipantsMetricManage"
+
+          metric_registry.settings do |settings|
+            settings.attribute :highlighted, type: :boolean, default: true
+            settings.attribute :scopes, type: :array, default: %w(participatory_process)
+            settings.attribute :weight, type: :integer, default: 1
+            settings.attribute :stat_block, type: :string, default: "big"
+          end
+        end
+
+        Decidim.metrics_registry.register(:followers) do |metric_registry|
+          metric_registry.manager_class = "Decidim::Metrics::FollowersMetricManage"
+
+          metric_registry.settings do |settings|
+            settings.attribute :highlighted, type: :boolean, default: false
+            settings.attribute :scopes, type: :array, default: %w(participatory_process)
+            settings.attribute :weight, type: :integer, default: 10
+            settings.attribute :stat_block, type: :string, default: "medium"
+          end
+        end
       end
 
       initializer "decidim.core.content_blocks" do

data/lib/decidim/core/test.rb

@@ -27,3 +27,14 @@ require "decidim/core/test/shared_examples/searchable_results_examples"
 require "decidim/core/test/shared_examples/has_space_in_mcell_examples"
 require "decidim/core/test/shared_examples/railtie_examples"
 require "decidim/core/test/shared_examples/edit_link_shared_examples"
+require "decidim/core/test/shared_examples/amendable/create_amendment_examples"
+require "decidim/core/test/shared_examples/amendable/withdraw_amendment_examples"
+require "decidim/core/test/shared_examples/amendable/reject_amendment_examples"
+require "decidim/core/test/shared_examples/amendable/promote_amendment_examples"
+require "decidim/core/test/shared_examples/amendable/amendment_form_examples"
+require "decidim/core/test/shared_examples/amendable/accept_amendment_examples"
+require "decidim/core/test/shared_examples/resourceable"
+require "decidim/core/test/shared_examples/amendable/amendment_created_event_examples"
+require "decidim/core/test/shared_examples/amendable/amendment_accepted_event_examples"
+require "decidim/core/test/shared_examples/amendable/amendment_rejected_event_examples"
+require "decidim/core/test/shared_examples/amendable/amendment_promoted_event_examples"

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

@@ -78,19 +78,19 @@ FactoryBot.define do
     favicon { Decidim::Dev.test_file("icon.png", "image/png") }
     default_locale { Decidim.default_locale }
     available_locales { Decidim.available_locales }
+    users_registration_mode { :enabled }
     official_img_header { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
     official_img_footer { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
     official_url { Faker::Internet.url }
     highlighted_content_banner_enabled { false }
     enable_omnipresent_banner { false }
-    tos_version { Time.current }
     badges_enabled { true }
+    user_groups_enabled { true }
+    send_welcome_notification { true }
 
-    trait :with_tos do
-      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?
-      end
+    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?
     end
   end
 
@@ -107,13 +107,8 @@ FactoryBot.define do
     personal_url { Faker::Internet.url }
     about { Faker::Lorem.paragraph(2) }
     confirmation_sent_at { Time.current }
-
-    after(:create) do |user|
-      tos_page = Decidim::StaticPage.find_by(slug: "terms-and-conditions", organization: user.organization)
-      create(:static_page, :tos, organization: user.organization) if tos_page.nil?
-      user.accepted_tos_version = user.organization.tos_version
-      user.save
-    end
+    accepted_tos_version { organization.tos_version }
+    email_on_notification { true }
 
     trait :confirmed do
       confirmed_at { Time.current }
@@ -181,6 +176,10 @@ FactoryBot.define do
       rejected_at { Time.current }
     end
 
+    trait :confirmed do
+      confirmed_at { Time.current }
+    end
+
     after(:build) do |user_group, evaluator|
       user_group.extended_data = {
         document_number: evaluator.document_number,
@@ -235,17 +234,35 @@ FactoryBot.define do
     slug { generate(:slug) }
     title { generate_localized_title }
     content { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    organization
+    organization { build(:organization) }
 
     trait :default do
-      slug { Decidim::StaticPage::DEFAULT_PAGES.sample }
+      slug { (Decidim::StaticPage::DEFAULT_PAGES - ["terms-and-conditions"]).sample }
     end
 
     trait :tos do
       slug { "terms-and-conditions" }
+      after(:create) do |tos_page|
+        tos_page.organization.tos_version = tos_page.updated_at
+        tos_page.organization.save!
+      end
+    end
+
+    trait :with_topic do
+      after(:create) do |static_page|
+        topic = create(:static_page_topic, organization: static_page.organization)
+        static_page.topic = topic
+        static_page.save
+      end
     end
   end
 
+  factory :static_page_topic, class: "Decidim::StaticPageTopic" do
+    title { generate_localized_title }
+    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    organization
+  end
+
   factory :attachment_collection, class: "Decidim::AttachmentCollection" do
     name { generate_localized_title }
     description { generate_localized_title }
@@ -495,4 +512,16 @@ FactoryBot.define do
     participatory_space { create :participatory_process, organization: organization }
     related_object { create :component, participatory_space: participatory_space }
   end
+
+  factory :amendment, class: "Decidim::Amendment" do
+    amender do
+      build(
+        :user,
+        organization: amendable.try(:organization) || build(:organization)
+      )
+    end
+    state { "evaluating" }
+    amendable { build(:dummy_resource) }
+    emendation { build(:dummy_resource) }
+  end
 end

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+shared_examples "accept amendment" do
+  context "when the form is valid" do
+    it "broadcasts ok" do
+      expect { command.call }.to broadcast(:ok)
+    end
+
+    it "changes the emendation state to accepted" do
+      expect { command.call && emendation.reload }.to change(emendation, :state)
+        .from("evaluating").to("accepted")
+    end
+
+    it "adds the emendation author as coauthor of the proposal" do
+      expect { command.call }.to change { amendable.coauthorships.count }
+        .from(1).to(2)
+        .and change { amendable.authored_by?(emendation.creator_author) }
+        .from(false).to(true)
+    end
+
+    it "traces the action", versioning: true do
+      expect(Decidim.traceability)
+        .to receive(:update!)
+        .with(
+          amendment,
+          amendable.creator_author,
+          { state: "accepted" },
+          visibility: "public-only"
+        ).and_call_original
+
+      expect(Decidim.traceability)
+        .to receive(:update!)
+        .with(
+          amendable,
+          emendation.creator_author,
+          { body: emendation.body, title: emendation.title },
+          visibility: "public-only"
+        ).and_call_original
+
+      expect { command.call }.to change(Decidim::ActionLog, :count).by(2)
+    end
+
+    it "notifies the change" do
+      expect(Decidim::EventsManager)
+        .to receive(:publish)
+        .with(
+          event: "decidim.events.amendments.amendment_accepted",
+          event_class: Decidim::Amendable::AmendmentAcceptedEvent,
+          resource: emendation,
+          followers: kind_of(Array),
+          affected_users: kind_of(Array)
+        )
+
+      command.call
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+shared_examples "amendment accepted event" do
+  include_context "when a simple event"
+
+  let(:resource) { emendation }
+  let(:event_name) { "decidim.events.amendments.amendment_accepted" }
+
+  it_behaves_like "a simple event"
+
+  let(:amendable_title) { amendable.title }
+  let(:emendation_author_nickname) { "@#{emendation.creator_author.nickname}" }
+  let(:emendation_path) { Decidim::ResourceLocatorPresenter.new(emendation).path }
+  let(:emendation_author_path) { Decidim::UserPresenter.new(emendation.creator_author).profile_path }
+  let(:amendable_path) { Decidim::ResourceLocatorPresenter.new(amendable).path }
+
+  describe "email_subject" do
+    it "is generated correctly" do
+      expect(subject.email_subject).to eq("An amendment accepted for #{amendable_title} from #{emendation_author_nickname}")
+    end
+  end
+
+  describe "email_intro" do
+    it "is generated correctly" do
+      expect(subject.email_intro)
+        .to eq("An emendation has been accepted for #{amendable_title}. You can see it from this page:")
+    end
+  end
+
+  describe "email_outro" do
+    it "is generated correctly" do
+      expect(subject.email_outro)
+        .to eq("You have received this notification because you are following #{amendable_title}. You can stop receiving notifications following the previous link.")
+    end
+  end
+
+  describe "notification_title" do
+    it "is generated correctly" do
+      expect(subject.notification_title)
+        .to include("The <a href=\"#{emendation_path}\">emendation</a> created by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a> has been accepted for <a href=\"#{amendable_path}\">#{amendable_title}</a> #{amendable_type}.") # rubocop:disable Metrics/LineLength
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+shared_examples "amendment created event" do
+  include_context "when a simple event"
+
+  let(:resource) { amendable }
+  let(:event_name) { "decidim.events.amendments.amendment_created" }
+  let!(:extra) do
+    {
+      amendment_id: amendment.id
+    }
+  end
+
+  it_behaves_like "a simple event"
+
+  let(:amendable_title) { amendable.title }
+  let(:emendation_author_nickname) { "@#{emendation.creator_author.nickname}" }
+  let(:emendation_path) { Decidim::ResourceLocatorPresenter.new(emendation).path }
+  let(:emendation_author_path) { Decidim::UserPresenter.new(emendation.creator_author).profile_path }
+  let(:amendable_path) { Decidim::ResourceLocatorPresenter.new(amendable).path }
+
+  describe "email_subject" do
+    it "is generated correctly" do
+      expect(subject.email_subject).to eq("A new amendment for #{amendable_title} from #{emendation_author_nickname}")
+    end
+  end
+
+  describe "email_intro" do
+    it "is generated correctly" do
+      expect(subject.email_intro)
+        .to eq("A new emendation has been created for #{amendable_title}. You can see it from this page:")
+    end
+  end
+
+  describe "email_outro" do
+    it "is generated correctly" do
+      expect(subject.email_outro)
+        .to eq("You have received this notification because you are following #{amendable_title}. You can stop receiving notifications following the previous link.")
+    end
+  end
+
+  describe "notification_title" do
+    it "is generated correctly" do
+      expect(subject.notification_title)
+        .to include("A <a href=\"#{emendation_path}\">new emendation</a> has been created by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a> for <a href=\"#{amendable_path}\">#{amendable_title}</a> #{amendable_type}.") # rubocop:disable Metrics/LineLength
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+shared_examples "an amendment form" do
+  let(:title) { "More sidewalks and less roads!" }
+  let(:body) { "Everything would be better" }
+  let(:emendation_fields) do
+    {
+      title: title,
+      body: body
+    }
+  end
+
+  context "when everything is OK" do
+    it { is_expected.to be_valid }
+  end
+
+  context "when there's no title" do
+    let(:title) { nil }
+
+    it { is_expected.to be_invalid }
+
+    it "only adds errors to this field" do
+      subject.valid?
+      expect(subject.errors.keys).to eq [:title]
+    end
+  end
+
+  context "when the title is too long" do
+    let(:body) { "A" * 200 }
+
+    it { is_expected.to be_invalid }
+  end
+
+  context "when the body is not etiquette-compliant" do
+    let(:body) { "A" }
+
+    it { is_expected.to be_invalid }
+  end
+
+  context "when there's no body" do
+    let(:body) { nil }
+
+    it { is_expected.to be_invalid }
+  end
+end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+shared_examples "amendment promoted event" do
+  include_context "when a simple event"
+
+  let(:resource) { emendation }
+  let(:event_name) { "decidim.events.amendments.amendment_promoted" }
+
+  it_behaves_like "a simple event"
+
+  let(:amendable_title) { amendable.title }
+  let(:emendation_author_nickname) { "@#{emendation.creator_author.nickname}" }
+  let(:emendation_path) { Decidim::ResourceLocatorPresenter.new(emendation).path }
+  let(:emendation_author_path) { Decidim::UserPresenter.new(emendation.creator_author).profile_path }
+  let(:amendable_path) { Decidim::ResourceLocatorPresenter.new(amendable).path }
+
+  describe "email_subject" do
+    it "is generated correctly" do
+      expect(subject.email_subject).to eq("An emendation from #{emendation_author_nickname} has been promoted")
+    end
+  end
+
+  describe "email_intro" do
+    it "is generated correctly" do
+      expect(subject.email_intro)
+        .to eq("An emendation rejected for #{amendable_title} has been promoted to an independent #{amendable_type}. You can see it from this page:")
+    end
+  end
+
+  describe "email_outro" do
+    it "is generated correctly" do
+      expect(subject.email_outro)
+        .to eq("You have received this notification because you are following #{amendable_title}. You can stop receiving notifications following the previous link.")
+    end
+  end
+
+  describe "notification_title" do
+    it "is generated correctly" do
+      expect(subject.notification_title)
+        .to include("A <a href=\"#{emendation_path}\">rejected emendation</a> for <a href=\"#{amendable_path}\">#{amendable_title}</a> #{amendable_type} has been promoted by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a>.") # rubocop:disable Metrics/LineLength
+    end
+  end
+end