diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-14 20:08:28 +0300 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-08-15 02:26:07 +0300 |
| commit | b05ae3c95e880a891fb606457a72ac7b3b4594c7 (patch) | |
| tree | b12f3ea78f6ed637b8a8d503dd2c02ab5281a749 /features | |
| parent | 52cd6fa366fae7eedb44708bd351b36947842632 (diff) | |
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.rb | 3 | ||||
| -rw-r--r-- | features/steps/shared/note.rb | 7 |
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 |