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

Skip to content

Update merge_request endpoints to new merge_requests endpoints #256

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
asedge merged 1 commit into from
Feb 22, 2017
Merged

Update merge_request endpoints to new merge_requests endpoints #256

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
12 changes: 6 additions & 6 deletions lib/gitlab/client/merge_requests.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def merge_requests(project, options={})
# @param [Integer] id The ID of a merge request.
# @return <Gitlab::ObjectifiedHash]
def merge_request(project, id)
get("/projects/#{url_encode project}/merge_request/#{id}")
get("/projects/#{url_encode project}/merge_requests/#{id}")
end

# Creates a merge request.
Expand Down Expand Up @@ -65,7 +65,7 @@ def create_merge_request(project, title, options={})
# @option options [String] :state_event New state (close|reopen|merge).
# @return [Gitlab::ObjectifiedHash] Information about updated merge request.
def update_merge_request(project, id, options={})
put("/projects/#{url_encode project}/merge_request/#{id}", body: options)
put("/projects/#{url_encode project}/merge_requests/#{id}", body: options)
end

# Accepts a merge request.
Expand All @@ -79,7 +79,7 @@ def update_merge_request(project, id, options={})
# @option options [String] :merge_commit_message Custom merge commit message
# @return [Gitlab::ObjectifiedHash] Information about updated merge request.
def accept_merge_request(project, id, options={})
put("/projects/#{url_encode project}/merge_request/#{id}/merge", body: options)
put("/projects/#{url_encode project}/merge_requests/#{id}/merge", body: options)
end

# Adds a comment to a merge request.
Expand Down Expand Up @@ -124,7 +124,7 @@ def edit_merge_request_comment(project, id, note_id , note)
def delete_merge_request_comment(project, id, note_id)
delete("/projects/#{url_encode project}/merge_requests/#{id}/notes/#{note_id}")
end

# Gets the comments on a merge request.
#
# @example
Expand All @@ -150,7 +150,7 @@ def merge_request_comments(project, id, options={})
# @param [Integer] id The ID of a merge request.
# @return [Gitlab::ObjectifiedHash] The merge request's changes.
def merge_request_changes(project, id)
get("/projects/#{url_encode project}/merge_request/#{id}/changes")
get("/projects/#{url_encode project}/merge_requests/#{id}/changes")
end

# Gets the commits of a merge request.
Expand All @@ -162,7 +162,7 @@ def merge_request_changes(project, id)
# @param [Integer] id The ID of a merge request.
# @return [Array<Gitlab::ObjectifiedHash>] The merge request's commits.
def merge_request_commits(project, id)
get("/projects/#{url_encode project}/merge_request/#{id}/commits")
get("/projects/#{url_encode project}/merge_requests/#{id}/commits")
end
end
end
20 changes: 10 additions & 10 deletions spec/gitlab/client/merge_requests_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@

describe ".merge_request" do
before do
stub_get("/projects/3/merge_request/1", "merge_request")
stub_get("/projects/3/merge_requests/1", "merge_request")
@merge_request = Gitlab.merge_request(3, 1)
end

it "should get the correct resource" do
expect(a_get("/projects/3/merge_request/1")).to have_been_made
expect(a_get("/projects/3/merge_requests/1")).to have_been_made
end

it "should return information about a merge request" do
Expand All @@ -50,7 +50,7 @@

describe ".update_merge_request" do
before do
stub_put("/projects/3/merge_request/2", "merge_request").
stub_put("/projects/3/merge_requests/2", "merge_request").
with(body: {
assignee_id: '1',
target_branch: 'master',
Expand All @@ -64,7 +64,7 @@
end

it "should get the correct resource" do
expect(a_put("/projects/3/merge_request/2").
expect(a_put("/projects/3/merge_requests/2").
with(body: {
assignee_id: '1',
target_branch: 'master',
Expand All @@ -80,13 +80,13 @@

describe ".accept_merge_request" do
before do
stub_put("/projects/5/merge_request/42/merge", "merge_request").
stub_put("/projects/5/merge_requests/42/merge", "merge_request").
with(body: { merge_commit_message: 'Nice!' })
@merge_request = Gitlab.accept_merge_request(5, 42, merge_commit_message: 'Nice!')
end

it "should get the correct resource" do
expect(a_put("/projects/5/merge_request/42/merge").
expect(a_put("/projects/5/merge_requests/42/merge").
with(body: { merge_commit_message: 'Nice!' })).to have_been_made
end

Expand Down Expand Up @@ -134,12 +134,12 @@

describe ".merge_request_changes" do
before do
stub_get("/projects/3/merge_request/2/changes", "merge_request_changes")
stub_get("/projects/3/merge_requests/2/changes", "merge_request_changes")
@mr_changes = Gitlab.merge_request_changes(3, 2)
end

it "should get the correct resource" do
expect(a_get("/projects/3/merge_request/2/changes")).to have_been_made
expect(a_get("/projects/3/merge_requests/2/changes")).to have_been_made
end

it "should return the merge request changes" do
Expand All @@ -154,12 +154,12 @@

describe ".merge_request_commits" do
before do
stub_get("/projects/3/merge_request/2/commits", "merge_request_commits")
stub_get("/projects/3/merge_requests/2/commits", "merge_request_commits")
@mr_commits = Gitlab.merge_request_commits(3, 2)
end

it "should get the correct resource" do
expect(a_get("/projects/3/merge_request/2/commits")).to have_been_made
expect(a_get("/projects/3/merge_requests/2/commits")).to have_been_made
end

it "should return the merge request commits" do
Expand Down