From 53695c36471da4d0e70d46252ce56f511c79ab8d Mon Sep 17 00:00:00 2001 From: Matt Farnsworth Date: Wed, 21 Oct 2015 16:08:21 +0300 Subject: [PATCH] config: EPP port. spec use config; depp/user use config not custom for test --- app/models/depp/user.rb | 2 +- spec/support/epp.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/depp/user.rb b/app/models/depp/user.rb index 44c25bbb1..51ce3f682 100644 --- a/app/models/depp/user.rb +++ b/app/models/depp/user.rb @@ -18,7 +18,7 @@ module Depp def server client_cert = File.read(ENV['cert_path']) client_key = File.read(ENV['key_path']) - port = Rails.env.test? ? 701 : ENV['epp_port'] + port = ENV['epp_port'] || '700' @server_cache ||= Epp::Server.new({ server: ENV['epp_hostname'], diff --git a/spec/support/epp.rb b/spec/support/epp.rb index b14eb79a7..a580ee01e 100644 --- a/spec/support/epp.rb +++ b/spec/support/epp.rb @@ -92,8 +92,10 @@ module Epp end def server + port = ENV['epp_port'] || 700 + hostname = ENV['epp_hostname'] || 'localhost' # tag and password not in use, add those at login xml - @server ||= Epp::Server.new({ server: 'localhost', port: 701, tag: '', password: '' }) + @server ||= Epp::Server.new({ server: hostname, port: port, tag: '', password: '' }) end def parse_response(raw)