diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-27 11:16:50 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-27 11:16:50 +0300 |
| commit | 10ee137e9c13271d49d7046723b1e473d62a578f (patch) | |
| tree | 6067fc4be800061ef5d10e4e1ddf02c401d7ac69 /spec/requests | |
| parent | 242291850d7513731355c42e67c2f8c3cc727451 (diff) | |
| download | gitlab-ce-10ee137e9c13271d49d7046723b1e473d62a578f.tar.gz | |
Expose timeout and same_ref compare fields
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec/requests')
| -rw-r--r-- | spec/requests/api/repositories_spec.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/requests/api/repositories_spec.rb b/spec/requests/api/repositories_spec.rb index 690a70b0b16..eaf217f0af4 100644 --- a/spec/requests/api/repositories_spec.rb +++ b/spec/requests/api/repositories_spec.rb @@ -118,18 +118,21 @@ describe API::API, api: true 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 + json_response['diffs'].size.should == 1 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 + json_response['diffs'].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 + json_response['diffs'].size.should == 9 end end end |