1 files changed, 33 insertions, 9 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index d9bb3981539..f2467bfd525 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -763,25 +763,35 @@ describe Projects::MergeRequestsController do
 
   describe 'GET ci_environments_status' do
     context 'the environment is from a forked project' do
-      let!(:forked)       { fork_project(project, user, repository: true) }
-      let!(:environment)  { create(:environment, project: forked) }
-      let!(:deployment)   { create(:deployment, environment: environment, sha: forked.commit.id, ref: 'master') }
-      let(:admin)         { create(:admin) }
+      let!(:forked)      { fork_project(project, user, repository: true) }
+      let!(:environment) { create(:environment, project: forked) }
+      let!(:deployment)  { create(:deployment, environment: environment, sha: forked.commit.id, ref: 'master') }
+      let(:admin)        { create(:admin) }
 
       let(:merge_request) do
         create(:merge_request, source_project: forked, target_project: project)
       end
 
-      before do
+      it 'links to the environment on that project' do
+        get_ci_environments_status
+
+        expect(json_response.first['url']).to match /#{forked.full_path}/
+      end
+
+      # we're trying to reduce the overall number of queries for this method.
+      # set a hard limit for now. https://gitlab.com/gitlab-org/gitlab-ce/issues/52287
+      it 'keeps queries in check' do
+        control_count = ActiveRecord::QueryRecorder.new { get_ci_environments_status }.count
+
+        expect(control_count).to be <= 137
+      end
+
+      def get_ci_environments_status
         get :ci_environments_status,
           namespace_id: merge_request.project.namespace.to_param,
           project_id: merge_request.project,
           id: merge_request.iid, format: 'json'
       end
-
-      it 'links to the environment on that project' do
-        expect(json_response.first['url']).to match /#{forked.full_path}/
-      end
     end
   end
 
@@ -885,4 +895,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