Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
3ba782d5
Commit
3ba782d5
authored
Aug 09, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Wait for requests to finish before running the ace JS
Closes #36191
parent
5388f5ee
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
0 deletions
+17
-0
spec/features/projects/user_edits_files_spec.rb
spec/features/projects/user_edits_files_spec.rb
+17
-0
No files found.
spec/features/projects/user_edits_files_spec.rb
View file @
3ba782d5
...
@@ -24,6 +24,9 @@ describe 'User edits files' do
...
@@ -24,6 +24,9 @@ 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
wait_for_requests
execute_script
(
"ace.edit('editor').setValue('*.rbca')"
)
execute_script
(
"ace.edit('editor').setValue('*.rbca')"
)
expect
(
evaluate_script
(
'ace.edit("editor").getValue()'
)).
to
eq
(
'*.rbca'
)
expect
(
evaluate_script
(
'ace.edit("editor").getValue()'
)).
to
eq
(
'*.rbca'
)
...
@@ -39,6 +42,9 @@ describe 'User edits files' do
...
@@ -39,6 +42,9 @@ 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
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
)
click_button
(
'Commit changes'
)
click_button
(
'Commit changes'
)
...
@@ -53,6 +59,9 @@ describe 'User edits files' do
...
@@ -53,6 +59,9 @@ describe 'User edits files' do
it
'commits an edited file to a new branch'
,
js:
true
do
it
'commits an edited file to a new branch'
,
js:
true
do
click_link
(
'.gitignore'
)
click_link
(
'.gitignore'
)
find
(
'.js-edit-blob'
).
click
find
(
'.js-edit-blob'
).
click
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
)
fill_in
(
:branch_name
,
with:
'new_branch_name'
,
visible:
true
)
fill_in
(
:branch_name
,
with:
'new_branch_name'
,
visible:
true
)
...
@@ -69,6 +78,9 @@ describe 'User edits files' do
...
@@ -69,6 +78,9 @@ describe 'User edits files' do
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
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'
)
...
@@ -93,6 +105,8 @@ describe 'User edits files' do
...
@@ -93,6 +105,8 @@ describe 'User edits files' do
expect
(
page
).
to
have_content
(
fork_message
)
expect
(
page
).
to
have_content
(
fork_message
)
wait_for_requests
execute_script
(
"ace.edit('editor').setValue('*.rbca')"
)
execute_script
(
"ace.edit('editor').setValue('*.rbca')"
)
expect
(
evaluate_script
(
'ace.edit("editor").getValue()'
)).
to
eq
(
'*.rbca'
)
expect
(
evaluate_script
(
'ace.edit("editor").getValue()'
)).
to
eq
(
'*.rbca'
)
...
@@ -106,6 +120,9 @@ describe 'User edits files' do
...
@@ -106,6 +120,9 @@ describe 'User edits files' do
expect
(
page
).
to
have_button
(
'Cancel'
)
expect
(
page
).
to
have_button
(
'Cancel'
)
click_link
(
'Fork'
)
click_link
(
'Fork'
)
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
)
click_button
(
'Commit changes'
)
click_button
(
'Commit changes'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment