diff --git a/CHANGELOG.md b/CHANGELOG.md index ecefbb279..44b66ef4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +26.07.2018 +* Grape (1.0.3), mustermann (1.0.2), multi_json (1.13.1) gem updates [#912](https://github.com/internetee/registry/issues/912) +* Capybara (3.3.1), mini_mime (0.1.3), nokogiri (1.8), rack (1.6.0), xpath (3.1) gem updates [#980](https://github.com/internetee/registry/issues/908) +* Webmock (3.4.2), addressable (2.5.2), hashdiff (0.3.7), public_suffix (3.0.2) gem updates [#907](https://github.com/internetee/registry/issues/907) +* fixed typo in assertions filename [#920](https://github.com/internetee/registry/issues/920) +* regenerate structure.sql [#915](https://github.com/internetee/registry/issues/915) + 12.07.2018 * Implemented JavaScript testing framework to catch web UI problems [#900](https://github.com/internetee/registry/issues/900) diff --git a/app/controllers/api/v1/registrant/auth_controller.rb b/app/controllers/api/v1/registrant/auth_controller.rb new file mode 100644 index 000000000..929d5b5c9 --- /dev/null +++ b/app/controllers/api/v1/registrant/auth_controller.rb @@ -0,0 +1,54 @@ +require 'rails5_api_controller_backport' +require 'auth_token/auth_token_creator' + +module Api + module V1 + module Registrant + class AuthController < ActionController::API + before_action :check_ip_whitelist + + rescue_from(ActionController::ParameterMissing) do |parameter_missing_exception| + error = {} + error[parameter_missing_exception.param] = ['parameter is required'] + response = { errors: [error] } + render json: response, status: :unprocessable_entity + end + + def eid + user = RegistrantUser.find_or_create_by_api_data(eid_params) + token = create_token(user) + + if token + render json: token + else + render json: { errors: [{ base: ['Cannot create generate session token'] }] } + end + end + + private + + def eid_params + required_params = %i[ident first_name last_name] + required_params.each_with_object(params) do |key, obj| + obj.require(key) + end + + params.permit(required_params) + end + + def create_token(user) + token_creator = AuthTokenCreator.create_with_defaults(user) + hash = token_creator.token_in_hash + hash + end + + def check_ip_whitelist + allowed_ips = ENV['registrant_api_auth_allowed_ips'].to_s.split(',').map(&:strip) + return if allowed_ips.include?(request.ip) || Rails.env.development? + + render json: { errors: [{ base: ['Not authorized'] }] }, status: :unauthorized + end + end + end + end +end diff --git a/app/controllers/api/v1/registrant/base_controller.rb b/app/controllers/api/v1/registrant/base_controller.rb new file mode 100644 index 000000000..4df0d226c --- /dev/null +++ b/app/controllers/api/v1/registrant/base_controller.rb @@ -0,0 +1,38 @@ +require 'rails5_api_controller_backport' +require 'auth_token/auth_token_decryptor' + +module Api + module V1 + module Registrant + class BaseController < ActionController::API + before_action :authenticate + + rescue_from(ActionController::ParameterMissing) do |parameter_missing_exception| + error = {} + error[parameter_missing_exception.param] = ['parameter is required'] + response = { errors: [error] } + render json: response, status: :unprocessable_entity + end + + private + + def bearer_token + pattern = /^Bearer / + header = request.headers['Authorization'] + header.gsub(pattern, '') if header&.match(pattern) + end + + def authenticate + decryptor = AuthTokenDecryptor.create_with_defaults(bearer_token) + decryptor.decrypt_token + + if decryptor.valid? + sign_in decryptor.user + else + render json: { errors: [{base: ['Not authorized']}] }, status: :unauthorized + end + end + end + end + end +end diff --git a/app/controllers/api/v1/registrant/domains_controller.rb b/app/controllers/api/v1/registrant/domains_controller.rb new file mode 100644 index 000000000..27b7b6125 --- /dev/null +++ b/app/controllers/api/v1/registrant/domains_controller.rb @@ -0,0 +1,49 @@ +require 'rails5_api_controller_backport' + +module Api + module V1 + module Registrant + class DomainsController < BaseController + def index + limit = params[:limit] || 200 + offset = params[:offset] || 0 + + if limit.to_i > 200 || limit.to_i < 1 + render(json: { errors: [{ limit: ['parameter is out of range'] }] }, + status: :bad_request) && return + end + + if offset.to_i.negative? + render(json: { errors: [{ offset: ['parameter is out of range'] }] }, + status: :bad_request) && return + end + + @domains = associated_domains(current_user).limit(limit).offset(offset) + render json: @domains + end + + def show + domain_pool = associated_domains(current_user) + @domain = domain_pool.find_by(uuid: params[:uuid]) + + if @domain + render json: @domain + else + render json: { errors: [{ base: ['Domain not found'] }] }, status: :not_found + end + end + + private + + def associated_domains(user) + country_code, ident = user.registrant_ident.split('-') + + BusinessRegistryCache.fetch_associated_domains(ident, country_code) + rescue Soap::Arireg::NotAvailableError => error + Rails.logger.fatal("[EXCEPTION] #{error}") + user.domains + end + end + end + end +end diff --git a/app/models/concerns/domain_version_observer.rb b/app/models/concerns/domain_version_observer.rb deleted file mode 100644 index f1e732f21..000000000 --- a/app/models/concerns/domain_version_observer.rb +++ /dev/null @@ -1,3 +0,0 @@ -module DomainVersionObserver - extend ActiveSupport::Concern -end diff --git a/app/models/registrant_user.rb b/app/models/registrant_user.rb index 12cae0d82..889f2ca4c 100644 --- a/app/models/registrant_user.rb +++ b/app/models/registrant_user.rb @@ -30,34 +30,56 @@ class RegistrantUser < User return false if issuer_organization != ACCEPTED_ISSUER idc_data.force_encoding('UTF-8') + user_data = {} # handling here new and old mode if idc_data.starts_with?("/") - identity_code = idc_data.scan(/serialNumber=(\d+)/).flatten.first - country = idc_data.scan(/^\/C=(.{2})/).flatten.first - first_name = idc_data.scan(%r{/GN=(.+)/serialNumber}).flatten.first - last_name = idc_data.scan(%r{/SN=(.+)/GN}).flatten.first + user_data[:ident] = idc_data.scan(/serialNumber=(\d+)/).flatten.first + user_data[:country_code] = idc_data.scan(/^\/C=(.{2})/).flatten.first + user_data[:first_name] = idc_data.scan(%r{/GN=(.+)/serialNumber}).flatten.first + user_data[:last_name] = idc_data.scan(%r{/SN=(.+)/GN}).flatten.first else parse_str = "," + idc_data - identity_code = parse_str.scan(/,serialNumber=(\d+)/).flatten.first - country = parse_str.scan(/,C=(.{2})/).flatten.first - first_name = parse_str.scan(/,GN=([^,]+)/).flatten.first - last_name = parse_str.scan(/,SN=([^,]+)/).flatten.first + user_data[:ident] = parse_str.scan(/,serialNumber=(\d+)/).flatten.first + user_data[:country_code] = parse_str.scan(/,C=(.{2})/).flatten.first + user_data[:first_name] = parse_str.scan(/,GN=([^,]+)/).flatten.first + user_data[:last_name] = parse_str.scan(/,SN=([^,]+)/).flatten.first end - u = where(registrant_ident: "#{country}-#{identity_code}").first_or_create - u.username = "#{first_name} #{last_name}" - u.save + find_or_create_by_user_data(user_data) + end - u + def find_or_create_by_api_data(user_data = {}) + return false unless user_data[:ident] + return false unless user_data[:first_name] + return false unless user_data[:last_name] + + user_data.each_value { |v| v.upcase! if v.is_a?(String) } + user_data[:country_code] ||= 'EE' + + find_or_create_by_user_data(user_data) end def find_or_create_by_mid_data(response) - u = where(registrant_ident: "#{response.user_country}-#{response.user_id_code}").first_or_create - u.username = "#{response.user_givenname} #{response.user_surname}" - u.save + user_data = { first_name: response.user_givenname, last_name: response.user_surname, + ident: response.user_id_code, country_code: response.user_country } - u + find_or_create_by_user_data(user_data) + end + + private + + def find_or_create_by_user_data(user_data = {}) + return unless user_data[:first_name] + return unless user_data[:last_name] + return unless user_data[:ident] + return unless user_data[:country_code] + + user = find_or_create_by(registrant_ident: "#{user_data[:country_code]}-#{user_data[:ident]}") + user.username = "#{user_data[:first_name]} #{user_data[:last_name]}" + user.save + + user end end end diff --git a/app/views/registrant/registrars/index.haml b/app/views/registrant/registrars/index.haml deleted file mode 100644 index 03bd5a02a..000000000 --- a/app/views/registrant/registrars/index.haml +++ /dev/null @@ -1,21 +0,0 @@ -- content_for :actions do - = render 'shared/title', name: t(:registrars) - -.row - .col-md-12 - .table-responsive - %table.table.table-hover.table-bordered.table-condensed - %thead - %tr - %th{class: 'col-xs-6'} - = sort_link(@q, 'name') - %th{class: 'col-xs-6'} - = sort_link(@q, 'reg_no', Registrar.human_attribute_name(:reg_no)) - %tbody - - @registrars.each do |x| - %tr - %td= link_to(x, [:registrar, x]) - %td= x.reg_no -.row - .col-md-12 - = paginate @registrars diff --git a/config/application-example.yml b/config/application-example.yml index 7785aafb5..b9917e69e 100644 --- a/config/application-example.yml +++ b/config/application-example.yml @@ -96,6 +96,8 @@ arireg_host: 'http://demo-ariregxml.rik.ee:81/' sk_digi_doc_service_endpoint: 'https://tsp.demo.sk.ee' sk_digi_doc_service_name: 'Testimine' +# Registrant API +registrant_api_auth_allowed_ips: '127.0.0.1, 0.0.0.0' #ips, separated with commas # # MISC diff --git a/config/application.rb b/config/application.rb index 400e72124..1420d3cd3 100644 --- a/config/application.rb +++ b/config/application.rb @@ -36,7 +36,7 @@ module DomainNameRegistry config.i18n.default_locale = :en config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb') - config.autoload_paths += Dir[Rails.root.join('app', 'api', '*')] + # config.autoload_paths += Dir[Rails.root.join('app', 'api', '*')] # Autoload all model subdirs config.autoload_paths += Dir[Rails.root.join('app', 'models', '**/')] diff --git a/config/routes.rb b/config/routes.rb index 614471798..c3545706a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -18,6 +18,16 @@ Rails.application.routes.draw do mount Repp::API => '/' + namespace :api do + namespace :v1 do + namespace :registrant do + post 'auth/eid', to: 'auth#eid' + + resources :domains, only: [:index, :show], param: :uuid + end + end + end + # REGISTRAR ROUTES namespace :registrar do resource :dashboard diff --git a/lib/auth_token/auth_token_creator.rb b/lib/auth_token/auth_token_creator.rb new file mode 100644 index 000000000..9fff8e5cd --- /dev/null +++ b/lib/auth_token/auth_token_creator.rb @@ -0,0 +1,41 @@ +class AuthTokenCreator + DEFAULT_VALIDITY = 2.hours + + attr_reader :user + attr_reader :key + attr_reader :expires_at + + def self.create_with_defaults(user) + new(user, Rails.application.config.secret_key_base, Time.now + DEFAULT_VALIDITY) + end + + def initialize(user, key, expires_at) + @user = user + @key = key + @expires_at = expires_at.utc.strftime('%F %T %Z') + end + + def hashable + { + user_ident: user.registrant_ident, + user_username: user.username, + expires_at: expires_at, + }.to_json + end + + def encrypted_token + encryptor = OpenSSL::Cipher::AES.new(256, :CBC) + encryptor.encrypt + encryptor.key = key + encrypted_bytes = encryptor.update(hashable) + encryptor.final + Base64.urlsafe_encode64(encrypted_bytes) + end + + def token_in_hash + { + access_token: encrypted_token, + expires_at: expires_at, + type: 'Bearer', + } + end +end diff --git a/lib/auth_token/auth_token_decryptor.rb b/lib/auth_token/auth_token_decryptor.rb new file mode 100644 index 000000000..be6bd99cd --- /dev/null +++ b/lib/auth_token/auth_token_decryptor.rb @@ -0,0 +1,43 @@ +class AuthTokenDecryptor + attr_reader :decrypted_data + attr_reader :token + attr_reader :key + attr_reader :user + + def self.create_with_defaults(token) + new(token, Rails.application.config.secret_key_base) + end + + def initialize(token, key) + @token = token + @key = key + end + + def decrypt_token + decipher = OpenSSL::Cipher::AES.new(256, :CBC) + decipher.decrypt + decipher.key = key + + base64_decoded = Base64.urlsafe_decode64(token.to_s) + plain = decipher.update(base64_decoded) + decipher.final + + @decrypted_data = JSON.parse(plain, symbolize_names: true) + rescue OpenSSL::Cipher::CipherError, ArgumentError + false + end + + def valid? + decrypted_data && valid_user? && still_valid? + end + + private + + def valid_user? + @user = RegistrantUser.find_by(registrant_ident: decrypted_data[:user_ident]) + @user&.username == decrypted_data[:user_username] + end + + def still_valid? + decrypted_data[:expires_at] > Time.now + end +end diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb index 6c06ef937..cceeb27c5 100644 --- a/test/application_system_test_case.rb +++ b/test/application_system_test_case.rb @@ -3,7 +3,7 @@ require 'test_helper' require 'database_cleaner' require 'selenium/webdriver' -class ApplicationSystemTestCase < ActionDispatch::IntegrationTest; end +ApplicationSystemTestCase = Class.new(ApplicationIntegrationTest) class JavaScriptApplicationSystemTestCase < ApplicationSystemTestCase self.use_transactional_fixtures = false diff --git a/test/fixtures/domains.yml b/test/fixtures/domains.yml index 59a1b8ea5..4d6468c92 100644 --- a/test/fixtures/domains.yml +++ b/test/fixtures/domains.yml @@ -42,10 +42,20 @@ metro: period_unit: m uuid: ef97cb80-333b-4893-b9df-163f2b452798 +hospital: + name: hospital.test + registrar: goodnames + registrant: john + transfer_code: 23118v2 + valid_to: 2010-07-05 + period: 1 + period_unit: m + uuid: 5edda1a5-3548-41ee-8b65-6d60daf85a37 + invalid: name: invalid.test transfer_code: 1438d6 valid_to: <%= Time.zone.parse('2010-07-05').utc.to_s(:db) %> registrar: bestnames registrant: invalid - uuid: 3c430ead-bb17-4b5b-aaa1-caa7dde7e138 \ No newline at end of file + uuid: 3c430ead-bb17-4b5b-aaa1-caa7dde7e138 diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index b20bd8a83..5fd2dc925 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -26,3 +26,4 @@ admin: registrant: type: RegistrantUser registrant_ident: US-1234 + username: Registrant User diff --git a/test/integration/api/domain_contacts_test.rb b/test/integration/api/domain_contacts_test.rb index a6d6376f7..e99a45825 100644 --- a/test/integration/api/domain_contacts_test.rb +++ b/test/integration/api/domain_contacts_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class APIDomainContactsTest < ActionDispatch::IntegrationTest +class APIDomainContactsTest < ApplicationIntegrationTest def test_replace_all_tech_contacts_of_the_current_registrar patch '/repp/v1/domains/contacts', { current_contact_id: 'william-001', new_contact_id: 'john-001' }, diff --git a/test/integration/api/domain_transfers_test.rb b/test/integration/api/domain_transfers_test.rb index 4b65b35de..d439a64e5 100644 --- a/test/integration/api/domain_transfers_test.rb +++ b/test/integration/api/domain_transfers_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class APIDomainTransfersTest < ActionDispatch::IntegrationTest +class APIDomainTransfersTest < ApplicationIntegrationTest setup do @domain = domains(:shop) @new_registrar = registrars(:goodnames) diff --git a/test/integration/api/nameservers/put_test.rb b/test/integration/api/nameservers/put_test.rb index 0967a1169..4c35d3e77 100644 --- a/test/integration/api/nameservers/put_test.rb +++ b/test/integration/api/nameservers/put_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class APINameserversPutTest < ActionDispatch::IntegrationTest +class APINameserversPutTest < ApplicationIntegrationTest def test_replaces_registrar_nameservers old_nameserver_ids = [nameservers(:shop_ns1).id, nameservers(:airport_ns1).id, diff --git a/test/integration/api/registrant/registrant_api_authentication_test.rb b/test/integration/api/registrant/registrant_api_authentication_test.rb new file mode 100644 index 000000000..10858d005 --- /dev/null +++ b/test/integration/api/registrant/registrant_api_authentication_test.rb @@ -0,0 +1,58 @@ +require 'test_helper' + +class RegistrantApiAuthenticationTest < ApplicationIntegrationTest + def setup + super + + @user_hash = { ident: '37010100049', first_name: 'Adam', last_name: 'Baker' } + @existing_user = RegistrantUser.find_or_create_by_api_data(@user_hash) + end + + def teardown + super + + end + + def test_request_creates_user_when_one_does_not_exist + params = { + ident: '30110100103', + first_name: 'John', + last_name: 'Smith', + } + + post '/api/v1/registrant/auth/eid', params + assert(User.find_by(registrant_ident: 'EE-30110100103')) + + json = JSON.parse(response.body, symbolize_names: true) + assert_equal([:access_token, :expires_at, :type], json.keys) + end + + def test_request_returns_existing_user + assert_no_changes User.count do + post '/api/v1/registrant/auth/eid', @user_hash + end + end + + def test_request_returns_401_from_a_not_whitelisted_ip + params = { foo: :bar, test: :test } + @original_whitelist_ip = ENV['registrant_api_auth_allowed_ips'] + ENV['registrant_api_auth_allowed_ips'] = '1.2.3.4' + + post '/api/v1/registrant/auth/eid', params + assert_equal(401, response.status) + json_body = JSON.parse(response.body, symbolize_names: true) + + assert_equal({ errors: [base: ['Not authorized']] }, json_body) + + ENV['registrant_api_auth_allowed_ips'] = @original_whitelist_ip + end + + def test_request_documented_parameters_are_required + params = { foo: :bar, test: :test } + + post '/api/v1/registrant/auth/eid', params + json = JSON.parse(response.body, symbolize_names: true) + assert_equal({ errors: [{ ident: ['parameter is required'] }] }, json) + assert_equal(422, response.status) + end +end diff --git a/test/integration/api/registrant/registrant_api_domains_test.rb b/test/integration/api/registrant/registrant_api_domains_test.rb new file mode 100644 index 000000000..128d15e20 --- /dev/null +++ b/test/integration/api/registrant/registrant_api_domains_test.rb @@ -0,0 +1,102 @@ +require 'test_helper' +require 'auth_token/auth_token_creator' + +class RegistrantApiDomainsTest < ApplicationIntegrationTest + def setup + super + + @original_registry_time = Setting.days_to_keep_business_registry_cache + Setting.days_to_keep_business_registry_cache = 1 + travel_to Time.zone.parse('2010-07-05') + + @domain = domains(:hospital) + @registrant = @domain.registrant + @user = users(:registrant) + @auth_headers = { 'HTTP_AUTHORIZATION' => auth_token } + end + + def teardown + super + + Setting.days_to_keep_business_registry_cache = @original_registry_time + travel_back + end + + def test_get_domain_details_by_uuid + get '/api/v1/registrant/domains/5edda1a5-3548-41ee-8b65-6d60daf85a37', {}, @auth_headers + assert_equal(200, response.status) + + domain = JSON.parse(response.body, symbolize_names: true) + assert_equal('hospital.test', domain[:name]) + end + + def test_get_non_existent_domain_details_by_uuid + get '/api/v1/registrant/domains/random-uuid', {}, @auth_headers + assert_equal(404, response.status) + + response_json = JSON.parse(response.body, symbolize_names: true) + assert_equal({ errors: [base: ['Domain not found']] }, response_json) + end + + def test_root_returns_domain_list + get '/api/v1/registrant/domains', {}, @auth_headers + assert_equal(200, response.status) + + response_json = JSON.parse(response.body, symbolize_names: true) + array_of_domain_names = response_json.map { |x| x[:name] } + assert(array_of_domain_names.include?('hospital.test')) + end + + def test_root_accepts_limit_and_offset_parameters + get '/api/v1/registrant/domains', { 'limit' => 2, 'offset' => 0 }, @auth_headers + response_json = JSON.parse(response.body, symbolize_names: true) + + assert_equal(200, response.status) + assert_equal(2, response_json.count) + + get '/api/v1/registrant/domains', {}, @auth_headers + response_json = JSON.parse(response.body, symbolize_names: true) + + assert_equal(5, response_json.count) + end + + def test_root_does_not_accept_limit_higher_than_200 + get '/api/v1/registrant/domains', { 'limit' => 400, 'offset' => 0 }, @auth_headers + + assert_equal(400, response.status) + response_json = JSON.parse(response.body, symbolize_names: true) + assert_equal({ errors: [{ limit: ['parameter is out of range'] }] }, response_json) + end + + def test_root_does_not_accept_offset_lower_than_0 + get '/api/v1/registrant/domains', { 'limit' => 200, 'offset' => "-10" }, @auth_headers + + assert_equal(400, response.status) + response_json = JSON.parse(response.body, symbolize_names: true) + assert_equal({ errors: [{ offset: ['parameter is out of range'] }] }, response_json) + end + + def test_root_returns_401_without_authorization + get '/api/v1/registrant/domains', {}, {} + assert_equal(401, response.status) + json_body = JSON.parse(response.body, symbolize_names: true) + + assert_equal({ errors: [base: ['Not authorized']] }, json_body) + end + + def test_details_returns_401_without_authorization + get '/api/v1/registrant/domains/5edda1a5-3548-41ee-8b65-6d60daf85a37', {}, {} + assert_equal(401, response.status) + json_body = JSON.parse(response.body, symbolize_names: true) + + assert_equal({ errors: [base: ['Not authorized']] }, json_body) + end + + private + + def auth_token + token_creator = AuthTokenCreator.create_with_defaults(@user) + hash = token_creator.token_in_hash + "Bearer #{hash[:access_token]}" + end +end diff --git a/test/integration/epp/domain/create/nameservers_test.rb b/test/integration/epp/domain/create/nameservers_test.rb index ddaddf2d1..954d1f300 100644 --- a/test/integration/epp/domain/create/nameservers_test.rb +++ b/test/integration/epp/domain/create/nameservers_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class EppDomainCreateNameserversTest < ActionDispatch::IntegrationTest +class EppDomainCreateNameserversTest < ApplicationIntegrationTest # Glue record requirement def test_nameserver_ip_address_is_required_if_hostname_is_under_the_same_domain request_xml = <<-XML diff --git a/test/integration/epp/domain/create/transfer_code_test.rb b/test/integration/epp/domain/create/transfer_code_test.rb index 60133cb35..131baf67a 100644 --- a/test/integration/epp/domain/create/transfer_code_test.rb +++ b/test/integration/epp/domain/create/transfer_code_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class EppDomainCreateTransferCodeTest < ActionDispatch::IntegrationTest +class EppDomainCreateTransferCodeTest < ApplicationIntegrationTest setup do travel_to Time.zone.parse('2010-07-05') end diff --git a/test/integration/epp/domain/domain_delete_test.rb b/test/integration/epp/domain/domain_delete_test.rb index 014497423..438e20eeb 100644 --- a/test/integration/epp/domain/domain_delete_test.rb +++ b/test/integration/epp/domain/domain_delete_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class EppDomainDeleteTest < ActionDispatch::IntegrationTest +class EppDomainDeleteTest < ApplicationIntegrationTest def setup @domain = domains(:shop) end diff --git a/test/integration/epp/domain/domain_renew_test.rb b/test/integration/epp/domain/domain_renew_test.rb index 338ecf766..ac48269ad 100644 --- a/test/integration/epp/domain/domain_renew_test.rb +++ b/test/integration/epp/domain/domain_renew_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class EppDomainRenewTest < ActionDispatch::IntegrationTest +class EppDomainRenewTest < ApplicationIntegrationTest self.use_transactional_fixtures = false setup do diff --git a/test/integration/epp/domain/domain_update_test.rb b/test/integration/epp/domain/domain_update_test.rb index 599512cf1..26996c63f 100644 --- a/test/integration/epp/domain/domain_update_test.rb +++ b/test/integration/epp/domain/domain_update_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class EppDomainUpdateTest < ActionDispatch::IntegrationTest +class EppDomainUpdateTest < ApplicationIntegrationTest def setup @domain = domains(:shop) end diff --git a/test/integration/epp/domain/transfer/base_test.rb b/test/integration/epp/domain/transfer/base_test.rb index aa9f841b6..e220f8ebd 100644 --- a/test/integration/epp/domain/transfer/base_test.rb +++ b/test/integration/epp/domain/transfer/base_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class EppDomainTransferBaseTest < ActionDispatch::IntegrationTest +class EppDomainTransferBaseTest < ApplicationIntegrationTest def test_non_existent_domain request_xml = <<-XML diff --git a/test/integration/epp/domain/transfer/query_test.rb b/test/integration/epp/domain/transfer/query_test.rb index 1412dd9b3..8a9c589c8 100644 --- a/test/integration/epp/domain/transfer/query_test.rb +++ b/test/integration/epp/domain/transfer/query_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class EppDomainTransferQueryTest < ActionDispatch::IntegrationTest +class EppDomainTransferQueryTest < ApplicationIntegrationTest def test_returns_domain_transfer_details post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } xml_doc = Nokogiri::XML(response.body) diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb index fba509c13..1a9f9ae75 100644 --- a/test/integration/epp/domain/transfer/request_test.rb +++ b/test/integration/epp/domain/transfer/request_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest +class EppDomainTransferRequestTest < ApplicationIntegrationTest def setup @domain = domains(:shop) @new_registrar = registrars(:goodnames) diff --git a/test/integration/epp/login/credentials_test.rb b/test/integration/epp/login/credentials_test.rb index 6a27c7393..3eac10da5 100644 --- a/test/integration/epp/login/credentials_test.rb +++ b/test/integration/epp/login/credentials_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class EppLoginCredentialsTest < ActionDispatch::IntegrationTest +class EppLoginCredentialsTest < ApplicationIntegrationTest def test_correct_credentials request_xml = <<-XML diff --git a/test/integration/epp/login/session_limit_test.rb b/test/integration/epp/login/session_limit_test.rb index b2fdfe88f..de7f85a06 100644 --- a/test/integration/epp/login/session_limit_test.rb +++ b/test/integration/epp/login/session_limit_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class EppLoginSessionLimitTest < ActionDispatch::IntegrationTest +class EppLoginSessionLimitTest < ApplicationIntegrationTest setup do travel_to Time.zone.parse('2010-07-05') EppSession.delete_all diff --git a/test/integration/epp/logout_test.rb b/test/integration/epp/logout_test.rb index 75b26f2f3..dc8276e7e 100644 --- a/test/integration/epp/logout_test.rb +++ b/test/integration/epp/logout_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class EppLogoutTest < ActionDispatch::IntegrationTest +class EppLogoutTest < ApplicationIntegrationTest def test_success_response post '/epp/session/logout', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } assert Nokogiri::XML(response.body).at_css('result[code="1500"]') diff --git a/test/integration/epp/poll_test.rb b/test/integration/epp/poll_test.rb index db6091cb0..30ee5c769 100644 --- a/test/integration/epp/poll_test.rb +++ b/test/integration/epp/poll_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class EppPollTest < ActionDispatch::IntegrationTest +class EppPollTest < ApplicationIntegrationTest def test_messages post '/epp/command/poll', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } assert_equal '1301', Nokogiri::XML(response.body).at_css('result')[:code] diff --git a/test/lib/auth_token/auth_token_creator_test.rb b/test/lib/auth_token/auth_token_creator_test.rb new file mode 100644 index 000000000..9d4cdd2c6 --- /dev/null +++ b/test/lib/auth_token/auth_token_creator_test.rb @@ -0,0 +1,53 @@ +require 'test_helper' +require 'openssl' +require_relative '../../../lib/auth_token/auth_token_creator' + +class AuthTokenCreatorTest < ActiveSupport::TestCase + def setup + super + + @user = users(:registrant) + time = Time.zone.parse('2010-07-05 00:30:00 +0000') + @random_bytes = SecureRandom.random_bytes(64) + @token_creator = AuthTokenCreator.new(@user, @random_bytes, time) + end + + def test_hashable_is_constructed_as_expected + expected_hashable = { user_ident: 'US-1234', user_username: 'Registrant User', + expires_at: '2010-07-05 00:30:00 UTC' }.to_json + + assert_equal(expected_hashable, @token_creator.hashable) + end + + def test_encrypted_token_is_decryptable + encryptor = OpenSSL::Cipher::AES.new(256, :CBC) + encryptor.decrypt + encryptor.key = @random_bytes + + base64_decoded = Base64.urlsafe_decode64(@token_creator.encrypted_token) + result = encryptor.update(base64_decoded) + encryptor.final + + hashable = { user_ident: 'US-1234', user_username: 'Registrant User', + expires_at: '2010-07-05 00:30:00 UTC' }.to_json + + assert_equal(hashable, result) + end + + def test_token_in_json_returns_expected_values + @token_creator.stub(:encrypted_token, 'super_secure_token') do + token = @token_creator.token_in_hash + assert_equal('2010-07-05 00:30:00 UTC', token[:expires_at]) + assert_equal('Bearer', token[:type]) + end + end + + def test_create_with_defaults_injects_values + travel_to Time.zone.parse('2010-07-05 00:30:00 +0000') + + token_creator_with_defaults = AuthTokenCreator.create_with_defaults(@user) + assert_equal(Rails.application.config.secret_key_base, token_creator_with_defaults.key) + assert_equal('2010-07-05 02:30:00 UTC', token_creator_with_defaults.expires_at) + + travel_back + end +end diff --git a/test/lib/auth_token/auth_token_decryptor_test.rb b/test/lib/auth_token/auth_token_decryptor_test.rb new file mode 100644 index 000000000..49ca2b820 --- /dev/null +++ b/test/lib/auth_token/auth_token_decryptor_test.rb @@ -0,0 +1,82 @@ +require 'test_helper' +require_relative '../../../lib/auth_token/auth_token_decryptor' +require_relative '../../../lib/auth_token/auth_token_creator' + +class AuthTokenDecryptorTest < ActiveSupport::TestCase + def setup + super + + travel_to Time.parse("2010-07-05 00:15:00 UTC") + @user = users(:registrant) + + # For testing purposes, the token needs to be random and long enough, hence: + @key = "b8+PtSq1+iXzUVnGEqciKsITNR0KmLl7uPiSTHbteqCoEBdbMLUl3GXlIDWD\nDZp1hIgKWnIMPNEgbuCa/7qccA==\n" + @faulty_key = "FALSE+iXzUVnGEqciKsITNR0KmLl7uPiSTHbteqCoEBdbMLUl3GXlIDWD\nDZp1hIgKWnIMPNEgbuCa/7qccA==\n" + + # this token corresponds to: + # {:user_ident=>"US-1234", :user_username=>"Registrant User", :expires_at=>"2010-07-05 02:15:00 UTC"} + @access_token = "q27NWIsKD5snWj9vZzJ0RcOYvgocEyu7H9yCaDjfmGi54sogovpBeALMPWTZHMcdFQzSiq6b4cI0p5tO0_5UEOHic2jRzNW7mkhi-bn-Y2Wlnw7jhMpxw6VwJR8QEoDzjkcNxnKBN6OKF4nssa60ZQ==" + end + + def teardown + super + + travel_back + end + + def test_decrypt_token_returns_a_hash_when_token_is_valid + decryptor = AuthTokenDecryptor.new(@access_token, @key) + + assert(decryptor.decrypt_token.is_a?(Hash)) + end + + def test_decrypt_token_return_false_when_token_is_invalid + faulty_decryptor = AuthTokenDecryptor.new(@access_token, @faulty_key) + refute(faulty_decryptor.decrypt_token) + end + + def test_decrypt_token_return_false_when_token_is_nil + faulty_decryptor = AuthTokenDecryptor.new(nil, @key) + refute(faulty_decryptor.decrypt_token) + end + + def test_valid_returns_true_for_valid_token + decryptor = AuthTokenDecryptor.new(@access_token, @key) + decryptor.decrypt_token + + assert(decryptor.valid?) + end + + def test_valid_returns_false_for_invalid_token + faulty_decryptor = AuthTokenDecryptor.new(@access_token, @faulty_key) + faulty_decryptor.decrypt_token + + refute(faulty_decryptor.valid?) + end + + def test_valid_returns_false_for_expired_token + travel_to Time.parse("2010-07-05 10:15:00 UTC") + + decryptor = AuthTokenDecryptor.new(@access_token, @key) + decryptor.decrypt_token + + refute(decryptor.valid?) + end + + def test_returns_false_for_non_existing_user + # This token was created from an admin user and @key. Decrypted, it corresponds to: + # {:user_ident=>nil, :user_username=>"test", :expires_at=>"2010-07-05 00:15:00 UTC"} + other_token = "rMkjgpyRcj2xOnHVwvvQ5RAS0yQepUSrw3XM5BrwM4TMH-h-TBeLve9InC_zaPneMMnCs0NHQHt1EpH95A2Yhdk6Ge6HQ-4gN5L0THDywCO2vHKGucPxbd6g6wOSaOnR" + + decryptor = AuthTokenDecryptor.new(other_token, @key) + decryptor.decrypt_token + + refute(decryptor.valid?) + end + + def test_create_with_defaults_injects_values + decryptor = AuthTokenDecryptor.create_with_defaults(@access_token) + + assert_equal(Rails.application.config.secret_key_base, decryptor.key) + end +end diff --git a/test/models/contact_test.rb b/test/models/contact_test.rb new file mode 100644 index 000000000..5651cc883 --- /dev/null +++ b/test/models/contact_test.rb @@ -0,0 +1,37 @@ +require 'test_helper' + +class ContactTest < ActiveSupport::TestCase + setup do + @contact = contacts(:john) + end + + def test_valid_fixture + assert @contact.valid? + end + + def test_invalid_without_email + @contact.email = '' + assert @contact.invalid? + end + + def test_email_format_validation + @contact.email = 'invalid' + assert @contact.invalid? + + @contact.email = 'test@bestmail.test' + assert @contact.valid? + end + + def test_invalid_without_phone + @contact.email = '' + assert @contact.invalid? + end + + def test_phone_format_validation + @contact.phone = '+123.' + assert @contact.invalid? + + @contact.phone = '+123.4' + assert @contact.valid? + end +end \ No newline at end of file diff --git a/test/models/registrant_user_test.rb b/test/models/registrant_user_test.rb new file mode 100644 index 000000000..86ab5591a --- /dev/null +++ b/test/models/registrant_user_test.rb @@ -0,0 +1,62 @@ +class RegistrantUserTest < ActiveSupport::TestCase + def setup + super + end + + def teardown + super + end + + def test_find_or_create_by_api_data_creates_a_user + user_data = { + ident: '37710100070', + first_name: 'JOHN', + last_name: 'SMITH' + } + + RegistrantUser.find_or_create_by_api_data(user_data) + + user = User.find_by(registrant_ident: 'EE-37710100070') + assert_equal('JOHN SMITH', user.username) + end + + def test_find_or_create_by_api_data_creates_a_user_after_upcasing_input + user_data = { + ident: '37710100070', + first_name: 'John', + last_name: 'Smith' + } + + RegistrantUser.find_or_create_by_api_data(user_data) + + user = User.find_by(registrant_ident: 'EE-37710100070') + assert_equal('JOHN SMITH', user.username) + end + + def test_find_or_create_by_mid_data_creates_a_user + user_data = OpenStruct.new(user_country: 'EE', user_id_code: '37710100070', + user_givenname: 'JOHN', user_surname: 'SMITH') + + RegistrantUser.find_or_create_by_mid_data(user_data) + user = User.find_by(registrant_ident: 'EE-37710100070') + assert_equal('JOHN SMITH', user.username) + end + + def test_find_or_create_by_idc_with_legacy_header_creates_a_user + header = '/C=EE/O=ESTEID/OU=authentication/CN=SMITH,JOHN,37710100070/SN=SMITH/GN=JOHN/serialNumber=37710100070' + + RegistrantUser.find_or_create_by_idc_data(header, RegistrantUser::ACCEPTED_ISSUER) + + user = User.find_by(registrant_ident: 'EE-37710100070') + assert_equal('JOHN SMITH', user.username) + end + + def test_find_or_create_by_idc_with_rfc2253_header_creates_a_user + header = 'serialNumber=37710100070,GN=JOHN,SN=SMITH,CN=SMITH\\,JOHN\\,37710100070,OU=authentication,O=ESTEID,C=EE' + + RegistrantUser.find_or_create_by_idc_data(header, RegistrantUser::ACCEPTED_ISSUER) + + user = User.find_by(registrant_ident: 'EE-37710100070') + assert_equal('JOHN SMITH', user.username) + end +end diff --git a/test/integration/admin/contact_versions_test.rb b/test/system/admin_area/contact_versions_test.rb similarity index 96% rename from test/integration/admin/contact_versions_test.rb rename to test/system/admin_area/contact_versions_test.rb index daaba64e8..10d20615a 100644 --- a/test/integration/admin/contact_versions_test.rb +++ b/test/system/admin_area/contact_versions_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class ContactVersionsTest < ActionDispatch::IntegrationTest +class ContactVersionsTest < ApplicationSystemTestCase def setup super diff --git a/test/integration/admin/contacts_test.rb b/test/system/admin_area/contacts_test.rb similarity index 89% rename from test/integration/admin/contacts_test.rb rename to test/system/admin_area/contacts_test.rb index 1d2d2e07e..c72004988 100644 --- a/test/integration/admin/contacts_test.rb +++ b/test/system/admin_area/contacts_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class AdminContactsTest < ActionDispatch::IntegrationTest +class AdminContactsTest < ApplicationSystemTestCase def setup super diff --git a/test/integration/admin/domain_versions_test.rb b/test/system/admin_area/domain_versions_test.rb similarity index 97% rename from test/integration/admin/domain_versions_test.rb rename to test/system/admin_area/domain_versions_test.rb index 760f4b4ef..6c375cefe 100644 --- a/test/integration/admin/domain_versions_test.rb +++ b/test/system/admin_area/domain_versions_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class DomainVersionsTest < ActionDispatch::IntegrationTest +class DomainVersionsTest < ApplicationSystemTestCase def setup super diff --git a/test/integration/admin/domains/details_test.rb b/test/system/admin_area/domains/details_test.rb similarity index 88% rename from test/integration/admin/domains/details_test.rb rename to test/system/admin_area/domains/details_test.rb index 8a0a6f7ef..04cdb06e3 100644 --- a/test/integration/admin/domains/details_test.rb +++ b/test/system/admin_area/domains/details_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class AdminAreaDomainDetailsTest < ActionDispatch::IntegrationTest +class AdminAreaDomainDetailsTest < ApplicationSystemTestCase setup do sign_in users(:admin) @domain = domains(:shop) diff --git a/test/integration/admin/domains/force_delete_test.rb b/test/system/admin_area/domains/force_delete_test.rb similarity index 95% rename from test/integration/admin/domains/force_delete_test.rb rename to test/system/admin_area/domains/force_delete_test.rb index d48444fb9..75a115fe6 100644 --- a/test/integration/admin/domains/force_delete_test.rb +++ b/test/system/admin_area/domains/force_delete_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class AdminAreaDomainForceDeleteTest < ActionDispatch::IntegrationTest +class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase include ActionMailer::TestHelper setup do diff --git a/test/integration/admin/domains_test.rb b/test/system/admin_area/domains_test.rb similarity index 91% rename from test/integration/admin/domains_test.rb rename to test/system/admin_area/domains_test.rb index 0df0780d8..83ceac3d5 100644 --- a/test/integration/admin/domains_test.rb +++ b/test/system/admin_area/domains_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class AdminDomainsTestTest < ActionDispatch::IntegrationTest +class AdminDomainsTestTest < ApplicationSystemTestCase def setup sign_in users(:admin) @domain = domains(:shop) diff --git a/test/integration/admin/mail_templates/new_test.rb b/test/system/admin_area/mail_templates/new_test.rb similarity index 79% rename from test/integration/admin/mail_templates/new_test.rb rename to test/system/admin_area/mail_templates/new_test.rb index c2a01f3d0..dcaa5d592 100644 --- a/test/integration/admin/mail_templates/new_test.rb +++ b/test/system/admin_area/mail_templates/new_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class AdminAreaNewMailTemplateTest < ActionDispatch::IntegrationTest +class AdminAreaNewMailTemplateTest < ApplicationSystemTestCase setup do sign_in users(:admin) end diff --git a/test/integration/admin/registrars/delete_test.rb b/test/system/admin_area/registrars/delete_test.rb similarity index 91% rename from test/integration/admin/registrars/delete_test.rb rename to test/system/admin_area/registrars/delete_test.rb index 177564d79..f0ecaecc6 100644 --- a/test/integration/admin/registrars/delete_test.rb +++ b/test/system/admin_area/registrars/delete_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class AdminAreaDeleteRegistrarTest < ActionDispatch::IntegrationTest +class AdminAreaDeleteRegistrarTest < ApplicationSystemTestCase setup do sign_in users(:admin) end diff --git a/test/integration/admin/registrars/details_test.rb b/test/system/admin_area/registrars/details_test.rb similarity index 84% rename from test/integration/admin/registrars/details_test.rb rename to test/system/admin_area/registrars/details_test.rb index fe96f46e2..1dfb4b03a 100644 --- a/test/integration/admin/registrars/details_test.rb +++ b/test/system/admin_area/registrars/details_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class AdminAreaRegistrarDetailsTest < ActionDispatch::IntegrationTest +class AdminAreaRegistrarDetailsTest < ApplicationSystemTestCase include ActionView::Helpers::NumberHelper setup do diff --git a/test/integration/admin/registrars/edit_test.rb b/test/system/admin_area/registrars/edit_test.rb similarity index 97% rename from test/integration/admin/registrars/edit_test.rb rename to test/system/admin_area/registrars/edit_test.rb index 6c58fe4e5..9cb9d5020 100644 --- a/test/integration/admin/registrars/edit_test.rb +++ b/test/system/admin_area/registrars/edit_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class AdminAreaEditRegistrarTest < ActionDispatch::IntegrationTest +class AdminAreaEditRegistrarTest < ApplicationSystemTestCase setup do sign_in users(:admin) @registrar = registrars(:bestnames) diff --git a/test/integration/admin/registrars/new_test.rb b/test/system/admin_area/registrars/new_test.rb similarity index 95% rename from test/integration/admin/registrars/new_test.rb rename to test/system/admin_area/registrars/new_test.rb index e0e286938..90425a714 100644 --- a/test/integration/admin/registrars/new_test.rb +++ b/test/system/admin_area/registrars/new_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class AdminAreaNewRegistrarTest < ActionDispatch::IntegrationTest +class AdminAreaNewRegistrarTest < ApplicationSystemTestCase setup do sign_in users(:admin) end diff --git a/test/integration/registrant/domains_test.rb b/test/system/registrant_area/domains_test.rb similarity index 90% rename from test/integration/registrant/domains_test.rb rename to test/system/registrant_area/domains_test.rb index fbed651b6..7eeebb6e7 100644 --- a/test/integration/registrant/domains_test.rb +++ b/test/system/registrant_area/domains_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class RegistrantDomainsTest < ActionDispatch::IntegrationTest +class RegistrantDomainsTest < ApplicationSystemTestCase setup do sign_in users(:registrant) diff --git a/test/integration/registrant/layout_test.rb b/test/system/registrant_area/layout_test.rb similarity index 88% rename from test/integration/registrant/layout_test.rb rename to test/system/registrant_area/layout_test.rb index 131389b6c..90d6f8907 100644 --- a/test/integration/registrant/layout_test.rb +++ b/test/system/registrant_area/layout_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class RegistrantLayoutTest < ActionDispatch::IntegrationTest +class RegistrantLayoutTest < ApplicationSystemTestCase def setup super sign_in(users(:registrant)) diff --git a/test/integration/registrar/billing/balance_top_up_test.rb b/test/system/registrar_area/billing/balance_top_up_test.rb similarity index 91% rename from test/integration/registrar/billing/balance_top_up_test.rb rename to test/system/registrar_area/billing/balance_top_up_test.rb index d991bea45..2d44e8328 100644 --- a/test/integration/registrar/billing/balance_top_up_test.rb +++ b/test/system/registrar_area/billing/balance_top_up_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class BalanceTopUpTest < ActionDispatch::IntegrationTest +class BalanceTopUpTest < ApplicationSystemTestCase setup do sign_in users(:api_bestnames) end diff --git a/test/integration/registrar/bulk_change/bulk_transfer_test.rb b/test/system/registrar_area/bulk_change/bulk_transfer_test.rb similarity index 95% rename from test/integration/registrar/bulk_change/bulk_transfer_test.rb rename to test/system/registrar_area/bulk_change/bulk_transfer_test.rb index 4cd374862..3a663a9bc 100644 --- a/test/integration/registrar/bulk_change/bulk_transfer_test.rb +++ b/test/system/registrar_area/bulk_change/bulk_transfer_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class RegistrarAreaBulkTransferTest < ActionDispatch::IntegrationTest +class RegistrarAreaBulkTransferTest < ApplicationSystemTestCase setup do sign_in users(:api_goodnames) end diff --git a/test/integration/registrar/bulk_change/nameserver_test.rb b/test/system/registrar_area/bulk_change/nameserver_test.rb similarity index 96% rename from test/integration/registrar/bulk_change/nameserver_test.rb rename to test/system/registrar_area/bulk_change/nameserver_test.rb index 841e68db5..c5789a969 100644 --- a/test/integration/registrar/bulk_change/nameserver_test.rb +++ b/test/system/registrar_area/bulk_change/nameserver_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class RegistrarAreaNameserverBulkChangeTest < ActionDispatch::IntegrationTest +class RegistrarAreaNameserverBulkChangeTest < ApplicationSystemTestCase setup do sign_in users(:api_goodnames) end diff --git a/test/integration/registrar/bulk_change/tech_contact_test.rb b/test/system/registrar_area/bulk_change/tech_contact_test.rb similarity index 95% rename from test/integration/registrar/bulk_change/tech_contact_test.rb rename to test/system/registrar_area/bulk_change/tech_contact_test.rb index 9277cdb38..0b68b9db2 100644 --- a/test/integration/registrar/bulk_change/tech_contact_test.rb +++ b/test/system/registrar_area/bulk_change/tech_contact_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class RegistrarAreaTechContactBulkChangeTest < ActionDispatch::IntegrationTest +class RegistrarAreaTechContactBulkChangeTest < ApplicationSystemTestCase setup do sign_in users(:api_bestnames) end diff --git a/test/integration/registrar/domains_test.rb b/test/system/registrar_area/domains_test.rb similarity index 92% rename from test/integration/registrar/domains_test.rb rename to test/system/registrar_area/domains_test.rb index 55333dfb4..a01dd576b 100644 --- a/test/integration/registrar/domains_test.rb +++ b/test/system/registrar_area/domains_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class RegistrarDomainsTest < ActionDispatch::IntegrationTest +class RegistrarDomainsTest < ApplicationSystemTestCase def test_downloads_domain_list_as_csv sign_in users(:api_bestnames) travel_to Time.zone.parse('2010-07-05 10:30') diff --git a/test/integration/registrar/invoices/list_test.rb b/test/system/registrar_area/invoices/list_test.rb similarity index 90% rename from test/integration/registrar/invoices/list_test.rb rename to test/system/registrar_area/invoices/list_test.rb index e9b051df7..be344d034 100644 --- a/test/integration/registrar/invoices/list_test.rb +++ b/test/system/registrar_area/invoices/list_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class ListInvoicesTest < ActionDispatch::IntegrationTest +class ListInvoicesTest < ApplicationSystemTestCase def setup super diff --git a/test/integration/registrar/invoices/new_invoice_payment_test.rb b/test/system/registrar_area/invoices/new_invoice_payment_test.rb similarity index 95% rename from test/integration/registrar/invoices/new_invoice_payment_test.rb rename to test/system/registrar_area/invoices/new_invoice_payment_test.rb index 2513751dd..6933ff9ad 100644 --- a/test/integration/registrar/invoices/new_invoice_payment_test.rb +++ b/test/system/registrar_area/invoices/new_invoice_payment_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class NewInvoicePaymentTest < ActionDispatch::IntegrationTest +class NewInvoicePaymentTest < ApplicationSystemTestCase def setup super diff --git a/test/integration/registrar/invoices/new_test.rb b/test/system/registrar_area/invoices/new_test.rb similarity index 95% rename from test/integration/registrar/invoices/new_test.rb rename to test/system/registrar_area/invoices/new_test.rb index 35011826b..b9b6b6db4 100644 --- a/test/integration/registrar/invoices/new_test.rb +++ b/test/system/registrar_area/invoices/new_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class NewInvoiceTest < ActionDispatch::IntegrationTest +class NewInvoiceTest < ApplicationSystemTestCase def setup super diff --git a/test/integration/registrar/invoices/payment_callback_test.rb b/test/system/registrar_area/invoices/payment_callback_test.rb similarity index 96% rename from test/integration/registrar/invoices/payment_callback_test.rb rename to test/system/registrar_area/invoices/payment_callback_test.rb index 20ecea3e5..c1920995d 100644 --- a/test/integration/registrar/invoices/payment_callback_test.rb +++ b/test/system/registrar_area/invoices/payment_callback_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class PaymentCallbackTest < ActionDispatch::IntegrationTest +class PaymentCallbackTest < ApplicationSystemTestCase def setup super diff --git a/test/integration/registrar/invoices/payment_return_test.rb b/test/system/registrar_area/invoices/payment_return_test.rb similarity index 98% rename from test/integration/registrar/invoices/payment_return_test.rb rename to test/system/registrar_area/invoices/payment_return_test.rb index 9530cf609..45e85118f 100644 --- a/test/integration/registrar/invoices/payment_return_test.rb +++ b/test/system/registrar_area/invoices/payment_return_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class PaymentReturnTest < ActionDispatch::IntegrationTest +class PaymentReturnTest < ApplicationSystemTestCase def setup super diff --git a/test/system/registrar/sign_in_test.rb b/test/system/registrar_area/sign_in_test.rb similarity index 100% rename from test/system/registrar/sign_in_test.rb rename to test/system/registrar_area/sign_in_test.rb diff --git a/test/test_helper.rb b/test/test_helper.rb index 56a4a7aeb..ee6923367 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -13,8 +13,6 @@ require 'capybara/minitest' require 'webmock/minitest' require 'support/rails5_assertions' # Remove once upgraded to Rails 5 -require 'application_system_test_case' - Setting.address_processing = false Setting.registry_country_code = 'US' @@ -29,7 +27,7 @@ class ActiveSupport::TestCase end end -class ActionDispatch::IntegrationTest +class ApplicationIntegrationTest < ActionDispatch::IntegrationTest include Capybara::DSL include Capybara::Minitest::Assertions include AbstractController::Translation @@ -41,3 +39,5 @@ class ActionDispatch::IntegrationTest Capybara.use_default_driver end end + +require 'application_system_test_case'