decidim-admin 0.30.9 → 0.31.0.rc1

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

@@ -29,7 +29,7 @@ shared_examples "inviting participatory space collaborators" do
 
       click_on space_sidebar_label
 
-      within "div.table-scroll" do
+      within ".table-list" do
         expect(page).to have_i18n_content(participatory_space.title)
       end
     end
@@ -53,7 +53,7 @@ shared_examples "inviting participatory space collaborators" do
 
       click_on space_sidebar_label
 
-      within "div.table-scroll" do
+      within ".table-list" do
         expect(page).to have_i18n_content(participatory_space.title)
       end
     end

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

@@ -27,9 +27,11 @@ shared_examples "inviting participatory space moderators" do
 
       click_on space_sidebar_label
 
-      within "div.table-scroll" do
-        expect(page).to have_i18n_content(participatory_space.title)
-        click_on "Moderate"
+      within ".table-list" do
+        within("tr", text: translated(participatory_space.title)) do
+          find("button[data-controller='dropdown']").click
+          click_on "Manage moderations"
+        end
       end
 
       within "div.process-title-content-breadcrumb-container-left" do
@@ -56,10 +58,11 @@ shared_examples "inviting participatory space moderators" do
 
       click_on space_sidebar_label
 
-      within "div.table-scroll" do
+      within ".table-list" do
         expect(page).to have_i18n_content(participatory_space.title)
-        within "tr", text: translated(participatory_space.title) do
-          click_on "Moderate"
+        within("tr", text: translated(participatory_space.title)) do
+          find("button[data-controller='dropdown']").click
+          click_on "Manage moderations"
         end
       end
 

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

@@ -28,6 +28,7 @@ shared_context "when inviting participatory space users" do
     visit participatory_space_user_roles_path
 
     within "tr", text: username do
+      find("button[data-controller='dropdown']").click
       click_on "Edit"
     end
   end

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

@@ -16,6 +16,7 @@ shared_examples "manage attachment collections examples" do
 
   it "can view an attachment collection details" do
     within "#attachment_collections table" do
+      find("button[data-controller='dropdown']").click
       click_on "Edit"
     end
 
@@ -56,6 +57,7 @@ shared_examples "manage attachment collections examples" do
   it "can update an attachment collection" do
     within "#attachment_collections" do
       within "tr", text: translated(attachment_collection.name) do
+        find("button[data-controller='dropdown']").click
         click_on "Edit"
       end
     end
@@ -90,6 +92,7 @@ shared_examples "manage attachment collections examples" do
 
       it "can delete the attachment collection" do
         within "tr", text: translated(attachment_collection2.name) do
+          find("button[data-controller='dropdown']").click
           accept_confirm { click_on "Delete" }
         end
 
@@ -110,7 +113,8 @@ shared_examples "manage attachment collections examples" do
 
       it "cannot delete it" do
         within "tr", text: translated(attachment_collection.name) do
-          expect(page).to have_no_css("a.action-icon--remove")
+          find("button[data-controller='dropdown']").click
+          expect(page).to have_no_css(".button", text: "Delete")
         end
       end
     end

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

@@ -3,7 +3,6 @@
 shared_examples "manage attachments examples" do
   context "when processing attachments" do
     let!(:attachment) { create(:attachment, attached_to:, attachment_collection:) }
-    let!(:attachment_with_link) { create(:attachment, :with_link, attached_to:, attachment_collection:) }
 
     before do
       visit current_path
@@ -20,6 +19,7 @@ shared_examples "manage attachments examples" do
 
     it "can view an attachment details" do
       within "tr", text: translated(attachment.title) do
+        find("button[data-controller='dropdown']").click
         click_on "Edit"
       end
 
@@ -153,6 +153,7 @@ shared_examples "manage attachments examples" do
       within "#attachments" do
         within "tr", text: translated(attachment.title) do
           expect(page).to have_text(translated(attachment_collection.name, locale: :en))
+          find("button[data-controller='dropdown']").click
           click_on "Edit"
         end
       end
@@ -172,6 +173,7 @@ shared_examples "manage attachments examples" do
 
     it "can delete an attachment from a process" do
       within "tr", text: translated(attachment.title) do
+        find("button[data-controller='dropdown']").click
         accept_confirm { click_on "Delete" }
       end
 
@@ -180,19 +182,10 @@ shared_examples "manage attachments examples" do
       expect(page).to have_no_content(translated(attachment.title, locale: :en))
     end
 
-    it "can delete an attachment with a link" do
-      within "tr", text: translated(attachment_with_link.title) do
-        accept_confirm { click_on "Delete" }
-      end
-
-      expect(page).to have_admin_callout("Attachment destroyed successfully")
-
-      expect(page).to have_no_content(translated(attachment_with_link.title, locale: :en))
-    end
-
     it "can update an attachment" do
       within "#attachments" do
         within "tr", text: translated(attachment.title) do
+          find("button[data-controller='dropdown']").click
           click_on "Edit"
         end
       end

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

@@ -2,6 +2,29 @@
 
 require "spec_helper"
 
+shared_examples "access permissions form" do
+  it "can view the permissions" do
+    within "tr", text: row_text do
+      find("button[data-controller='dropdown']").click
+      click_on "Manage permissions"
+    end
+    expect(page).to have_content("Edit permissions")
+  end
+end
+
+shared_examples "access component permissions form" do
+  let(:participatory_space_engine) { Decidim::EngineRouter.admin_proxy(participatory_space) }
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+    visit participatory_space_engine.components_path(participatory_space)
+  end
+
+  include_examples "access permissions form" do
+    let!(:row_text) { translated(component.name) }
+  end
+end
+
 shared_examples "Managing component permissions" do
   let(:organization) do
     create(
@@ -23,7 +46,8 @@ shared_examples "Managing component permissions" do
   context "when setting permissions" do
     before do
       within ".component-#{component.id}" do
-        click_on "Permissions"
+        find("button[data-controller='dropdown']").click
+        click_on "Manage permissions"
       end
     end
 
@@ -54,7 +78,8 @@ 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_on "Permissions"
+        find("button[data-controller='dropdown']").click
+        click_on "Manage permissions"
       end
       within "#components form" do
         within ".foo-permission" do
@@ -85,7 +110,8 @@ shared_examples "Managing component permissions" do
       )
 
       within ".component-#{component.id}" do
-        click_on "Permissions"
+        find("button[data-controller='dropdown']").click
+        click_on "Manage permissions"
       end
     end
 
@@ -120,7 +146,8 @@ shared_examples "Managing component permissions" do
       )
 
       within ".component-#{component.id}" do
-        click_on "Permissions"
+        find("button[data-controller='dropdown']").click
+        click_on "Manage permissions"
       end
     end
 

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

@@ -53,7 +53,6 @@ shared_examples "hideable resource during block" do
       fill_in :block_user_justification, with: "This user is a spammer" * 2 # to have at least 15 chars
 
       click_on I18n.t("decidim.admin.block_user.new.action")
-      expect(page).to have_content(I18n.t("decidim.admin.officializations.block.success"))
 
       expect(content.reload).to be_hidden
 

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

@@ -82,7 +82,8 @@ shared_examples "manage moderations" do
 
     it "user can un-report a resource" do
       within "tr[data-id=\"#{moderation.id}\"]" do
-        click_on "Unreport"
+        find("button[data-controller='dropdown']").click
+        click_on "Undo the report"
       end
 
       expect(page).to have_admin_callout("Resource successfully unreported")
@@ -90,6 +91,7 @@ shared_examples "manage moderations" do
 
     it "user can hide a resource" do
       within "tr[data-id=\"#{moderation.id}\"]" do
+        find("button[data-controller='dropdown']").click
         click_on "Hide"
       end
 
@@ -114,8 +116,8 @@ shared_examples "manage moderations" do
     it "user can filter by reportable type" do
       reportable_type = moderation.reportable.class.name.demodulize
       within ".filters__section" do
-        find(:xpath, "//a[contains(text(), 'Filter')]").hover
-        find(:xpath, "//a[contains(text(), 'Type')]").hover
+        click_on "Filter"
+        click_on "Type"
         click_on reportable_type
       end
       expect(page).to have_css("tbody tr", count: moderations.length)
