BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
2c403dfd
Unverified
Commit
2c403dfd
authored
Jun 02, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove file api tests which depend on old satellite logic
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
54113319
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
32 deletions
+3
-32
files_spec.rb
spec/requests/api/files_spec.rb
+3
-32
No files found.
spec/requests/api/files_spec.rb
View file @
2c403dfd
...
...
@@ -63,9 +63,9 @@ describe API::API, api: true do
expect
(
response
.
status
).
to
eq
(
400
)
end
it
"should return a 400 if
satellite
fails to create file"
do
Gitlab
::
Satellite
::
NewFileAction
.
any_instance
.
stub
(
commit
!
:
false
,
it
"should return a 400 if
editor
fails to create file"
do
Repository
.
any_instance
.
stub
(
commit
_file
:
false
,
)
post
api
(
"/projects/
#{
project
.
id
}
/repository/files"
,
user
),
valid_params
...
...
@@ -97,35 +97,6 @@ describe API::API, api: true do
put
api
(
"/projects/
#{
project
.
id
}
/repository/files"
,
user
)
expect
(
response
.
status
).
to
eq
(
400
)
end
it
'should return a 400 if the checkout fails'
do
Gitlab
::
Satellite
::
EditFileAction
.
any_instance
.
stub
(
:commit!
)
.
and_raise
(
Gitlab
::
Satellite
::
CheckoutFailed
)
put
api
(
"/projects/
#{
project
.
id
}
/repository/files"
,
user
),
valid_params
expect
(
response
.
status
).
to
eq
(
400
)
ref
=
valid_params
[
:branch_name
]
expect
(
response
.
body
).
to
match
(
"ref '
#{
ref
}
' could not be checked out"
)
end
it
'should return a 409 if the file was not modified'
do
Gitlab
::
Satellite
::
EditFileAction
.
any_instance
.
stub
(
:commit!
)
.
and_raise
(
Gitlab
::
Satellite
::
CommitFailed
)
put
api
(
"/projects/
#{
project
.
id
}
/repository/files"
,
user
),
valid_params
expect
(
response
.
status
).
to
eq
(
409
)
expect
(
response
.
body
).
to
match
(
"Maybe there was nothing to commit?"
)
end
it
'should return a 409 if the push fails'
do
Gitlab
::
Satellite
::
EditFileAction
.
any_instance
.
stub
(
:commit!
)
.
and_raise
(
Gitlab
::
Satellite
::
PushFailed
)
put
api
(
"/projects/
#{
project
.
id
}
/repository/files"
,
user
),
valid_params
expect
(
response
.
status
).
to
eq
(
409
)
expect
(
response
.
body
).
to
match
(
"Maybe the file was changed by another process?"
)
end
end
describe
"DELETE /projects/:id/repository/files"
do
...
...
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