diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 12:09:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 12:09:22 +0000 |
commit | 286fe61013674fe2d245ffc8d2233baf09923e70 (patch) | |
tree | 2037291f5863105e54e75be056b49f7d62007cae /spec/views | |
parent | 4cb5e5011abfe8d50ac3a7ebd0018c563c6d7af4 (diff) | |
download | gitlab-ce-286fe61013674fe2d245ffc8d2233baf09923e70.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/views')
-rw-r--r-- | spec/views/admin/sessions/new.html.haml_spec.rb | 2 | ||||
-rw-r--r-- | spec/views/admin/sessions/two_factor.html.haml_spec.rb | 41 |
2 files changed, 42 insertions, 1 deletions
diff --git a/spec/views/admin/sessions/new.html.haml_spec.rb b/spec/views/admin/sessions/new.html.haml_spec.rb index b3208296c80..05601e5471e 100644 --- a/spec/views/admin/sessions/new.html.haml_spec.rb +++ b/spec/views/admin/sessions/new.html.haml_spec.rb @@ -15,7 +15,7 @@ describe 'admin/sessions/new.html.haml' do render expect(rendered).to have_css('#login-pane.active') - expect(rendered).to have_selector('input[name="password"]') + expect(rendered).to have_selector('input[name="user[password]"]') end it 'warns authentication not possible if password not set' do diff --git a/spec/views/admin/sessions/two_factor.html.haml_spec.rb b/spec/views/admin/sessions/two_factor.html.haml_spec.rb new file mode 100644 index 00000000000..2c061c7707b --- /dev/null +++ b/spec/views/admin/sessions/two_factor.html.haml_spec.rb @@ -0,0 +1,41 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe 'admin/sessions/two_factor.html.haml' do + before do + allow(view).to receive(:current_user).and_return(user) + end + + context 'user has no two factor auth' do + let(:user) { create(:admin) } + + it 'shows tab' do + render + + expect(rendered).to have_no_field('user[otp_attempt]') + expect(rendered).to have_no_field('user[device_response]') + end + end + + context 'user has otp active' do + let(:user) { create(:admin, :two_factor) } + + it 'shows enter otp form' do + render + + expect(rendered).to have_css('#login-pane.active') + expect(rendered).to have_field('user[otp_attempt]') + end + end + + context 'user has u2f active' do + let(:user) { create(:admin, :two_factor_via_u2f) } + + it 'shows enter u2f form' do + render + + expect(rendered).to have_css('#js-login-2fa-device.btn') + end + end +end |