decidim-meetings 0.27.10 → 0.28.0.rc4

data/lib/decidim/meetings/test/factories.rb

@@ -1,17 +1,15 @@
 # frozen_string_literal: true
 
+require "decidim/components/namer"
 require "decidim/core/test/factories"
 require "decidim/forms/test/factories"
 require "decidim/participatory_processes/test/factories"
 
 FactoryBot.define do
   factory :meeting_component, parent: :component do
-    transient do
-      skip_injection { false }
-    end
-    name { generate_component_name(participatory_space.organization.available_locales, :meetings, skip_injection: skip_injection) }
+    name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :meetings).i18n_name }
     manifest_name { :meetings }
-    participatory_space { create(:participatory_process, :with_steps, organization: organization, skip_injection: skip_injection) }
+    participatory_space { create(:participatory_process, :with_steps, organization:) }
 
     trait :with_creation_enabled do
       settings do
@@ -27,10 +25,40 @@ FactoryBot.define do
       skip_injection { false }
     end
 
-    title { generate_localized_title(:meeting_title, skip_injection: skip_injection) }
-    description { generate_localized_description(:meeting_description, skip_injection: skip_injection) }
-    location { generate_localized_description(:meeting_location, skip_injection: skip_injection) }
-    location_hints { generate_localized_description(:meeting_location_hints, skip_injection: skip_injection) }
+    title do
+      if skip_injection
+        Decidim::Faker::Localized.localized { generate(:title) }
+      else
+        Decidim::Faker::Localized.localized { "<script>alert(\"Meetings TITLE\")</script> #{generate(:title)}" }
+      end
+    end
+    description do
+      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        if skip_injection
+          Decidim::Faker::Localized.localized { generate(:title) }
+        else
+          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings description\");</script> #{generate(:title)}" }
+        end
+      end
+    end
+    location do
+      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        if skip_injection
+          Decidim::Faker::Localized.localized { generate(:title) }
+        else
+          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings location\");</script> #{generate(:title)}" }
+        end
+      end
+    end
+    location_hints do
+      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        if skip_injection
+          Decidim::Faker::Localized.localized { generate(:title) }
+        else
+          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings location_hints\");</script> #{generate(:title)}" }
+        end
+      end
+    end
     address { Faker::Lorem.sentence(word_count: 3) }
     latitude { Faker::Address.latitude }
     longitude { Faker::Address.longitude }
@@ -40,10 +68,18 @@ FactoryBot.define do
     transparent { true }
     questionnaire { build(:questionnaire) }
     registration_form_enabled { true }
-    registration_terms { generate_localized_description(:meeting_registration_terms, skip_injection: skip_injection) }
+    registration_terms do
+      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        if skip_injection
+          Decidim::Faker::Localized.localized { generate(:title) }
+        else
+          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings registration_terms\");</script> #{generate(:title)}" }
+        end
+      end
+    end
     registration_type { :on_this_platform }
     type_of_meeting { :in_person }
-    component { build(:meeting_component) }
+    component { build(:component, manifest_name: "meetings") }
     iframe_access_level { :all }
     iframe_embed_type { :none }
 
@@ -78,7 +114,7 @@ FactoryBot.define do
     end
 
     trait :not_official do
-      author { create(:user, organization: component.organization, skip_injection: skip_injection) if component }
+      author { create(:user, organization: component.organization) if component }
     end
 
     trait :with_services do
@@ -89,7 +125,7 @@ FactoryBot.define do
       end
 
       after(:build) do |meeting, evaluator|
-        meeting.services = evaluator.services || build_list(:service, 2, meeting: meeting, skip_injection: evaluator.skip_injection)
+        meeting.services = evaluator.services || build_list(:service, 2, meeting:)
       end
     end
 
@@ -97,15 +133,21 @@ FactoryBot.define do
 
     trait :user_group_author do
       author do
-        create(:user, organization: component.organization, skip_injection: skip_injection) if component
+        create(:user, organization: component.organization) if component
       end
       user_group do
-        create(:user_group, :verified, organization: component.organization, users: [author], skip_injection: skip_injection) if component
+        create(:user_group, :verified, organization: component.organization, users: [author]) if component
       end
     end
 
     trait :closed do
