Commit 8c772ed1 authored by Dan Davison's avatar Dan Davison

Merge branch 'fix-monitor-broken-test' into 'master'

Fix duplicate button issue in monitor core spec

See merge request gitlab-org/gitlab!38482
parents 32c5dfbc 1ada6874
...@@ -407,6 +407,7 @@ export default { ...@@ -407,6 +407,7 @@ export default {
right right
class="gl-flex-grow-1" class="gl-flex-grow-1"
data-testid="actions-menu" data-testid="actions-menu"
data-qa-selector="actions_menu_dropdown"
:title="s__('Metrics|Create dashboard')" :title="s__('Metrics|Create dashboard')"
:icon="'plus-square'" :icon="'plus-square'"
> >
......
...@@ -20,6 +20,7 @@ module QA ...@@ -20,6 +20,7 @@ module QA
element :environments_dropdown element :environments_dropdown
element :edit_dashboard_button element :edit_dashboard_button
element :range_picker_dropdown element :range_picker_dropdown
element :actions_menu_dropdown
end end
view 'app/assets/javascripts/monitoring/components/duplicate_dashboard_form.vue' do view 'app/assets/javascripts/monitoring/components/duplicate_dashboard_form.vue' do
...@@ -60,8 +61,8 @@ module QA ...@@ -60,8 +61,8 @@ module QA
end end
def duplicate_dashboard(save_as = 'test_duplication.yml', commit_option = 'Commit to master branch') def duplicate_dashboard(save_as = 'test_duplication.yml', commit_option = 'Commit to master branch')
click_element :dashboards_filter_dropdown click_element :actions_menu_dropdown
click_on 'Duplicate dashboard' click_on 'Duplicate current dashboard'
fill_element :duplicate_dashboard_filename_field, "#{SecureRandom.hex(8)}-#{save_as}" fill_element :duplicate_dashboard_filename_field, "#{SecureRandom.hex(8)}-#{save_as}"
choose commit_option choose commit_option
within('.modal-content') { click_button(class: 'btn-success') } within('.modal-content') { click_button(class: 'btn-success') }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment