Commit 7dc02ae2 authored by Dan Davison's avatar Dan Davison

Merge branch 'qa-fix-jira-import-e2e-spec' into 'master'

Fix Jira tests

See merge request gitlab-org/gitlab!56376
parents 705f625e 967d7180
...@@ -66,7 +66,6 @@ export default { ...@@ -66,7 +66,6 @@ export default {
<gl-dropdown <gl-dropdown
v-if="showImportButton" v-if="showImportButton"
v-gl-tooltip.hover="__('Import issues')" v-gl-tooltip.hover="__('Import issues')"
data-qa-selector="import_issues_dropdown"
data-testid="import-csv-dropdown" data-testid="import-csv-dropdown"
icon="import" icon="import"
> >
......
...@@ -15,18 +15,21 @@ module QA ...@@ -15,18 +15,21 @@ module QA
element :avatar_counter_content element :avatar_counter_content
end end
view 'app/assets/javascripts/issuable/components/csv_export_modal.vue' do
element :export_issuable_modal
end
view 'app/assets/javascripts/issuable/components/csv_import_export_buttons.vue' do view 'app/assets/javascripts/issuable/components/csv_import_export_buttons.vue' do
element :export_as_csv_button element :export_as_csv_button
element :import_issues_dropdown
element :import_from_jira_link element :import_from_jira_link
end end
view 'app/views/shared/issuable/csv_export/_modal.html.haml' do view 'app/views/projects/issues/import_csv/_button.html.haml' do
element :export_issues_button element :import_issues_button
end end
view 'app/assets/javascripts/issuable/components/csv_export_modal.vue' do view 'app/views/shared/issuable/csv_export/_modal.html.haml' do
element :export_issuable_modal element :export_issues_button
end end
view 'app/views/shared/issuable/_nav.html.haml' do view 'app/views/shared/issuable/_nav.html.haml' do
...@@ -60,7 +63,7 @@ module QA ...@@ -60,7 +63,7 @@ module QA
def click_import_issues_dropdown def click_import_issues_dropdown
# When there are no issues, the image that loads causes the buttons to jump # When there are no issues, the image that loads causes the buttons to jump
has_loaded_all_images? has_loaded_all_images?
click_element(:import_issues_dropdown) click_element(:import_issues_button)
end end
def export_issues_modal def export_issues_modal
......
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