decidim-admin 0.28.1 → 0.29.0.rc1

data/lib/decidim/admin/test/manage_attachment_collections_examples.rb

@@ -2,6 +2,7 @@
 
 shared_examples "manage attachment collections examples" do
   let!(:attachment_collection) { create(:attachment_collection, collection_for:) }
+  let(:attributes) { attributes_for(:attachment_collection) }
 
   before do
     visit current_path
@@ -15,32 +16,28 @@ shared_examples "manage attachment collections examples" do
 
   it "can view an attachment collection details" do
     within "#attachment_collections table" do
-      click_link "Edit"
+      click_on "Edit"
     end
 
-    expect(page).to have_selector("input#attachment_collection_name_en[value='#{translated(attachment_collection.name, locale: :en)}']")
-    expect(page).to have_selector("input#attachment_collection_weight[value='#{attachment_collection.weight}']")
-    expect(page).to have_selector("input#attachment_collection_description_en[value='#{translated(attachment_collection.description, locale: :en)}']")
+    expect(page).to have_css("input#attachment_collection_name_en[value='#{translated(attachment_collection.name, locale: :en)}']")
+    expect(page).to have_css("input#attachment_collection_weight[value='#{attachment_collection.weight}']")
+    expect(page).to have_css("input#attachment_collection_description_en[value='#{translated(attachment_collection.description, locale: :en)}']")
   end
 
   it "can add attachment collections to a process" do
-    click_link "New attachment folder"
+    click_on "New attachment folder"
 
     within ".new_attachment_collection" do
       fill_in_i18n(
         :attachment_collection_name,
         "#attachment_collection-name-tabs",
-        en: "Application forms",
-        es: "Formularios de solicitud",
-        ca: "Formularis de sol·licitud"
+        **attributes[:name].except("machine_translations")
       )
 
       fill_in_i18n(
         :attachment_collection_description,
         "#attachment_collection-description-tabs",
-        en: "Contains the application forms",
-        es: "Contiene los formularios de solicitud",
-        ca: "Conté els formularis de sol·licitud"
+        **attributes[:description].except("machine_translations")
       )
 
       find("*[type=submit]").click
@@ -49,14 +46,17 @@ shared_examples "manage attachment collections examples" do
     expect(page).to have_admin_callout("successfully")
 
     within "#attachment_collections table" do
-      expect(page).to have_text("Application forms")
+      expect(page).to have_content(translated(attributes[:name]))
     end
+
+    visit decidim_admin.root_path
+    expect(page).to have_content("created the #{translated(attributes[:name])} attachment collection")
   end
 
   it "can update an attachment collection" do
     within "#attachment_collections" do
-      within find("tr", text: translated(attachment_collection.name)) do
-        click_link "Edit"
+      within "tr", text: translated(attachment_collection.name) do
+        click_on "Edit"
       end
     end
 
@@ -64,9 +64,7 @@ shared_examples "manage attachment collections examples" do
       fill_in_i18n(
         :attachment_collection_name,
         "#attachment_collection-name-tabs",
-        en: "Latest application forms",
-        es: "Últimos formularios de solicitud",
-        ca: "Últims formularis de sol·licitud"
+        **attributes[:name].except("machine_translations")
       )
 
       find("*[type=submit]").click
@@ -75,8 +73,11 @@ shared_examples "manage attachment collections examples" do
     expect(page).to have_admin_callout("successfully")
 
     within "#attachment_collections table" do
-      expect(page).to have_text("Latest application forms")
+      expect(page).to have_content(translated(attributes[:name]))
     end
+
+    visit decidim_admin.root_path
+    expect(page).to have_content("updated the #{translated(attributes[:name])} attachment collection")
   end
 
   context "when deleting a attachment collection" do
@@ -88,14 +89,14 @@ shared_examples "manage attachment collections examples" do
       end
 
       it "can delete the attachment collection" do
