From 95ad3086b0fd2f7ba6362191e36218df2a12b6f8 Mon Sep 17 00:00:00 2001
From: Alex Sherman <yul.golem@gmail.com>
Date: Wed, 29 Jan 2020 15:13:48 +0500
Subject: [PATCH] Change deprecated usage of strings in if blocks

---
 app/controllers/epp/base_controller.rb | 2 +-
 app/models/contact.rb                  | 4 ++--
 app/models/registrar.rb                | 4 ++--
 config/application.rb                  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/epp/base_controller.rb b/app/controllers/epp/base_controller.rb
index 6e3f39e46..fb48c285a 100644
--- a/app/controllers/epp/base_controller.rb
+++ b/app/controllers/epp/base_controller.rb
@@ -10,7 +10,7 @@ module Epp
     before_action :latin_only
     before_action :validate_against_schema
     before_action :validate_request
-    before_action :update_epp_session, if: 'signed_in?'
+    before_action :update_epp_session, if: -> { signed_in? }
 
     around_action :wrap_exceptions
 
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 558292dbd..31ef7241e 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -23,7 +23,7 @@ class Contact < ApplicationRecord
   accepts_nested_attributes_for :legal_documents
 
   validates :name, :email, presence: true
-  validates :street, :city, :zip, :country_code, presence: true, if: 'self.class.address_processing?'
+  validates :street, :city, :zip, :country_code, presence: true, if: -> { self.class.address_processing? }
 
   validates :phone, presence: true, e164: true, phone: true
 
@@ -37,7 +37,7 @@ class Contact < ApplicationRecord
   validates_associated :identifier
 
   validate :validate_html
-  validate :validate_country_code, if: 'self.class.address_processing?'
+  validate :validate_country_code, if: -> { self.class.address_processing? }
 
   after_initialize do
     self.status_notes = {} if status_notes.nil?
diff --git a/app/models/registrar.rb b/app/models/registrar.rb
index 8f41d62ca..3ebddf8ae 100644
--- a/app/models/registrar.rb
+++ b/app/models/registrar.rb
@@ -21,9 +21,9 @@ class Registrar < ApplicationRecord
   validates :reference_no, format: Billing::ReferenceNo::REGEXP
   validate :forbid_special_code
 
-  validates :vat_rate, presence: true, if: 'vat_liable_in_foreign_country? && vat_no.blank?'
+  validates :vat_rate, presence: true, if: -> { vat_liable_in_foreign_country? && vat_no.blank? }
   validates :vat_rate, absence: true, if: :vat_liable_locally?
-  validates :vat_rate, absence: true, if: 'vat_liable_in_foreign_country? && vat_no?'
+  validates :vat_rate, absence: true, if: -> { vat_liable_in_foreign_country? && vat_no? }
   validates :vat_rate, numericality: { greater_than_or_equal_to: 0, less_than: 100 },
             allow_nil: true
 
diff --git a/config/application.rb b/config/application.rb
index 57a3878a9..72b592a3b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -16,7 +16,7 @@ end
 
 module DomainNameRegistry
   class Application < Rails::Application
-    #config.load_defaults 5.1
+    config.load_defaults 5.1
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.