2 files changed, 56 insertions, 4 deletions
diff --git a/spec/controllers/projects/settings/integrations_controller_spec.rb b/spec/controllers/projects/settings/integrations_controller_spec.rb
index 8ee9f22aa7f..b76269f6f93 100644
--- a/spec/controllers/projects/settings/integrations_controller_spec.rb
+++ b/spec/controllers/projects/settings/integrations_controller_spec.rb
@@ -50,7 +50,7 @@ RSpec.describe Projects::Settings::IntegrationsController do
       end
     end
 
-    context 'when validations fail' do
+    context 'when validations fail', :clean_gitlab_redis_rate_limiting do
       let(:integration_params) { { active: 'true', url: '' } }
 
       it 'returns error messages in JSON response' do
@@ -62,7 +62,7 @@ RSpec.describe Projects::Settings::IntegrationsController do
       end
     end
 
-    context 'when successful' do
+    context 'when successful', :clean_gitlab_redis_rate_limiting do
       context 'with empty project' do
         let_it_be(:project) { create(:project) }
 
@@ -200,8 +200,8 @@ RSpec.describe Projects::Settings::IntegrationsController do
 
         2.times { post :test, params: project_params(service: integration_params) }
 
-        expect(response.body).to eq(_('This endpoint has been requested too many times. Try again later.'))
-        expect(response).to have_gitlab_http_status(:too_many_requests)
+        expect(response.body).to include(_('This endpoint has been requested too many times. Try again later.'))
+        expect(response).to have_gitlab_http_status(:ok)
       end
     end
   end
diff --git a/spec/controllers/projects/settings/merge_requests_controller_spec.rb b/spec/controllers/projects/settings/merge_requests_controller_spec.rb
new file mode 100644
index 00000000000..106ec62bea0
--- /dev/null
+++ b/spec/controllers/projects/settings/merge_requests_controller_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Projects::Settings::MergeRequestsController do
+  let(:project) { create(:project_empty_repo, :public) }
+  let(:user) { create(:user) }
+
+  before do
+    project.add_maintainer(user)
+    sign_in(user)
+  end
+
+  describe 'GET show' do
+    it 'renders show with 200 status code' do
+      get :show, params: { namespace_id: project.namespace, project_id: project }
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(response).to render_template(:show)
+    end
+  end
+
+  describe '#update', :enable_admin_mode do
+    render_views
+
+    let(:admin) { create(:admin) }
+
+    before do
+      sign_in(admin)
+    end
+
+    it 'updates Fast Forward Merge attributes' do
+      controller.instance_variable_set(:@project, project)
+
+      params = {
+        merge_method: :ff
+      }
+
+      put :update,
+          params: {
+            namespace_id: project.namespace,
+            project_id: project.id,
+            project: params
+          }
+
+      expect(response).to redirect_to project_settings_merge_requests_path(project)
+      params.each do |param, value|
+        expect(project.public_send(param)).to eq(value)
+      end
+    end
+  end
+end