Merge branch 'qa-e2e-fix-job-log-page-object' into 'master'

Fix Job page object for E2E tests to use new job log

Closes #118428

See merge request gitlab-org/gitlab!21862

app/assets/javascripts/jobs/components/log/log.vue

@@ -49,7 +49,7 @@ export default {
 };
 </script>
 <template>
-  <code class="job-log d-block">
+  <code class="job-log d-block" data-qa-selector="job_log_content">
     <template v-for="(section, index) in trace">
       <collpasible-log-section
         v-if="section.isHeader"

qa/qa/page/project/job/show.rb

@@ -5,8 +5,8 @@ module QA::Page
     class Show < QA::Page::Base
       include Component::CiBadgeLink
 
-      view 'app/assets/javascripts/jobs/components/job_log.vue' do
-        element :build_trace
+      view 'app/assets/javascripts/jobs/components/log/log.vue' do
+        element :job_log_content
       end
 
       view 'app/assets/javascripts/jobs/components/stages_dropdown.vue' do
@@ -25,7 +25,7 @@ module QA::Page
         result = ''
 
         wait(reload: false, max: wait, interval: 1) do
-          result = find_element(:build_trace).text
+          result = find_element(:job_log_content).text
 
           result.include?('Job')
         end
@@ -37,7 +37,7 @@ module QA::Page
 
       def loaded?(wait: 60)
         wait(reload: true, max: wait, interval: 1) do
-          has_element?(:build_trace, wait: 1)
+          has_element?(:job_log_content, wait: 1)
         end
       end
     end

qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb

@@ -6,10 +6,6 @@ module QA
   context 'Release', :docker do
     describe 'Git clone using a deploy key' do
       before do
-        # Handle WIP Job Logs flag - https://gitlab.com/gitlab-org/gitlab/issues/31162
-        @job_log_json_flag_enabled = Runtime::Feature.enabled?('job_log_json')
-        Runtime::Feature.disable('job_log_json') if @job_log_json_flag_enabled
-
         Flow::Login.sign_in
 
         @runner_name = "qa-runner-#{Time.now.to_i}"
@@ -29,7 +25,6 @@ module QA
       end
 
       after do
-        Runtime::Feature.enable('job_log_json') if @job_log_json_flag_enabled
         Service::DockerRun::GitlabRunner.new(@runner_name).remove!
       end