decidim-admin 0.28.1 → 0.28.2

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

@@ -15,6 +15,23 @@ shared_examples "showing the unauthorized error message" do
   end
 end
 
+shared_examples "admin participatory space edit button" do
+  context "and visits the participatory space public page" do
+    before do
+      switch_to_host(organization.host)
+      login_as role, scope: :user
+    end
+
+    it "shows the admin bar with the Edit button" do
+      visit participatory_space_path
+
+      within "#admin-bar" do
+        expect(page).to have_link("Edit", href: target_path)
+      end
+    end
+  end
+end
+
 shared_examples "admin participatory space access" do
   before do
     switch_to_host(organization.host)
@@ -31,6 +48,16 @@ shared_examples "admin participatory space access" do
   context "when the user has the role" do
     let(:user) { role }
 
+    context "and visits the root path" do
+      it "shows the admin bar" do
+        visit decidim.root_path
+
+        within "#admin-bar" do
+          expect(page).to have_link("Admin dashboard", href: "/admin/")
+        end
+      end
+    end
+
     context "and has permission" do
       before do
         visit target_path

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

@@ -0,0 +1,180 @@
+# frozen_string_literal: true
+
+shared_examples "inviting participatory space admins" do |check_private_space: true, check_landing_page: true|
+  let(:role) { "Administrator" }
+
+  before do
+    switch_to_host organization.host
+  end
+
+  shared_examples "sees public space menu" do
+    it "can access all sections" do
+      within_admin_sidebar_menu do
+        expect(page).to have_content(about_this_space_label)
+        expect(page).to have_content("Landing page") if check_landing_page
+        expect(page).to have_content("Phases") if participatory_space.is_a?(Decidim::ParticipatoryProcess)
+        expect(page).to have_content("Components")
+        expect(page).to have_content("Categories")
+        expect(page).to have_content("Attachments")
+        expect(page).to have_content(space_admins_label)
+        expect(page).not_to have_content("Private participants") if participatory_space.respond_to?(:private_space)
+        expect(page).to have_content("Moderations")
+      end
+    end
+  end
+
+  shared_examples "sees private space menu" do
+    it "can access all sections" do
+      within_admin_sidebar_menu do
+        expect(page).to have_content(about_this_space_label)
+        expect(page).to have_content("Landing page") if check_landing_page
+        expect(page).to have_content("Phases") if participatory_space.is_a?(Decidim::ParticipatoryProcess)
+        expect(page).to have_content("Components")
+        expect(page).to have_content("Categories")
+        expect(page).to have_content("Attachments")
+        expect(page).to have_content(space_admins_label)
+        expect(page).to have_content("Private participants") if participatory_space.respond_to?(:private_space)
+        expect(page).to have_content("Moderations")
+      end
+    end
+  end
+
+  context "when the user does not exist" do
+    before do
+      perform_enqueued_jobs { invite_user }
+    end
+
+    it "asks for a password and nickname and redirects to the admin dashboard" do
+      visit last_email_link
+
+      within "form.new_user" do
+        fill_in :invitation_user_nickname, with: "caballo_loco"
+        fill_in :invitation_user_password, with: "decidim123456789"
+        check :invitation_user_tos_agreement
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_current_path "/admin/admin_terms/show"
+
+      visit decidim_admin.admin_terms_show_path
+
+      find_button("I agree with the terms").click
+
+      click_on space_sidebar_label
+
+      within "div.table-scroll" do
+        expect(page).to have_i18n_content(participatory_space.title)
+        within "tr", text: translated(participatory_space.title) do
+          click_on translated(participatory_space.title)
+        end
+      end
+    end
+
+    context "when the user does not exist" do
+      before do
+        perform_enqueued_jobs { invite_user }
+
+        visit last_email_link
+
+        within "form.new_user" do
+          fill_in :invitation_user_nickname, with: "caballo_loco"
+          fill_in :invitation_user_password, with: "decidim123456789"
+          check :invitation_user_tos_agreement
+          find("*[type=submit]").click
+        end
+
+        expect(page).to have_current_path "/admin/admin_terms/show"
+
+        visit decidim_admin.admin_terms_show_path
+
+        find_button("I agree with the terms").click
+
+        click_on space_sidebar_label
+
+        within "div.table-scroll" do
+          expect(page).to have_i18n_content(participatory_space.title)
+          within "tr", text: translated(participatory_space.title) do
+            click_on translated(participatory_space.title)
+          end
+        end
+      end
+
+      context "and is a public space" do
+        it_behaves_like "sees public space menu"
+      end
+
+      if check_private_space
+        context "and is a private space" do
+          let(:participatory_space) { private_participatory_space }
+
+          it_behaves_like "sees private space menu"
+        end
+      end
+    end
+  end
+
+  context "when the user already exists" do
+    let(:email) { "administrator@example.org" }
+
+    let!(:administrator) do
+      create(:user, :confirmed, :admin_terms_accepted, email:, organization:)
+    end
+
+    before do
+      perform_enqueued_jobs { invite_user }
+    end
+
+    it "redirects the administrator to the admin dashboard" do
+      login_as administrator, scope: :user
+
+      visit decidim_admin.root_path
+
+      click_on space_sidebar_label
+
+      within "div.table-scroll" do
+        expect(page).to have_i18n_content(participatory_space.title)
+        expect(page).to have_i18n_content(participatory_space.title)
+        within "tr", text: translated(participatory_space.title) do
+          click_on translated(participatory_space.title)
+        end
+      end
+    end
+
+    it "selects the user role in the form" do
+      edit_user(administrator.name)
+
+      expect(page).to have_select("Role", selected: "Administrator")
+    end
+
+    context "when user exists in the organization" do
+      before do
+        perform_enqueued_jobs { invite_user }
+        login_as administrator, scope: :user
+
+        visit decidim_admin.root_path
+
+        click_on space_sidebar_label
+
+        within "div.table-scroll" do
+          expect(page).to have_i18n_content(participatory_space.title)
+          expect(page).to have_i18n_content(participatory_space.title)
+          within "tr", text: translated(participatory_space.title) do
+            click_on translated(participatory_space.title)
+          end
+        end
+      end
+
+      context "and is a public space" do
+        it_behaves_like "sees public space menu"
+      end
+
+      if check_private_space
+        context "and is a private space" do
+          let(:participatory_space) { private_participatory_space }
+
+          it_behaves_like "sees private space menu"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+shared_examples "inviting participatory space collaborators" do
+  let(:role) { "Collaborator" }
+
+  before do
+    switch_to_host organization.host
+  end
+
+  context "when the user does not exist" do
+    before do
+      perform_enqueued_jobs { invite_user }
+    end
+
+    it "asks for a password and nickname and redirects to the admin dashboard" do
+      visit last_email_link
+
+      within "form.new_user" do
+        fill_in :invitation_user_nickname, with: "caballo_loco"
+        fill_in :invitation_user_password, with: "decidim123456789"
+        check :invitation_user_tos_agreement
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_current_path "/admin/admin_terms/show"
+
+      visit decidim_admin.admin_terms_show_path
+      find_button("I agree with the terms").click
+
+      click_on space_sidebar_label
+
+      within "div.table-scroll" do
+        expect(page).to have_i18n_content(participatory_space.title)
+      end
+    end
+  end
+
+  context "when the user already exists" do
+    let(:email) { "collaborator@example.org" }
+
+    let!(:collaborator) do
+      create(:user, :confirmed, :admin_terms_accepted, email:, organization:)
+    end
+
+    before do
+      perform_enqueued_jobs { invite_user }
+    end
+
+    it "redirects the collaborator to the admin dashboard" do
+      login_as collaborator, scope: :user
+
+      visit decidim_admin.root_path
+
+      click_on space_sidebar_label
+
+      within "div.table-scroll" do
+        expect(page).to have_i18n_content(participatory_space.title)
+      end
+    end
+
+    it "selects the user role in the form" do
+      edit_user(collaborator.name)
+
+      expect(page).to have_select("Role", selected: "Collaborator")
+    end
+  end
+end

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

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+shared_examples "inviting participatory space moderators" do
+  before do
+    switch_to_host organization.host
+  end
+
+  context "when the user does not exist" do
+    before do
+      perform_enqueued_jobs { invite_user }
+    end
+
+    it "asks for a password and nickname and redirects to the admin dashboard" do
+      visit last_email_link
+
+      within "form.new_user" do
+        fill_in :invitation_user_nickname, with: "caballo_loco"
+        fill_in :invitation_user_password, with: "decidim123456789"
+        check :invitation_user_tos_agreement
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_current_path "/admin/admin_terms/show"
+
+      visit decidim_admin.admin_terms_show_path
+      find_button("I agree with the terms").click
+
+      click_on space_sidebar_label
+
+      within "div.table-scroll" do
+        expect(page).to have_i18n_content(participatory_space.title)
+        click_on "Moderate"
+      end
+
+      within "div.process-title-content-breadcrumb-container-left" do
+        expect(page).to have_css("span.process-title-content-breadcrumb", text: "Moderations")
+      end
+    end
+  end
+
+  context "when the user already exists" do
+    let(:email) { "moderator@example.org" }
+
+    let!(:moderator) do
+      create(:user, :confirmed, :admin_terms_accepted, email:, organization:)
+    end
+
+    before do
+      perform_enqueued_jobs { invite_user }
+    end
+
+    it "redirects the moderator to the admin dashboard" do
+      login_as moderator, scope: :user
+
+      visit decidim_admin.root_path
+
+      click_on space_sidebar_label
+
+      within "div.table-scroll" do
+        expect(page).to have_i18n_content(participatory_space.title)
+        within "tr", text: translated(participatory_space.title) do
+          click_on "Moderate"
+        end
+      end
+
+      within "div.process-title-content-breadcrumb-container-left" do
+        expect(page).to have_css("span.process-title-content-breadcrumb", text: "Moderations")
+      end
+    end
+
+    it "selects the user role in the form" do
+      edit_user(moderator.name)
+
+      expect(page).to have_select("Role", selected: "Moderator")
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+shared_context "when inviting participatory space users" do
+  let(:organization) { participatory_space.organization }
+  let(:user) { create(:user, :admin, :confirmed, organization: participatory_space.organization) }
+  let(:email) { "this_email_does_not_exist@example.org" }
+  let(:role) { "Moderator" }
+
+  def invite_user
+    login_as user, scope: :user
+
+    visit participatory_space_user_roles_path
+    within "[data-content]" do
+      click_on new_button_label
+    end
+
+    fill_in "Name", with: "Alice Liddel"
+    fill_in "Email", with: email
+    select role, from: "Role"
+    click_on "Create"
+    logout :user
+  end
+
+  def edit_user(username)
+    login_as user, scope: :user
+
+    visit participatory_space_user_roles_path
+
+    within "tr", text: username do
+      click_on "Edit"
+    end
+  end
+end

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
@@ -30,17 +31,13 @@ shared_examples "manage attachment collections examples" 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,8 +46,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("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
@@ -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

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))
@@ -25,9 +26,7 @@ shared_examples "manage categories examples" 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,8 +35,11 @@ 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
@@ -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

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

