From 2643df8d2151e0fab408260b1272163d6b79a780 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Wed, 9 Nov 2016 19:12:51 +0200
Subject: [PATCH] Improve registrar sessions specs

registry-240
---
 .../registrar/sessions_controller.rb          |  6 ------
 app/views/registrar/sessions/login.haml       |  6 +++---
 app/views/registrar/sessions/login_mid.haml   |  6 +++---
 config/locales/en.yml                         |  1 -
 config/locales/registrar/sessions.en.yml      |  7 +++++++
 .../registrar/login/mobile_id_spec.rb         | 21 +++++++++++++++++++
 .../registrar/sessions_routing_spec.rb        |  9 ++++++++
 7 files changed, 43 insertions(+), 13 deletions(-)
 create mode 100644 config/locales/registrar/sessions.en.yml
 create mode 100644 spec/features/registrar/login/mobile_id_spec.rb
 create mode 100644 spec/routing/registrar/sessions_routing_spec.rb

diff --git a/app/controllers/registrar/sessions_controller.rb b/app/controllers/registrar/sessions_controller.rb
index ff97c4f2c..2d04c6fdd 100644
--- a/app/controllers/registrar/sessions_controller.rb
+++ b/app/controllers/registrar/sessions_controller.rb
@@ -101,12 +101,6 @@ class Registrar::SessionsController < Devise::SessionsController
     endpoint = "#{ENV['sk_digi_doc_service_endpoint']}"
     client = Digidoc::Client.new(endpoint)
 
-    if Rails.env.test? && phone == "123"
-      @user = ApiUser.find_by(identity_code: "14212128025")
-      sign_in(@user, event: :authentication)
-      return redirect_to registrar_root_url
-    end
-
     # country_codes = {'+372' => 'EST'}
     phone.gsub!('+372', '')
     response = client.authenticate(
diff --git a/app/views/registrar/sessions/login.haml b/app/views/registrar/sessions/login.haml
index 8aaf8a01b..75ec951af 100644
--- a/app/views/registrar/sessions/login.haml
+++ b/app/views/registrar/sessions/login.haml
@@ -8,13 +8,13 @@
       - error_class = f.object.errors.any? ? 'has-error' : ''
       %div{class: error_class}
         = f.text_field :tag, class: 'form-control', placeholder: t(:username), required: true
-        = f.password_field :password, class: 'form-control', 
+        = f.password_field :password, class: 'form-control',
           autocomplete: 'off', placeholder: t(:password), required: true
 
-      %button.btn.btn-lg.btn-primary.btn-block{:type => 'submit'}= t(:log_in)
+      %button.btn.btn-lg.btn-primary.btn-block{:type => 'submit'}= t('.login_btn')
 
     %hr
-    = link_to '/registrar/login/mid' do
+    = link_to '/registrar/login/mid', id: 'login-with-mobile-id-btn' do
       = image_tag 'mid.gif'
     = link_to '/registrar/id', method: :post do
       = image_tag 'id_card.gif'
diff --git a/app/views/registrar/sessions/login_mid.haml b/app/views/registrar/sessions/login_mid.haml
index 9a09a47ec..eeb18402d 100644
--- a/app/views/registrar/sessions/login_mid.haml
+++ b/app/views/registrar/sessions/login_mid.haml
@@ -2,11 +2,11 @@
   .form-signin.col-md-4.center-block.text-center
     %h2.form-signin-heading.text-center= t(:log_in_with_mid)
     %hr
-    = form_for @user, url: registrar_mid_path, auto_html5_validation: false, 
+    = form_for @user, url: registrar_mid_path, auto_html5_validation: false,
       html: {class: 'form-signin'} do |f|
-      = f.text_field :phone, class: 'form-control', 
+      = f.text_field :phone, class: 'form-control',
         placeholder: t(:phone_no), autocomplete: 'off', required: true
-      %button.btn.btn-lg.btn-primary.btn-block.js-login{:type => 'submit'}= t(:log_in)
+      %button.btn.btn-lg.btn-primary.btn-block.js-login{:type => 'submit'}= t('.login_btn')
 
   - if ['development', 'alpha'].include?(Rails.env)
     %div.text-center
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a5bf12885..cc211c4b3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -531,7 +531,6 @@ en:
   ident_update_error: 'Parameter value policy error. Update of ident data not allowed [ident]'
   invoices: 'Invoices'
   no_such_user: 'No such user'
-  log_in: 'Log in'
   phone_no: 'Phone number'
   log_in_with_mid: 'Log in with mobile-id'
   confirmation_sms_was_sent_to_your_phone_verification_code_is: 'Confirmation sms was sent to your phone. Verification code is %{code}.'
diff --git a/config/locales/registrar/sessions.en.yml b/config/locales/registrar/sessions.en.yml
new file mode 100644
index 000000000..25031e189
--- /dev/null
+++ b/config/locales/registrar/sessions.en.yml
@@ -0,0 +1,7 @@
+en:
+  registrar:
+    sessions:
+      login:
+        login_btn: Login
+      login_mid:
+        login_btn: Login
diff --git a/spec/features/registrar/login/mobile_id_spec.rb b/spec/features/registrar/login/mobile_id_spec.rb
new file mode 100644
index 000000000..9c1b42ee5
--- /dev/null
+++ b/spec/features/registrar/login/mobile_id_spec.rb
@@ -0,0 +1,21 @@
+require 'rails_helper'
+
+RSpec.feature 'Mobile ID login', db: true do
+  given!(:api_user) { Fabricate(:api_user, identity_code: 1234) }
+
+  background do
+    Setting.registrar_ip_whitelist_enabled = false
+    digidoc_client = instance_double(Digidoc::Client, authenticate: OpenStruct.new(user_id_code: 1234), session_code: 1234)
+    allow(Digidoc::Client).to receive(:new).and_return(digidoc_client)
+  end
+
+  scenario 'login with phone number' do
+    visit registrar_login_path
+    click_on 'login-with-mobile-id-btn'
+
+    fill_in 'user[phone]', with: '1234'
+    click_button 'Login'
+
+    expect(page).to have_text('Confirmation sms was sent to your phone. Verification code is')
+  end
+end
diff --git a/spec/routing/registrar/sessions_routing_spec.rb b/spec/routing/registrar/sessions_routing_spec.rb
new file mode 100644
index 000000000..24e075e58
--- /dev/null
+++ b/spec/routing/registrar/sessions_routing_spec.rb
@@ -0,0 +1,9 @@
+require 'rails_helper'
+
+RSpec.describe Registrar::SessionsController do
+  describe 'routing' do
+    it 'routes to #login' do
+      expect(get: '/registrar/login').to route_to('registrar/sessions#login')
+    end
+  end
+end