mirror of
https://github.com/opf/openproject.git
synced 2026-06-14 03:30:14 +00:00
Merge pull request #21013 from opf/bug/69015-draft-meetings-don-t-show-up-in-the-meetings-selector
[#69015] Draft meetings don't show up in the meetings selector
This commit is contained in:
@@ -36,8 +36,7 @@ module MeetingAgendaItems
|
||||
|
||||
def self.assignable_meetings(user)
|
||||
Meeting
|
||||
.open
|
||||
.or(Meeting.in_progress)
|
||||
.not_closed
|
||||
.not_templated
|
||||
.not_cancelled
|
||||
.visible(user)
|
||||
|
||||
+20
-2
@@ -346,8 +346,9 @@ RSpec.describe "Open the Meetings tab",
|
||||
meetings_tab.expect_add_to_meeting_dialog_shown
|
||||
end
|
||||
|
||||
context "when open, upcoming meetings are visible for the user" do
|
||||
context "when draft, open, upcoming meetings are visible for the user" do
|
||||
shared_let(:past_meeting) { create(:meeting, project:, start_time: Date.yesterday - 10.hours) }
|
||||
shared_let(:draft_meeting) { create(:meeting, project:, state: :draft) }
|
||||
shared_let(:first_upcoming_meeting) { create(:meeting, project:) }
|
||||
shared_let(:second_upcoming_meeting) { create(:meeting, project:) }
|
||||
shared_let(:in_progress_meeting) { create(:meeting, project:, state: :in_progress) }
|
||||
@@ -358,7 +359,7 @@ RSpec.describe "Open the Meetings tab",
|
||||
|
||||
let(:meeting_page) { Pages::Meetings::Show.new(first_upcoming_meeting) }
|
||||
|
||||
it "enables the user to add the work package to multiple open, upcoming meetings" do
|
||||
it "enables the user to add the work package to multiple upcoming meetings" do
|
||||
work_package_page.visit!
|
||||
switch_to_meetings_tab
|
||||
|
||||
@@ -429,6 +430,23 @@ RSpec.describe "Open the Meetings tab",
|
||||
end
|
||||
end
|
||||
|
||||
it "allows the user to select draft meetings" do
|
||||
work_package_page.visit!
|
||||
switch_to_meetings_tab
|
||||
|
||||
meetings_tab.open_add_to_meeting_dialog
|
||||
|
||||
meetings_tab.fill_and_submit_meeting_dialog(
|
||||
draft_meeting,
|
||||
"Draft notes",
|
||||
1
|
||||
)
|
||||
|
||||
page.within_test_selector("op-meeting-container-#{draft_meeting.id}") do
|
||||
expect(page).to have_content("Draft notes")
|
||||
end
|
||||
end
|
||||
|
||||
it "does not enable the user to select a past meeting" do
|
||||
work_package_page.visit!
|
||||
switch_to_meetings_tab
|
||||
|
||||
Reference in New Issue
Block a user