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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
1d5f07cb
Commit
1d5f07cb
authored
Sep 18, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix transient user_edits_files_spec failures
parent
64664b64
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
10 deletions
+6
-10
spec/features/projects/user_edits_files_spec.rb
spec/features/projects/user_edits_files_spec.rb
+6
-10
No files found.
spec/features/projects/user_edits_files_spec.rb
View file @
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
)
...
...
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