-        within find("tr", text: translated(attachment_collection2.name)) do
-          accept_confirm { click_link "Delete" }
+        within "tr", text: translated(attachment_collection2.name) do
+          accept_confirm { click_on "Delete" }
         end
 
         expect(page).to have_admin_callout("successfully")
 
         within "#attachment_collections table" do
-          expect(page).not_to have_content(translated(attachment_collection2.name))
+          expect(page).to have_no_content(translated(attachment_collection2.name))
         end
       end
     end
@@ -108,8 +109,8 @@ shared_examples "manage attachment collections examples" do
       end
 
       it "cannot delete it" do
-        within find("tr", text: translated(attachment_collection.name)) do
-          expect(page).not_to have_selector("a.action-icon--remove")
+        within "tr", text: translated(attachment_collection.name) do
+          expect(page).to have_no_css("a.action-icon--remove")
         end
       end
     end

data/lib/decidim/admin/test/manage_attachments_examples.rb

@@ -19,18 +19,18 @@ shared_examples "manage attachments examples" do
 
     it "can view an attachment details" do
       within "#attachments table" do
-        click_link "Edit"
+        click_on "Edit"
       end
 
-      expect(page).to have_selector("input#attachment_title_en[value='#{translated(attachment.title, locale: :en)}']")
-      expect(page).to have_selector("input#attachment_description_en[value='#{translated(attachment.description, locale: :en)}']")
-      expect(page).to have_selector("input#attachment_weight[value='#{attachment.weight}']")
+      expect(page).to have_css("input#attachment_title_en[value='#{translated(attachment.title, locale: :en)}']")
+      expect(page).to have_css("input#attachment_description_en[value='#{translated(attachment.description, locale: :en)}']")
+      expect(page).to have_css("input#attachment_weight[value='#{attachment.weight}']")
       expect(page).to have_select("attachment_attachment_collection_id", selected: translated(attachment_collection.name, locale: :en))
       expect(page).to have_css("img[src~='#{attachment.url}']")
     end
 
     it "can add attachments without a collection to a process" do
