Skip to content

Commit

Permalink
Adding tests for missing merge request api calls.
Browse files Browse the repository at this point in the history
  • Loading branch information
TJ Biddle committed Jul 30, 2013
1 parent af42bcb commit 6f4a170
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 0 deletions.
1 change: 1 addition & 0 deletions spec/fixtures/comment_merge_request.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"note":"Cool Merge Request!","author":{"id":1,"username":"jsmith","email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-07-11T01:32:18Z"}}
1 change: 1 addition & 0 deletions spec/fixtures/create_merge_request.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":2,"target_branch":"master","source_branch":"api","project_id":3,"title":"New feature","closed":false,"merged":false,"author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-10-19T05:56:05Z"},"assignee":{"id":2,"email":"jack@example.com","name":"Jack Smith","blocked":false,"created_at":"2012-10-19T05:56:14Z"}}
1 change: 1 addition & 0 deletions spec/fixtures/update_merge_request.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":1,"target_branch":"master","source_branch":"api","project_id":3,"title":"A different new feature","closed":false,"merged":false,"author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-10-19T05:56:05Z"},"assignee":{"id":2,"email":"jack@example.com","name":"Jack Smith","blocked":false,"created_at":"2012-10-19T05:56:14Z"}}
49 changes: 49 additions & 0 deletions spec/gitlab/client/merge_requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,53 @@
@merge_request.assignee.name.should == "Jack Smith"
end
end

describe ".create_merge_request" do
before do
stub_post("/projects/3/merge_requests", "create_merge_request")
@merge_request = Gitlab.create_merge_request(3,
:source_branch => 'api',
:target_branch => 'master',
:title => 'New feature'
)
end

it "should return information about a merge request" do
@merge_request.project_id.should == 3
@merge_request.assignee.name.should == "Jack Smith"
@merge_request.title.should == 'New feature'
end
end

describe ".update_merge_request" do
before do
stub_put("/projects/3/merge_request/2", "update_merge_request")
@merge_request = Gitlab.update_merge_request(3, 2,
:assignee_id => '1',
:target_branch => 'master',
:title => 'A different new feature'
)
end

it "should return information about a merge request" do
@merge_request.project_id.should == 3
@merge_request.assignee.name.should == "Jack Smith"
@merge_request.title.should == 'A different new feature'
end
end

describe ".comment_merge_request" do
before do
stub_post("/projects/3/merge_request/2/comments", "comment_merge_request")
@merge_request = Gitlab.comment_merge_request(3, 2,
:note => 'Cool Merge Request!'
)
end

it "should return information about a merge request" do
@merge_request.note.should == 'Cool Merge Request!'
@merge_request.author.id == 1
end
end

end

0 comments on commit 6f4a170

Please sign in to comment.