Refactor malformed titles in admin logs (part 1)

decidim-accountability/spec/shared/manage_results_examples.rb

@@ -31,6 +31,7 @@
   context "when having existing proposals" do
     let!(:proposal_component) { create(:proposal_component, participatory_space:) }
     let!(:proposals) { create_list(:proposal, 5, component: proposal_component) }
+    let(:attributes) { attributes_for(:result, component: current_component) }
 
     it "updates a result" do
       within "tr", text: translated(result.title) do
@@ -41,9 +42,7 @@
         fill_in_i18n(
           :result_title,
           "#result-title-tabs",
-          en: "My new title",
-          es: "Mi nuevo título",
-          ca: "El meu nou títol"
+          **attributes[:title].except("machine_translations")
         )
 
         tom_select("#proposals_list", option_id: proposals.first(2).map(&:id))
@@ -54,8 +53,12 @@
       expect(page).to have_admin_callout("successfully")
 
       within "table" do
-        expect(page).to have_content("My new title")
+        expect(page).to have_content(translated(attributes[:title]))
       end
+
+      visit decidim_admin.root_path
+      expect(page).to have_content("updated result")
+      expect(page).to have_content(translated(attributes[:title]))
     end
 
     it "creates a new result", :slow do
@@ -65,16 +68,12 @@
         fill_in_i18n(
           :result_title,
           "#result-title-tabs",
-          en: "My result",
-          es: "Mi result",
-          ca: "El meu result"
+          **attributes[:title].except("machine_translations")
         )
         fill_in_i18n_editor(
           :result_description,
           "#result-description-tabs",
-          en: "A longer description",
-          es: "Descripción más larga",
-          ca: "Descripció més llarga"
+          **attributes[:description].except("machine_translations")
         )
 
         tom_select("#proposals_list", option_id: proposals.first(2).map(&:id))
@@ -88,8 +87,12 @@
       expect(page).to have_admin_callout("successfully")
 
       within "table" do
-        expect(page).to have_content("My result")
+        expect(page).to have_content(translated(attributes[:title]))
       end
+
+      visit decidim_admin.root_path
+      expect(page).to have_content("created result")
+      expect(page).to have_content(attributes[:title]["en"])
     end
   end
 

decidim-accountability/spec/shared/manage_statuses_examples.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.shared_examples "manage statuses" do
+  let(:attributes) { attributes_for(:status) }
+
   it "updates a status" do
     within "tr", text: status.key do
       click_on "Edit"
@@ -10,9 +12,7 @@
       fill_in_i18n(
         :status_name,
         "#status-name-tabs",
-        en: "My new name",
-        es: "Mi nuevo nombre",
-        ca: "El meu nou nom"
+        **attributes[:name].except("machine_translations")
       )
 
       find("*[type=submit]").click
@@ -21,8 +21,11 @@
     expect(page).to have_admin_callout("successfully")
 
     within "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])} status")
   end
 
   it "creates a new status" do
@@ -31,21 +34,8 @@
     within ".new_status" do
       fill_in :status_key, with: "status_key_1"
 
-      fill_in_i18n(
-        :status_name,
-        "#status-name-tabs",
-        en: "A longer name",
-        es: "Nombre más larga",
-        ca: "Nom més llarga"
-      )
-
-      fill_in_i18n(
-        :status_description,
-        "#status-description-tabs",
-        en: "A longer description",
-        es: "Descripción más larga",
-        ca: "Descripció més llarga"
-      )
+      fill_in_i18n(:status_name, "#status-name-tabs", **attributes[:name].except("machine_translations"))
+      fill_in_i18n(:status_description, "#status-description-tabs", **attributes[:description].except("machine_translations"))
 
       fill_in :status_progress, with: 75
 
@@ -56,8 +46,11 @@
 
     within "table" do
       expect(page).to have_content("status_key_1")
-      expect(page).to have_content("A longer name")
+      expect(page).to have_content(translated(attributes[:name]))
     end
+
+    visit decidim_admin.root_path
+    expect(page).to have_content("created the #{translated(attributes[:name])} status")
   end
 
   describe "deleting a result" do

decidim-accountability/spec/shared/manage_timeline_examples.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples "manage timeline" do
+  let(:attributes) { attributes_for(:timeline_entry, result:) }
+
+  it "updates a timeline entry", versioning: true do
+    visit current_path
+    click_on "Edit", match: :first
+
+    within ".edit_timeline_entry" do
+      fill_in :timeline_entry_entry_date_date, with: Date.current.strftime("%d/%m/%Y")
+      fill_in_i18n(:timeline_entry_title, "#timeline_entry-title-tabs", **attributes[:title].except("machine_translations"))
+      fill_in_i18n_editor(:timeline_entry_description, "#timeline_entry-description-tabs", **attributes[:description].except("machine_translations"))
+
+      find("*[type=submit]").click
+    end
+
+    expect(page).to have_admin_callout("successfully")
+
+    within "table" do
+      expect(page).to have_content(translated(attributes[:title]))
+    end
+
+    visit decidim_admin.root_path
+    expect(page).to have_content("updated the #{translated(attributes[:title])} timeline entry")
+  end
+
+  it "creates a timeline entry", versioning: true do
+    click_on "New timeline entry", match: :first
+
+    within ".new_timeline_entry" do
+      fill_in :timeline_entry_entry_date_date, with: Date.current.strftime("%d/%m/%Y")
+      fill_in_i18n(:timeline_entry_title, "#timeline_entry-title-tabs", **attributes[:title].except("machine_translations"))
+      fill_in_i18n_editor(:timeline_entry_description, "#timeline_entry-description-tabs", **attributes[:description].except("machine_translations"))
+
+      find("*[type=submit]").click
+    end
+
+    expect(page).to have_admin_callout("successfully")
+
+    within "table" do
+      expect(page).to have_content(translated(attributes[:title]))
+    end
+
+    visit decidim_admin.root_path
+    expect(page).to have_content("created the #{translated(attributes[:title])} timeline entry")
+  end
+end