-      click_link "New attachment"
+      click_on "New attachment"
 
       within ".new_attachment" do
         fill_in_i18n(
@@ -63,8 +63,44 @@ shared_examples "manage attachments examples" do
       end
     end
 
+    it "can add attachments with a link to a process" do
+      click_on "New attachment"
+
+      within ".new_attachment" do
+        fill_in_i18n(
+          :attachment_title,
+          "#attachment-title-tabs",
+          en: "Very Important Document",
+          es: "Documento Muy Importante",
+          ca: "Document Molt Important"
+        )
+
+        fill_in_i18n(
+          :attachment_description,
+          "#attachment-description-tabs",
+          en: "This document contains important information",
+          es: "Este documento contiene información importante",
+          ca: "Aquest document conté informació important"
+        )
+      end
+
+      within ".new_attachment" do
+        find_by_id("trigger-link").click
+
+        fill_in "attachment[link]", with: "https://example.com/docs.pdf"
+
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_admin_callout("successfully")
+
+      within "#attachments table" do
+        expect(page).to have_text("Very Important Document")
+      end
+    end
+
     it "can add attachments within a collection to a process" do
-      click_link "New attachment"
+      click_on "New attachment"
 
       within ".new_attachment" do
         fill_in_i18n(
@@ -102,9 +138,9 @@ shared_examples "manage attachments examples" do
 
     it "can remove an attachment from a collection" do
       within "#attachments" do
-        within find("tr", text: translated(attachment.title)) do
+        within "tr", text: translated(attachment.title) do
           expect(page).to have_text(translated(attachment_collection.name, locale: :en))
-          click_link "Edit"
+          click_on "Edit"
         end
       end
 
@@ -115,26 +151,26 @@ shared_examples "manage attachments examples" do
       end
 
       within "#attachments" do
-        within find("tr", text: translated(attachment.title)) do
-          expect(page).not_to have_text(translated(attachment_collection.name, locale: :en))
+        within "tr", text: translated(attachment.title) do
+          expect(page).to have_no_text(translated(attachment_collection.name, locale: :en))
         end
       end
     end
 
     it "can delete an attachment from a process" do
-      within find("tr", text: translated(attachment.title)) do
-        accept_confirm { click_link "Delete" }
+      within "tr", text: translated(attachment.title) do
+        accept_confirm { click_on "Delete" }
       end
 
       expect(page).to have_admin_callout("successfully")
 
-      expect(page).not_to have_content(translated(attachment.title, locale: :en))
+      expect(page).to have_no_content(translated(attachment.title, locale: :en))
     end
 
     it "can update an attachment" do
       within "#attachments" do
-        within find("tr", text: translated(attachment.title)) do
-          click_link "Edit"
+        within "tr", text: translated(attachment.title) do
+          click_on "Edit"
         end
       end
 

data/lib/decidim/admin/test/manage_categories_examples.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 shared_examples "manage categories examples" do
+  let(:attributes) { attributes_for(:category) }
   it "lists all the categories for the process" do
     within "#categories table" do
       expect(page).to have_content(translated(category.name, locale: :en))
@@ -9,25 +10,23 @@ shared_examples "manage categories examples" do
 
   it "can view a category detail" do
     within "#categories table" do
-      click_link translated(category.name, locale: :en)
+      click_on translated(category.name, locale: :en)
     end
 
-    expect(page).to have_selector("input#category_name_en[value='#{translated(category.name, locale: :en)}']")
-    expect(page).to have_selector("input#category_weight[value='#{category.weight}']")
+    expect(page).to have_css("input#category_name_en[value='#{translated(category.name, locale: :en)}']")
+    expect(page).to have_css("input#category_weight[value='#{category.weight}']")
 
     expect(page).to have_select(id: "category_parent_id")
   end
 
   it "creates a new category" do
-    click_link "New category"
+    click_on "New category"
 
     within ".new_category" do
       fill_in_i18n(
         :category_name,
         "#category-name-tabs",
-        en: "My category",
-        es: "Mi categoría",
-        ca: "La meva categoria"
+        **attributes[:name].except("machine_translations")
       )
 
       find("*[type=submit]").click
@@ -36,14 +35,17 @@ shared_examples "manage categories examples" do
     expect(page).to have_admin_callout("successfully")
 
     within "#categories table" do
-      expect(page).to have_content("My category")
+      expect(page).to have_content(translated(attributes[:name]))
     end
+
+    visit decidim_admin.root_path
+    expect(page).to have_content("added the #{translated(attributes[:name])} category to the")
   end
 
   it "updates a category" do
     within "#categories" do
-      within find("tr", text: translated(category.name)) do
-        click_link "Edit"
+      within "tr", text: translated(category.name) do
+        click_on "Edit"
       end
     end
 
@@ -51,9 +53,7 @@ shared_examples "manage categories examples" do
       fill_in_i18n(
         :category_name,
         "#category-name-tabs",
-        en: "My new name",
-        es: "Mi nuevo nombre",
-        ca: "El meu nou nom"
+        **attributes[:name].except("machine_translations")
       )
 
       find("*[type=submit]").click
@@ -62,8 +62,11 @@ shared_examples "manage categories examples" do
     expect(page).to have_admin_callout("successfully")
 
     within "#categories table" do
-      expect(page).to have_content("My new name")
+      expect(page).to have_content(translated(attributes[:name]))
     end
+
+    visit decidim_admin.root_path
+    expect(page).to have_content("updated the #{translated(attributes[:name])} category in the")
   end
 
   context "when deleting a category" do
@@ -76,14 +79,14 @@ shared_examples "manage categories examples" do
         end
 
         it "deletes a category" do
-          within find("tr", text: translated(category2.name)) do
-            accept_confirm { click_link "Delete" }
+          within "tr", text: translated(category2.name) do
+            accept_confirm { click_on "Delete" }
           end
 
           expect(page).to have_admin_callout("successfully")
 
           within "#categories table" do
-            expect(page).not_to have_content(translated(category2.name))
+            expect(page).to have_no_content(translated(category2.name))
           end
         end
       end
@@ -96,8 +99,8 @@ shared_examples "manage categories examples" do
         end
 
         it "deletes a category" do
-          within find("tr", text: translated(category2.name)) do
-            accept_confirm { click_link "Delete" }
+          within "tr", text: translated(category2.name) do
+            accept_confirm { click_on "Delete" }
           end
 
           expect(page).to have_admin_callout("problem deleting")
@@ -116,8 +119,8 @@ shared_examples "manage categories examples" do
       it "cannot delete it" do
         visit current_path
 
-        within find("tr", text: translated(category.name)) do
-          expect(page).not_to have_selector("a.action-icon--remove")
+        within "tr", text: translated(category.name) do
+          expect(page).to have_no_css("a.action-icon--remove")
         end
       end
     end

data/lib/decidim/admin/test/manage_component_permissions_examples.rb

@@ -23,7 +23,7 @@ shared_examples "Managing component permissions" do
   context "when setting permissions" do
     before do
       within ".component-#{component.id}" do
-        click_link "Permissions"
+        click_on "Permissions"
       end
     end
 
@@ -54,7 +54,7 @@ shared_examples "Managing component permissions" do
     before do
       allow_any_instance_of(Decidim::Admin::PermissionsForm).to receive(:valid?).and_return(false)
       within ".component-#{component.id}" do
-        click_link "Permissions"
+        click_on "Permissions"
       end
       within "#components form" do
         within ".foo-permission" do
@@ -85,7 +85,7 @@ shared_examples "Managing component permissions" do
       )
 
       within ".component-#{component.id}" do
-        click_link "Permissions"
+        click_on "Permissions"
       end
     end
 
@@ -120,7 +120,7 @@ shared_examples "Managing component permissions" do
       )
 
       within ".component-#{component.id}" do
