From cbb3c0d5ef706c63102cd9e1e311d24aab162621 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Tue, 17 Sep 2019 18:03:49 +0300
Subject: [PATCH] Improve readability

---
 app/models/epp_session.rb          | 6 +++---
 config/application.yml.sample      | 2 +-
 test/integration/epp/login_test.rb | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/models/epp_session.rb b/app/models/epp_session.rb
index 657f76973..7567bf3d2 100644
--- a/app/models/epp_session.rb
+++ b/app/models/epp_session.rb
@@ -6,14 +6,14 @@ class EppSession < ApplicationRecord
   class_attribute :timeout
   self.timeout = (ENV['epp_session_timeout_seconds'] || 300).to_i.seconds
 
-  class_attribute :limit_per_registrar
-  self.limit_per_registrar = (ENV['epp_session_limit_per_registrar'] || 4).to_i
+  class_attribute :sessions_per_registrar
+  self.sessions_per_registrar = (ENV['epp_session_limit_per_registrar'] || 4).to_i
 
   alias_attribute :last_access, :updated_at
 
   def self.limit_reached?(registrar)
     count = where(user_id: registrar.api_users.ids).count
-    count >= limit_per_registrar
+    count >= sessions_per_registrar
   end
 
   def self.expired
diff --git a/config/application.yml.sample b/config/application.yml.sample
index 65e83b603..e979e772a 100644
--- a/config/application.yml.sample
+++ b/config/application.yml.sample
@@ -170,7 +170,7 @@ tara_rant_redirect_uri: 'redirect_uri'
 default_email_validation_type: 'regex'
 
 
-epp_session_limit_per_registrar: '4'
+epp_sessions_per_registrar: '4'
 
 # Since the keys for staging are absent from the repo, we need to supply them separate for testing.
 test:
diff --git a/test/integration/epp/login_test.rb b/test/integration/epp/login_test.rb
index fe62f9afe..d82ba8891 100644
--- a/test/integration/epp/login_test.rb
+++ b/test/integration/epp/login_test.rb
@@ -2,11 +2,11 @@ require 'test_helper'
 
 class EppLoginTest < EppTestCase
   setup do
-    @original_session_limit_per_registrar = EppSession.limit_per_registrar
+    @original_sessions_per_registrar_setting = EppSession.sessions_per_registrar
   end
 
   teardown do
-    EppSession.limit_per_registrar = @original_session_limit_per_registrar
+    EppSession.sessions_per_registrar = @original_sessions_per_registrar_setting
   end
 
   def test_logging_in_with_correct_credentials_creates_new_session
@@ -142,10 +142,10 @@ class EppLoginTest < EppTestCase
     assert_equal new_password, user.plain_text_password
   end
 
-  def test_user_cannot_login_when_session_limit_is_exceeded
+  def test_user_cannot_login_when_max_allowed_sessions_per_registrar_is_exceeded
     user = users(:api_bestnames)
     eliminate_effect_of_existing_epp_sessions
-    EppSession.limit_per_registrar = 1
+    EppSession.sessions_per_registrar = 1
     EppSession.create!(session_id: 'any', user: user)
 
     request_xml = <<-XML