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
52ad2e11
Commit
52ad2e11
authored
Dec 24, 2021
by
Anastasia McDonald
Committed by
Sanad Liaquat
Dec 24, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow for consolidated edit button in E2Es
parent
32dd97c8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
1 deletion
+21
-1
app/assets/javascripts/vue_shared/components/actions_button.vue
...sets/javascripts/vue_shared/components/actions_button.vue
+2
-0
qa/qa/page/file/show.rb
qa/qa/page/file/show.rb
+19
-1
No files found.
app/assets/javascripts/vue_shared/components/actions_button.vue
View file @
52ad2e11
...
@@ -66,6 +66,7 @@ export default {
...
@@ -66,6 +66,7 @@ export default {
:variant=
"variant"
:variant=
"variant"
:category=
"category"
:category=
"category"
split
split
data-qa-selector=
"action_dropdown"
@
click=
"handleClick(selectedAction, $event)"
@
click=
"handleClick(selectedAction, $event)"
>
>
<template
#button-content
>
<template
#button-content
>
...
@@ -79,6 +80,7 @@ export default {
...
@@ -79,6 +80,7 @@ export default {
:is-check-item=
"true"
:is-check-item=
"true"
:is-checked=
"action.key === selectedAction.key"
:is-checked=
"action.key === selectedAction.key"
:secondary-text=
"action.secondaryText"
:secondary-text=
"action.secondaryText"
:data-qa-selector=
"`$
{action.key}_menu_item`"
:data-testid="`action_${action.key}`"
:data-testid="`action_${action.key}`"
@click="handleItemClick(action)"
@click="handleItemClick(action)"
>
>
...
...
qa/qa/page/file/show.rb
View file @
52ad2e11
...
@@ -23,9 +23,27 @@ module QA
...
@@ -23,9 +23,27 @@ module QA
element
:delete_file_button
,
"button_tag 'Delete file'"
# rubocop:disable QA/ElementWithPattern
element
:delete_file_button
,
"button_tag 'Delete file'"
# rubocop:disable QA/ElementWithPattern
end
end
view
'app/assets/javascripts/vue_shared/components/web_ide_link.vue'
do
element
:edit_button
end
view
'app/assets/javascripts/vue_shared/components/actions_button.vue'
do
element
:action_dropdown
element
:edit_menu_item
,
':data-qa-selector="`${action.key}_menu_item`"'
# rubocop:disable QA/ElementWithPattern
end
def
click_edit
def
click_edit
# TODO: remove this condition and else part once ff :consolidated_edit_button is enabled by default
if
has_element?
(
:action_dropdown
)
within_element
(
:action_dropdown
)
do
click_button
(
class:
'dropdown-toggle-split'
)
click_element
(
:edit_menu_item
)
click_element
(
:edit_button
)
end
else
click_on
'Edit'
click_on
'Edit'
end
end
end
def
click_delete
def
click_delete
click_on
'Delete'
click_on
'Delete'
...
...
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