summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-06 15:09:11 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-06 15:09:11 +0000
commit0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89 (patch)
treefd70d5bc63fe152e0a67aaa5a70e4c9f16dc6ffc /qa
parent5564275a0b378298dc6281599cbfe71a937109ff (diff)
downloadgitlab-ce-0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/page/base.rb6
-rw-r--r--qa/qa/page/component/select2.rb4
-rw-r--r--qa/qa/page/project/issue/show.rb2
-rw-r--r--qa/qa/page/project/new.rb3
-rw-r--r--qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb2
5 files changed, 7 insertions, 10 deletions
diff --git a/qa/qa/page/base.rb b/qa/qa/page/base.rb
index fc460f41a36..22b0021ea77 100644
--- a/qa/qa/page/base.rb
+++ b/qa/qa/page/base.rb
@@ -255,12 +255,6 @@ module QA
click_link text
end
- def click_body
- wait_for_requests
-
- find('body').click
- end
-
def visit_link_in_element(name)
visit find_element(name)['href']
end
diff --git a/qa/qa/page/component/select2.rb b/qa/qa/page/component/select2.rb
index 1dd718a1d88..e667fad1dd3 100644
--- a/qa/qa/page/component/select2.rb
+++ b/qa/qa/page/component/select2.rb
@@ -34,6 +34,10 @@ module QA
has_css?('.select2-active', wait: 1)
has_no_css?('.select2-active', wait: 30)
end
+
+ def dropdown_open?
+ has_css?('.select2-input')
+ end
end
end
end
diff --git a/qa/qa/page/project/issue/show.rb b/qa/qa/page/project/issue/show.rb
index a1e1bb4bc98..a56083ea25c 100644
--- a/qa/qa/page/project/issue/show.rb
+++ b/qa/qa/page/project/issue/show.rb
@@ -124,7 +124,7 @@ module QA
end
end
- click_body
+ click_element(:edit_link_labels)
labels.each do |label|
has_element?(:labels_block, text: label)
diff --git a/qa/qa/page/project/new.rb b/qa/qa/page/project/new.rb
index d0e8011d82d..97214e22820 100644
--- a/qa/qa/page/project/new.rb
+++ b/qa/qa/page/project/new.rb
@@ -32,8 +32,7 @@ module QA
def choose_namespace(namespace)
retry_on_exception do
- click_body
- click_element :project_namespace_select
+ click_element :project_namespace_select unless dropdown_open?
search_and_select(namespace)
end
end
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb
index 887625c4aa8..58caacc1ad1 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module QA
- context 'Verify', :docker do
+ context 'Verify', :docker, quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/202149' do
describe 'Pipeline creation and processing' do
let(:executor) { "qa-runner-#{Time.now.to_i}" }
let(:max_wait) { 30 }