From 8e70cf25641fc023e146ac1632f89203a55ce6f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 11 Oct 2016 17:25:57 +0200
Subject: [PATCH] Addresses Robert's feedback
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Rémy Coutable <remy@rymai.me>
---
doc/api/projects.md | 2 +-
doc/api/users.md | 2 +-
spec/requests/api/users_spec.rb | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 27436a052da..f96bf7f6d63 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -436,7 +436,7 @@ Parameters:
### Get project events
Get the events for the specified project.
-Sorted from newest to latest
+Sorted from newest to oldest
```
GET /projects/:id/events
diff --git a/doc/api/users.md b/doc/api/users.md
index 15202010b7b..a52b2d51d78 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -630,7 +630,7 @@ Will return `200 OK` on success, `404 User Not Found` is user cannot be found or
### Get user contribution events
-Get the contribution events for the specified user, sorted from newest to latest.
+Get the contribution events for the specified user, sorted from newest to oldest.
```
GET /users/:id/events
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index 56b2ec6271e..91e54af1209 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -898,7 +898,6 @@ describe API::API, api: true do
describe 'GET /user/:id/events' do
let(:user) { create(:user) }
- let(:lambda_user) { create(:user) }
let(:project) { create(:empty_project) }
let(:note) { create(:note_on_issue, note: 'What an awesome day!', project: project) }
@@ -909,7 +908,9 @@ describe API::API, api: true do
context "as a user than cannot see the event's project" do
it 'returns no events' do
- get api("/users/#{user.id}/events", lambda_user)
+ other_user = create(:user)
+
+ get api("/users/#{user.id}/events", other_user)
expect(response).to have_http_status(200)
expect(json_response).to be_empty
--
GitLab