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
Boxiang Sun
gitlab-ce
Commits
0e2cecfd
Commit
0e2cecfd
authored
Aug 16, 2016
by
Timothy Andrew
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix API::BranchesSpec.
- Previously created a protected branch manually, without using a factory.
parent
dd3b738d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
spec/requests/api/branches_spec.rb
spec/requests/api/branches_spec.rb
+1
-1
No files found.
spec/requests/api/branches_spec.rb
View file @
0e2cecfd
...
@@ -243,7 +243,7 @@ describe API::API, api: true do
...
@@ -243,7 +243,7 @@ describe API::API, api: true do
end
end
it
"removes protected branch"
do
it
"removes protected branch"
do
project
.
protected_branches
.
create
(
name:
branch_name
)
create
(
:protected_branch
,
project:
project
,
name:
branch_name
)
delete
api
(
"/projects/
#{
project
.
id
}
/repository/branches/
#{
branch_name
}
"
,
user
)
delete
api
(
"/projects/
#{
project
.
id
}
/repository/branches/
#{
branch_name
}
"
,
user
)
expect
(
response
).
to
have_http_status
(
405
)
expect
(
response
).
to
have_http_status
(
405
)
expect
(
json_response
[
'message'
]).
to
eq
(
'Protected branch cant be removed'
)
expect
(
json_response
[
'message'
]).
to
eq
(
'Protected branch cant be removed'
)
...
...
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