diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-05 21:09:49 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-05 21:09:49 +0300 |
commit | f9d0e8961132dce481c3eec0a7f87a534e60cb4b (patch) | |
tree | 5cd80530b8e1ceefb1025daf0acc518d8f28f29f /qa | |
parent | 71da5de44f7e30be58ff1563d3d8de697e0d20c0 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
3 files changed, 5 insertions, 4 deletions
diff --git a/qa/qa/page/project/operations/metrics/show.rb b/qa/qa/page/project/operations/metrics/show.rb index e9e4923a0e2..ee5f42147f6 100644 --- a/qa/qa/page/project/operations/metrics/show.rb +++ b/qa/qa/page/project/operations/metrics/show.rb @@ -20,6 +20,7 @@ module QA element :environments_dropdown element :edit_dashboard_button element :range_picker_dropdown + element :actions_menu_dropdown end view 'app/assets/javascripts/monitoring/components/duplicate_dashboard_form.vue' do @@ -60,8 +61,8 @@ module QA end def duplicate_dashboard(save_as = 'test_duplication.yml', commit_option = 'Commit to master branch') - click_element :dashboards_filter_dropdown - click_on 'Duplicate dashboard' + click_element :actions_menu_dropdown + click_on 'Duplicate current dashboard' fill_element :duplicate_dashboard_filename_field, "#{SecureRandom.hex(8)}-#{save_as}" choose commit_option within('.modal-content') { click_button(class: 'btn-success') } diff --git a/qa/qa/page/project/settings/ci_variables.rb b/qa/qa/page/project/settings/ci_variables.rb index de268b14aa2..aef9800e876 100644 --- a/qa/qa/page/project/settings/ci_variables.rb +++ b/qa/qa/page/project/settings/ci_variables.rb @@ -23,7 +23,7 @@ module QA end def fill_variable(key, value, masked) - fill_element :ci_variable_key_field, key + within_element(:ci_variable_key_field) { find('input').set key } fill_element :ci_variable_value_field, value click_ci_variable_save_button end diff --git a/qa/qa/specs/features/browser_ui/4_verify/ci_variable/add_remove_ci_variable_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/ci_variable/add_remove_ci_variable_spec.rb index 41baaa02544..fd342503a5c 100644 --- a/qa/qa/specs/features/browser_ui/4_verify/ci_variable/add_remove_ci_variable_spec.rb +++ b/qa/qa/specs/features/browser_ui/4_verify/ci_variable/add_remove_ci_variable_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module QA - RSpec.describe 'Verify', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/229724', type: :investigating } do + RSpec.describe 'Verify' do describe 'Add or Remove CI variable via UI', :smoke do let!(:project) do Resource::Project.fabricate_via_api! do |project| |