-      closing_report { generate_localized_title(:meeting_closing_report, skip_injection: skip_injection) }
+      closing_report do
+        if skip_injection
+          Decidim::Faker::Localized.localized { generate(:title) }
+        else
+          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings registration_terms\");</script> #{generate(:title)}" }
+        end
+      end
       attendees_count { rand(50) }
       contributions_count { rand(50) }
       attending_organizations { Array.new(3) { Faker::TvShows::GameOfThrones.house }.join(", ") }
@@ -124,7 +166,13 @@ FactoryBot.define do
       registrations_enabled { true }
       available_slots { 10 }
       reserved_slots { 4 }
-      registration_terms { generate_localized_title(:meeting_registration_terms, skip_injection: skip_injection) }
+      registration_terms do
+        if skip_injection
+          Decidim::Faker::Localized.localized { generate(:title) }
+        else
+          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings registration_terms\");</script> #{generate(:title)}" }
+        end
+      end
     end
 
     trait :past do
@@ -177,9 +225,6 @@ FactoryBot.define do
   end
 
   factory :registration, class: "Decidim::Meetings::Registration" do
-    transient do
-      skip_injection { false }
-    end
     meeting
     user
   end
@@ -188,13 +233,20 @@ FactoryBot.define do
     transient do
       skip_injection { false }
     end
+
     meeting
-    title { generate_localized_title(:meeting_agenda_title, skip_injection: skip_injection) }
+    title do
+      if skip_injection
+        Decidim::Faker::Localized.localized { generate(:title) }
+      else
+        Decidim::Faker::Localized.localized { "<script>alert(\"Meetings agenda title\");</script> #{generate(:title)}" }
+      end
+    end
     visible { true }
 
     trait :with_agenda_items do
-      after(:create) do |agenda, evaluator|
-        create_list(:agenda_item, 2, :with_children, agenda: agenda, skip_injection: evaluator.skip_injection)
+      after(:create) do |agenda, _evaluator|
+        create_list(:agenda_item, 2, :with_children, agenda:)
       end
     end
   end
@@ -203,27 +255,39 @@ FactoryBot.define do
     transient do
       skip_injection { false }
     end
+
     agenda
-    title { generate_localized_title(:meeting_agenda_item_title, skip_injection: skip_injection) }
-    description { generate_localized_description(:meeting_agenda_item_description, skip_injection: skip_injection) }
+    title do
+      if skip_injection
+        Decidim::Faker::Localized.localized { generate(:title) }
+      else
+        Decidim::Faker::Localized.localized { "<script>alert(\"Meetings agenda item title\");</script> #{generate(:title)}" }
+      end
+    end
+    description do
+      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        if skip_injection
+          Decidim::Faker::Localized.localized { generate(:title) }
+        else
+          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings agenda item descrition\");</script> #{generate(:title)}" }
+        end
+      end
+    end
     duration { 15 }
     position { 0 }
 
     trait :with_parent do
-      parent { create(:agenda_item, agenda: agenda, skip_injection: skip_injection) }
+      parent { create(:agenda_item, agenda:) }
     end
 
     trait :with_children do
       after(:create) do |agenda_item, evaluator|
-        create_list(:agenda_item, 2, parent: agenda_item, agenda: evaluator.agenda, skip_injection: evaluator.skip_injection)
+        create_list(:agenda_item, 2, parent: agenda_item, agenda: evaluator.agenda)
       end
     end
   end
 
   factory :invite, class: "Decidim::Meetings::Invite" do
-    transient do
-      skip_injection { false }
-    end
     meeting
     user
     sent_at { 1.day.ago }
@@ -243,23 +307,32 @@ FactoryBot.define do
     transient do
       skip_injection { false }
     end
+
     meeting
-    title { generate_localized_title(:meeting_service_title, skip_injection: skip_injection) }
-    description { generate_localized_description(:meeting_service_description, skip_injection: skip_injection) }
+    title do
+      if skip_injection
+        Decidim::Faker::Localized.localized { generate(:title) }
+      else
+        Decidim::Faker::Localized.localized { "<script>alert(\"Meetings agenda title\");</script> #{generate(:title)}" }
+      end
+    end
+    description do
+      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        if skip_injection
+          Decidim::Faker::Localized.localized { generate(:title) }
+        else
+          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings agenda title\");</script> #{generate(:title)}" }
+        end
+      end
+    end
   end
 
   factory :poll, class: "Decidim::Meetings::Poll" do
