Commit fe7a7611 authored by Mark Chao's avatar Mark Chao

Add date sourcing milestone titles in meta data for rendering

parent dfb77a17
...@@ -27,9 +27,11 @@ module EpicsHelper ...@@ -27,9 +27,11 @@ module EpicsHelper
start_date_fixed: epic.start_date_fixed, start_date_fixed: epic.start_date_fixed,
start_date_is_fixed: epic.start_date_is_fixed?, start_date_is_fixed: epic.start_date_is_fixed?,
start_date_from_milestones: epic.start_date_from_milestones, start_date_from_milestones: epic.start_date_from_milestones,
start_date_sourcing_milestone_title: epic.start_date_sourcing_milestone&.title,
due_date_fixed: epic.due_date_fixed, due_date_fixed: epic.due_date_fixed,
due_date_is_fixed: epic.due_date_is_fixed?, due_date_is_fixed: epic.due_date_is_fixed?,
due_date_from_milestones: epic.due_date_from_milestones due_date_from_milestones: epic.due_date_from_milestones,
due_date_sourcing_milestone_title: epic.due_date_sourcing_milestone&.title
) )
end end
......
...@@ -13,6 +13,8 @@ module EE ...@@ -13,6 +13,8 @@ module EE
belongs_to :assignee, class_name: "User" belongs_to :assignee, class_name: "User"
belongs_to :group belongs_to :group
belongs_to :start_date_sourcing_milestone, class_name: 'Milestone'
belongs_to :due_date_sourcing_milestone, class_name: 'Milestone'
has_internal_id :iid, scope: :group, init: ->(s) { s&.group&.epics&.maximum(:iid) } has_internal_id :iid, scope: :group, init: ->(s) { s&.group&.epics&.maximum(:iid) }
......
...@@ -28,6 +28,19 @@ describe EpicsHelper do ...@@ -28,6 +28,19 @@ describe EpicsHelper do
end end
context 'when user has edit permission' do context 'when user has edit permission' do
let(:milestone) { create(:milestone, title: 'make me a sandwich') }
let!(:epic) do
create(
:epic,
author: user,
start_date_sourcing_milestone: milestone,
start_date: Date.new(2000, 1, 1),
due_date_sourcing_milestone: milestone,
due_date: Date.new(2000, 1, 2)
)
end
before do before do
epic.group.add_developer(user) epic.group.add_developer(user)
end end
...@@ -38,9 +51,13 @@ describe EpicsHelper do ...@@ -38,9 +51,13 @@ describe EpicsHelper do
expect(meta_data.keys).to match_array(%w[ expect(meta_data.keys).to match_array(%w[
created author created author
start_date start_date_fixed start_date_is_fixed start_date_from_milestones start_date start_date_fixed start_date_is_fixed start_date_from_milestones start_date_sourcing_milestone_title
end_date due_date due_date_fixed due_date_is_fixed due_date_from_milestones end_date due_date due_date_fixed due_date_is_fixed due_date_from_milestones due_date_sourcing_milestone_title
]) ])
expect(meta_data['start_date']).to eq('2000-01-01')
expect(meta_data['start_date_sourcing_milestone_title']).to eq(milestone.title)
expect(meta_data['due_date']).to eq('2000-01-02')
expect(meta_data['due_date_sourcing_milestone_title']).to eq(milestone.title)
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment