From f61bb2a16a514b71bf33aabbbb999d6732016a24 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 20 Apr 2021 14:36:54 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-11-stable-ee --- qa/qa/page/project/settings/access_tokens.rb | 15 ++++++++++++++ qa/qa/page/project/settings/ci_cd.rb | 2 ++ qa/qa/page/project/settings/integrations.rb | 6 +++--- qa/qa/page/project/settings/merge_request.rb | 4 ++-- qa/qa/page/project/settings/runners.rb | 7 ++----- qa/qa/page/project/settings/services/jira.rb | 31 +++++++++++++++++++++++----- 6 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 qa/qa/page/project/settings/access_tokens.rb (limited to 'qa/qa/page/project/settings') diff --git a/qa/qa/page/project/settings/access_tokens.rb b/qa/qa/page/project/settings/access_tokens.rb new file mode 100644 index 00000000000..d559ca4daaa --- /dev/null +++ b/qa/qa/page/project/settings/access_tokens.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +require 'date' + +module QA + module Page + module Project + module Settings + class AccessTokens < Page::Base + include Page::Component::AccessTokens + end + end + end + end +end diff --git a/qa/qa/page/project/settings/ci_cd.rb b/qa/qa/page/project/settings/ci_cd.rb index 7a910233d12..7224fdae10e 100644 --- a/qa/qa/page/project/settings/ci_cd.rb +++ b/qa/qa/page/project/settings/ci_cd.rb @@ -42,3 +42,5 @@ module QA end end end + +QA::Page::Project::Settings::CICD.prepend_if_ee("QA::EE::Page::Project::Settings::CICD") diff --git a/qa/qa/page/project/settings/integrations.rb b/qa/qa/page/project/settings/integrations.rb index dd676c86486..6f5c50eac52 100644 --- a/qa/qa/page/project/settings/integrations.rb +++ b/qa/qa/page/project/settings/integrations.rb @@ -5,9 +5,9 @@ module QA module Project module Settings class Integrations < QA::Page::Base - view 'app/views/shared/integrations/_index.html.haml' do - element :prometheus_link, 'data: { qa_selector: "#{integration.to_param' # rubocop:disable QA/ElementWithPattern - element :jira_link, 'data: { qa_selector: "#{integration.to_param' # rubocop:disable QA/ElementWithPattern + view 'app/assets/javascripts/integrations/index/components/integrations_table.vue' do + element :prometheus_link, %q(:data-qa-selector="`${item.name}_link`") # rubocop:disable QA/ElementWithPattern + element :jira_link, %q(:data-qa-selector="`${item.name}_link`") # rubocop:disable QA/ElementWithPattern end def click_on_prometheus_integration diff --git a/qa/qa/page/project/settings/merge_request.rb b/qa/qa/page/project/settings/merge_request.rb index fe5d629effe..0b4a12dbb2e 100644 --- a/qa/qa/page/project/settings/merge_request.rb +++ b/qa/qa/page/project/settings/merge_request.rb @@ -20,11 +20,11 @@ module QA end def click_save_changes - click_element :save_merge_request_changes_button + click_element(:save_merge_request_changes_button) end def enable_ff_only - click_element :merge_ff_radio_button + click_element(:merge_ff_radio_button) click_save_changes end diff --git a/qa/qa/page/project/settings/runners.rb b/qa/qa/page/project/settings/runners.rb index af4dbb08430..aa1ac216ae2 100644 --- a/qa/qa/page/project/settings/runners.rb +++ b/qa/qa/page/project/settings/runners.rb @@ -10,12 +10,9 @@ module QA element :coordinator_address, '%code#coordinator_address' # rubocop:disable QA/ElementWithPattern end - ## - # TODO, phase-out CSS classes added in Ruby helpers. - # view 'app/helpers/ci/runners_helper.rb' do # rubocop:disable Lint/InterpolationCheck - element :runner_status, 'runner-status-#{status}' # rubocop:disable QA/ElementWithPattern + element :runner_status_icon, 'qa_selector: "runner_status_#{status}_content"' # rubocop:disable QA/ElementWithPattern # rubocop:enable Lint/InterpolationCheck end @@ -28,7 +25,7 @@ module QA end def has_online_runner? - page.has_css?('.runner-status-online') + has_element?(:runner_status_online_content) end end end diff --git a/qa/qa/page/project/settings/services/jira.rb b/qa/qa/page/project/settings/services/jira.rb index eaa3e90db78..0a56aaa758e 100644 --- a/qa/qa/page/project/settings/services/jira.rb +++ b/qa/qa/page/project/settings/services/jira.rb @@ -10,7 +10,13 @@ module QA element :service_url_field, ':data-qa-selector="`${fieldId}_field`"' # rubocop:disable QA/ElementWithPattern element :service_username_field, ':data-qa-selector="`${fieldId}_field`"' # rubocop:disable QA/ElementWithPattern element :service_password_field, ':data-qa-selector="`${fieldId}_field`"' # rubocop:disable QA/ElementWithPattern - element :service_jira_issue_transition_id_field, ':data-qa-selector="`${fieldId}_field`"' # rubocop:disable QA/ElementWithPattern + end + + view 'app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue' do + element :service_jira_issue_transition_enabled_checkbox + element :service_jira_issue_transition_automatic_true_radio, ':data-qa-selector="`service_jira_issue_transition_automatic_${issueTransitionOption.value}_radio`"' # rubocop:disable QA/ElementWithPattern + element :service_jira_issue_transition_automatic_false_radio, ':data-qa-selector="`service_jira_issue_transition_automatic_${issueTransitionOption.value}_radio`"' # rubocop:disable QA/ElementWithPattern + element :service_jira_issue_transition_id_field end view 'app/assets/javascripts/integrations/edit/components/integration_form.vue' do @@ -23,7 +29,10 @@ module QA set_jira_server_url(url) set_username(Runtime::Env.jira_admin_username) set_password(Runtime::Env.jira_admin_password) - set_transaction_ids('11,21,31,41') + + enable_transitions + use_custom_transitions + set_transition_ids('11,21,31,41') click_save_changes_button wait_until(reload: false) do @@ -45,12 +54,24 @@ module QA fill_element(:service_password_field, password) end - def set_transaction_ids(transaction_ids) - fill_element(:service_jira_issue_transition_id_field, transaction_ids) + def enable_transitions + check_element(:service_jira_issue_transition_enabled_checkbox, true) + end + + def use_automatic_transitions + choose_element(:service_jira_issue_transition_automatic_true_radio, true) + end + + def use_custom_transitions + choose_element(:service_jira_issue_transition_automatic_false_radio, true) + end + + def set_transition_ids(transition_ids) + fill_element(:service_jira_issue_transition_id_field, transition_ids) end def click_save_changes_button - click_element :save_changes_button + click_element(:save_changes_button) end end end -- cgit v1.2.1