-    transient do
-      skip_injection { false }
-    end
     meeting
   end
 
   factory :meetings_poll_questionnaire, class: "Decidim::Meetings::Questionnaire" do
-    transient do
-      skip_injection { false }
-    end
-    questionnaire_for { build(:poll, skip_injection: skip_injection) }
+    questionnaire_for { build(:poll) }
   end
 
   factory :meetings_poll_question, class: "Decidim::Meetings::Question" do
@@ -268,13 +341,19 @@ FactoryBot.define do
       options { [] }
     end
 
-    body { generate_localized_title(:meeting_poll_question_body, skip_injection: skip_injection) }
+    body do
+      if skip_injection
+        Decidim::Faker::Localized.localized { generate(:title) }
+      else
+        Decidim::Faker::Localized.localized { "<script>alert(\"Meetings agenda title\");</script> #{generate(:title)}" }
+      end
+    end
     position { 0 }
     status { 0 }
     question_type { Decidim::Meetings::Question::QUESTION_TYPES.first }
     questionnaire factory: :meetings_poll_questionnaire
     answer_options do
-      Array.new(3).collect { build(:meetings_poll_answer_option, question: nil, skip_injection: skip_injection) }
+      Array.new(3).collect { build(:meetings_poll_answer_option, question: nil) }
     end
 
     trait :unpublished do
@@ -291,27 +370,18 @@ FactoryBot.define do
   end
 
   factory :meetings_poll_answer, class: "Decidim::Meetings::Answer" do
-    transient do
-      skip_injection { false }
-    end
     questionnaire factory: :meetings_poll_questionnaire
-    question { create(:meetings_poll_question, questionnaire: questionnaire, skip_injection: skip_injection) }
-    user { create(:user, organization: questionnaire.questionnaire_for.organization, skip_injection: skip_injection) }
+    question { create(:meetings_poll_question, questionnaire:) }
+    user { create(:user, organization: questionnaire.questionnaire_for.organization) }
   end
 
   factory :meetings_poll_answer_option, class: "Decidim::Meetings::AnswerOption" do
-    transient do
-      skip_injection { false }
-    end
-    question { create(:meetings_poll_question, skip_injection: skip_injection) }
+    question { create(:meetings_poll_question) }
     body { generate_localized_title }
   end
 
   factory :meetings_poll_answer_choice, class: "Decidim::Meetings::AnswerChoice" do
-    transient do
-      skip_injection { false }
-    end
     answer factory: :meetings_poll_answer
-    answer_option { create(:meetings_poll_answer_option, question: answer.question, skip_injection: skip_injection) }
+    answer_option { create(:meetings_poll_answer_option, question: answer.question) }
   end
 end

data/lib/decidim/meetings/test/notifications_handling.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 shared_examples_for "emits an upcoming notificaton" do
-  context "when it's a future meeting" do
+  context "when it is a future meeting" do
     let(:future_start_date) { 3.days.from_now }
 
     before do
@@ -21,14 +21,14 @@ shared_examples_for "emits an upcoming notificaton" do
     end
   end
 
-  context "when it's a past meeting" do
+  context "when it is a past meeting" do
     let(:past_start_date) { 1.day.ago }
 
     before do
       meeting.start_time = past_start_date
     end
 
-    it "doesn't schedule an upcoming meeting notification" do
+    it "does not schedule an upcoming meeting notification" do
       expect(Decidim::Meetings::UpcomingMeetingNotificationJob).not_to receive(:generate_checksum)
       expect(Decidim::Meetings::UpcomingMeetingNotificationJob).not_to receive(:set)
       expect(Decidim::Meetings::UpcomingMeetingNotificationJob).not_to receive(:perform_later)

data/lib/decidim/meetings/test/translated_event.rb

@@ -4,7 +4,7 @@ shared_examples_for "a translated meeting event" do
   describe "translated notifications" do
     let(:en_body) { "This is Sparta!" }
     let(:body) { { en: en_body, machine_translations: { ca: "C'est Sparta!" } } }
-    let(:participatory_process) { create :participatory_process, organization: organization }
+    let(:participatory_process) { create :participatory_process, organization: }
     let(:meeting_component) { create(:meeting_component, participatory_space: participatory_process) }
     let(:translatable) { true }
     let(:en_version) { resource.description["en"] }

data/lib/decidim/meetings/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Meetings
     def self.version
-      "0.27.10"
+      "0.28.0.rc4"
     end
   end
 end