Skip to content

Commit

Permalink
Use published meetings scope on processes landing and proposal's form (
Browse files Browse the repository at this point in the history
  • Loading branch information
ferblape authored Mar 21, 2022
1 parent aecc039 commit 3279ed5
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ def upcoming_meetings
.includes(component: :participatory_space)
.where(component: meeting_components)
.visible_for(current_user)
.published
.where("end_time >= ?", Time.current)
.except_withdrawn
.not_hidden
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,15 @@ module ContentBlocks
let!(:moderated_meeting) do
create(:meeting, :moderated, :published, start_time: meeting.start_time.advance(weeks: 1), component: meeting.component)
end
let!(:unpublished_meeting) do
create(:meeting, start_time: 2.weeks.from_now, component: meeting.component)
end

it { is_expected.not_to include(moderated_meeting) }
it { is_expected.not_to include(past_meeting) }
it { is_expected.to include(meeting) }
it { is_expected.to include(second_meeting) }
it { is_expected.not_to include(unpublished_meeting) }

it "orders them correctly" do
expect(subject.length).to eq(2)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def geocoded?
# Finds the Meetings of the current participatory space
def meetings
@meetings ||= Decidim.find_resource_manifest(:meetings).try(:resource_scope, current_component)
&.order(title: :asc)
&.published&.order(title: :asc)
end

# Return the meeting as author
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module Admin
let(:component) { create(:proposal_component) }
let(:organization) { component.organization }
let(:meeting_component) { create(:meeting_component, participatory_space: component.participatory_space) }
let(:meetings) { create_list(:meeting, 3, component: meeting_component) }
let(:meetings) { create_list(:meeting, 3, :published, component: meeting_component) }
let(:user) { create :user, :admin, :confirmed, organization: organization }
let(:form) do
form_klass.from_params(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
let!(:collaborative_draft7) { create(:collaborative_draft, component: component) }

let(:meetings_component) { create(:component, manifest_name: "meetings", participatory_space: participatory_space) }
let(:meeting) { create :meeting, component: meetings_component }
let(:meeting) { create :meeting, :published, component: meetings_component }

let(:dummy_component) { create(:component, manifest_name: "dummy", participatory_space: participatory_space) }
let(:dummy_resource) { create :dummy_resource, component: dummy_component }
Expand Down
2 changes: 1 addition & 1 deletion decidim-proposals/spec/requests/proposal_search_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
let!(:proposal7) { create(:proposal, :accepted, component: component) }

let(:meetings_component) { create(:component, manifest_name: "meetings", participatory_space: participatory_space) }
let(:meeting) { create :meeting, component: meetings_component }
let(:meeting) { create :meeting, :published, component: meetings_component }

let(:dummy_component) { create(:component, manifest_name: "dummy", participatory_space: participatory_space) }
let(:dummy_resource) { create :dummy_resource, component: dummy_component }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module Proposals
let(:component) { proposal.component }

let!(:meetings_component) { create(:component, manifest_name: "meetings", participatory_space: participatory_process) }
let(:meetings) { create_list(:meeting, 2, component: meetings_component) }
let(:meetings) { create_list(:meeting, 2, :published, component: meetings_component) }

let!(:proposals_component) { create(:component, manifest_name: "proposals", participatory_space: participatory_process) }
let(:other_proposals) { create_list(:proposal, 2, component: proposals_component) }
Expand Down
2 changes: 1 addition & 1 deletion decidim-proposals/spec/shared/manage_proposals_examples.rb
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@

context "when proposals comes from a meeting" do
let!(:meeting_component) { create(:meeting_component, participatory_space: participatory_process) }
let!(:meetings) { create_list(:meeting, 3, component: meeting_component) }
let!(:meetings) { create_list(:meeting, 3, :published, component: meeting_component) }

it "creates a new proposal with meeting as author" do
click_link "New proposal"
Expand Down
2 changes: 1 addition & 1 deletion decidim-proposals/spec/shared/proposal_form_examples.rb
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@
let(:body) { { en: "Everything would be better" } }
let(:created_in_meeting) { true }
let(:meeting_component) { create(:meeting_component, participatory_space: participatory_space) }
let(:author) { create(:meeting, component: meeting_component) }
let(:author) { create(:meeting, :published, component: meeting_component) }
let!(:meeting_as_author) { author }

let(:params) do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@

context "with related meetings" do
let(:meeting_component) { create :meeting_component, participatory_space: participatory_process }
let(:meeting) { create :meeting, component: meeting_component }
let(:meeting) { create :meeting, :published, component: meeting_component }
let(:moderated_meeting) { create :meeting, component: meeting_component }
let!(:moderation) { create(:moderation, reportable: moderated_meeting) }

Expand Down
2 changes: 1 addition & 1 deletion decidim-proposals/spec/system/proposals_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
let(:meeting_component) do
create(:component, manifest_name: :meetings, participatory_space: proposal.component.participatory_space)
end
let(:meeting) { create(:meeting, component: meeting_component) }
let(:meeting) { create(:meeting, :published, component: meeting_component) }

before do
meeting.link_resources([proposal], "proposals_from_meeting")
Expand Down

0 comments on commit 3279ed5

Please sign in to comment.