summaryrefslogtreecommitdiff
path: root/spec/support/api
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/support/api
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/support/api')
-rw-r--r--spec/support/api/scopes/read_user_shared_examples.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/support/api/scopes/read_user_shared_examples.rb b/spec/support/api/scopes/read_user_shared_examples.rb
index cae6099a0c2..3bd589d64b9 100644
--- a/spec/support/api/scopes/read_user_shared_examples.rb
+++ b/spec/support/api/scopes/read_user_shared_examples.rb
@@ -32,7 +32,6 @@ shared_examples_for 'allows the "read_user" scope' do
end
context 'for doorkeeper (OAuth) tokens' do
- let!(:user) {create(:user)}
let!(:application) { Doorkeeper::Application.create!(name: "MyApp", redirect_uri: "https://app.com", owner: user) }
context 'when the requesting token has the "api" scope' do