Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 4 deletions

diff --git a/qa/qa/page/project/pipeline_editor/show.rb b/qa/qa/page/project/pipeline_editor/show.rb
index 0a7a4460d18..bf86a0f5edb 100644
--- a/qa/qa/page/project/pipeline_editor/show.rb
+++ b/qa/qa/page/project/pipeline_editor/show.rb
@@ -122,8 +122,8 @@ module QA
             go_to_tab('Visualize')
           end
 
-          def go_to_view_merged_yaml_tab
-            go_to_tab('View merged YAML')
+          def go_to_full_configuration_tab
+            go_to_tab('Full configuration')
           end
 
           def go_to_validate_tab
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_tabs_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_tabs_spec.rb
index dbe24e2a2b2..745879cf12f 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_tabs_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_tabs_spec.rb
@@ -74,7 +74,7 @@ module QA
               show.simulate_pipeline
               expect(show.tab_alert_title).to have_content('Simulation completed successfully')
 
-              show.go_to_view_merged_yaml_tab
+              show.go_to_full_configuration_tab
               expect(show).to have_source_editor
             end
           end
@@ -101,7 +101,7 @@ module QA
 
               expect(show.ci_syntax_validate_message).to have_content('CI configuration is invalid')
 
-              show.go_to_view_merged_yaml_tab
+              show.go_to_full_configuration_tab
 
               # TODO: remove this retry when
               # https://gitlab.com/gitlab-org/gitlab/-/issues/378536 is resolved