Add latest changes from gitlab-org/gitlab@master

2 files changed, 48 insertions, 2 deletions

diff --git a/spec/controllers/admin/runners_controller_spec.rb b/spec/controllers/admin/runners_controller_spec.rb
index a39a1f38a11..9555caf24db 100644
--- a/spec/controllers/admin/runners_controller_spec.rb
+++ b/spec/controllers/admin/runners_controller_spec.rb
@@ -61,6 +61,51 @@ RSpec.describe Admin::RunnersController, feature_category: :runner_fleet do
     end
   end
 
+  describe '#register' do
+    subject(:register) { get :register, params: { id: new_runner.id } }
+
+    context 'when create_runner_workflow is enabled' do
+      before do
+        stub_feature_flags(create_runner_workflow: true)
+      end
+
+      context 'when runner can be registered after creation' do
+        let_it_be(:new_runner) { create(:ci_runner, registration_type: :authenticated_user) }
+
+        it 'renders a :register template' do
+          register
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response).to render_template(:register)
+        end
+      end
+
+      context 'when runner cannot be registered after creation' do
+        let_it_be(:new_runner) { runner }
+
+        it 'returns :not_found' do
+          register
+
+          expect(response).to have_gitlab_http_status(:not_found)
+        end
+      end
+    end
+
+    context 'when create_runner_workflow is disabled' do
+      let_it_be(:new_runner) { create(:ci_runner, registration_type: :authenticated_user) }
+
+      before do
+        stub_feature_flags(create_runner_workflow: false)
+      end
+
+      it 'returns :not_found' do
+        register
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+  end
+
   describe '#edit' do
     render_views
 
diff --git a/spec/controllers/admin/spam_logs_controller_spec.rb b/spec/controllers/admin/spam_logs_controller_spec.rb
index 53eb107a251..b39c3bd009b 100644
--- a/spec/controllers/admin/spam_logs_controller_spec.rb
+++ b/spec/controllers/admin/spam_logs_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Admin::SpamLogsController do
+RSpec.describe Admin::SpamLogsController, feature_category: :instance_resiliency do
   let(:admin) { create(:admin) }
   let(:user) { create(:user) }
   let!(:first_spam) { create(:spam_log, user: user) }
@@ -13,9 +13,10 @@ RSpec.describe Admin::SpamLogsController do
   end
 
   describe '#index' do
-    it 'lists all spam logs' do
+    it 'lists paginated spam logs' do
       get :index
 
+      expect(assigns(:spam_logs)).to be_kind_of(Kaminari::PaginatableWithoutCount)
       expect(response).to have_gitlab_http_status(:ok)
     end
   end