Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 0 deletions

diff --git a/spec/controllers/admin/application_settings_controller_spec.rb b/spec/controllers/admin/application_settings_controller_spec.rb
index e02589ddc83..cb25011fd96 100644
--- a/spec/controllers/admin/application_settings_controller_spec.rb
+++ b/spec/controllers/admin/application_settings_controller_spec.rb
@@ -362,6 +362,17 @@ RSpec.describe Admin::ApplicationSettingsController, :do_not_mock_admin_mode_set
         expect(application_settings.reload.pipeline_limit_per_project_user_sha).to eq(25)
       end
     end
+
+    context 'invitation flow enforcement setting' do
+      let(:application_settings) { ApplicationSetting.current }
+
+      it 'updates invitation_flow_enforcement setting' do
+        put :update, params: { application_setting: { invitation_flow_enforcement: true } }
+
+        expect(response).to redirect_to(general_admin_application_settings_path)
+        expect(application_settings.reload.invitation_flow_enforcement).to eq(true)
+      end
+    end
   end
 
   describe 'PUT #reset_registration_token' do