@@ -124,7 +126,7 @@ shared_examples "manage moderations" do
     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)
+        fill_in("Search moderation by reportable id or content", with: search)
         within(".input-group-button") { click_on(class: "text-secondary") }
       end
       expect(page).to have_css("tbody tr", count: 1)
@@ -132,6 +134,7 @@ shared_examples "manage moderations" do
 
     it "user can see moderation details" do
       within "tr[data-id=\"#{moderation.id}\"]" do
+        find("button[data-controller='dropdown']").click
         click_on "Expand"
       end
 
@@ -188,7 +191,10 @@ shared_examples "manage moderations" do
     end
 
     it "user cannot unreport them" do
-      expect(page).to have_no_css(".action-icon--unreport")
+      within "tr[data-id=\"#{hidden_moderations.first.id}\"]" do
+        find("button[data-controller='dropdown']").click
+        expect(page).to have_no_css("a", text: "Undo the report")
+      end
     end
 
     it "user can review them" do
@@ -231,6 +237,7 @@ shared_examples "manage moderations" do
     it "user can hide them" do
       moderation_id = moderations.first.id
       within "tr[data-id=\"#{moderation_id}\"]" do
+        find("button[data-controller='dropdown']").click
         click_on "Hide"
       end
 

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-shared_examples "manage participatory space publications" do |_options|
+shared_examples "manage participatory space publications" do
   before do
-    participatory_space.update(title: { en: title })
     switch_to_host(organization.host)
     login_as user, scope: :user
+    visit admin_page_path
   end
 
   context "when the participatory space is unpublished" do
@@ -12,16 +12,19 @@ shared_examples "manage participatory space publications" do |_options|
       participatory_space.unpublish!
       participatory_space.reload
       visit admin_page_path
+
+      within("tr", text: translated_attribute(participatory_space.title)) do
+        find("button[data-controller='dropdown']").click
+        find("a", text: "Publish", visible: true).click
+      end
     end
 
     it "publishes it" do
-      click_on "Publish"
-
       expect(page).to have_content("successfully")
 
       visit public_collection_path
 
-      expect(page).to have_content title
+      expect(page).to have_content(translated_attribute(participatory_space.title))
     end
   end
 
@@ -42,7 +45,10 @@ 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_on "Unpublish"
+      within("tr", text: translated_attribute(participatory_space.title)) do
+        find("button[data-controller='dropdown']").click
+        click_on "Unpublish"
+      end
 
       expect(page).to have_content("successfully")
 

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

@@ -18,7 +18,13 @@ shared_examples "manage soft deletable component or space" do |resource_name|
         expect(page).to have_content(title[:en])
       end
 
-      accept_confirm { click_on "Soft delete" }
+      accept_confirm do
+        within("tr", text: title[:en]) do
+          # To remove once all the actions are migrated to dropdowns
+          find("button[data-controller='dropdown']").click
+          click_on "Move to trash"
+        end
+      end
 
       expect(page).to have_admin_callout("successfully")
 
@@ -34,7 +40,11 @@ shared_examples "manage soft deletable component or space" do |resource_name|
     end
 
     it "does not allow to move it to the trash" do
-      expect(page).to have_no_content("Soft delete")
+      within("tr", text: title[:en]) do
+        # To remove once all the actions are migrated to dropdowns
+        find("button[data-controller='dropdown']").click
+        have_css(".dropdown__button-disabled span", text: "Move to trash")
+      end
     end
   end
 
@@ -67,7 +77,8 @@ shared_examples "manage soft deletable resource" do |resource_name|
     expect(page).to have_content(title[:en])
 
     within(resource_row) do
-      accept_confirm { click_on "Soft delete" }
+      find("button[data-controller='dropdown']").click
+      accept_confirm { click_on "Move to trash" }
     end
 
     expect(page).to have_admin_callout("successfully")
@@ -101,7 +112,11 @@ shared_examples "manage trashed resource" do |resource_name|
     end
 
     it "restores the #{resource_name} from the trash" do
