diff options
author | Robert Speicher <robert@gitlab.com> | 2017-05-10 10:17:50 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-05-10 10:17:50 +0300 |
commit | f222d81c47de562ecd0b131f0fe71af17462d74e (patch) | |
tree | 28d846b8b93bde98892eabd1d17fe99dce97b814 /spec | |
parent | a6eaa51caed33a1f3a6d7e71769c6ae9161f35bb (diff) | |
parent | b550de51b9c84ce8500eb104f57e60746727e7c2 (diff) |
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
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/login_spec.rb | 4 | ||||
-rw-r--r-- | spec/features/projects/members/sorting_spec.rb | 4 | ||||
-rw-r--r-- | spec/requests/openid_connect_spec.rb | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/spec/features/login_spec.rb b/spec/features/login_spec.rb index 11d417c253d..c82e8c03343 100644 --- a/spec/features/login_spec.rb +++ b/spec/features/login_spec.rb @@ -41,7 +41,7 @@ feature 'Login', feature: true do expect(page).to have_content('Your account has been blocked.') end - it 'does not update Devise trackable attributes' do + it 'does not update Devise trackable attributes', :redis do user = create(:user, :blocked) expect { login_with(user) }.not_to change { user.reload.sign_in_count } @@ -55,7 +55,7 @@ feature 'Login', feature: true do expect(page).to have_content('Invalid Login or password.') 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 } end end diff --git a/spec/features/projects/members/sorting_spec.rb b/spec/features/projects/members/sorting_spec.rb index c7a32a65e49..b7ae5f0b925 100644 --- a/spec/features/projects/members/sorting_spec.rb +++ b/spec/features/projects/members/sorting_spec.rb @@ -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') end - scenario 'sorts by recent sign in' do + scenario 'sorts by recent sign in', :redis do visit_members_list(sort: :recent_sign_in) expect(first_member).to include(master.name) @@ -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') end - scenario 'sorts by oldest sign in' do + scenario 'sorts by oldest sign in', :redis do visit_members_list(sort: :oldest_sign_in) expect(first_member).to include(developer.name) diff --git a/spec/requests/openid_connect_spec.rb b/spec/requests/openid_connect_spec.rb index 132c983fb0d..fbb69bc0920 100644 --- a/spec/requests/openid_connect_spec.rb +++ b/spec/requests/openid_connect_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' 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_token) { create :oauth_access_token, application: application, resource_owner_id: user.id } @@ -98,7 +98,7 @@ describe 'OpenID Connect requests' do expect(@payload['sub']).to eq hashed_subject 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 end |