-
+
-
-
-
-
-
-
-
-
- <% if @form.participatory_process_types_for_select.present? %>
-
- <%= form.select(
- :participatory_process_type_id,
- @form.participatory_process_types_for_select,
- include_blank: t(".select_participatory_process_type")
- ) %>
-
- <% end %>
-
-
-
-<%= append_javascript_pack_tag "decidim_participatory_processes_admin" %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e0bcaae..37cf4e2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,5 +1,10 @@
---
en:
+ activemodel:
+ attributes:
+ participatory_process:
+ emitter_name: Emitter name
+ emitter_image: Emitter logo
decidim:
admin:
forms:
@@ -8,19 +13,34 @@ en:
explanation: 'Guidance for logo:'
message_1: Preferrably a logo that will be seen on a white background.
message_2: The service reduce the image.
+ participatory_process_imports:
+ new:
+ select: Select which data you would like to duplicate
components:
emitter:
name: Emitter
+ forms:
+ file_help:
+ import:
+ message_1: Has to be a JSON document downloaded through the export feature.
+ explanation: 'Guidance for file:'
participatory_processes:
admin:
+ new_import:
+ help_html: This import feature allows you to create a new participatory process from an exported JSON file. You can export a process from another organization or from this same organization. The imported process will include its settings, components, and attachments (if selected).
participatory_processes:
form:
emitter: Emitter
emitter_logo: Emitter logo
emitter_logo_select: Select an emitter
emitter_name: Emitter name
+ emitter_image: Emitter logo
emitter_new: New emitter
emitter_now: Emitter now
+ participatory_process_imports:
+ form:
+ document_legend: Add a document
+ slug_help_html: 'URL slugs are used to generate the URLs that point to this process. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
emitter:
emitter_text: Consultation published by %{developer_group}
emitter_img_alt_test: Logo of %{developer_group}
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 993be55..3a3c65a 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1,5 +1,10 @@
---
fr:
+ activemodel:
+ attributes:
+ participatory_process:
+ emitter_name: Nom de l’émetteur
+ emitter_image: Logo de l’émetteur
decidim:
admin:
forms:
@@ -8,11 +13,21 @@ fr:
explanation: 'Consignes pour le logo :'
message_1: De préférence un logo qui sera visible sur un fond blanc.
message_2: Le service réduit l'image.
+ participatory_process_imports:
+ new:
+ select: Sélectionnez les données que vous souhaitez dupliquer
components:
emitter:
name: Émetteur
+ forms:
+ file_help:
+ import:
+ message_1: Les fichiers CSV, JSON et Excel (.xlsx) sont supportés
+ explanation: 'Instructions concernant le fichier:'
participatory_processes:
admin:
+ new_import:
+ help_html: Cette fonctionnalité d’importation vous permet de créer un nouveau processus participatif à partir d’un fichier JSON exporté. Vous pouvez exporter un processus depuis une autre organisation ou depuis cette même organisation. Le processus importé inclura ses paramètres, ses composants et ses pièces jointes (si sélectionnés).
participatory_processes:
form:
emitter: Organisateur
@@ -21,6 +36,10 @@ fr:
emitter_name: Nom du nouveau logo
emitter_new: Ou choisissez un nouveau logo pour l’organisateur de la concertation
emitter_now: Émetteur actuel
+ participatory_process_imports:
+ form:
+ document_legend: Ajouter un document
+ slug_help_html: 'Les identifiants d''URL sont utilisés pour générer les URL qui pointent vers cette concertation. N''accepte que des lettres, des chiffres et des tirets et doit commencer par une lettre. Exemple: %{url}'
emitter:
emitter_text: Publié par %{developer_group}
emitter_img_alt_test: Logo de %{developer_group}
diff --git a/lib/decidim/emitter/engine.rb b/lib/decidim/emitter/engine.rb
index 480c038..cec7523 100644
--- a/lib/decidim/emitter/engine.rb
+++ b/lib/decidim/emitter/engine.rb
@@ -39,7 +39,7 @@ class Engine < ::Rails::Engine
Decidim::ParticipatoryProcesses::Admin::CreateParticipatoryProcess.include(Decidim::Emitter::ParticipatoryProcesses::Admin::CreateParticipatoryProcessOverride)
end
unless Decidim::Emitter.skip_extend?(:participatory_process_copy)
- Decidim::ParticipatoryProcesses::Admin::CopyParticipatoryProcess.include(Decidim::Emitter::ParticipatoryProcesses::Admin::CopyParticipatoryProcessOverride)
+ Decidim::ParticipatoryProcesses::Admin::DuplicateParticipatoryProcess.include(Decidim::Emitter::ParticipatoryProcesses::Admin::DuplicateParticipatoryProcessOverride)
end
unless Decidim::Emitter.skip_extend?(:participatory_process_update)
Decidim::ParticipatoryProcesses::Admin::UpdateParticipatoryProcess.include(Decidim::Emitter::ParticipatoryProcesses::Admin::UpdateParticipatoryProcessOverride)
diff --git a/lib/decidim/emitter/test/factories.rb b/lib/decidim/emitter/test/factories.rb
index 0686693..3d904ef 100644
--- a/lib/decidim/emitter/test/factories.rb
+++ b/lib/decidim/emitter/test/factories.rb
@@ -30,8 +30,6 @@
participatory_scope { generate_localized_title }
participatory_structure { generate_localized_title }
announcement { generate_localized_title }
- show_metrics { true }
- show_statistics { true }
private_space { false }
start_date { Date.current }
end_date { 2.months.from_now }
diff --git a/lib/decidim/emitter/version.rb b/lib/decidim/emitter/version.rb
index 442864c..dcbbe34 100644
--- a/lib/decidim/emitter/version.rb
+++ b/lib/decidim/emitter/version.rb
@@ -3,7 +3,7 @@
module Decidim
# This holds the decidim-meetings version.
module Emitter
- VERSION = "1.0.0"
- DECIDIM_VERSION = "~> 0.29.0"
+ VERSION = "2.0.0"
+ DECIDIM_VERSION = "~> 0.31.0"
end
end
diff --git a/spec/commands/create_participatory_process_spec.rb b/spec/commands/create_participatory_process_spec.rb
index 0177912..f597d92 100644
--- a/spec/commands/create_participatory_process_spec.rb
+++ b/spec/commands/create_participatory_process_spec.rb
@@ -8,14 +8,15 @@ module Decidim::ParticipatoryProcesses
let(:organization) { create(:organization) }
let(:participatory_process_group) { create(:participatory_process_group, organization:) }
- let(:participatory_process_type) { create(:participatory_process_type, organization:) }
- let(:scope) { create(:scope, organization:) }
- let(:area) { create(:area, organization:) }
let(:current_user) { create(:user, :admin, organization:) }
let(:errors) { double.as_null_object }
let(:related_process_ids) { [] }
let(:weight) { 1 }
let(:hero_image) { nil }
+ let(:taxonomizations) do
+ 2.times.map { build(:taxonomization, taxonomy: create(:taxonomy, :with_parent, organization:), taxonomizable: nil) }
+ end
+
let(:emitter) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
let(:emitter_name) { "Berlin" }
let(:form) do
@@ -26,7 +27,6 @@ module Decidim::ParticipatoryProcesses
subtitle: { en: "subtitle" },
weight:,
slug: "slug",
- hashtag: "hashtag",
meta_scope: { en: "meta scope" },
hero_image:,
promoted: nil,
@@ -42,20 +42,17 @@ module Decidim::ParticipatoryProcesses
current_user:,
current_organization: organization,
organization:,
- scopes_enabled: true,
private_space: false,
- scope:,
- scope_type_max_depth: nil,
- area:,
+ taxonomizations:,
errors:,
related_process_ids:,
participatory_process_group:,
- participatory_process_type:,
announcement: { en: "message" },
emitter:,
emitter_name:
)
end
+
let(:invalid) { false }
context "when the form is not valid" do
@@ -103,8 +100,7 @@ module Decidim::ParticipatoryProcesses
.and_call_original
expect { subject.call }.to change(Decidim::ActionLog, :count)
- action_log = Decidim::ActionLog.last
- expect(action_log.version).to be_present
+ expect(Decidim::ActionLog.last.version).to be_present
end
it "broadcasts ok" do
@@ -122,6 +118,20 @@ module Decidim::ParticipatoryProcesses
expect(current_user.follows?(process)).to be true
end
+ it "links to taxonomizations" do
+ subject.call
+ expect(process.taxonomizations).to match_array(taxonomizations)
+ end
+
+ context "when no taxonomizations are set" do
+ let(:taxonomizations) { [] }
+
+ it "taxonomizations are empty" do
+ subject.call
+ expect(process.taxonomizations).to be_empty
+ end
+ end
+
context "with related processes" do
let!(:another_process) { create(:participatory_process, organization:) }
let(:related_process_ids) { [another_process.id] }
diff --git a/spec/commands/copy_participatory_process_spec.rb b/spec/commands/duplicate_participatory_process_spec.rb
similarity index 69%
rename from spec/commands/copy_participatory_process_spec.rb
rename to spec/commands/duplicate_participatory_process_spec.rb
index 0187e7e..e1abbc6 100644
--- a/spec/commands/copy_participatory_process_spec.rb
+++ b/spec/commands/duplicate_participatory_process_spec.rb
@@ -3,39 +3,34 @@
require "spec_helper"
module Decidim::ParticipatoryProcesses
- describe Admin::CopyParticipatoryProcess do
+ describe Admin::DuplicateParticipatoryProcess do
subject { described_class.new(form, participatory_process) }
let(:organization) { create(:organization) }
let(:current_user) { create(:user, organization:) }
- let(:participatory_process_group) { create(:participatory_process_group, organization:) }
- let(:scope) { create(:scope, organization:) }
+ let(:participatory_process_group) { create(:participatory_process_group, organization:, taxonomies: [taxonomy]) }
+ let(:taxonomy) { create(:taxonomy, with_parent, organization:) }
let(:errors) { double.as_null_object }
let!(:participatory_process) { create(:participatory_process, :with_steps) }
+ let!(:content_block) { create(:content_block, manifest_name: :hero, organization: participatory_process.organization, scope_name: :participatory_process_homepage, scoped_resource_id: participatory_process.id) }
let!(:component) { create(:component, manifest_name: :dummy, participatory_space: participatory_process) }
let(:form) do
instance_double(
- Admin::ParticipatoryProcessCopyForm,
+ Admin::ParticipatoryProcessDuplicateForm,
invalid?: invalid,
title: { en: "title" },
slug: "copied-slug",
- copy_steps?: copy_steps,
- copy_categories?: copy_categories,
- copy_components?: copy_components,
+ duplicate_steps?: duplicate_steps,
+ duplicate_components?: duplicate_components,
+ duplicate_landing_page_blocks?: duplicate_landing_page_blocks,
current_user:
)
end
- let!(:category) do
- create(
- :category,
- participatory_space: participatory_process
- )
- end
let(:invalid) { false }
- let(:copy_steps) { false }
- let(:copy_categories) { false }
- let(:copy_components) { false }
+ let(:duplicate_steps) { false }
+ let(:duplicate_components) { false }
+ let(:duplicate_landing_page_blocks) { false }
context "when the form is not valid" do
let(:invalid) { true }
@@ -60,7 +55,6 @@ module Decidim::ParticipatoryProcesses
expect(new_participatory_process.description).to eq(old_participatory_process.description)
expect(new_participatory_process.short_description).to eq(old_participatory_process.short_description)
expect(new_participatory_process.promoted).to eq(old_participatory_process.promoted)
- expect(new_participatory_process.scope).to eq(old_participatory_process.scope)
expect(new_participatory_process.developer_group).to eq(old_participatory_process.developer_group)
expect(new_participatory_process.local_area).to eq(old_participatory_process.local_area)
expect(new_participatory_process.target).to eq(old_participatory_process.target)
@@ -70,6 +64,7 @@ module Decidim::ParticipatoryProcesses
expect(new_participatory_process.participatory_process_group).to eq(old_participatory_process.participatory_process_group)
expect(new_participatory_process.private_space).to eq(old_participatory_process.private_space)
expect(new_participatory_process.emitter_name).to eq(old_participatory_process.emitter_name)
+ expect(new_participatory_process.taxonomies).to eq(old_participatory_process.taxonomies)
end
it "broadcasts ok" do
@@ -89,8 +84,8 @@ module Decidim::ParticipatoryProcesses
end
end
- context "when copy_steps exists" do
- let(:copy_steps) { true }
+ context "when duplicate_steps exists" do
+ let(:duplicate_steps) { true }
it "duplicates a participatory process and the steps" do
expect { subject.call }.to change(Decidim::ParticipatoryProcessStep, :count).by(1)
@@ -106,40 +101,12 @@ module Decidim::ParticipatoryProcesses
end
end
- context "when copy_categories exists" do
- let(:copy_categories) { true }
-
- it "duplicates a participatory process and the categories" do
- expect { subject.call }.to change(Decidim::Category, :count).by(1)
- expect(Decidim::Category.unscoped.distinct.pluck(:decidim_participatory_space_id).count).to eq 2
-
- old_participatory_process_category = Decidim::Category.unscoped.first
- new_participatory_process_category = Decidim::Category.unscoped.last
-
- expect(new_participatory_process_category.name).to eq(old_participatory_process_category.name)
- expect(new_participatory_process_category.description).to eq(old_participatory_process_category.description)
- expect(new_participatory_process_category.participatory_space).not_to eq(participatory_process)
- end
-
- context "with subcategories" do
- let!(:subcategory) { create(:category, parent: category, participatory_space: participatory_process) }
-
- it "duplicates the parent and its children" do
- expect { subject.call }.to change(Decidim::Category, :count).by(2)
- new_participatory_process = Decidim::ParticipatoryProcess.last
-
- expect(participatory_process.categories.count).to eq(2)
- expect(new_participatory_process.categories.count).to eq(2)
- end
- end
- end
-
- context "when copy_components exists" do
- let(:copy_components) { true }
+ context "when duplicate_components exists" do
+ let(:duplicate_components) { true }
it "duplicates a participatory process and the components" do
dummy_hook = proc {}
- component.manifest.on :copy, &dummy_hook
+ component.manifest.on :duplicate, &dummy_hook
expect(dummy_hook).to receive(:call).with({ new_component: an_instance_of(Decidim::Component), old_component: component })
expect { subject.call }.to change(Decidim::Component, :count).by(1)
@@ -155,5 +122,39 @@ module Decidim::ParticipatoryProcesses
expect(last_component.step_settings.values).not_to eq(component.step_settings.values)
end
end
+
+ context "when duplicate_landing_page_blocks exists" do
+ let(:duplicate_landing_page_blocks) { true }
+ let(:original_image) do
+ Rack::Test::UploadedFile.new(
+ Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
+ "image/jpeg"
+ )
+ end
+
+ before do
+ content_block.images_container.background_image.purge
+ content_block.images_container.background_image = original_image
+ content_block.save
+ content_block.reload
+ end
+
+ it "duplicates a participatory_process and the content_block with its attachments" do
+ expect { subject.call }.to change(Decidim::ContentBlock, :count).by(1)
+
+ old_block = Decidim::ContentBlock.unscoped.first
+ new_block = Decidim::ContentBlock.unscoped.last
+ last_process = Decidim::ParticipatoryProcess.last
+
+ expect(new_block.scope_name).to eq(old_block.scope_name)
+ expect(new_block.manifest_name).to eq(old_block.manifest_name)
+ # published_at is set in content_block factory
+ expect(new_block.published_at).not_to be_nil
+ expect(new_block.scoped_resource_id).to eq(last_process.id)
+ expect(new_block.attachments.length).to eq(1)
+ expect(new_block.attachments.first.name).to eq("background_image")
+ expect(new_block.images_container.attached_uploader(:background_image).url).not_to be_nil
+ end
+ end
end
end
diff --git a/spec/commands/update_participatory_process_spec.rb b/spec/commands/update_participatory_process_spec.rb
index 776c2e3..569312b 100644
--- a/spec/commands/update_participatory_process_spec.rb
+++ b/spec/commands/update_participatory_process_spec.rb
@@ -5,7 +5,11 @@
module Decidim::ParticipatoryProcesses
describe Admin::UpdateParticipatoryProcess do
describe "call" do
- let(:my_process) { create :participatory_process }
+ let(:organization) { create(:organization) }
+ let(:my_process) { create(:participatory_process, organization:, taxonomies:) }
+ let(:taxonomies) { create_list(:taxonomy, 2, :with_parent, organization:) }
+ let(:taxonomy) { create(:taxonomy, :with_parent, organization:) }
+ let(:user) { create(:user, :admin, :confirmed, organization:) }
let(:params) do
{
participatory_process: {
@@ -18,7 +22,6 @@ module Decidim::ParticipatoryProcesses
subtitle_es: my_process.subtitle,
weight: my_process.weight,
slug: my_process.slug,
- hashtag: my_process.hashtag,
meta_scope: my_process.meta_scope,
promoted: my_process.promoted,
description_en: my_process.description,
@@ -27,13 +30,11 @@ module Decidim::ParticipatoryProcesses
short_description_en: my_process.short_description,
short_description_ca: my_process.short_description,
short_description_es: my_process.short_description,
- current_organization: my_process.organization,
- scopes_enabled: my_process.scopes_enabled,
- scope: my_process.scope,
- area: my_process.area,
+ current_organization: organization,
errors: my_process.errors,
participatory_process_group: my_process.participatory_process_group,
private_space: my_process.private_space,
+ taxonomies: [taxonomy.id, taxonomies.first.id],
emitter_name: my_process.emitter_name
}.merge(attachment_params)
}
@@ -44,7 +45,6 @@ module Decidim::ParticipatoryProcesses
emitter: my_process.hero_image.blob
}
end
- let(:user) { create :user, :admin, :confirmed, organization: my_process.organization }
let(:context) do
{
current_organization: my_process.organization,
@@ -97,6 +97,12 @@ module Decidim::ParticipatoryProcesses
expect { command.call }.to broadcast(:ok)
end
+ it "updates the taxonomizations" do
+ expect(my_process.reload.taxonomies).to match_array(taxonomies)
+ command.call
+ expect(my_process.reload.taxonomies).to contain_exactly(taxonomy, taxonomies.first)
+ end
+
it "updates the participatory process" do
expect { command.call }.to broadcast(:ok)
my_process.reload
@@ -117,7 +123,7 @@ module Decidim::ParticipatoryProcesses
end
context "with related processes" do
- let!(:another_process) { create :participatory_process, organization: my_process.organization }
+ let!(:another_process) { create(:participatory_process, organization:) }
it "links related processes" do
allow(form).to receive(:related_process_ids).and_return([another_process.id])
diff --git a/spec/forms/participatory_process_form_spec.rb b/spec/forms/participatory_process_form_spec.rb
index 22c5627..db76b5c 100644
--- a/spec/forms/participatory_process_form_spec.rb
+++ b/spec/forms/participatory_process_form_spec.rb
@@ -8,7 +8,13 @@ module Admin
describe ParticipatoryProcessForm do
subject { described_class.from_params(attributes).with_context(current_organization: organization) }
- let(:organization) { create :organization }
+ let(:organization) { create(:organization) }
+ let(:root_taxonomy) { create(:taxonomy, organization:) }
+ let!(:taxonomies) { create_list(:taxonomy, 3, parent: root_taxonomy, organization:) }
+ let!(:process_taxonomy_filter_one) { create(:taxonomy_filter, participatory_space_manifests: ["participatory_processes"], root_taxonomy:) }
+ let!(:process_taxonomy_filter_two) { create(:taxonomy_filter, participatory_space_manifests: ["participatory_processes"], root_taxonomy:) }
+ let!(:assembly_taxonomy_filter) { create(:taxonomy_filter, participatory_space_manifests: ["assemblies"], root_taxonomy:) }
+ let!(:process_taxonomy_filter_without_root) { create(:taxonomy_filter, participatory_space_manifests: ["participatory_processes"]) }
let(:title) do
{
en: "Title",
@@ -38,6 +44,8 @@ module Admin
ca: "Descripció curta"
}
end
+ let(:start_date) { 1.month.ago }
+ let(:end_date) { 1.month.from_now }
let(:slug) { "slug" }
let(:attachment) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
let(:emitter_name) { "city" }
@@ -57,10 +65,13 @@ module Admin
"short_description_en" => short_description[:en],
"short_description_es" => short_description[:es],
"short_description_ca" => short_description[:ca],
+ "start_date" => start_date,
+ "end_date" => end_date,
"hero_image" => attachment,
"slug" => slug,
"emitter" => attachment,
- "emitter_name" => emitter_name
+ "emitter_name" => emitter_name,
+ "taxonomies" => [taxonomies.first.id, taxonomies.second.id]
}
}
end
@@ -69,6 +80,18 @@ module Admin
it { is_expected.to be_valid }
end
+ it "returns taxonomizations and taxonomies" do
+ expect(subject.taxonomizations.map(&:taxonomy_id)).to eq([taxonomies.first.id, taxonomies.second.id])
+ expect(subject.root_taxonomies).to eq([root_taxonomy])
+ expect(subject.taxonomy_filters).to contain_exactly(process_taxonomy_filter_one, process_taxonomy_filter_two)
+ end
+
+ context "when taxonomies belong to another organization" do
+ let!(:taxonomies) { create_list(:taxonomy, 3) }
+
+ it { is_expected.not_to be_valid }
+ end
+
context "when hero_image is too big" do
before do
organization.settings.tap do |settings|
@@ -160,6 +183,71 @@ module Admin
end
end
end
+
+ context "when the start_date is later than end_date" do
+ let(:start_date) { 1.month.from_now }
+ let(:end_date) { 2.months.ago }
+
+ it { is_expected.to be_invalid }
+
+ it "has an error" do
+ subject.valid?
+
+ expect(subject.errors).not_to be_empty
+ expect(subject.errors[:end_date]).not_to be_empty
+ expect(subject.errors[:start_date]).not_to be_empty
+ end
+ end
+
+ context "when start_date is present" do
+ let(:start_date) { 3.months.ago }
+
+ it { is_expected.to be_valid }
+ end
+
+ context "when end_date is present" do
+ let(:end_date) { 2.months.from_now }
+
+ it { is_expected.to be_valid }
+ end
+
+ context "when start_date is not present" do
+ let(:start_date) { nil }
+
+ it { is_expected.to be_valid }
+ end
+
+ context "when end_date is not present" do
+ let(:end_date) { nil }
+
+ it { is_expected.to be_valid }
+ end
+
+ context "when selecting an emitter from another process" do
+ let(:other_process_with_emitter) { create(:participatory_process, organization:) }
+ let(:other_process_without_emitter) { create(:participatory_process, organization:) }
+
+ before do
+ other_process_with_emitter.emitter.attach(
+ io: File.open(Decidim::Dev.test_file("city.jpeg", "image/jpeg")),
+ filename: "city.jpeg",
+ content_type: "image/jpeg"
+ )
+ other_process_with_emitter.update!(emitter_name: "Other Emitter")
+ end
+
+ context "when the target process has no emitter attached" do
+ before do
+ attributes["participatory_process"]["emitter_select"] = other_process_without_emitter.id
+ end
+
+ it { is_expected.to be_valid }
+
+ it "does not raise an error" do
+ expect { subject.valid? }.not_to raise_error
+ end
+ end
+ end
end
end
end
diff --git a/spec/lib/decidim/emitter/version_spec.rb b/spec/lib/decidim/emitter/version_spec.rb
index ba28bd0..15a8ab8 100644
--- a/spec/lib/decidim/emitter/version_spec.rb
+++ b/spec/lib/decidim/emitter/version_spec.rb
@@ -7,7 +7,7 @@ module Decidim
subject { described_class }
it "has version" do
- expect(Decidim::Emitter::VERSION).to eq("1.0.0")
+ expect(Decidim::Emitter::VERSION).to eq("2.0.0")
end
end
end
diff --git a/spec/shared/manage_processes_examples.rb b/spec/shared/manage_processes_examples.rb
index 98e52bd..88d509c 100644
--- a/spec/shared/manage_processes_examples.rb
+++ b/spec/shared/manage_processes_examples.rb
@@ -49,7 +49,12 @@ def filter_by_group(group_title)
let!(:participatory_process) { create(:participatory_process, :unpublished, organization:) }
it "allows the user to preview the unpublished process" do
- new_window = window_opened_by { page.find("tr", text: translated(participatory_process.title)).click_on("Preview") }
+ new_window = window_opened_by do
+ within("tr", text: translated(participatory_process.title)) do
+ find("button[data-controller='dropdown']").click
+ click_on "Preview"
+ end
+ end
page.within_window(new_window) do
expect(page).to have_css(".participatory-space__container")
@@ -62,12 +67,13 @@ def filter_by_group(group_title)
let!(:participatory_process) { create(:participatory_process, organization:) }
it "allows the user to preview the published process" do
- within "tr", text: translated(participatory_process.title) do
- click_on "Preview"
+ new_window = window_opened_by do
+ within("tr", text: translated(participatory_process.title)) do
+ find("button[data-controller='dropdown']").click
+ click_on "Preview"
+ end
end
- new_window = window_opened_by { page.find("tr", text: translated(participatory_process.title)).click_on("Preview") }
-
page.within_window(new_window) do
expect(page).to have_current_path decidim_participatory_processes.participatory_process_path(participatory_process)
expect(page).to have_content(translated(participatory_process.title))
@@ -134,20 +140,23 @@ def filter_by_group(group_title)
let!(:participatory_process) { create(:participatory_process, :unpublished, organization:) }
before do
- within "tr", text: translated(participatory_process.title) do
- click_on translated(participatory_process.title)
- end
-
- within_admin_sidebar_menu do
- click_on "About this process"
- end
+ visit decidim_admin_participatory_processes.participatory_processes_path
end
it "publishes the process" do
- click_on "Publish"
+ within("tr", text: translated_attribute(participatory_process.title)) do
+ find("button[data-controller='dropdown']").click
+ find("a", text: "Publish", visible: true).click
+ end
+
expect(page).to have_content("successfully published")
- expect(page).to have_content("Unpublish")
- expect(page).to have_current_path decidim_admin_participatory_processes.edit_participatory_process_path(participatory_process)
+
+ within("tr", text: translated_attribute(participatory_process.title)) do
+ find("button[data-controller='dropdown']").click
+ expect(page).to have_content("Unpublish")
+ end
+
+ expect(page).to have_current_path decidim_admin_participatory_processes.participatory_processes_path
participatory_process.reload
expect(participatory_process).to be_published
@@ -158,20 +167,18 @@ def filter_by_group(group_title)
let!(:participatory_process) { create(:participatory_process, organization:) }
before do
- within "tr", text: translated(participatory_process.title) do
- click_on translated(participatory_process.title)
- end
-
- within_admin_sidebar_menu do
- click_on "About this process"
- end
+ visit decidim_admin_participatory_processes.participatory_processes_path
end
it "unpublishes the process" do
- click_on "Unpublish"
+ within("tr", text: translated_attribute(participatory_process.title)) do
+ find("button[data-controller='dropdown']").click
+ find("a", text: "Unpublish", visible: true).click
+ end
+
expect(page).to have_content("successfully unpublished")
expect(page).to have_content("Publish")
- expect(page).to have_current_path decidim_admin_participatory_processes.edit_participatory_process_path(participatory_process)
+ expect(page).to have_current_path decidim_admin_participatory_processes.participatory_processes_path
participatory_process.reload
expect(participatory_process).not_to be_published
@@ -191,32 +198,4 @@ def filter_by_group(group_title)
end
end
end
-
- context "when the process has a scope" do
- let(:scope) { create(:scope, organization:) }
-
- before do
- participatory_process.update!(scopes_enabled: true, scope:)
- end
-
- it "disables the scope for a participatory process" do
- within "tr", text: translated(participatory_process.title) do
- click_on translated(participatory_process.title)
- end
-
- within_admin_sidebar_menu do
- click_on "About this process"
- end
-
- uncheck :participatory_process_scopes_enabled
-
- expect(page).to have_css("#participatory_process_scope_id[disabled]")
-
- within ".edit_participatory_process" do
- find("*[type=submit]").click
- end
-
- expect(page).to have_admin_callout("successfully")
- end
- end
end
diff --git a/spec/shared/process_announcements_examples.rb b/spec/shared/process_announcements_examples.rb
new file mode 100644
index 0000000..06c2e26
--- /dev/null
+++ b/spec/shared/process_announcements_examples.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+shared_examples "manage processes announcements" do
+ let!(:participatory_process) { create(:participatory_process, :with_content_blocks, organization:, blocks_manifests: [:announcement], announcement: {}) }
+
+ it "can customize a general announcement for the process" do
+ within "tr", text: translated(participatory_process.title) do
+ click_on translated(participatory_process.title)
+ end
+
+ within_admin_sidebar_menu do
+ click_on "About this process"
+ end
+
+ fill_in_i18n_editor(
+ :participatory_process_announcement,
+ "#participatory_process-announcement-tabs",
+ en: "An important announcement",
+ es: "Un aviso muy importante",
+ ca: "Un avís molt important"
+ )
+
+ within ".edit_participatory_process" do
+ find("*[type=submit]").click
+ end
+
+ expect(page).to have_admin_callout("successfully")
+
+ visit decidim_admin_participatory_processes.participatory_processes_path
+
+ new_window = window_opened_by do
+ within("tr", text: translated(participatory_process.title)) do
+ find("button[data-controller='dropdown']").click
+ click_on "Preview"
+ end
+ end
+
+ page.within_window(new_window) do
+ expect(page).to have_content("An important announcement")
+ end
+ end
+
+ it "remove announcement element if announcement body is empty" do
+ within "tr", text: translated(participatory_process.title) do
+ click_on translated(participatory_process.title)
+ end
+
+ within_admin_sidebar_menu do
+ click_on "About this process"
+ end
+
+ find_by_id("participatory_process-announcement-tabs").click
+ send_keys("T")
+ send_keys(:backspace)
+
+ within ".edit_participatory_process" do
+ find("*[type=submit]").click
+ end
+
+ expect(page).to have_admin_callout("successfully")
+
+ visit decidim_admin_participatory_processes.participatory_processes_path
+
+ new_window = window_opened_by do
+ within("tr", text: translated(participatory_process.title)) do
+ find("button[data-controller='dropdown']").click
+ click_on "Preview"
+ end
+ end
+
+ page.within_window(new_window) do
+ expect(page).to have_no_css(".flash")
+ expect(page).to have_no_css(".flash__message")
+ expect(page).to have_no_css(".announcement")
+ end
+ end
+end
diff --git a/spec/system/admin/admin_import_participatory_process_spec.rb b/spec/system/admin/admin_import_participatory_process_spec.rb
index e8d125c..f173f38 100644
--- a/spec/system/admin/admin_import_participatory_process_spec.rb
+++ b/spec/system/admin/admin_import_participatory_process_spec.rb
@@ -2,7 +2,7 @@
require "spec_helper"
-describe "Admin imports participatory process" do # rubocop:disable RSpec/DescribeClass
+describe "Admin imports participatory process", type: :system do
include_context "when admin administrating a participatory process"
before do
@@ -11,6 +11,18 @@
visit decidim_admin_participatory_processes.participatory_processes_path
end
+ context "when viewing the import page" do
+ before do
+ within_admin_menu do
+ click_on "Import"
+ end
+ end
+
+ it "displays the import help text" do
+ expect(page).to have_content("This import feature allows you to create a new participatory process from an exported JSON file")
+ end
+ end
+
context "with context" do
before "Imports the process with the basic fields" do
within_admin_menu do
@@ -52,15 +64,6 @@
expect(page).to have_content(translated("Magni."))
end
- within_admin_sidebar_menu do
- click_on "Categories"
- end
-
- within ".table-list" do
- expect(page).to have_content(translated("Illum nesciunt praesentium explicabo qui."))
- expect(page).to have_content(translated("Expedita sint earum rerum consequatur."))
- end
-
within_admin_sidebar_menu do
click_on "Components"
end
diff --git a/spec/system/admin/admin_manages_participatory_processes_spec.rb b/spec/system/admin/admin_manages_participatory_processes_spec.rb
index 9b3a0c3..77ffa64 100644
--- a/spec/system/admin/admin_manages_participatory_processes_spec.rb
+++ b/spec/system/admin/admin_manages_participatory_processes_spec.rb
@@ -4,7 +4,10 @@
describe "Admin manages participatory processes", :versioning do # rubocop:disable RSpec/DescribeClass
include_context "when admin administrating a participatory process"
+ include_context "with taxonomy filters context"
+ let(:participatory_space_manifests) { ["participatory_processes"] }
+ let!(:another_taxonomy_filter) { create(:taxonomy_filter, root_taxonomy: another_root_taxonomy, participatory_space_manifests:) }
let!(:participatory_process_groups) do
create_list(:participatory_process_group, 3, organization:)
end
@@ -30,7 +33,7 @@
it "hides the private user menu entry" do
within_admin_sidebar_menu do
- expect(page).to have_content("Private participants")
+ expect(page).to have_content("Members")
end
end
end
@@ -40,7 +43,7 @@
it "shows the private user menu entry" do
within_admin_sidebar_menu do
- expect(page).to have_no_content("Private participants")
+ expect(page).to have_no_content("Members")
end
end
end
@@ -56,6 +59,7 @@
let(:image2_filename) { "city2.jpeg" }
let(:image2_path) { Decidim::Dev.asset(image2_filename) }
let(:attributes) { attributes_for(:participatory_process, organization:) }
+ let(:last_participatory_process) { Decidim::ParticipatoryProcess.last }
before do
click_on "New process"
@@ -83,8 +87,9 @@
group_title = participatory_process_groups.first.title["en"]
select group_title, from: :participatory_process_participatory_process_group_id
+ select(decidim_sanitize_translated(taxonomy.name), from: "taxonomies-#{taxonomy_filter.id}")
+
fill_in :participatory_process_slug, with: "slug"
- fill_in :participatory_process_hashtag, with: "#hashtag"
fill_in :participatory_process_weight, with: 1
end
@@ -95,6 +100,7 @@
end
expect(page).to have_admin_callout("successfully")
+ expect(last_participatory_process.taxonomies).to contain_exactly(taxonomy)
within "[data-content]" do
expect(page).to have_current_path decidim_admin_participatory_processes.participatory_process_steps_path(Decidim::ParticipatoryProcess.last)
@@ -123,9 +129,14 @@
click_on "About this process"
end
+ select(decidim_sanitize_translated(taxonomy.name), from: "taxonomies-#{taxonomy_filter.id}")
+
click_on "Update"
expect(page).to have_admin_callout("successfully")
+ expect(page).to have_select("taxonomies-#{taxonomy_filter.id}", selected: decidim_sanitize_translated(taxonomy.name))
+ expect(page).to have_select("taxonomies-#{another_taxonomy_filter.id}", selected: "Please select an option")
+ expect(participatory_process3.reload.taxonomies).to contain_exactly(taxonomy)
hero_blob = participatory_process3.hero_image.blob
within %([data-active-uploads] [data-filename="#{hero_blob.filename}"]) do
diff --git a/spec/system/participatory_processes_spec.rb b/spec/system/participatory_processes_spec.rb
index 32149e0..d1926c4 100644
--- a/spec/system/participatory_processes_spec.rb
+++ b/spec/system/participatory_processes_spec.rb
@@ -268,7 +268,7 @@
end
end
- it_behaves_like "followable content for users" do
+ it_behaves_like "followable space content for users" do
let!(:participatory_process) { base_process }
let!(:user) { create(:user, :confirmed, organization:) }
let(:followable) { participatory_process }
@@ -326,7 +326,6 @@
expect(page).to have_content(translated(participatory_process.participatory_structure, locale: :en))
expect(page).to have_content(I18n.l(participatory_process.start_date, format: :decidim_short_with_month_name_short))
expect(page).to have_content(I18n.l(participatory_process.end_date, format: :decidim_short_with_month_name_short))
- expect(page).to have_content(participatory_process.hashtag)
end
end
@@ -385,42 +384,6 @@
end
end
- context "and the process metrics are enabled" do
- let(:organization) { create(:organization) }
- let(:metrics) do
- Decidim.metrics_registry.filtered(highlight: true, scope: "participatory_process").each do |metric_registry|
- create(:metric, metric_type: metric_registry.metric_name, day: Time.zone.today - 1.week, organization:, participatory_space_type: Decidim::ParticipatoryProcess.name, participatory_space_id: participatory_process.id, cumulative: 5, quantity: 2)
- end
- end
- let(:blocks_manifests) { [:metrics] }
-
- before do
- metrics
- visit current_path
- end
-
- it "shows the metrics charts" do
- expect(page).to have_css("h2.h2", text: "Metrics")
-
- within "[data-metrics]" do
- Decidim.metrics_registry.filtered(highlight: true, scope: "participatory_process").each do |metric_registry|
- expect(page).to have_css(%(##{metric_registry.metric_name}_chart))
- end
- end
- end
-
- it "renders a link to all metrics" do
- within "[data-metrics]" do
- expect(page).to have_link("Show all")
- end
- end
-
- it "click link" do # rubocop:disable RSpec/NoExpectationExample
- click_on("Show all")
- have_current_path(decidim_participatory_processes.all_metrics_participatory_process_path(participatory_process))
- end
- end
-
context "and the process statistics are enabled" do
let(:blocks_manifests) { [:hero, :stats] }
@@ -440,24 +403,6 @@
expect(page).to have_no_css(".statistic__number", text: "3")
end
end
-
- context "and the process metrics are not enabled" do
- it "the metrics for the participatory processes are not rendered" do
- expect(page).to have_no_css("h4", text: "METRICS")
- end
-
- it "has no link to all metrics" do
- expect(page).to have_no_link("Show all metrics")
- end
- end
-
- context "and the process does not have hashtag" do
- let(:hashtag) { false }
-
- it "the hashtags for those components are not visible" do
- expect(page).to have_no_content("#")
- end
- end
end
context "when assemblies are linked to participatory process" do