Improve settings options for Related Spaces content block. (decidim#1…

…3501)

decidim-assemblies/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_settings_form/show.erb

@@ -1,3 +1,3 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.select :max_results, [6, 9, 12], prompt: "", label: %>
+  <%= settings_fields.number_field :max_results, label: %>
 <% end %>

decidim-assemblies/spec/system/admin/admin_manages_assembly_landing_page_spec.rb

@@ -24,7 +24,7 @@ def edit_content_block_path(resource, content_block)
       visit edit_content_block_path(resource, related_assemblies_content_block)
 
       expect(related_assemblies_content_block.settings["max_results"]).to eq(6)
-      select 12, from: :content_block_settings_max_results
+      fill_in :content_block_settings_max_results, with: "12"
       click_on "Update"
 
       expect(page).to have_content("Related assemblies")

decidim-assemblies/spec/system/homepage_content_blocks_spec.rb

@@ -7,10 +7,13 @@
   let!(:promoted_assembly) { create(:assembly, :promoted, organization:) }
   let!(:unpromoted_assembly) { create(:assembly, organization:) }
   let!(:promoted_external_assembly) { create(:assembly, :promoted) }
+  let!(:highlighted_assemblies_content_block) { create(:content_block, organization:, scope_name: :homepage, manifest_name: :highlighted_assemblies) }
+
+  include_context "when admin administrating an assembly"
 
   before do
-    create(:content_block, organization:, scope_name: :homepage, manifest_name: :highlighted_assemblies)
     switch_to_host(organization.host)
+    login_as user, scope: :user
   end
 
   it "includes active assemblies to the homepage" do
@@ -22,4 +25,22 @@
       expect(page).not_to have_i18n_content(promoted_external_assembly.title)
     end
   end
+
+  it "updates the settings of the content block" do
+    visit decidim_admin.edit_organization_homepage_content_block_path(highlighted_assemblies_content_block)
+
+    expect(find("input[type='number'][name='content_block[settings][max_results]").value).to eq("6")
+
+    fill_in "content_block[settings][max_results]", with: "1"
+    click_on "Update"
+
+    expect(page).to have_content("Highlighted assemblies")
+    expect(highlighted_assemblies_content_block.reload.settings["max_results"]).to eq(1)
+
+    visit decidim.root_path
+
+    within "#highlighted-assemblies" do
+      expect(page).to have_css("a.card__grid", count: 1)
+    end
+  end
 end

decidim-conferences/app/cells/decidim/conferences/content_blocks/highlighted_conferences_settings_form/show.erb

@@ -1,3 +1,3 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.select :max_results, [6, 9, 12], prompt: "", label: %>
+  <%= settings_fields.number_field :max_results, label: %>
 <% end %>

decidim-conferences/spec/system/homepage_content_blocks_spec.rb

@@ -8,10 +8,13 @@
   let!(:promoted_conference) { create(:conference, :promoted, organization:) }
   let!(:unpromoted_conference) { create(:conference, organization:) }
   let!(:promoted_external_conference) { create(:conference, :promoted) }
+  let!(:highlighted_conferences_content_block) { create(:content_block, organization:, scope_name: :homepage, manifest_name: :highlighted_conferences) }
+
+  include_context "when admin administrating a conference"
 
   before do
-    create(:content_block, organization:, scope_name: :homepage, manifest_name: :highlighted_conferences)
     switch_to_host(organization.host)
+    login_as user, scope: :user
   end
 
   it "includes active conferences to the homepage" do
@@ -21,6 +24,26 @@
       expect(page).to have_i18n_content(promoted_conference.title)
       expect(page).to have_i18n_content(unpromoted_conference.title)
       expect(page).not_to have_i18n_content(promoted_external_conference.title)
+
+      expect(page).to have_css("a.card__grid", count: 3)
+    end
+  end
+
+  it "updates the number of highlighted conferences with a number input field" do
+    visit decidim_admin.edit_organization_homepage_content_block_path(highlighted_conferences_content_block)
+
+    expect(find("input[type='number'][name='content_block[settings][max_results]']").value).to eq("6")
+
+    fill_in "content_block[settings][max_results]", with: "1"
+    click_on "Update"
+
+    expect(page).to have_content("Highlighted conferences")
+    expect(highlighted_conferences_content_block.reload.settings["max_results"]).to eq(1)
+
+    visit decidim.root_path
+
+    within "#highlighted-conferences" do
+      expect(page).to have_css("a.card__grid", count: 1)
     end
   end
 end

decidim-initiatives/app/cells/decidim/initiatives/content_blocks/highlighted_initiatives_settings_form/show.erb

@@ -1,4 +1,4 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.select :max_results, [4, 8, 12], prompt: "", label: max_results_label %>
+  <%= settings_fields.number_field :max_results, label: max_results_label %>
   <%= settings_fields.select :order, order_select, prompt: "", label: order_label %>
 <% end %>

decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes_settings_form/show.erb

@@ -1,3 +1,3 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.select :max_results, [6, 9, 12], prompt: "", label: %>
+  <%= settings_fields.number_field :max_results, label: %>
 <% end %>

decidim-participatory_processes/spec/system/homepage_content_blocks_spec.rb

@@ -16,10 +16,12 @@
   end
   let!(:unpromoted_process) { create(:participatory_process, organization:) }
   let!(:promoted_external_process) { create(:participatory_process, :promoted) }
+  let!(:highlighted_participatory_processes_content_block) { create(:content_block, organization:, scope_name: :homepage, manifest_name: :highlighted_processes) }
+  let!(:user) { create(:user, :admin, :confirmed, organization:) }
 
   before do
-    create(:content_block, organization:, scope_name: :homepage, manifest_name: :highlighted_processes)
     switch_to_host(organization.host)
+    login_as user, scope: :user
   end
 
   it "includes active processes to the homepage" do
@@ -30,6 +32,8 @@
       expect(page).to have_i18n_content(unpromoted_process.title)
       expect(page).not_to have_i18n_content(promoted_external_process.title)
       expect(page).not_to have_i18n_content(promoted_past_process.title)
+
+      expect(page).to have_css("a.card__grid", count: 2)
     end
   end
 
@@ -50,4 +54,22 @@
       end
     end
   end
+
+  it "updates the number of highlighted participatory processes with a number input field" do
+    visit decidim_admin.edit_organization_homepage_content_block_path(highlighted_participatory_processes_content_block)
+
+    expect(find("input[type='number'][name='content_block[settings][max_results]']").value).to eq("6")
+
+    fill_in "content_block[settings][max_results]", with: "1"
+    click_on "Update"
+
+    expect(page).to have_content("Highlighted processes")
+    expect(highlighted_participatory_processes_content_block.reload.settings["max_results"]).to eq(1)
+
+    visit decidim.root_path
+
+    within "#highlighted-processes" do
+      expect(page).to have_css("a.card__grid", count: 1)
+    end
+  end
 end