1 files changed, 58 insertions, 1 deletions

diff --git a/spec/requests/api/ci/runner/jobs_request_post_spec.rb b/spec/requests/api/ci/runner/jobs_request_post_spec.rb
index d15bc9d2dd5..6e721d40560 100644
--- a/spec/requests/api/ci/runner/jobs_request_post_spec.rb
+++ b/spec/requests/api/ci/runner/jobs_request_post_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state, feature_category: :runner do
+RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state, feature_category: :continuous_integration do
   include StubGitlabCalls
   include RedisHelpers
   include WorkhorseHelpers
@@ -119,6 +119,63 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state, feature_catego
           end
         end
 
+        context 'when system_id parameter is specified' do
+          subject(:request) { request_job(**args) }
+
+          context 'with create_runner_machine FF enabled' do
+            before do
+              stub_feature_flags(create_runner_machine: true)
+            end
+
+            context 'when ci_runner_machines with same system_xid does not exist' do
+              let(:args) { { system_id: 's_some_system_id' } }
+
+              it 'creates respective ci_runner_machines record', :freeze_time do
+                expect { request }.to change { runner.runner_machines.reload.count }.from(0).to(1)
+
+                machine = runner.runner_machines.last
+                expect(machine.system_xid).to eq args[:system_id]
+                expect(machine.runner).to eq runner
+                expect(machine.contacted_at).to eq Time.current
+              end
+            end
+
+            context 'when ci_runner_machines with same system_xid already exists', :freeze_time do
+              let(:args) { { system_id: 's_existing_system_id' } }
+              let!(:runner_machine) do
+                create(:ci_runner_machine, runner: runner, system_xid: args[:system_id], contacted_at: 1.hour.ago)
+              end
+
+              it 'does not create new ci_runner_machines record' do
+                expect { request }.not_to change { Ci::RunnerMachine.count }
+              end
+
+              it 'updates the contacted_at field' do
+                request
+
+                expect(runner_machine.reload.contacted_at).to eq Time.current
+              end
+            end
+          end
+
+          context 'with create_runner_machine FF disabled' do
+            before do
+              stub_feature_flags(create_runner_machine: false)
+            end
+
+            context 'when ci_runner_machines with same system_xid does not exist' do
+              let(:args) { { system_id: 's_some_system_id' } }
+
+              it 'does not create respective ci_runner_machines record', :freeze_time, :aggregate_failures do
+                expect { request }.not_to change { runner.runner_machines.reload.count }
+
+                expect(response).to have_gitlab_http_status(:created)
+                expect(runner.runner_machines).to be_empty
+              end
+            end
+          end
+        end
+
         context 'when jobs are finished' do
           before do
             job.success