diff options
author | Robert Speicher <robert@gitlab.com> | 2017-08-28 15:58:21 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-08-28 15:58:21 +0000 |
commit | 3dd1efe6fc324e0e7993822327e4732ad1936ac6 (patch) | |
tree | 403a58fe1c42ce7a02a19735048199280693013f | |
parent | 7ccef75a26bc4997e04c109007e6c6ee004574cb (diff) | |
parent | bcd2135e08fea5193b0ed9960cd96fab6e7015a4 (diff) | |
download | gitlab-ce-3dd1efe6fc324e0e7993822327e4732ad1936ac6.tar.gz |
Merge branch 'fix-flakes' into 'master'
fix transient dropdown test failures
Closes #37052 and #34436
See merge request !13862
-rw-r--r-- | spec/features/snippets/notes_on_personal_snippets_spec.rb | 2 | ||||
-rw-r--r-- | spec/support/features/reportable_note_shared_examples.rb | 2 | ||||
-rw-r--r-- | spec/support/helpers/note_interaction_helpers.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/snippets/notes_on_personal_snippets_spec.rb b/spec/features/snippets/notes_on_personal_snippets_spec.rb index c0c293dee78..bf79974b8c6 100644 --- a/spec/features/snippets/notes_on_personal_snippets_spec.rb +++ b/spec/features/snippets/notes_on_personal_snippets_spec.rb @@ -91,7 +91,7 @@ describe 'Comments on personal snippets', :js do context 'when editing a note' do it 'changes the text' do - find('.js-note-edit').click + find('.js-note-edit').trigger('click') page.within('.current-note-edit-form') do fill_in 'note[note]', with: 'new content' diff --git a/spec/support/features/reportable_note_shared_examples.rb b/spec/support/features/reportable_note_shared_examples.rb index cb483ae9a5a..5a0e7c3d099 100644 --- a/spec/support/features/reportable_note_shared_examples.rb +++ b/spec/support/features/reportable_note_shared_examples.rb @@ -34,7 +34,7 @@ shared_examples 'reportable note' do end def open_dropdown(dropdown) - dropdown.click + dropdown.find('.more-actions-toggle').trigger('click') dropdown.find('.dropdown-menu li', match: :first) end end diff --git a/spec/support/helpers/note_interaction_helpers.rb b/spec/support/helpers/note_interaction_helpers.rb index 551c759133c..86008698692 100644 --- a/spec/support/helpers/note_interaction_helpers.rb +++ b/spec/support/helpers/note_interaction_helpers.rb @@ -2,7 +2,7 @@ module NoteInteractionHelpers def open_more_actions_dropdown(note) note_element = find("#note_#{note.id}") - note_element.find('.more-actions').click + note_element.find('.more-actions-toggle').trigger('click') note_element.find('.more-actions .dropdown-menu li', match: :first) end end |