-        click_link "Permissions"
+        click_on "Permissions"
       end
     end
 
@@ -206,7 +206,7 @@ shared_examples "Managing component permissions" do
       let(:component_settings) { { resources_permissions_enabled: false } }
 
       it "does not show the resource permissions settings" do
-        expect(page).not_to have_content(resource.title)
+        expect(page).to have_no_content(resource.title)
       end
     end
 

data/lib/decidim/admin/test/manage_hide_content_examples.rb

@@ -19,7 +19,7 @@ shared_examples "hideable resource during block" do
     visit reportable_path
 
     within ".profile__actions-secondary", match: :first do
-      click_button(I18n.t("decidim.shared.flag_modal.report"))
+      click_on(I18n.t("decidim.shared.flag_modal.report"))
     end
     within ".flag-modal" do
       find(:css, "input[name='report[block]']").set(true)
@@ -31,7 +31,7 @@ shared_examples "hideable resource during block" do
     within ".flag-modal" do
       find(:css, "input[name='report[hide]']").set(true)
     end
-    click_button I18n.t("decidim.shared.flag_user_modal.block")
+    click_on I18n.t("decidim.shared.flag_user_modal.block")
     expect(page).to have_current_path(decidim_admin.new_user_block_path(user_id: reportable.id, hide: true))
   end
 
@@ -46,14 +46,18 @@ shared_examples "hideable resource during block" do
       within ".flag-modal" do
         find(:css, "input[name='report[hide]']").set(true)
       end
-      click_button I18n.t("decidim.shared.flag_user_modal.block")
+      click_on I18n.t("decidim.shared.flag_user_modal.block")
       expect(page).to have_current_path(decidim_admin.new_user_block_path(user_id: reportable.id, hide: true))
 
       fill_in :block_user_justification, with: "This user is a spammer" * 2 # to have at least 15 chars
 
