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

Wait for requests to finish before running the ace JS 

Closes #36191
This commit is contained in:
Phil Hughes 2017-08-09 08:54:32 +01:00
parent 5388f5ee13
commit 3ba782d5de
No known key found for this signature in database
GPG Key ID: DB8CE4B3A3EE91AB
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,9 @@ 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
execute_script("ace.edit('editor').setValue('*.rbca')")
expect(evaluate_script('ace.edit("editor").getValue()')).to eq('*.rbca')
@ -39,6 +42,9 @@ describe 'User edits files' do
it 'commits an edited file', js: true do
click_link('.gitignore')
find('.js-edit-blob').click
wait_for_requests
execute_script("ace.edit('editor').setValue('*.rbca')")
fill_in(:commit_message, with: 'New commit message', visible: true)
click_button('Commit changes')
@ -53,6 +59,9 @@ describe 'User edits files' do
it 'commits an edited file to a new branch', js: true do
click_link('.gitignore')
find('.js-edit-blob').click
wait_for_requests
execute_script("ace.edit('editor').setValue('*.rbca')")
fill_in(:commit_message, with: 'New commit message', visible: true)
fill_in(:branch_name, with: 'new_branch_name', visible: true)
@ -69,6 +78,9 @@ describe 'User edits files' do
it 'shows the diff of an edited file', js: true do
click_link('.gitignore')
find('.js-edit-blob').click
wait_for_requests
execute_script("ace.edit('editor').setValue('*.rbca')")
click_link('Preview changes')
@ -93,6 +105,8 @@ describe 'User edits files' do
expect(page).to have_content(fork_message)
wait_for_requests
execute_script("ace.edit('editor').setValue('*.rbca')")
expect(evaluate_script('ace.edit("editor").getValue()')).to eq('*.rbca')
@ -106,6 +120,9 @@ describe 'User edits files' do
expect(page).to have_button('Cancel')
click_link('Fork')
wait_for_requests
execute_script("ace.edit('editor').setValue('*.rbca')")
fill_in(:commit_message, with: 'New commit message', visible: true)
click_button('Commit changes')