summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorAlin Ciciu <aciciu@gitlab.com>2018-09-12 16:39:34 +0000
committerRobert Speicher <robert@gitlab.com>2018-09-12 16:39:34 +0000
commite7094236a019ff8e4402cc4f7db03861d03ff8f9 (patch)
treea3f6214170780e8c5b24cb3e1c1a5189f78deae4 /spec/controllers
parent8f5c95314914ce687501200e0dc0645ab10247ae (diff)
downloadgitlab-ce-e7094236a019ff8e4402cc4f7db03861d03ff8f9.tar.gz
Fix mention in edit mr
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects/merge_requests_controller_spec.rb14
1 files changed, 14 insertions, 0 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index d9bb3981539..7446e0650f7 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -885,4 +885,18 @@ describe Projects::MergeRequestsController do
end
end
end
+
+ describe 'GET edit' do
+ it 'responds successfully' do
+ get :edit, namespace_id: project.namespace, project_id: project, id: merge_request
+
+ expect(response).to have_gitlab_http_status(:success)
+ end
+
+ it 'assigns the noteable to make sure autocompletes work' do
+ get :edit, namespace_id: project.namespace, project_id: project, id: merge_request
+
+ expect(assigns(:noteable)).not_to be_nil
+ end
+ end
end