decidim-accountability/spec/system/admin/admin_manages_accountability_spec.rb

@@ -35,4 +35,17 @@
 
     it_behaves_like "manage statuses"
   end
+
+  describe "timeline" do
+    before do
+      visit_component_admin
+      within "tr", text: translated(result.title) do
+        click_on "Project evolution"
+      end
+    end
+
+    let!(:timeline_entry) { create(:timeline_entry, result:) }
+
+    it_behaves_like "manage timeline"
+  end
 end

decidim-assemblies/spec/shared/manage_assemblies_examples.rb

@@ -6,24 +6,33 @@
     let(:image3_path) { Decidim::Dev.asset(image3_filename) }
 
     let(:assembly_parent_id_options) { page.find_by_id("assembly_parent_id").find_all("option").map(&:value) }
+    let(:attributes) { attributes_for(:assembly, :with_content_blocks, organization:, blocks_manifests: [:announcement]) }
 
     before do
       click_on "Configure"
     end
 
     it "updates an assembly" do
-      fill_in_i18n(
-        :assembly_title,
-        "#assembly-title-tabs",
-        en: "My new title",
-        es: "Mi nuevo título",
-        ca: "El meu nou títol"
-      )
+      fill_in_i18n(:assembly_title, "#assembly-title-tabs", **attributes[:title].except("machine_translations"))
 
       dynamically_attach_file(:assembly_banner_image, image3_path, remove_before: true)
 
       within ".edit_assembly" do
         expect(assembly_parent_id_options).not_to include(assembly.id)
+        fill_in_i18n(:assembly_subtitle, "#assembly-subtitle-tabs", **attributes[:subtitle].except("machine_translations"))
+        fill_in_i18n_editor(:assembly_short_description, "#assembly-short_description-tabs", **attributes[:short_description].except("machine_translations"))
+        fill_in_i18n_editor(:assembly_description, "#assembly-description-tabs", **attributes[:description].except("machine_translations"))
+        fill_in_i18n_editor(:assembly_purpose_of_action, "#assembly-purpose_of_action-tabs", **attributes[:purpose_of_action].except("machine_translations"))
+        fill_in_i18n_editor(:assembly_composition, "#assembly-composition-tabs", **attributes[:composition].except("machine_translations"))
+        fill_in_i18n_editor(:assembly_internal_organisation, "#assembly-internal_organisation-tabs", **attributes[:internal_organisation].except("machine_translations"))
+        fill_in_i18n_editor(:assembly_announcement, "#assembly-announcement-tabs", **attributes[:announcement].except("machine_translations"))
+        fill_in_i18n_editor(:assembly_closing_date_reason, "#assembly-closing_date_reason-tabs", **attributes[:closing_date_reason].except("machine_translations"))
+
+        fill_in_i18n(:assembly_participatory_scope, "#assembly-participatory_scope-tabs", **attributes[:participatory_scope].except("machine_translations"))
+        fill_in_i18n(:assembly_participatory_structure, "#assembly-participatory_structure-tabs", **attributes[:participatory_structure].except("machine_translations"))
+        fill_in_i18n(:assembly_meta_scope, "#assembly-meta_scope-tabs", **attributes[:meta_scope].except("machine_translations"))
+        fill_in_i18n(:assembly_local_area, "#assembly-local_area-tabs", **attributes[:local_area].except("machine_translations"))
+        fill_in_i18n(:assembly_target, "#assembly-target-tabs", **attributes[:target].except("machine_translations"))
 
         fill_in :assembly_creation_date_date, with: nil, fill_options: { clear: :backspace }
         fill_in :assembly_included_at_date, with: nil, fill_options: { clear: :backspace }
@@ -39,13 +48,16 @@
       expect(page).to have_admin_callout("successfully")
 
       within "[data-content]" do
-        expect(page).to have_css("input[value='My new title']")
+        expect(page).to have_css("input[value='#{translated(attributes[:title])}']")
         expect(page).to have_css("img[src*='#{image3_filename}']")
         expect(page).to have_field(:assembly_creation_date_date, with: Date.yesterday.strftime("%d/%m/%Y").to_s)
         expect(page).to have_field(:assembly_included_at_date, with: Date.current.strftime("%d/%m/%Y").to_s)
         expect(page).to have_field(:assembly_duration_date, with: Date.tomorrow.strftime("%d/%m/%Y").to_s)
         expect(page).to have_field(:assembly_closing_date_date, with: Date.tomorrow.strftime("%d/%m/%Y").to_s)
       end
+
+      visit decidim_admin.root_path
+      expect(page).to have_content("updated the #{translated(attributes[:title])} assembly")
     end
   end
 

decidim-assemblies/spec/shared/manage_assembly_admins_examples.rb

@@ -2,6 +2,7 @@
 
 shared_examples "manage assembly admins examples" do
   let(:other_user) { create(:user, organization:, email: "my_email@example.org") }
+  let(:attributes) { attributes_for(:user, organization:) }
 
   let!(:assembly_admin) do
     create(:assembly_admin,
@@ -25,12 +26,12 @@
     end
   end
 
-  it "creates a new assembly admin" do
+  it "creates a new assembly admin", versioning: true do
     click_on "New assembly admin"
 
     within ".new_assembly_user_role" do
       fill_in :assembly_user_role_email, with: other_user.email
-      fill_in :assembly_user_role_name, with: "John Doe"
+      fill_in :assembly_user_role_name, with: attributes[:name]
       select "Administrator", from: :assembly_user_role_role
 
       find("*[type=submit]").click
@@ -41,6 +42,9 @@
     within "#assembly_admins table" do
       expect(page).to have_content(other_user.email)
     end
+
+    visit decidim_admin.root_path
+    expect(page).to have_content("invited #{other_user.name} to the #{translated(assembly.title)} assembly")
   end
 
   describe "when managing different users" do
@@ -49,7 +53,7 @@
       visit current_path
     end
 
-    it "updates an assembly admin" do
+    it "updates an assembly admin", versioning: true do
       within "#assembly_admins" do
         within "#assembly_admins tr", text: other_user.email do
           click_on "Edit"
@@ -67,6 +71,8 @@
       within "#assembly_admins table" do
         expect(page).to have_content("Collaborator")
       end
+      visit decidim_admin.root_path
+      expect(page).to have_content("changed the role of #{other_user.name} in the #{translated(assembly.title)} assembly")
     end
 
     it "deletes an assembly_user_role" do

decidim-assemblies/spec/shared/manage_assembly_members_examples.rb

@@ -12,17 +12,17 @@
 
   context "without existing user" do
     let!(:assembly_member) { create(:assembly_member, assembly:) }
+    let(:attributes) { attributes_for(:assembly_member, assembly:) }
 
-    it "creates a new assembly member" do
+    it "creates a new assembly member", versioning: true do
       click_on "New assembly member"
 
       fill_in_datepicker :assembly_member_designation_date_date, with: Time.current.strftime("%d/%m/%Y")
 
       within ".new_assembly_member" do
-        fill_in(
-          :assembly_member_full_name,
-          with: "Daisy O'connor"
-        )
+        fill_in(:assembly_member_full_name, with: attributes[:full_name])
+        fill_in(:assembly_member_gender, with: attributes[:gender])
+        fill_in(:assembly_member_birthplace, with: attributes[:birthplace])
       end
 
       dynamically_attach_file(:assembly_member_non_user_avatar, Decidim::Dev.asset("avatar.jpg")) do
@@ -39,8 +39,11 @@
       expect(page).to have_current_path decidim_admin_assemblies.assembly_members_path(assembly)
 
       within "#assembly_members table" do
-        expect(page).to have_content("Daisy O'connor")
+        expect(page).to have_content(attributes[:full_name])
       end
+
+      visit decidim_admin.root_path
+      expect(page).to have_content("created the #{attributes[:full_name]} member")
     end
   end
 
@@ -98,6 +101,7 @@
 
   describe "when managing other assembly members" do
     let!(:assembly_member) { create(:assembly_member, assembly:) }
+    let(:attributes) { attributes_for(:assembly_member, assembly:) }
 
     before do
       visit current_path
@@ -109,16 +113,15 @@
       end
     end
 
-    it "updates an assembly member" do
+    it "updates an assembly member", versioning: true do
       within "#assembly_members tr", text: assembly_member.full_name do
         click_on "Edit"
       end
 
       within ".edit_assembly_member" do
-        fill_in(
-          :assembly_member_full_name,
-          with: "Alicia O'connor"
-        )
+        fill_in(:assembly_member_full_name, with: attributes[:full_name])
+        fill_in(:assembly_member_gender, with: attributes[:gender])
+        fill_in(:assembly_member_birthplace, with: attributes[:birthplace])
 
         find("*[type=submit]").click
       end
@@ -127,8 +130,11 @@
       expect(page).to have_current_path decidim_admin_assemblies.assembly_members_path(assembly)
 
       within "#assembly_members table" do
-        expect(page).to have_content("Alicia O'connor")
+        expect(page).to have_content(attributes[:full_name])
       end
+
+      visit decidim_admin.root_path
+      expect(page).to have_content("updated the #{assembly_member.full_name} member")
     end
 
     it "deletes the assembly member" do