diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-10-02 12:51:16 -0500 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-10-02 17:28:31 -0500 |
| commit | 7a5c2d5eff6cd13f6971140294c395e877eafacf (patch) | |
| tree | 1b2f9cdb5d2da4890d7bea9ccadc9963bc06c58e /spec/features/merge_requests/conflicts_spec.rb | |
| parent | bd2822ce1f67c5e50ead272962840638fe37a1f7 (diff) | |
| download | gitlab-ce-7a5c2d5eff6cd13f6971140294c395e877eafacf.tar.gz | |
Fix Element is not clickable at this point
Diffstat (limited to 'spec/features/merge_requests/conflicts_spec.rb')
| -rw-r--r-- | spec/features/merge_requests/conflicts_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/merge_requests/conflicts_spec.rb b/spec/features/merge_requests/conflicts_spec.rb index 70937666334..5e6220c5b1c 100644 --- a/spec/features/merge_requests/conflicts_spec.rb +++ b/spec/features/merge_requests/conflicts_spec.rb @@ -23,11 +23,11 @@ feature 'Merge request conflict resolution', js: true do within find('.files-wrapper .diff-file', text: 'files/ruby/regex.rb') do all('button', text: 'Use ours').each do |button| - button.click + button.send_keys(:return) end end - click_button 'Commit conflict resolution' + find_button('Commit conflict resolution').send_keys(:return) expect(page).to have_content('All merge conflicts were resolved') merge_request.reload_diff @@ -69,7 +69,7 @@ feature 'Merge request conflict resolution', js: true do execute_script('ace.edit($(".files-wrapper .diff-file pre")[1]).setValue("Gregor Samsa woke from troubled dreams");') end - click_button 'Commit conflict resolution' + find_button('Commit conflict resolution').send_keys(:return) expect(page).to have_content('All merge conflicts were resolved') merge_request.reload_diff |