decidim-core 0.18.1 → 0.19.0

data/lib/decidim/core/test.rb

@@ -27,7 +27,10 @@ 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/create_amendment_draft_examples"
+require "decidim/core/test/shared_examples/amendable/update_amendment_draft_examples"
+require "decidim/core/test/shared_examples/amendable/destroy_amendment_draft_examples"
+require "decidim/core/test/shared_examples/amendable/publish_amendment_draft_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"

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

@@ -41,7 +41,7 @@ FactoryBot.define do
   end
 
   sequence(:scope_name) do |n|
-    "#{Faker::Lorem.sentence(1, true, 3)} #{n}"
+    "#{Faker::Lorem.sentence(1, true, 3)} #{n}".gsub("s", "z").gsub("S", "Z")
   end
 
   sequence(:scope_code) do |n|
@@ -87,6 +87,7 @@ FactoryBot.define do
     badges_enabled { true }
     user_groups_enabled { true }
     send_welcome_notification { true }
+    force_users_to_authenticate_before_access_organization { false }
     smtp_settings do
       {
         "from" => "test@example.org",
@@ -311,6 +312,17 @@ FactoryBot.define do
     participatory_space { create(:participatory_process, organization: organization) }
     manifest_name { "dummy" }
     published_at { Time.current }
+    settings do
+      {
+        dummy_global_translatable_text: generate_localized_title
+      }
+    end
+
+    default_step_settings do
+      {
+        dummy_step_translatable_text: generate_localized_title
+      }
+    end
 
     trait :unpublished do
       published_at { nil }
@@ -319,6 +331,14 @@ FactoryBot.define do
     trait :published do
       published_at { Time.current }
     end
+
+    trait :with_amendments_enabled do
+      settings do
+        {
+          amendments_enabled: true
+        }
+      end
+    end
   end
 
   factory :scope_type, class: "Decidim::ScopeType" do
@@ -366,6 +386,10 @@ FactoryBot.define do
     component { create(:component, manifest_name: "dummy") }
     author { create(:user, :confirmed, organization: component.organization) }
     scope { create(:scope, organization: component.organization) }
+
+    trait :published do
+      published_at { Time.current }
+    end
   end
 
   factory :resource_link, class: "Decidim::ResourceLink" do
@@ -525,14 +549,17 @@ FactoryBot.define do
   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) }
+    amender { emendation.try(:creator_author) || emendation.try(:author) }
+    state { "evaluating" }
+
+    trait :draft do
+      state { "draft" }
+    end
+
+    trait :rejected do
+      state { "rejected" }
+    end
   end
 end

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+shared_examples "create amendment draft" do
+  context "when the form is valid" do
+    it "broadcasts ok" do
+      expect { command.call }.to broadcast(:ok)
+    end
+
+    it "creates an amendment (draft) and the emendation (not published)" do
+      expect { command.call }
+        .to change(Decidim::Amendment, :count)
+        .by(1)
+        .and change(amendable.class, :count)
+        .by(1)
+
+      expect(Decidim::Amendment.last.draft?).to eq(true)
+      expect(amendable.class.last.published?).to eq(false)
+    end
+
+    it "traces the action without creating a PaperTrail version for the emendation", versioning: true do
+      expect(Decidim.traceability)
+        .to receive(:perform_action!)
+        .with(
+          :create,
+          amendable.class,
+          form.current_user,
+          kind_of(Hash)
+        ).and_call_original
+
+      expect { command.call }.to change(Decidim::ActionLog, :count).by(1)
+      expect(amendable.class.last.versions.count).to eq(0)
+    end
+  end
+
+  context "when the form is invalid" do
+    let(:title) { "Too short" }
+
+    it "broadcasts invalid" do
+      expect { command.call }.to broadcast(:invalid)
+    end
+
+    it "doesn't create an amendment and the emendation" do
+      expect { command.call }
+        .to change(Decidim::Amendment, :count)
+        .by(0)
+        .and change(amendable.class, :count)
+        .by(0)
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+shared_examples "destroy amendment draft" do
+  context "when current user is the author of the amendment" do
+    let(:current_user) { amendment.amender }
+
+    describe "and the amendment is a draft" do
+      it "broadcasts ok" do
+        expect { command.call }.to broadcast(:ok)
+      end
+
+      it "destroys the amendment and the emendation" do
+        expect { command.call }
+          .to change(Decidim::Amendment, :count)
+          .by(-1)
+          .and change(amendable.class, :count)
+          .by(-1)
+      end
+    end
+
+    describe "and the amendment is not a draft" do
+      before do
+        amendment.update(state: "evaluating")
+      end
+
+      it "broadcasts invalid" do
+        expect { command.call }.to broadcast(:invalid)
+      end
+    end
+  end
+
+  describe "when the current user is not the amender" do
+    let!(:current_user) { other_user }
+
+    it "broadcasts invalid" do
+      expect { command.call }.to broadcast(:invalid)
+    end
+  end
+end

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