@@ -54,6 +54,10 @@ shared_examples "hideable resource during block" do
       click_button 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.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.28.2"
     end
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.28.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -94,28 +94,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -347,7 +347,6 @@ files:
 - app/jobs/decidim/admin/newsletter_delivery_job.rb
 - app/jobs/decidim/admin/newsletter_job.rb
 - app/jobs/decidim/admin/verify_user_group_from_csv_job.rb
-- app/mailers/decidim/admin/application_mailer.rb
 - app/models/decidim/admin/fake_newsletter.rb
 - app/packs/entrypoints/decidim_admin.js
 - app/packs/entrypoints/decidim_admin.scss
@@ -676,6 +675,10 @@ files:
 - lib/decidim/admin/test/forms/attachment_collection_form_examples.rb
 - lib/decidim/admin/test/forms/attachment_form_examples.rb
 - lib/decidim/admin/test/forms/category_form_examples.rb
+- lib/decidim/admin/test/invite_participatory_space_admins_shared_examples.rb
+- lib/decidim/admin/test/invite_participatory_space_collaborators_shared_examples.rb
+- lib/decidim/admin/test/invite_participatory_space_moderators_shared_examples.rb
+- lib/decidim/admin/test/invite_participatory_space_users_shared_context.rb
 - lib/decidim/admin/test/manage_attachment_collections_examples.rb
 - lib/decidim/admin/test/manage_attachments_examples.rb
 - lib/decidim/admin/test/manage_categories_examples.rb
@@ -695,7 +698,7 @@ metadata:
   funding_uri: https://opencollective.com/decidim
   homepage_uri: https://decidim.org
   source_code_uri: https://github.com/decidim/decidim
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -710,8 +713,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Decidim organization administration
 test_files: []

data/app/mailers/decidim/admin/application_mailer.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    # Custom application mailer, scoped to the admin mailer.
-    #
-    class ApplicationMailer < ActionMailer::Base
-      default from: Decidim.config.mailer_sender
-      layout "mailer"
-    end
-  end
-end