1 files changed, 32 insertions, 37 deletions

diff --git a/spec/requests/api/ci/runner/runners_verify_post_spec.rb b/spec/requests/api/ci/runner/runners_verify_post_spec.rb
index a6a1ad947aa..f1b33826f5e 100644
--- a/spec/requests/api/ci/runner/runners_verify_post_spec.rb
+++ b/spec/requests/api/ci/runner/runners_verify_post_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state, feature_catego
   end
 
   describe '/api/v4/runners' do
-    describe 'POST /api/v4/runners/verify' do
+    describe 'POST /api/v4/runners/verify', :freeze_time do
       let_it_be_with_reload(:runner) { create(:ci_runner, token_expires_at: 3.days.from_now) }
 
       let(:params) {}
@@ -45,9 +45,12 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state, feature_catego
       context 'when valid token is provided' do
         let(:params) { { token: runner.token } }
 
-        context 'with create_runner_machine FF enabled' do
-          before do
-            stub_feature_flags(create_runner_machine: true)
+        context 'with glrt-prefixed token' do
+          let_it_be(:registration_token) { 'glrt-abcdefg123456' }
+          let_it_be(:registration_type) { :authenticated_user }
+          let_it_be(:runner) do
+            create(:ci_runner, registration_type: registration_type,
+              token: registration_token, token_expires_at: 3.days.from_now)
           end
 
           it 'verifies Runner credentials' do
@@ -61,39 +64,29 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state, feature_catego
             })
           end
 
-          context 'with non-expiring runner token' do
-            before do
-              runner.update!(token_expires_at: nil)
-            end
-
-            it 'verifies Runner credentials' do
-              verify
-
-              expect(response).to have_gitlab_http_status(:ok)
-              expect(json_response).to eq({
-                'id' => runner.id,
-                'token' => runner.token,
-                'token_expires_at' => nil
-              })
-            end
+          it 'does not update contacted_at' do
+            expect { verify }.not_to change { runner.reload.contacted_at }.from(nil)
           end
+        end
 
-          it_behaves_like 'storing arguments in the application context for the API' do
-            let(:expected_params) { { client_id: "runner/#{runner.id}" } }
-          end
+        it 'verifies Runner credentials' do
+          verify
 
-          context 'when system_id is provided' do
-            let(:params) { { token: runner.token, system_id: 's_some_system_id' } }
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(json_response).to eq({
+            'id' => runner.id,
+            'token' => runner.token,
+            'token_expires_at' => runner.token_expires_at.iso8601(3)
+          })
+        end
 
-            it 'creates a runner_machine' do
-              expect { verify }.to change { Ci::RunnerMachine.count }.by(1)
-            end
-          end
+        it 'updates contacted_at' do
+          expect { verify }.to change { runner.reload.contacted_at }.from(nil).to(Time.current)
         end
 
-        context 'with create_runner_machine FF disabled' do
+        context 'with non-expiring runner token' do
           before do
-            stub_feature_flags(create_runner_machine: false)
+            runner.update!(token_expires_at: nil)
           end
 
           it 'verifies Runner credentials' do
@@ -103,18 +96,20 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state, feature_catego
             expect(json_response).to eq({
               'id' => runner.id,
               'token' => runner.token,
-              'token_expires_at' => runner.token_expires_at.iso8601(3)
+              'token_expires_at' => nil
             })
           end
+        end
 
-          context 'when system_id is provided' do
-            let(:params) { { token: runner.token, system_id: 's_some_system_id' } }
+        it_behaves_like 'storing arguments in the application context for the API' do
+          let(:expected_params) { { client_id: "runner/#{runner.id}" } }
+        end
 
-            it 'does not create a runner_machine', :aggregate_failures do
-              expect { verify }.not_to change { Ci::RunnerMachine.count }
+        context 'when system_id is provided' do
+          let(:params) { { token: runner.token, system_id: 's_some_system_id' } }
 
-              expect(response).to have_gitlab_http_status(:ok)
-            end
+          it 'creates a runner_manager' do
+            expect { verify }.to change { Ci::RunnerManager.count }.by(1)
           end
         end
       end