Commit fbdc02ad authored by Fatih Acet's avatar Fatih Acet

IssueNotesRefactor: Temp workaround for a failing test.

parent 33c20468
...@@ -78,7 +78,7 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do ...@@ -78,7 +78,7 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do
describe 'merging the MR from the note' do describe 'merging the MR from the note' do
context 'when the current user can merge the MR' do context 'when the current user can merge the MR' do
it 'merges the MR' do it 'merges the MR' do
write_note("/merge") write_note("/merge", false)
expect(page).to have_content 'Commands applied' expect(page).to have_content 'Commands applied'
......
module QuickActionsHelpers module QuickActionsHelpers
def write_note(text) def write_note(text, wait = true)
Sidekiq::Testing.fake! do Sidekiq::Testing.fake! do
page.within('.js-main-target-form') do page.within('.js-main-target-form') do
fill_in 'note[note]', with: text fill_in 'note[note]', with: text
find('.js-comment-submit-button').trigger('click') find('.js-comment-submit-button').trigger('click')
if wait
wait_for_requests wait_for_requests
end end
end end
end end
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment