Commit c1322ab9 authored by Phil Hughes's avatar Phil Hughes

karma & rubocop fixes

parent 5428e913
...@@ -533,10 +533,10 @@ module API ...@@ -533,10 +533,10 @@ module API
class MergeRequestBasic < ProjectEntity class MergeRequestBasic < ProjectEntity
expose :title_html, if: -> (_, options) { options[:render_html] } do |entity| expose :title_html, if: -> (_, options) { options[:render_html] } do |entity|
MarkupHelper::markdown_field(entity, :title) MarkupHelper.markdown_field(entity, :title)
end end
expose :description_html, if: -> (_, options) { options[:render_html] } do |entity| expose :description_html, if: -> (_, options) { options[:render_html] } do |entity|
MarkupHelper::markdown_field(entity, :description) MarkupHelper.markdown_field(entity, :description)
end end
expose :target_branch, :source_branch expose :target_branch, :source_branch
expose :upvotes do |merge_request, options| expose :upvotes do |merge_request, options|
......
...@@ -39,7 +39,9 @@ describe('IDE store merge request actions', () => { ...@@ -39,7 +39,9 @@ describe('IDE store merge request actions', () => {
store store
.dispatch('getMergeRequestData', { projectId: 'abcproject', mergeRequestId: 1 }) .dispatch('getMergeRequestData', { projectId: 'abcproject', mergeRequestId: 1 })
.then(() => { .then(() => {
expect(service.getProjectMergeRequestData).toHaveBeenCalledWith('abcproject', 1); expect(service.getProjectMergeRequestData).toHaveBeenCalledWith('abcproject', 1, {
render_html: true,
});
done(); done();
}) })
......
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