summaryrefslogtreecommitdiff
path: root/spec/requests
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2017-06-21 09:22:39 +0000
committerTimothy Andrew <mail@timothyandrew.net>2017-06-28 07:17:13 +0000
commit1b8223dd51345f6075172a92dab610f9dee89d84 (patch)
tree426b9b5e599e074724941baf1ce3fbade6e3b4e8 /spec/requests
parent8b399b185cf72f396be8d6b7caae37f2a3aa4279 (diff)
downloadgitlab-ce-1b8223dd51345f6075172a92dab610f9dee89d84.tar.gz
Fix remaining spec failures for !12300.
1. Get the spec for `lib/gitlab/auth.rb` passing. - Make the `request` argument to `AccessTokenValidationService` optional - `auth.rb` doesn't need to pass in a request. - Pass in scopes in the format `[{ name: 'api' }]` rather than `['api']`, which is what `AccessTokenValidationService` now expects. 2. Get the spec for `API::V3::Users` passing 2. Get the spec for `AccessTokenValidationService` passing
Diffstat (limited to 'spec/requests')
-rw-r--r--spec/requests/api/v3/users_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/v3/users_spec.rb b/spec/requests/api/v3/users_spec.rb
index b2c5003c97a..de7499a4e43 100644
--- a/spec/requests/api/v3/users_spec.rb
+++ b/spec/requests/api/v3/users_spec.rb
@@ -300,7 +300,7 @@ describe API::V3::Users do
end
it 'returns a 404 error if not found' do
- get v3_api('/users/42/events', user)
+ get v3_api('/users/420/events', user)
expect(response).to have_http_status(404)
expect(json_response['message']).to eq('404 User Not Found')