Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'qa/qa/page/project/pipeline/show.rb')
-rw-r--r--qa/qa/page/project/pipeline/show.rb24
1 files changed, 2 insertions, 22 deletions
diff --git a/qa/qa/page/project/pipeline/show.rb b/qa/qa/page/project/pipeline/show.rb
index 41c61aaecc8..c955b4d933d 100644
--- a/qa/qa/page/project/pipeline/show.rb
+++ b/qa/qa/page/project/pipeline/show.rb
@@ -7,19 +7,8 @@ module QA
class Show < QA::Page::Base
include Component::CiBadgeLink
- # TODO: remove element with FF pipeline_details_header_vue removal
- view 'app/assets/javascripts/vue_shared/components/header_ci_component.vue' do
- element :pipeline_header
- end
-
- # TODO: make this a requirement at page render - `required: true`
- # together with FF pipeline_details_header_vue removal
view 'app/assets/javascripts/pipelines/components/pipeline_details_header.vue' do
- element :pipeline_details_header
- end
-
- view 'app/views/projects/pipelines/_info.html.haml' do
- element :merge_request_badge_tag
+ element :pipeline_details_header, required: true
end
view 'app/assets/javascripts/pipelines/components/graph/graph_component.vue' do
@@ -63,20 +52,11 @@ module QA
end
def running?(wait: 0)
- # TODO: remove condition check together with FF pipeline_details_header_vue removal
- # issue: https://gitlab.com/gitlab-org/gitlab/-/issues/411442
-
- element = has_element?(:pipeline_details_header) ? :pipeline_details_header : :pipeline_header
-
- within_element(element) do
+ within_element(:pipeline_details_header) do
page.has_content?('running', wait: wait)
end
end
- def has_merge_request_badge_tag?
- has_element?(:merge_request_badge_tag)
- end
-
def has_build?(name, status: :success, wait: nil)
if status
within_element(:job_item_container, text: name) do