Commit 00873960 authored by Robert Speicher's avatar Robert Speicher

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

Fix Issue boards don't show milestone in issue details

See merge request gitlab-org/gitlab-ce!23813
parents de9b380e fa7b4eca
...@@ -17,7 +17,7 @@ class IssueBoardEntity < Grape::Entity ...@@ -17,7 +17,7 @@ class IssueBoardEntity < Grape::Entity
end end
expose :milestone, expose_nil: false do |issue| 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 end
expose :assignees do |issue| expose :assignees do |issue|
......
...@@ -3,21 +3,40 @@ ...@@ -3,21 +3,40 @@
require 'spec_helper' require 'spec_helper'
describe IssueBoardEntity do describe IssueBoardEntity do
let(:project) { create(:project) } let(:project) { create(:project) }
let(:resource) { create(:issue, project: project) } let(:resource) { create(:issue, project: project) }
let(:user) { create(:user) } let(:user) { create(:user) }
let(:milestone) { create(:milestone, project: project) }
let(:request) { double('request', current_user: user) } 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 } subject { described_class.new(resource, request: request).as_json }
it 'has basic attributes' do it 'has basic attributes' do
expect(subject).to include(:id, :iid, :title, :confidential, :due_date, :project_id, :relative_position, expect(subject).to include(:id, :iid, :title, :confidential, :due_date, :project_id, :relative_position,
:project, :labels) :labels, :assignees, project: hash_including(:id, :path))
end end
it 'has path and endpoints' do it 'has path and endpoints' do
expect(subject).to include(:reference_path, :real_path, :issue_sidebar_endpoint, expect(subject).to include(:reference_path, :real_path, :issue_sidebar_endpoint,
:toggle_subscription_endpoint, :assignable_labels_endpoint) :toggle_subscription_endpoint, :assignable_labels_endpoint)
end 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 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