kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'bw-fix-missing-board-milestone' into 'master'

Browse source 
Fix Issue boards don't show milestone in issue details

See merge request gitlab-org/gitlab-ce!23813
This commit is contained in:
Robert Speicher 2018-12-14 00:26:05 +00:00
commit 0087396036
2 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/serializers/issue_board_entity.rb
View file

@ -17,7 +17,7 @@ class IssueBoardEntity < Grape::Entity
end
expose :milestone, expose_nil: false do |issue|
API::Entities::Project.represent issue.milestone, only: [:id, :title]
API::Entities::Milestone.represent issue.milestone, only: [:id, :title]
end
expose :assignees do |issue|

31
spec/serializers/issue_board_entity_spec.rb
View file

@ -3,21 +3,40 @@
require 'spec_helper'
describe IssueBoardEntity do
let(:project) { create(:project) }
let(:resource) { create(:issue, project: project) }
let(:user) { create(:user) }
let(:request) { double('request', current_user: user) }
let(:project) { create(:project) }
let(:resource) { create(:issue, project: project) }
let(:user) { create(:user) }
let(:milestone) { create(:milestone, project: project) }
let(:label) { create(:label, project: project, title: 'Test Label') }
let(:request) { double('request', current_user: user) }
subject { described_class.new(resource, request: request).as_json }
it 'has basic attributes' do
expect(subject).to include(:id, :iid, :title, :confidential, :due_date, :project_id, :relative_position,
:project, :labels)
:labels, :assignees, project: hash_including(:id, :path))
end
it 'has path and endpoints' do
expect(subject).to include(:reference_path, :real_path, :issue_sidebar_endpoint,
:toggle_subscription_endpoint, :assignable_labels_endpoint)
end
it 'has milestone attributes' do
resource.milestone = milestone
expect(subject).to include(milestone: hash_including(:id, :title))
end
it 'has assignee attributes' do
resource.assignees = [user]
expect(subject).to include(assignees: array_including(hash_including(:id, :name, :username, :avatar_url)))
end
it 'has label attributes' do
resource.labels = [label]
expect(subject).to include(labels: array_including(hash_including(:id, :title, :color, :description, :text_color, :priority)))
end
end