diff options
author | Rémy Coutable <remy@rymai.me> | 2017-02-20 17:06:46 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-02-20 17:06:46 +0000 |
commit | 6f5bf9fcbb1f501c44b689d24e6276271070659d (patch) | |
tree | ddb5f9c301ed30f5db5891d3a931eba97fe039a1 /spec/requests/api/users_spec.rb | |
parent | 5f0e4619dc556a6d009856bff94c2a6c91fbabe9 (diff) | |
parent | 993c3d14d5ff5aa6c43eaeb79c55dceddca8f5da (diff) | |
download | gitlab-ce-6f5bf9fcbb1f501c44b689d24e6276271070659d.tar.gz |
Merge branch 'remove-paginated-ressource' into 'master'
Remove shared example for pagination
See merge request !9377
Diffstat (limited to 'spec/requests/api/users_spec.rb')
-rw-r--r-- | spec/requests/api/users_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb index 9484d82a11b..603da9f49fc 100644 --- a/spec/requests/api/users_spec.rb +++ b/spec/requests/api/users_spec.rb @@ -1093,14 +1093,14 @@ describe API::Users, api: true do end context "as a user than can see the event's project" do - it_behaves_like 'a paginated resources' do - let(:request) { get api("/users/#{user.id}/events", user) } - end - context 'joined event' do it 'returns the "joined" event' do get api("/users/#{user.id}/events", user) + expect(response).to have_http_status(200) + expect(response).to include_pagination_headers + expect(json_response).to be_an Array + comment_event = json_response.find { |e| e['action_name'] == 'commented on' } expect(comment_event['project_id'].to_i).to eq(project.id) |