Commit c74f9a99 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'acey-flakes' into 'master'

fix transient user_edits_files_spec failures

See merge request gitlab-org/gitlab-ce!14324
parents a3150449 1d5f07cb
...@@ -20,8 +20,7 @@ describe 'User edits files' do ...@@ -20,8 +20,7 @@ describe 'User edits files' do
it 'inserts a content of a file', js: true do it 'inserts a content of a file', js: true do
click_link('.gitignore') click_link('.gitignore')
find('.js-edit-blob').click find('.js-edit-blob').click
find('.file-editor', match: :first)
wait_for_requests
execute_script("ace.edit('editor').setValue('*.rbca')") execute_script("ace.edit('editor').setValue('*.rbca')")
...@@ -38,8 +37,7 @@ describe 'User edits files' do ...@@ -38,8 +37,7 @@ describe 'User edits files' do
it 'commits an edited file', js: true do it 'commits an edited file', js: true do
click_link('.gitignore') click_link('.gitignore')
find('.js-edit-blob').click find('.js-edit-blob').click
find('.file-editor', match: :first)
wait_for_requests
execute_script("ace.edit('editor').setValue('*.rbca')") execute_script("ace.edit('editor').setValue('*.rbca')")
fill_in(:commit_message, with: 'New commit message', visible: true) fill_in(:commit_message, with: 'New commit message', visible: true)
...@@ -56,7 +54,7 @@ describe 'User edits files' do ...@@ -56,7 +54,7 @@ describe 'User edits files' do
click_link('.gitignore') click_link('.gitignore')
find('.js-edit-blob').click find('.js-edit-blob').click
wait_for_requests find('.file-editor', match: :first)
execute_script("ace.edit('editor').setValue('*.rbca')") execute_script("ace.edit('editor').setValue('*.rbca')")
fill_in(:commit_message, with: 'New commit message', visible: true) fill_in(:commit_message, with: 'New commit message', visible: true)
...@@ -67,15 +65,13 @@ describe 'User edits files' do ...@@ -67,15 +65,13 @@ describe 'User edits files' do
click_link('Changes') click_link('Changes')
wait_for_requests
expect(page).to have_content('*.rbca') expect(page).to have_content('*.rbca')
end end
it 'shows the diff of an edited file', js: true do it 'shows the diff of an edited file', js: true do
click_link('.gitignore') click_link('.gitignore')
find('.js-edit-blob').click find('.js-edit-blob').click
find('.file-editor', match: :first)
wait_for_requests
execute_script("ace.edit('editor').setValue('*.rbca')") execute_script("ace.edit('editor').setValue('*.rbca')")
click_link('Preview changes') click_link('Preview changes')
...@@ -104,7 +100,7 @@ describe 'User edits files' do ...@@ -104,7 +100,7 @@ describe 'User edits files' do
"A fork of this project has been created that you can make changes in, so you can submit a merge request." "A fork of this project has been created that you can make changes in, so you can submit a merge request."
) )
wait_for_requests find('.file-editor', match: :first)
execute_script("ace.edit('editor').setValue('*.rbca')") execute_script("ace.edit('editor').setValue('*.rbca')")
...@@ -120,7 +116,7 @@ describe 'User edits files' do ...@@ -120,7 +116,7 @@ describe 'User edits files' do
click_link('Fork') click_link('Fork')
wait_for_requests find('.file-editor', match: :first)
execute_script("ace.edit('editor').setValue('*.rbca')") execute_script("ace.edit('editor').setValue('*.rbca')")
fill_in(:commit_message, with: 'New commit message', visible: true) fill_in(:commit_message, with: 'New commit message', visible: true)
......
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