Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7dc02ae2
Commit
7dc02ae2
authored
Mar 11, 2021
by
Dan Davison
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'qa-fix-jira-import-e2e-spec' into 'master'
Fix Jira tests See merge request gitlab-org/gitlab!56376
parents
705f625e
967d7180
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
app/assets/javascripts/issuable/components/csv_import_export_buttons.vue
...scripts/issuable/components/csv_import_export_buttons.vue
+0
-1
qa/qa/page/project/issue/index.rb
qa/qa/page/project/issue/index.rb
+9
-6
No files found.
app/assets/javascripts/issuable/components/csv_import_export_buttons.vue
View file @
7dc02ae2
...
@@ -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"
>
>
...
...
qa/qa/page/project/issue/index.rb
View file @
7dc02ae2
...
@@ -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
:
ex
port_issues_button
element
:
im
port_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_issu
able_modal
element
:export_issu
es_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_
dropdow
n
)
click_element
(
:import_issues_
butto
n
)
end
end
def
export_issues_modal
def
export_issues_modal
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment