diff --git a/app/controllers/admin/api_users_controller.rb b/app/controllers/admin/api_users_controller.rb index 5021fe15a..2b421cbad 100644 --- a/app/controllers/admin/api_users_controller.rb +++ b/app/controllers/admin/api_users_controller.rb @@ -50,7 +50,7 @@ module Admin def set_test_date_to_api_user user_api = User.find(params[:user_api_id]) - uri = URI.parse(ENV['registry_demo_registrar_api_user_url'] + "?username=#{user_api.username}&identity_code=#{user_api.identity_code}") + uri = URI.parse((ENV['registry_demo_registrar_api_user_url'] || 'testapi.test') + "?username=#{user_api.username}&identity_code=#{user_api.identity_code}") response = base_get_request(uri: uri, port: ENV['registry_demo_registrar_port']) diff --git a/app/controllers/admin/registrars_controller.rb b/app/controllers/admin/registrars_controller.rb index 08dbbef2b..1824575f1 100644 --- a/app/controllers/admin/registrars_controller.rb +++ b/app/controllers/admin/registrars_controller.rb @@ -60,7 +60,7 @@ module Admin def set_test_date registrar = Registrar.find(params[:registrar_id]) - uri = URI.parse(ENV['registry_demo_registrar_results_url'] + "?registrar_name=#{registrar.name}") + uri = URI.parse((ENV['registry_demo_registrar_results_url'] || 'testapi.test') + "?registrar_name=#{registrar.name}") response = base_get_request(uri: uri, port: ENV['registry_demo_registrar_port']) diff --git a/test/integration/admin_area/api_users_test.rb b/test/integration/admin_area/api_users_test.rb index 2fbdba3c1..f0ae5620a 100644 --- a/test/integration/admin_area/api_users_test.rb +++ b/test/integration/admin_area/api_users_test.rb @@ -1,38 +1,37 @@ require 'test_helper' class AdminAreaRegistrarsIntegrationTest < ActionDispatch::IntegrationTest - include Devise::Test::IntegrationHelpers - - setup do - @api_user = users(:api_bestnames) - sign_in users(:admin) - end - - def test_set_test_date_to_api_user - date = Time.zone.now - 10.minutes - - api_user = @api_user.dup - api_user.accreditation_date = date - api_user.accreditation_expire_date = api_user.accreditation_date + 1.year - api_user.save - - assert_nil @api_user.accreditation_date - assert_equal api_user.accreditation_date, date - - # api_v1_accreditation_center_show_api_user_url - stub_request(:get, "http://registry.test:3000/api/v1/accreditation_center/show_api_user?identity_code=#{@api_user.identity_code}&username=#{@api_user.username}"). - with( - headers: { - 'Accept'=>'*/*', - 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', - 'User-Agent'=>'Ruby' - }).to_return(status: 200, body: { code: 200, user_api: api_user }.to_json, headers: {}) + include Devise::Test::IntegrationHelpers - - post set_test_date_to_api_user_admin_registrars_path, params: { user_api_id: @api_user.id }, headers: { "HTTP_REFERER" => root_path } - @api_user.reload - - assert_equal @api_user.accreditation_date.to_date, api_user.accreditation_date.to_date - assert_equal @api_user.accreditation_expire_date.to_date, api_user.accreditation_expire_date.to_date - end + setup do + @api_user = users(:api_bestnames) + sign_in users(:admin) end + + def test_set_test_date_to_api_user + # ENV['registry_demo_registrar_api_user_url'] = 'http://testapi.test' + + date = Time.zone.now - 10.minutes + + api_user = @api_user.dup + api_user.accreditation_date = date + api_user.accreditation_expire_date = api_user.accreditation_date + 1.year + api_user.save + + assert_nil @api_user.accreditation_date + assert_equal api_user.accreditation_date, date + + # api_v1_accreditation_center_show_api_user_url + stub_request(:get, "http://registry.test:3000/api/v1/accreditation_center/show_api_user?identity_code=#{@api_user.identity_code}&username=#{@api_user.username}"). + with( + headers: { + 'Accept'=>'*/*', + 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', + 'User-Agent'=>'Ruby' + }).to_return(status: 200, body: { code: 200, user_api: api_user }.to_json, headers: {}) + post set_test_date_to_api_user_admin_registrars_path, params: { user_api_id: @api_user.id }, headers: { "HTTP_REFERER" => root_path } + @api_user.reload + assert_equal @api_user.accreditation_date.to_date, api_user.accreditation_date.to_date + assert_equal @api_user.accreditation_expire_date.to_date, api_user.accreditation_expire_date.to_date + end +end