-      click_on "Restore"
+      # To remove once all the actions are migrated to dropdowns
+      within("tr", text: title[:en]) do
+        find("button[data-controller='dropdown']").click
+        click_on "Restore"
+      end
 
       expect(page).to have_admin_callout("successfully")
       visit trash_path

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

@@ -16,8 +16,12 @@ shared_examples "manage taxonomy filters in settings" do
     let!(:another_taxonomy_filter) do
       create(:taxonomy_filter, internal_name: { en: "Another filter" }, participatory_space_manifests: [participatory_space.manifest.name], root_taxonomy:)
     end
+
     before do
-      click_on "Configure"
+      within "tr", text: translated_attribute(component.name) do
+        find("button[data-controller='dropdown']").click
+        click_on "Configure"
+      end
     end
 
     it "can be added to settings" do
@@ -36,8 +40,9 @@ shared_examples "manage taxonomy filters in settings" do
       within ".js-current-filters" do
         expect(page).to have_css("td", text: "Internal taxonomy filter name")
         expect(page).to have_css("td", text: "Public taxonomy filter name")
-        expect(page).to have_link("Edit")
+        expect(page).to have_css("button[data-controller='dropdown']", count: 1)
       end
+
       expect(component.reload.settings.taxonomy_filters).to eq([taxonomy_filter.id.to_s])
 
       click_on "Add filter"
@@ -52,12 +57,15 @@ shared_examples "manage taxonomy filters in settings" do
         expect(page).to have_css("td", text: "Internal taxonomy filter name")
         expect(page).to have_css("td", text: "Public taxonomy filter name")
         expect(page).to have_css("td", text: "Another filter")
-        expect(page).to have_link("Edit", count: 2)
+        expect(page).to have_css("button[data-controller='dropdown']", count: 2)
       end
       expect(component.reload.settings.taxonomy_filters).to contain_exactly(taxonomy_filter.id.to_s, another_taxonomy_filter.id.to_s)
 
       click_on "Update"
-      click_on "Configure"
+      within "tr", text: translated(component.name) do
+        find("button[data-controller='dropdown']").click
+        click_on "Configure"
+      end
       within ".js-current-filters" do
         expect(page).to have_css("td", text: "Internal taxonomy filter name")
         expect(page).to have_css("td", text: "Public taxonomy filter name")
@@ -69,7 +77,10 @@ shared_examples "manage taxonomy filters in settings" do
     let(:taxonomy_filter_item) { nil }
     let(:taxonomy_filter) { nil }
     before do
-      click_on "Configure"
+      within "tr", text: translated(component.name) do
+        find("button[data-controller='dropdown']").click
+        click_on "Configure"
+      end
     end
 
     it "shows a configuration message" do
@@ -83,12 +94,16 @@ shared_examples "manage taxonomy filters in settings" do
 
     before do
       component.update!(settings: { taxonomy_filters: [another_taxonomy_filter.id.to_s, taxonomy_filter.id.to_s] })
-      click_on "Configure"
+      within "tr", text: translated(component.name) do
+        find("button[data-controller='dropdown']").click
+        click_on "Configure"
+      end
     end
 
     it "can be removed from settings" do
       within ".js-current-filters" do
         within "tr", text: "Internal taxonomy filter name" do
+          find("button[data-controller='dropdown']").click
           click_on "Edit"
         end
       end
@@ -113,11 +128,16 @@ shared_examples "manage taxonomy filters in settings" do
         expect(page).to have_css("td", text: "Another taxonomy filter name")
         expect(page).to have_css("td", text: "Internal taxonomy filter name")
         expect(page).to have_css("td", text: "Public taxonomy filter name")
-        expect(page).to have_link("Edit", count: 2)
+        within "table" do
+          expect(page).to have_css("button[data-controller='dropdown']", count: 2)
+        end
       end
 
       click_on "Update"
-      click_on "Configure"
+      within "tr", text: translated(component.name) do
+        find("button[data-controller='dropdown']").click
+        click_on "Configure"
+      end
       within ".js-current-filters" do
         expect(page).to have_css("td", text: "Internal taxonomy filter name")
         expect(page).to have_css("td", text: "Public taxonomy filter name")

data/lib/decidim/admin/version.rb

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