From 49c5ed29dd1de02b4d980513ca485eca92c66c62 Mon Sep 17 00:00:00 2001 From: Alex Kotov Date: Sun, 2 Dec 2018 22:29:09 +0500 Subject: [PATCH] Fix error --- app/views/passports/index.html.erb | 12 +++++++----- spec/requests/passports/index_spec.rb | 8 ++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/views/passports/index.html.erb b/app/views/passports/index.html.erb index fe1ece8..d64d0d8 100644 --- a/app/views/passports/index.html.erb +++ b/app/views/passports/index.html.erb @@ -28,14 +28,16 @@ <% @passports.each do |passport| %> <%= passport.id %> - <%= truncate passport.surname, length: 15 %> - <%= truncate passport.given_name, length: 15 %> - <%= truncate passport.patronymic, length: 15 %> + <%= truncate passport.passport_map&.surname, length: 15 %> + <%= truncate passport.passport_map&.given_name, length: 15 %> + <%= truncate passport.passport_map&.patronymic, length: 15 %> - <%= localize passport.date_of_birth %> + <% if passport.passport_map %> + <%= localize passport.passport_map.date_of_birth %> + <% end %> - <%= truncate passport.place_of_birth, length: 15 %> + <%= truncate passport.passport_map&.place_of_birth, length: 15 %> <% if policy(passport).show? %> diff --git a/spec/requests/passports/index_spec.rb b/spec/requests/passports/index_spec.rb index d486a4d..96a54f1 100644 --- a/spec/requests/passports/index_spec.rb +++ b/spec/requests/passports/index_spec.rb @@ -4,6 +4,14 @@ require 'rails_helper' RSpec.describe 'GET /passports' do before do + create :empty_passport + create :passport_with_passport_map + create :passport_with_image + create :passport_with_passport_map_and_image + create :passport_with_almost_enough_confirmations + create :passport_with_enough_confirmations + create :confirmed_passport + get '/passports' end