Skip to content

Commit

Permalink
Display Published meetings in Assembly cell (#10341)
Browse files Browse the repository at this point in the history
  • Loading branch information
alecslupu committed Feb 7, 2023
1 parent 928a46a commit 7cbe1b5
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 1 deletion.
2 changes: 2 additions & 0 deletions decidim-assemblies/decidim-assemblies.gemspec
Expand Up @@ -22,4 +22,6 @@ Gem::Specification.new do |s|

s.add_development_dependency "decidim-admin", Decidim::Assemblies.version
s.add_development_dependency "decidim-dev", Decidim::Assemblies.version
s.add_development_dependency "decidim-meetings", Decidim::Assemblies.version
s.add_development_dependency "decidim-proposals", Decidim::Assemblies.version
end
1 change: 1 addition & 0 deletions decidim-assemblies/spec/factories.rb
Expand Up @@ -2,5 +2,6 @@

require "decidim/core/test/factories"
require "decidim/proposals/test/factories"
require "decidim/meetings/test/factories"

require "decidim/assemblies/test/factories"
28 changes: 28 additions & 0 deletions decidim-assemblies/spec/system/assemblies_spec.rb
Expand Up @@ -234,6 +234,34 @@
expect(page).to have_selector("#assemblies-grid .row .column:first-child", text: child_assembly.title[:en])
expect(page).to have_selector("#assemblies-grid .row .column:last-child", text: second_child_assembly.title[:en])
end

context "when child assembly has a meeting" do
let(:meetings_component) { create(:meeting_component, :published, participatory_space: child_assembly) }

context "with unpublished meeting" do
let!(:meeting) { create(:meeting, :upcoming, component: meetings_component) }

it "is not displaying the widget" do
visit decidim_assemblies.assembly_path(assembly)

within("#assemblies-grid") do
expect(page).not_to have_content("Upcoming meeting")
end
end
end

context "with published meeting" do
let!(:meeting) { create(:meeting, :upcoming, :published, component: meetings_component) }

it "is displaying the widget" do
visit decidim_assemblies.assembly_path(assembly)

within("#assemblies-grid") do
expect(page).to have_content("Upcoming meeting")
end
end
end
end
end

context "when the assembly has children private and transparent assemblies" do
Expand Down
2 changes: 1 addition & 1 deletion decidim-meetings/lib/decidim/meetings/engine.rb
Expand Up @@ -57,7 +57,7 @@ class Engine < ::Rails::Engine
# meeting for the given participatory space.
Decidim.view_hooks.register(:upcoming_meeting_for_card, priority: Decidim::ViewHooks::LOW_PRIORITY) do |view_context|
published_components = Decidim::Component.where(participatory_space: view_context.current_participatory_space).published
upcoming_meeting = Decidim::Meetings::Meeting.where(component: published_components).upcoming.order(:start_time, :end_time).first
upcoming_meeting = Decidim::Meetings::Meeting.where(component: published_components).published.upcoming.order(:start_time, :end_time).first

next unless upcoming_meeting

Expand Down

0 comments on commit 7cbe1b5

Please sign in to comment.