Merge branch 'mk/fix-intermittent-qa-test-failure' into 'master'

Improve fix for intermittent QA failure in "cloning code using a deploy key"

Closes charts/gitlab#396

See merge request gitlab-org/gitlab-ce!18608

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

 module QA::Page
   module Project::Job
     class Show < QA::Page::Base
+      COMPLETED_STATUSES = %w[passed failed canceled blocked skipped manual].freeze # excludes created, pending, running
+      PASSED_STATUS = 'passed'.freeze
+
       view 'app/views/projects/jobs/show.html.haml' do
         element :build_output, '.js-build-output'
       end
 
-      def output
-        css = '.js-build-output'
+      view 'app/assets/javascripts/vue_shared/components/ci_badge_link.vue' do
+        element :status_badge, 'ci-status'
+      end
 
-        wait(reload: false) do
-          has_css?(css)
-        end
+      def completed?
+        COMPLETED_STATUSES.include? find('.ci-status').text
+      end
 
-        find(css).text
+      def passed?
+        find('.ci-status').text == PASSED_STATUS
+      end
+
+      # Reminder: You may wish to wait for a particular job status before checking output
+      def output
+        find('.js-build-output').text
       end
     end
   end

qa/qa/specs/features/project/deploy_key_clone_spec.rb

@@ -87,16 +87,12 @@ module QA
         Page::Project::Show.act { wait_for_push }
         Page::Menu::Side.act { click_ci_cd_pipelines }
         Page::Project::Pipeline::Index.act { go_to_latest_pipeline }
-
-        Page::Project::Pipeline::Show.act do
-          go_to_first_job
-
-          wait do
-            !has_content?('running')
-          end
-        end
+        Page::Project::Pipeline::Show.act { go_to_first_job }
 
         Page::Project::Job::Show.perform do |job|
+          job.wait(reload: false) { job.completed? }
+
+          expect(job.passed?).to be_truthy, "Job status did not become \"passed\"."
           expect(job.output).to include(sha1sum)
         end
       end