diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /spec/controllers/oauth | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'spec/controllers/oauth')
-rw-r--r-- | spec/controllers/oauth/authorizations_controller_spec.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/spec/controllers/oauth/authorizations_controller_spec.rb b/spec/controllers/oauth/authorizations_controller_spec.rb index 0e25f6a96d7..98cc8d83e0c 100644 --- a/spec/controllers/oauth/authorizations_controller_spec.rb +++ b/spec/controllers/oauth/authorizations_controller_spec.rb @@ -3,8 +3,7 @@ require 'spec_helper' RSpec.describe Oauth::AuthorizationsController do - let(:user) { create(:user, confirmed_at: confirmed_at) } - let(:confirmed_at) { 1.hour.ago } + let(:user) { create(:user) } let!(:application) { create(:oauth_application, scopes: 'api read_user', redirect_uri: 'http://example.com') } let(:params) do { @@ -40,7 +39,7 @@ RSpec.describe Oauth::AuthorizationsController do end context 'when the user is unconfirmed' do - let(:confirmed_at) { nil } + let(:user) { create(:user, :unconfirmed) } it 'returns 200 and renders error view' do subject @@ -73,8 +72,6 @@ RSpec.describe Oauth::AuthorizationsController do include_examples "Implicit grant can't be used in confidential application" context 'when the user is confirmed' do - let(:confirmed_at) { 1.hour.ago } - context 'when there is already an access token for the application with a matching scope' do before do scopes = Doorkeeper::OAuth::Scopes.from_string('api') |