kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'acey-flakes' into 'master' 

fix transient user_edits_files_spec failures

See merge request gitlab-org/gitlab-ce!14324
This commit is contained in:
Rémy Coutable 2017-09-19 13:53:52 +00:00
parent a31504497e 1d5f07cb33
commit c74f9a998f
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spec/features/projects/user_edits_files_spec.rb
View File

@ -20,8 +20,7 @@ describe 'User edits files' do
it 'inserts a content of a file', js: true do
click_link('.gitignore')
find('.js-edit-blob').click
wait_for_requests
find('.file-editor', match: :first)
execute_script("ace.edit('editor').setValue('*.rbca')")
@ -38,8 +37,7 @@ describe 'User edits files' do
it 'commits an edited file', js: true do
click_link('.gitignore')
find('.js-edit-blob').click
wait_for_requests
find('.file-editor', match: :first)
execute_script("ace.edit('editor').setValue('*.rbca')")
fill_in(:commit_message, with: 'New commit message', visible: true)
@ -56,7 +54,7 @@ describe 'User edits files' do
click_link('.gitignore')
find('.js-edit-blob').click
wait_for_requests
find('.file-editor', match: :first)
execute_script("ace.edit('editor').setValue('*.rbca')")
fill_in(:commit_message, with: 'New commit message', visible: true)
@ -67,15 +65,13 @@ describe 'User edits files' do
click_link('Changes')
wait_for_requests
expect(page).to have_content('*.rbca')
end
it 'shows the diff of an edited file', js: true do
click_link('.gitignore')
find('.js-edit-blob').click
wait_for_requests
find('.file-editor', match: :first)
execute_script("ace.edit('editor').setValue('*.rbca')")
click_link('Preview changes')
@ -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."
)
wait_for_requests
find('.file-editor', match: :first)
execute_script("ace.edit('editor').setValue('*.rbca')")
@ -120,7 +116,7 @@ describe 'User edits files' do
click_link('Fork')
wait_for_requests
find('.file-editor', match: :first)
execute_script("ace.edit('editor').setValue('*.rbca')")
fill_in(:commit_message, with: 'New commit message', visible: true)