-      click_button I18n.t("decidim.admin.block_user.new.action")
+      click_on I18n.t("decidim.admin.block_user.new.action")
 
       expect(content.reload).to be_hidden
+
+      visit decidim_admin.root_path
+      expect(page).to have_content("blocked user")
+      expect(page).to have_content("hid a resource of type")
     end
   end
 end

data/lib/decidim/admin/test/manage_moderations_examples.rb

@@ -15,16 +15,16 @@ shared_examples "sorted moderations" do
   before do
     visit participatory_space_path
     if moderations_link_in_admin_menu
-      within_admin_sidebar_menu { click_link(moderations_link_text) }
+      within_admin_sidebar_menu { click_on(moderations_link_text) }
     else
-      within("div.layout-nav") { click_link(moderations_link_text) }
+      within("div.layout-nav") { click_on(moderations_link_text) }
     end
   end
 
   it "sorts the most recent first" do
     link_text = find("ul[data-pages]").text.split("\n")[-2]
     within "ul[data-pages]" do
-      click_link link_text
+      click_on link_text
     end
     all("tbody tr").each_with_index do |row, _index|
       expect(row.find("td:first-child")).to have_content(reportables.first.id)
@@ -54,9 +54,9 @@ shared_examples "manage moderations" do
   before do
     visit participatory_space_path
     if moderations_link_in_admin_menu
-      within_admin_sidebar_menu { click_link(moderations_link_text) }
+      within_admin_sidebar_menu { click_on(moderations_link_text) }
     else
-      within("div.layout-nav") { click_link(moderations_link_text) }
+      within("div.layout-nav") { click_on(moderations_link_text) }
     end
   end
 
@@ -68,7 +68,7 @@ shared_examples "manage moderations" do
 
       visit current_path
 
-      expect(page).not_to have_selector("tr[data-id=\"#{external_moderation.id}\"]")
+      expect(page).to have_no_css("tr[data-id=\"#{external_moderation.id}\"]")
     end
 
     it "user can review them" do
@@ -82,7 +82,7 @@ shared_examples "manage moderations" do
 
     it "user can un-report a resource" do
       within "tr[data-id=\"#{moderation.id}\"]" do
-        click_link "Unreport"
+        click_on "Unreport"
       end
 
       expect(page).to have_admin_callout("Resource successfully unreported")
@@ -90,11 +90,11 @@ shared_examples "manage moderations" do
 
     it "user can hide a resource" do
       within "tr[data-id=\"#{moderation.id}\"]" do
-        click_link "Hide"
+        click_on "Hide"
       end
 
       expect(page).to have_admin_callout("Resource successfully hidden")
-      expect(page).not_to have_content(moderation.reportable.reported_content_url)
+      expect(page).to have_no_content(moderation.reportable.reported_content_url)
     end
 
     it "user can sort by report count" do
@@ -102,7 +102,7 @@ shared_examples "manage moderations" do
       moderations_ordered_by_report_count_asc = moderations.sort_by(&:report_count)
 
       within "table" do
-        click_link "Reports count"
+        click_on "Reports count"
 
         all("tbody tr").each_with_index do |row, index|
           reportable_id = moderations_ordered_by_report_count_asc[index].reportable.id
@@ -116,23 +116,23 @@ shared_examples "manage moderations" do
       within ".filters__section" do
         find(:xpath, "//a[contains(text(), 'Filter')]").hover
         find(:xpath, "//a[contains(text(), 'Type')]").hover
-        click_link reportable_type
+        click_on reportable_type
       end
-      expect(page).to have_selector("tbody tr", count: moderations.length)
+      expect(page).to have_css("tbody tr", count: moderations.length)
     end
 
     it "user can filter by reported content" do
       search = moderation.reportable.id
       within ".filters__section" do
         fill_in("Search Moderation by reportable id or content.", with: search)
-        click_button(type: "submit")
+        within(".input-group-button") { click_on(class: "text-secondary") }
       end
-      expect(page).to have_selector("tbody tr", count: 1)
+      expect(page).to have_css("tbody tr", count: 1)
     end
 
     it "user can see moderation details" do
       within "tr[data-id=\"#{moderation.id}\"]" do
-        click_link "Expand"
+        click_on "Expand"
       end
 
       reported_content_slice = moderation.reportable.reported_searchable_content_text.split("\n").first
@@ -144,7 +144,7 @@ shared_examples "manage moderations" do
         moderation.reportable.destroy
         visit current_path
 
-        expect(page).not_to have_selector("tr[data-id=\"#{moderation.id}\"]")
+        expect(page).to have_no_css("tr[data-id=\"#{moderation.id}\"]")
       end
     end
 
@@ -170,7 +170,7 @@ shared_examples "manage moderations" do
         )
 
         within_language_menu(admin: true) do
-          click_link "Català"
+          click_on "Català"
         end
       end
 
@@ -184,11 +184,11 @@ shared_examples "manage moderations" do
 
   context "when listing hidden resources" do
     before do
-      click_link "Hidden"
+      click_on "Hidden"
     end
 
     it "user cannot unreport them" do
-      expect(page).not_to have_css(".action-icon--unreport")
+      expect(page).to have_no_css(".action-icon--unreport")
     end
 
     it "user can review them" do
@@ -231,11 +231,11 @@ shared_examples "manage moderations" do
     it "user can hide them" do
       moderation_id = moderations.first.id
       within "tr[data-id=\"#{moderation_id}\"]" do
-        click_link "Hide"
+        click_on "Hide"
       end
 
       expect(page).to have_admin_callout("Resource successfully hidden")
-      expect(page).not_to have_selector("tr[data-id=\"#{moderation_id}\"]")
+      expect(page).to have_no_css("tr[data-id=\"#{moderation_id}\"]")
     end
   end
 end

data/lib/decidim/admin/test/manage_paginated_collection_examples.rb

@@ -3,7 +3,7 @@
 shared_examples "a paginated collection" do |options|
   before do
     # Current path strips out the request parameters, use current_url when needed
-    # Be aware that current_utl can lead to flaky, use with caution
+    # Be aware that current_url can lead to flaky, use with caution
     if options&.dig(:url)
       visit current_url
     else
@@ -19,10 +19,10 @@ shared_examples "a paginated collection" do |options|
     it "changes the number of results per page" do
       within "[data-pagination]" do
         page.find("details", text: "15").click
-        click_link "50"
+        click_on "50"
       end
 
-      expect(page).to have_selector(".table-list tbody tr", count: 50)
+      expect(page).to have_css(".table-list tbody tr", count: 50)
     end
   end
 end

data/lib/decidim/admin/test/manage_participatory_space_publications_examples.rb

@@ -15,7 +15,7 @@ shared_examples "manage participatory space publications" do |_options|
     end
 
     it "publishes it" do
-      click_link "Publish"
+      click_on "Publish"
 
       expect(page).to have_content("successfully")
 
@@ -42,7 +42,7 @@ shared_examples "manage participatory space publications" do |_options|
     it "unpublishes it" do
       # we cannot use "a 404 page" shared example as we want to check it
       # inside an example
-      click_link "Unpublish"
+      click_on "Unpublish"
 
       expect(page).to have_content("successfully")
 

data/lib/decidim/admin/test.rb

@@ -14,3 +14,4 @@ require "decidim/admin/test/manage_hide_content_examples"
 require "decidim/admin/test/needs_admin_tos_accepted_examples"
 require "decidim/admin/test/destroy_admin_examples"
 require "decidim/admin/test/commands/publish_participatory_space_examples"
+require "decidim/admin/test/invite_participatory_space_users_shared_context"

data/lib/decidim/admin/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-admin version.
   module Admin
     def self.version
-      "0.28.1"
+      "0.29.0.rc1"
     end
   end
 end