Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Protected branches missing methods #440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NARKOZ merged 1 commit into from
Nov 20, 2018
Merged

Protected branches missing methods #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions lib/gitlab/client/branches.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,30 @@ def delete_merged_branches(project)
delete("/projects/#{url_encode project}/repository/merged_branches")
end
alias repo_delete_merged_branches delete_merged_branches

# Gets a list of protected branches from a project.
#
# @example
# Gitlab.protected_branches(42)
#
# @param [Integer, String] project The ID or name of a project.
# @return [Array<Gitlab::ObjectifiedHash>]
def protected_branches(project)
get("/projects/#{url_encode project}/protected_branches")
end
alias repo_protected_branches protected_branches

# Gets a single protected branch or wildcard protected branch
#
# @example
# Gitlab.protected_branch(3, 'api')
#
# @param [Integer, String] project The ID or name of a project.
# @param [String] The name of the branch or wildcard
Copy link
Contributor

@connorshea connorshea Nov 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The param here doesn't have a name (unless I'm mistaken?)

Copy link
Owner

@NARKOZ NARKOZ Nov 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR is welcome

# @return [Gitlab::ObjectifiedHash]
def protected_branch(project, branch)
get("/projects/#{url_encode project}/protected_branches/#{url_encode branch}")
end
alias repo_protected_branch protected_branch
end
end
15 changes: 15 additions & 0 deletions spec/fixtures/protected_branch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"name": "master",
"push_access_levels": [
{
"access_level": 40,
"access_level_description": "Maintainers"
}
],
"merge_access_levels": [
{
"access_level": 40,
"access_level_description": "Maintainers"
}
]
}
17 changes: 17 additions & 0 deletions spec/fixtures/protected_branches.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[
{
"name": "master",
"push_access_levels": [
{
"access_level": 40,
"access_level_description": "Maintainers"
}
],
"merge_access_levels": [
{
"access_level": 40,
"access_level_description": "Maintainers"
}
]
}
]
36 changes: 36 additions & 0 deletions spec/gitlab/client/branches_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
it { is_expected.to respond_to :repo_create_branch }
it { is_expected.to respond_to :repo_delete_branch }
it { is_expected.to respond_to :repo_delete_merged_branches }
it { is_expected.to respond_to :repo_protected_branches }
it { is_expected.to respond_to :repo_protected_branch }

describe '.branches' do
before do
Expand Down Expand Up @@ -131,4 +133,38 @@
expect(a_delete('/projects/3/repository/merged_branches')).to have_been_made
end
end

describe '.protected_branches' do
before do
stub_get('/projects/3/protected_branches', 'protected_branches')
@branches = Gitlab.protected_branches(3)
end

it 'gets the correct resource' do
expect(a_get('/projects/3/protected_branches')).to have_been_made
end

it 'returns information about the protected_branches' do
expect(@branches).to be_a Gitlab::PaginatedResponse
expect(@branches.first.merge_access_levels).to be_a Array
expect(@branches.first.push_access_levels).to be_a Array
end
end

describe '.protected_branch' do
before do
stub_get('/projects/3/protected_branches/master', 'protected_branch')
@branch = Gitlab.protected_branch(3, 'master')
end

it 'gets the correct resource' do
expect(a_get('/projects/3/protected_branches/master')).to have_been_made
end

it 'returns correct information about the protected_branch' do
expect(@branch.name).to eq 'master'
expect(@branch.merge_access_levels).to be_a Array
expect(@branch.push_access_levels).to be_a Array
end
end
end