@@ -7,9 +7,7 @@ shared_examples "promote amendment" do
     end
 
     it "creates an amendable type resource" do
-      expect { command.call }
-        .to change(amendable.resource_manifest.model_class_name.constantize, :count)
-        .by(1)
+      expect { command.call }.to change(amendable.class, :count).by(1)
     end
 
     it "traces the action", versioning: true do
@@ -40,4 +38,30 @@ shared_examples "promote amendment" do
       command.call
     end
   end
+
+  context "when the form is not valid" do
+    let(:form) { Decidim::Amendable::PromoteForm.from_params(id: nil) }
+
+    it "broadcasts invalid" do
+      expect { command.call }.to broadcast(:invalid)
+    end
+  end
+
+  context "when current user is not the author of the amendment" do
+    let(:current_user) { other_user }
+
+    it "broadcasts invalid" do
+      expect { command.call }.to broadcast(:invalid)
+    end
+  end
+
+  context "when amendment is not rejected" do
+    before do
+      amendment.update(state: "evaluating")
+    end
+
+    it "broadcasts invalid" do
+      expect { command.call }.to broadcast(:invalid)
+    end
+  end
 end

data/lib/decidim/core/test/shared_examples/amendable/{create_amendment_examples.rb → publish_amendment_draft_examples.rb}

@@ -1,17 +1,16 @@
 # frozen_string_literal: true
 
-shared_examples "create amendment" do
-  context "when the form is valid" do
+shared_examples "publish amendment draft" do
+  describe "when the form is valid" do
     it "broadcasts ok" do
       expect { command.call }.to broadcast(:ok)
     end
 
-    it "creates an amendment and the emendation" do
-      expect { command.call }
-        .to change(Decidim::Amendment, :count)
-        .by(1)
-        .and change(amendable.resource_manifest.model_class_name.constantize, :count)
-        .by(1)
+    it "publishes the amendment and the emendation" do
+      command.call
+
+      expect(Decidim::Amendment.last.draft?).to eq(false)
+      expect(amendable.class.last.published?).to eq(true)
     end
 
     it "traces the action", versioning: true do
@@ -19,7 +18,7 @@ shared_examples "create amendment" do
         .to receive(:perform_action!)
         .with(
           "publish",
-          form.amendable.amendable_type.constantize,
+          form.amendable.class,
           form.current_user,
           kind_of(Hash)
         ).and_call_original
@@ -42,19 +41,29 @@ shared_examples "create amendment" do
     end
   end
 
-  context "when the form is invalid" do
-    let(:title) { "Too short" }
+  context "when the form is not valid" do
+    let(:form) { Decidim::Amendable::PublishForm.from_params(id: nil) }
 
     it "broadcasts invalid" do
       expect { command.call }.to broadcast(:invalid)
     end
+  end
+
+  context "when current user is not the author of the amendment" do
+    let(:current_user) { other_user }
 
-    it "doesn't create an amendment and the emendation" do
-      expect { command.call }
-        .to change(Decidim::Amendment, :count)
-        .by(0)
-        .and change(amendable.resource_manifest.model_class_name.constantize, :count)
-        .by(0)
+    it "broadcasts invalid" do
+      expect { command.call }.to broadcast(:invalid)
+    end
+  end
+
+  context "when amendment is not a draft" do
+    before do
+      amendment.update(state: "evaluating")
+    end
+
+    it "broadcasts invalid" do
+      expect { command.call }.to broadcast(:invalid)
     end
   end
 end

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+shared_examples "update amendment draft" do
+  describe "when the form is valid" do
+    it "broadcasts ok" do
+      expect { command.call }.to broadcast(:ok)
+    end
+
+    it "updates the emendation without creating a PaperTrail version" do
+      expect { command.call }
+        .to change(form.emendation, :title)
+        .and change(form.emendation, :body)
+      expect(amendable.class.last.versions.count).to eq(0)
+    end
+  end
+
+  describe "when the form is not valid" do
+    let(:title) { "Too short" }
+
+    it "broadcasts invalid" do
+      expect { command.call }.to broadcast(:invalid)
+    end
+  end
+
+  describe "when the current user is not the amender" do
+    let(:current_user) { other_user }
+
+    it "broadcasts invalid" do
+      expect { command.call }.to broadcast(:invalid)
+    end
+  end
+
+  describe "when the amendment is not a draft" do
+    before do
+      amendment.update(state: "evaluating")
+    end
+
+    it "broadcasts invalid" do
+      expect { command.call }.to broadcast(:invalid)
+    end
+  end
+end

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

@@ -1,29 +1,37 @@
 # frozen_string_literal: true
 
 shared_examples "withdraw amendment" do
-  context "when current user IS the author of the amendment" do
+  context "when current user is the author of the amendment" do
+    let(:current_user) { amendment.amender }
+
     context "and the amendment has no supports" do
       it "withdraws the amendment" do
-        expect do
-          expect { command.call }.to broadcast(:ok)
-        end.to change { Decidim::Proposals::Proposal.count }.by(0)
-        expect(emendation.amendment.state).to eq("withdrawn")
+        expect { command.call }.to broadcast(:ok)
+        expect(amendment.state).to eq("withdrawn")
         expect(emendation.state).to eq("withdrawn")
       end
     end
 
-    context "and the amendment HAS some supports" do
+    context "and the amendment has some supports" do
       before do
-        emendation.votes.create!(author: current_user)
+        emendation.votes.create!(author: other_user)
       end
 
       it "is not able to withdraw the amendment" do
-        expect do
-          expect { command.call }.to broadcast(:invalid)
-        end.to change { Decidim::Proposals::Proposal.count }.by(0)
-        expect(emendation.amendment.state).not_to eq("withdrawn")
+        expect { command.call }.to broadcast(:invalid)
+        expect(amendment.state).not_to eq("withdrawn")
         expect(emendation.state).not_to eq("withdrawn")
       end
     end
   end
+
+  context "when current user is not the author of the amendment" do
+    let!(:current_user) { other_user }
+
+    it "is not able to withdraw the amendment" do
+      expect { command.call }.to broadcast(:invalid)
+      expect(amendment.state).not_to eq("withdrawn")
+      expect(emendation.state).not_to eq("withdrawn")
+    end
+  end
 end

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

@@ -26,7 +26,7 @@ shared_examples_for "has attachment collections" do
     end
   end
 
-  context "that are ordered by weight", processing_uploads_for: Decidim::AttachmentUploader do
+  context "when 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) }
 

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

@@ -23,7 +23,7 @@ shared_examples_for "has attachments" do
     end
   end
 
-  context "that are ordered by weight", processing_uploads_for: Decidim::AttachmentUploader do
+  context "when 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) }

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

@@ -3,6 +3,7 @@
 require "spec_helper"
 
 shared_context "when a simple event" do
+  include Decidim::SanitizeHelper
   subject { event_instance }
 
   let(:event_instance) do
@@ -40,6 +41,9 @@ shared_context "when a simple event" do
     end
   end
   let(:author_presenter) { Decidim::UserPresenter.new(author) }
+  let(:author_name) { decidim_html_escape author.name }
+  let(:author_path) { author_presenter&.profile_path.to_s }
+  let(:author_nickname) { author_presenter&.nickname.to_s }
   let(:i18n_scope) { event_name }
 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.18.1"
+      "0.19.0"
     end
   end
 end

data/lib/decidim/data_portability_file_zipper.rb

@@ -38,8 +38,10 @@ module Decidim
       zipfile = Zip::File.open(file_path)
       @export_images.each do |image_block|
         next if image_block.last.nil?
+
         image_block.last.each do |image|
           next if image.file.nil?
+
           folder_name = image_block.first.parameterize
           uploader = Decidim::ApplicationUploader.new(image.model, image.mounted_as)
           if image.file.respond_to? :file
@@ -54,6 +56,7 @@ module Decidim
           end
           my_image_path = File.open(image.file.file)
           next unless File.exist?(my_image_path)
+
           zipfile.add("#{folder_name}/#{image.file.filename}", my_image_path)
           CarrierWave.clean_cached_files!
         end