Add latest changes from gitlab-org/gitlab@master

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