summaryrefslogtreecommitdiff
path: root/spec/requests
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-04-12 11:23:12 +0000
committerRémy Coutable <remy@rymai.me>2016-04-12 11:23:12 +0000
commit734df1bb504aedec6a5668567de808b549a84749 (patch)
treef49589fdf85ace7b53cbb0c519b418ba1a99f591 /spec/requests
parent25998f57a8eae4e8b9a6e938383dfaef9532b27b (diff)
parent9d03e8fd5c564b20f3a1ef18583aa4c7c2b27cfc (diff)
downloadgitlab-ce-734df1bb504aedec6a5668567de808b549a84749.tar.gz
Merge branch 'api-fix-milestone-iid-filter' into 'master'
API: Add iid filter to milestones This was documented in the API docs but it was never working because the iid filter was never applied to the milestones. The tests were working by accident because the were checking the first element, which was by accident the request element. * Closes https://github.com/gitlabhq/gitlabhq/issues/10122 See merge request !3588
Diffstat (limited to 'spec/requests')
-rw-r--r--spec/requests/api/milestones_spec.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/spec/requests/api/milestones_spec.rb b/spec/requests/api/milestones_spec.rb
index d97bf6d38ff..344f0fe0b7f 100644
--- a/spec/requests/api/milestones_spec.rb
+++ b/spec/requests/api/milestones_spec.rb
@@ -50,10 +50,12 @@ describe API::API, api: true do
end
it 'should return a project milestone by iid' do
- get api("/projects/#{project.id}/milestones?iid=#{milestone.iid}", user)
+ get api("/projects/#{project.id}/milestones?iid=#{closed_milestone.iid}", user)
+
expect(response.status).to eq 200
- expect(json_response.first['title']).to eq milestone.title
- expect(json_response.first['id']).to eq milestone.id
+ expect(json_response.size).to eq(1)
+ expect(json_response.first['title']).to eq closed_milestone.title
+ expect(json_response.first['id']).to eq closed_milestone.id
end
it 'should return 401 error if user not authenticated' do