Add spec for refresh

Author: oliverguenther

modules/meeting/app/components/meetings/presentation_mode/footer_component.html.erb

@@ -1,4 +1,5 @@
-<%= component_wrapper(class: "op-meeting-presentation--footer") do %>
+<%= component_wrapper(class: "op-meeting-presentation--footer",
+                      data: { "test-selector": "meeting-presentation-footer" }) do %>
   <div class="op-meeting-presentation--footer-left">
     <%= render(Primer::Beta::Button.new(
       tag: :a,

modules/meeting/app/components/meetings/presentation_mode/header_component.html.erb

@@ -1,5 +1,5 @@
-<%=
-  component_wrapper do
+<%= component_wrapper(data: { "test-selector": "meeting-presentation-header" }) do %>
+  <%=
     render Primer::OpenProject::PageHeader.new(classes: "op-meeting-presentation-header") do |header|
       header.with_breadcrumbs([])
       header.with_title_content(@meeting.title)
@@ -17,5 +17,11 @@
         t(:"meeting.presentation_mode.exit")
       end
     end
-  end
-%>
+  %>
+  <div class="op-meeting-presentation--header">
+    <div class="op-meeting-presentation--header-title">
+      <%= render(Primer::Beta::Text.new(color: :subtle)) { MeetingSection.model_name.human } %>:
+      <%= render(Primer::Beta::Text.new(font_weight: :bold, color: :subtle)) { current_section.title } %>
+    </div>
+  </div>
+<% end %>

modules/meeting/app/components/meetings/presentation_mode/header_component.rb

@@ -33,10 +33,17 @@ module PresentationMode
     class HeaderComponent < ApplicationComponent
       include OpTurbo::Streamable
 
-      def initialize(meeting:)
+      attr_reader :meeting, :current_item
+
+      def initialize(meeting:, current_item:)
         super()
 
         @meeting = meeting
+        @current_item = current_item
+      end
+
+      def current_section
+        current_item&.meeting_section
       end
     end
   end

modules/meeting/app/components/meetings/presentation_mode/show_component.html.erb

@@ -5,31 +5,25 @@
         zen_mode_autostart_value: @initial,
         poll_for_changes_continuous_value: true,
         poll_for_changes_url_value: check_for_updates_project_meeting_presentation_path(
-          @meeting.project,
-          @meeting,
+          meeting.project,
+          meeting,
           meeting_agenda_item_id: current_item.id,
           started_at: started_at_param
         ),
         poll_for_changes_interval_value: check_for_updates_interval,
       }
     ) do %>
-  <%= render Meetings::PresentationMode::HeaderComponent.new(meeting: @meeting) %>
   <%= content_tag :div,
                   id: "op-meeting-presentation-content",
                   class: "op-meeting-presentation--content",
                   data: {
                     controller: "meetings--submit",
                     poll_for_changes_target: "reference",
-                    reference_value: @meeting.changed_hash
+                    reference_value: meeting.changed_hash
                   } do %>
-    <div class="op-meeting-presentation--header">
-      <div class="op-meeting-presentation--header-title">
-        <%= render(Primer::Beta::Text.new(color: :subtle)) { MeetingSection.model_name.human } %>:
-        <%= render(Primer::Beta::Text.new(font_weight: :bold, color: :subtle)) { current_section.title } %>
-      </div>
-    </div>
+    <%= render Meetings::PresentationMode::HeaderComponent.new(meeting:, current_item:) %>
 
