diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-06 16:46:36 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-06 16:46:36 +0200 |
| commit | 3137a7fec37b7fb66ea464f4c5fdab964a73d390 (patch) | |
| tree | 042228550ffc5f729a5358208c97283acf950721 /spec/features/admin | |
| parent | 842f0a3401de8d358fce850df288d9822e523c6e (diff) | |
| parent | 13d4231eb9f577456b420ff5044c55584add9b39 (diff) | |
| download | gitlab-ce-3137a7fec37b7fb66ea464f4c5fdab964a73d390.tar.gz | |
Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2
Diffstat (limited to 'spec/features/admin')
| -rw-r--r-- | spec/features/admin/admin_users_spec.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb index 96621843b30..b72ad405479 100644 --- a/spec/features/admin/admin_users_spec.rb +++ b/spec/features/admin/admin_users_spec.rb @@ -19,7 +19,7 @@ describe "Admin::Users", feature: true do describe 'Two-factor Authentication filters' do it 'counts users who have enabled 2FA' do - create(:user, two_factor_enabled: true) + create(:user, :two_factor) visit admin_users_path @@ -29,7 +29,7 @@ describe "Admin::Users", feature: true do end it 'filters by users who have enabled 2FA' do - user = create(:user, two_factor_enabled: true) + user = create(:user, :two_factor) visit admin_users_path click_link '2FA Enabled' @@ -38,7 +38,7 @@ describe "Admin::Users", feature: true do end it 'counts users who have not enabled 2FA' do - create(:user, two_factor_enabled: false) + create(:user) visit admin_users_path @@ -48,7 +48,7 @@ describe "Admin::Users", feature: true do end it 'filters by users who have not enabled 2FA' do - user = create(:user, two_factor_enabled: false) + user = create(:user) visit admin_users_path click_link '2FA Disabled' @@ -173,7 +173,7 @@ describe "Admin::Users", feature: true do describe 'Two-factor Authentication status' do it 'shows when enabled' do - @user.update_attribute(:two_factor_enabled, true) + @user.update_attribute(:otp_required_for_login, true) visit admin_user_path(@user) |
