Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

1 files changed, 13 insertions, 4 deletions

diff --git a/spec/presenters/ci/build_runner_presenter_spec.rb b/spec/presenters/ci/build_runner_presenter_spec.rb
index fe2d8f0f670..396fe7843ba 100644
--- a/spec/presenters/ci/build_runner_presenter_spec.rb
+++ b/spec/presenters/ci/build_runner_presenter_spec.rb
@@ -350,6 +350,15 @@ RSpec.describe Ci::BuildRunnerPresenter do
         )
       end
 
+      it 'logs file_variable_is_referenced_in_another_variable' do
+        expect(Gitlab::AppJsonLogger).to receive(:info).with(
+          event: 'file_variable_is_referenced_in_another_variable',
+          project_id: project.id
+        ).once
+
+        runner_variables
+      end
+
       context 'when the FF ci_stop_expanding_file_vars_for_runners is disabled' do
         before do
           stub_feature_flags(ci_stop_expanding_file_vars_for_runners: false)
@@ -383,10 +392,10 @@ RSpec.describe Ci::BuildRunnerPresenter do
 
       it 'returns expanded and sorted variables' do
         is_expected.to eq [
-                            { key: 'C', value: 'value', public: false, masked: false },
-                            { key: 'B', value: 'refB-value-$D', public: false, masked: false },
-                            { key: 'A', value: 'refA-refB-value-$D', public: false, masked: false }
-                          ]
+          { key: 'C', value: 'value', public: false, masked: false },
+          { key: 'B', value: 'refB-value-$D', public: false, masked: false },
+          { key: 'A', value: 'refA-refB-value-$D', public: false, masked: false }
+        ]
       end
     end
   end