-    <%= render(border_box_container) do |container| %>
+    <%= render(border_box_container(test_selector: "meeting-presentation-agenda-item")) do |container| %>
       <%= render MeetingAgendaItems::ItemComponent.new(
         container:,
         meeting_agenda_item: current_item,
@@ -39,7 +33,7 @@
   <% end %>
 
   <%= render Meetings::PresentationMode::FooterComponent.new(
-    meeting: @meeting,
+    meeting: meeting,
     sorted_agenda_item_ids: @agenda_item_ids,
     current_item: current_item,
     started_at: @started_at

modules/meeting/app/components/meetings/presentation_mode/show_component.rb

@@ -35,6 +35,8 @@ class ShowComponent < ApplicationComponent
       include OpTurbo::Streamable
       include OpPrimer::ComponentHelpers
 
+      attr_reader :meeting
+
       def initialize(meeting:, sorted_agenda_item_ids:, current_id: nil, started_at: nil)
         super()
 

modules/meeting/app/controllers/concerns/meetings/presentation_component_streams.rb

@@ -53,7 +53,8 @@ def update_reference_value(new_reference)
       def update_header_via_turbo_stream
         update_via_turbo_stream(
           component: Meetings::PresentationMode::HeaderComponent.new(
-            meeting: @meeting
+            meeting: @meeting,
+            current_item: @meeting_agenda_item
           )
         )
       end

modules/meeting/spec/features/presentation/meeting_presentation_mode_spec.rb

@@ -51,9 +51,11 @@
            author: user
   end
 
-  shared_let(:meeting_section) { create(:meeting_section, meeting:, position: 1) }
-  shared_let(:first_agenda_item) { create(:meeting_agenda_item, meeting:, meeting_section:, title: "First Item", position: 1) }
-  shared_let(:second_agenda_item) { create(:meeting_agenda_item, meeting:, meeting_section:, title: "Second Item", position: 2) }
+  shared_let(:first_meeting_section) { create(:meeting_section, meeting:, title: "Blockers", position: 1) }
+  shared_let(:second_meeting_section) { create(:meeting_section, meeting:, title: "Other topics", position: 2) }
+  shared_let(:first_agenda_item) { create(:meeting_agenda_item, meeting:, meeting_section: first_meeting_section, title: "First Item", position: 1) }
+  shared_let(:second_agenda_item) { create(:meeting_agenda_item, meeting:, meeting_section: first_meeting_section, title: "Second Item", position: 2) }
+  shared_let(:third_agenda_item) { create(:meeting_agenda_item, meeting:, meeting_section: second_meeting_section, title: "Third Item", position: 1) }
 
   let(:show_page) { Pages::Meetings::Show.new(meeting) }
   let(:editor) { Components::WysiwygEditor.new "#meetings-presentation-component", "opce-ckeditor-augmented-textarea" }
@@ -85,26 +87,68 @@ def outcome_field_for(agenda_item)
     expect(page).to have_text("First Item")
     expect(page).to have_link("Next")
     expect(page).to have_button("Previous", disabled: true)
-    expect(page).to have_text("1 of 2")
+    expect(page).to have_text("1 of 3")
+
+    within_test_selector("meeting-presentation-header") do
+      expect(page).to have_text("Blockers")
+    end
+
+    within_test_selector("meeting-presentation-footer") do
+      expect(page).to have_text("Second Item")
+      expect(page).to have_no_text("Blockers")
+      expect(page).to have_no_text("Other topics")
+    end
 
     # 1. Navigate between agenda items
     click_link_or_button "Next"
 
-    expect(page).to have_text("Second Item")
-    expect(page).to have_no_text("First Item")
-    expect(page).to have_link("Previous")
-    expect(page).to have_button("Next", disabled: true)
-    expect(page).to have_text("2 of 2")
+    within_test_selector("meeting-presentation-agenda-item") do
+      expect(page).to have_text("Second Item")
+      expect(page).to have_text("First Item")
+    end
+
+    within_test_selector("meeting-presentation-footer") do
+      expect(page).to have_text("First item")
+      expect(page).to have_text("Third item")
+      expect(page).to have_no_text("Blockers")
+      expect(page).to have_text("Other topics")
+      expect(page).to have_link("Previous")
+      expect(page).to have_link("Next")
+    end
+
+    expect(page).to have_text("2 of 3")
+
+    # 1. Navigate between agenda items
+    click_link_or_button "Next"
+
+    within_test_selector("meeting-presentation-agenda-item") do
+      expect(page).to have_text("Third Item")
+      expect(page).to have_no_text("First Item")
+      expect(page).to have_no_text("Second Item")
+    end
+
+    # On third item, footer shows second item and first item
+    within_test_selector("meeting-presentation-footer") do
+      # Shows second item with section
+      expect(page).to have_text("Second item")
+      expect(page).to have_text("Blockers")
+
+      # Doesn't show first item or current section
+      expect(page).to have_no_text("First item")
+      expect(page).to have_no_text("Other topics")
+      expect(page).to have_link("Previous")
+      expect(page).to have_button("Next", disabled: true)
+    end
+
+    expect(page).to have_text("3 of 3")
 
     click_link_or_button "Previous"
+    expect(page).to have_text("2 of 3")
 
-    expect(page).to have_text("First Item")
-    expect(page).to have_no_text("Second Item")
-    expect(page).to have_link("Next")
+    click_link_or_button "Previous"
+    expect(page).to have_text("1 of 3")
     expect(page).to have_button("Previous", disabled: true)
 
-    expect(page).to have_text("1 of 2")
-
     # 2. Edit an agenda item (add notes)
     item = MeetingAgendaItem.find(first_agenda_item.id)
 
@@ -154,6 +198,39 @@ def outcome_field_for(agenda_item)
     expect(page).to have_current_path(project_meeting_path(project, meeting), ignore_query: true)
   end
 
+  it "automatically refreshes when things get updated" do
+    visit project_meeting_presentation_path(project, meeting)
+    expect(page).to have_css(".op-meeting-presentation")
+    expect(page).to have_text("Sprint Planning")
+    expect(page).to have_text("First Item")
+
+    # In the background, update the first agenda item
+    MeetingAgendaItems::UpdateService
+      .new(model: first_agenda_item, user: User.system)
+      .call(title: "Updated item")
+      .on_failure { |result| raise "Failed to update agenda item in background: #{result.errors.full_messages}" }
+
+    # In the background, delete the second item
+    # so that the "new" second item is now the third one
+    MeetingAgendaItems::DeleteService
+      .new(model: second_agenda_item, user: User.system)
+      .call
+      .on_failure { |result| raise "Failed to update agenda item in background: #{result.errors.full_messages}" }
+
+    # Wait for the changes to appear
+    expect(page).to have_text("Updated item", wait: 10)
+    expect(page).to have_no_text("Second Item")
+
+    # On third item, footer shows second item and first item
+    within_test_selector("meeting-presentation-footer") do
+      # Shows second item with section
+      expect(page).to have_text("Third Item")
+      expect(page).to have_text("Other topics")
+      expect(page).to have_no_text("Second Item")
+      expect(page).to have_no_text("Blockers")
+    end
+  end
+
   context "with an empty meeting" do
     let(:meeting) do
       create :meeting,