summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-07-06 06:59:51 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-07-06 06:59:51 +0000
commit83f79ced3fd98031194e5667c4d80f66d7987c67 (patch)
tree0e8e629c0a7c0ec9fd3c86e6741f6673c15efc54 /spec
parent969b7c565c6fe5cdfc54830d1da35f254ddaf530 (diff)
parentd038fac4b659c88ff991c70806adfdd5bc3af793 (diff)
downloadgitlab-ce-83f79ced3fd98031194e5667c4d80f66d7987c67.tar.gz
Merge branch '31583-osw-gfm-complete-status-indication' into 'master'
Resolve "GFM preview should have status indicator" Closes #31583 See merge request gitlab-org/gitlab-ce!20418
Diffstat (limited to 'spec')
-rw-r--r--spec/controllers/projects_controller_spec.rb29
1 files changed, 28 insertions, 1 deletions
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 27f04be3fdf..34ed835a388 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -616,13 +616,40 @@ describe ProjectsController do
end
describe 'POST #preview_markdown' do
- it 'renders json in a correct format' do
+ before do
sign_in(user)
+ end
+ it 'renders json in a correct format' do
post :preview_markdown, namespace_id: public_project.namespace, id: public_project, text: '*Markdown* text'
expect(JSON.parse(response.body).keys).to match_array(%w(body references))
end
+
+ context 'state filter on references' do
+ let(:issue) { create(:issue, :closed, project: public_project) }
+ let(:merge_request) { create(:merge_request, :closed, target_project: public_project) }
+
+ it 'renders JSON body with state filter for issues' do
+ post :preview_markdown, namespace_id: public_project.namespace,
+ id: public_project,
+ text: issue.to_reference
+
+ json_response = JSON.parse(response.body)
+
+ expect(json_response['body']).to match(/\##{issue.iid} \(closed\)/)
+ end
+
+ it 'renders JSON body with state filter for MRs' do
+ post :preview_markdown, namespace_id: public_project.namespace,
+ id: public_project,
+ text: merge_request.to_reference
+
+ json_response = JSON.parse(response.body)
+
+ expect(json_response['body']).to match(/\!#{merge_request.iid} \(closed\)/)
+ end
+ end
end
describe '#ensure_canonical_path' do