summaryrefslogtreecommitdiff
path: root/spec/requests/api
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-12-04 12:17:07 +0000
committerRémy Coutable <remy@rymai.me>2016-12-04 12:17:07 +0000
commitbd67459131e22273b502eb27d97709827ff42262 (patch)
treebe9f7895077833da2ee8f6446fc944d7addaecdd /spec/requests/api
parent0819d093e9b4aa9d5af1f6bdde147462f0c7cb48 (diff)
parent79d99d470faf5cf088a0b76ae6bb2ec280c4c4a8 (diff)
downloadgitlab-ce-bd67459131e22273b502eb27d97709827ff42262.tar.gz
Merge branch 'api-expose-commiter-details' into 'master'
API: Expose committer details for a commit Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22312 See merge request !7849
Diffstat (limited to 'spec/requests/api')
-rw-r--r--spec/requests/api/commits_spec.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
index 52491e1b9ed..e497bce6943 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -18,11 +18,14 @@ describe API::Commits, api: true do
before { project.team << [user2, :reporter] }
it "returns project commits" do
+ commit = project.repository.commit
get api("/projects/#{project.id}/repository/commits", user)
- expect(response).to have_http_status(200)
+ expect(response).to have_http_status(200)
expect(json_response).to be_an Array
- expect(json_response.first['id']).to eq(project.repository.commit.id)
+ expect(json_response.first['id']).to eq(commit.id)
+ expect(json_response.first['committer_name']).to eq(commit.committer_name)
+ expect(json_response.first['committer_email']).to eq(commit.committer_email)
end
end
@@ -134,6 +137,8 @@ describe API::Commits, api: true do
expect(response).to have_http_status(201)
expect(json_response['title']).to eq(message)
+ expect(json_response['committer_name']).to eq(user.name)
+ expect(json_response['committer_email']).to eq(user.email)
end
it 'returns a 400 bad request if file exists' do