Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-26 19:05:55 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-26 19:05:55 +0400
commit242291850d7513731355c42e67c2f8c3cc727451 (patch)
tree13518c26afe3e8f0a35e0b57b88054c3e94bc502
parentf441436e53377f207657ac0e0e518e5ee2b33a6c (diff)
Add some tests to compare api
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--spec/requests/api/repositories_spec.rb20
1 files changed, 20 insertions, 0 deletions
diff --git a/spec/requests/api/repositories_spec.rb b/spec/requests/api/repositories_spec.rb
index 5a5222ed3c5..690a70b0b16 100644
--- a/spec/requests/api/repositories_spec.rb
+++ b/spec/requests/api/repositories_spec.rb
@@ -112,4 +112,24 @@ describe API::API, api: true do
response.status.should == 404
end
end
+
+ describe 'GET /GET /projects/:id/repository/compare' do
+ it "should compare 2 branches" do
+ get api("/projects/#{project.id}/repository/compare", user), from: 'master', to: 'simple_merge_request'
+ response.status.should == 200
+ json_response['commits'].size.should == 3
+ end
+
+ it "should compare 2 commits" do
+ get api("/projects/#{project.id}/repository/compare", user), from: 'b1e6a9dbf1c85', to: '1e689bfba395'
+ response.status.should == 200
+ json_response['commits'].size.should == 0
+ end
+
+ it "should compare 2 commits" do
+ get api("/projects/#{project.id}/repository/compare", user), from: '1e689bfba395', to: 'b1e6a9dbf1c85'
+ response.status.should == 200
+ json_response['commits'].size.should == 4
+ end
+ end
end