summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2017-08-14 17:08:28 +0000
committerClement Ho <clemmakesapps@gmail.com>2017-08-14 17:08:28 +0000
commitcf55fb9b964ad47fa2f1eb5703f447bbb614f125 (patch)
tree7aabdcc059ce89897fbd4f11f1a75888508da6b9 /features
parent3248911c08755b8c2885e88c65f3af33e6d1800c (diff)
parent8858ddaf83e57adc6c003e03e72929f6068a6bfa (diff)
downloadgitlab-ce-cf55fb9b964ad47fa2f1eb5703f447bbb614f125.tar.gz
Merge branch '34527-make-edit-comment-button-always-available-outside-of-dropdown' into 'master'
Resolve "Make edit comment button always available outside of dropdown" Closes #34527 See merge request !12931
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/merge_requests.rb3
-rw-r--r--features/steps/shared/note.rb7
2 files changed, 2 insertions, 8 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 810cd75591b..7254fbc2e4e 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -299,9 +299,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step 'I change the comment "Line is wrong" to "Typo, please fix" on diff' do
page.within('.diff-file:nth-of-type(5) .note') do
- find('.more-actions').click
- find('.more-actions .dropdown-menu li', match: :first)
-
find('.js-note-edit').click
page.within('.current-note-edit-form', visible: true) do
diff --git a/features/steps/shared/note.rb b/features/steps/shared/note.rb
index 80187b83fee..492da38355c 100644
--- a/features/steps/shared/note.rb
+++ b/features/steps/shared/note.rb
@@ -11,8 +11,8 @@ module SharedNote
note = find('.note')
note.hover
- note.find('.more-actions').click
- note.find('.more-actions .dropdown-menu li', match: :first)
+ find('.more-actions').click
+ find('.more-actions .dropdown-menu li', match: :first)
find(".js-note-delete").click
end
@@ -147,9 +147,6 @@ module SharedNote
note = find('.note')
note.hover
- note.find('.more-actions').click
- note.find('.more-actions .dropdown-menu li', match: :first)
-
note.find('.js-note-edit').click
end