Commit f222d81c authored by Robert Speicher's avatar Robert Speicher

Merge branch 'tc-fix-openid-sign-in-at-again' into 'master'

Spec fix: Add :redis keyword to some specs clear state of trackable attributes

Closes #32041

See merge request !11221
parents a6eaa51c b550de51
...@@ -41,7 +41,7 @@ feature 'Login', feature: true do ...@@ -41,7 +41,7 @@ feature 'Login', feature: true do
expect(page).to have_content('Your account has been blocked.') expect(page).to have_content('Your account has been blocked.')
end end
it 'does not update Devise trackable attributes' do it 'does not update Devise trackable attributes', :redis do
user = create(:user, :blocked) user = create(:user, :blocked)
expect { login_with(user) }.not_to change { user.reload.sign_in_count } expect { login_with(user) }.not_to change { user.reload.sign_in_count }
...@@ -55,7 +55,7 @@ feature 'Login', feature: true do ...@@ -55,7 +55,7 @@ feature 'Login', feature: true do
expect(page).to have_content('Invalid Login or password.') expect(page).to have_content('Invalid Login or password.')
end end
it 'does not update Devise trackable attributes' do it 'does not update Devise trackable attributes', :redis do
expect { login_with(User.ghost) }.not_to change { User.ghost.reload.sign_in_count } expect { login_with(User.ghost) }.not_to change { User.ghost.reload.sign_in_count }
end end
end end
......
...@@ -68,7 +68,7 @@ feature 'Projects > Members > Sorting', feature: true do ...@@ -68,7 +68,7 @@ feature 'Projects > Members > Sorting', feature: true do
expect(page).to have_css('.member-sort-dropdown .dropdown-toggle-text', text: 'Name, descending') expect(page).to have_css('.member-sort-dropdown .dropdown-toggle-text', text: 'Name, descending')
end end
scenario 'sorts by recent sign in' do scenario 'sorts by recent sign in', :redis do
visit_members_list(sort: :recent_sign_in) visit_members_list(sort: :recent_sign_in)
expect(first_member).to include(master.name) expect(first_member).to include(master.name)
...@@ -76,7 +76,7 @@ feature 'Projects > Members > Sorting', feature: true do ...@@ -76,7 +76,7 @@ feature 'Projects > Members > Sorting', feature: true do
expect(page).to have_css('.member-sort-dropdown .dropdown-toggle-text', text: 'Recent sign in') expect(page).to have_css('.member-sort-dropdown .dropdown-toggle-text', text: 'Recent sign in')
end end
scenario 'sorts by oldest sign in' do scenario 'sorts by oldest sign in', :redis do
visit_members_list(sort: :oldest_sign_in) visit_members_list(sort: :oldest_sign_in)
expect(first_member).to include(developer.name) expect(first_member).to include(developer.name)
......
require 'spec_helper' require 'spec_helper'
describe 'OpenID Connect requests' do describe 'OpenID Connect requests' do
let(:user) { create(:user, current_sign_in_at: Time.now) } let(:user) { create :user }
let(:access_grant) { create :oauth_access_grant, application: application, resource_owner_id: user.id } let(:access_grant) { create :oauth_access_grant, application: application, resource_owner_id: user.id }
let(:access_token) { create :oauth_access_token, application: application, resource_owner_id: user.id } let(:access_token) { create :oauth_access_token, application: application, resource_owner_id: user.id }
...@@ -98,7 +98,7 @@ describe 'OpenID Connect requests' do ...@@ -98,7 +98,7 @@ describe 'OpenID Connect requests' do
expect(@payload['sub']).to eq hashed_subject expect(@payload['sub']).to eq hashed_subject
end end
it 'includes the time of the last authentication' do it 'includes the time of the last authentication', :redis do
expect(@payload['auth_time']).to eq user.current_sign_in_at.to_i expect(@payload['auth_time']).to eq user.current_sign_in_at.to_i
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment