diff --git a/app/controllers/registrar/domains_controller.rb b/app/controllers/registrar/domains_controller.rb index a75469de3..76467ce79 100644 --- a/app/controllers/registrar/domains_controller.rb +++ b/app/controllers/registrar/domains_controller.rb @@ -85,6 +85,7 @@ class Registrar def new authorize! :create, Depp::Domain @domain_params = Depp::Domain.default_params + @domain_params[:period] = Depp::Domain.default_period end def create @@ -140,6 +141,7 @@ class Registrar @data = @domain.renew(params) render 'renew_index' and return unless response_ok? else + params[:period] = Depp::Domain.default_period render 'renew_index' end end diff --git a/app/models/depp/domain.rb b/app/models/depp/domain.rb index 2b35a695c..1351b2672 100644 --- a/app/models/depp/domain.rb +++ b/app/models/depp/domain.rb @@ -145,6 +145,10 @@ module Depp end class << self + def default_period + '1y' + end + def default_params ret = {} diff --git a/spec/features/registrar/domains/new_spec.rb b/spec/features/registrar/domains/new_spec.rb new file mode 100644 index 000000000..4dd1d85d5 --- /dev/null +++ b/spec/features/registrar/domains/new_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +RSpec.feature 'New domain in registrar area', settings: false do + background do + sign_in_to_registrar_area + end + + it 'has default period' do + visit registrar_domains_path + click_link_or_button t('new') + + expect(page).to have_field('domain_period', with: Depp::Domain.default_period) + end +end diff --git a/spec/features/registrar/domains/renew_spec.rb b/spec/features/registrar/domains/renew_spec.rb new file mode 100644 index 000000000..1d6ab0a7e --- /dev/null +++ b/spec/features/registrar/domains/renew_spec.rb @@ -0,0 +1,18 @@ +require 'rails_helper' + +RSpec.feature 'Renew domain in registrar area' do + given!(:registrar) { create(:registrar) } + given!(:user) { create(:api_user, registrar: registrar) } + given!(:domain) { create(:domain, registrar: registrar) } + + background do + sign_in_to_registrar_area(user: user) + end + + it 'has default period' do + visit registrar_domains_path + click_link_or_button t('renew') + + expect(page).to have_field('period', with: Depp::Domain.default_period) + end +end diff --git a/spec/models/depp/domain_spec.rb b/spec/models/depp/domain_spec.rb new file mode 100644 index 000000000..c780e6a00 --- /dev/null +++ b/spec/models/depp/domain_spec.rb @@ -0,0 +1,9 @@ +require 'rails_helper' + +RSpec.describe Depp::Domain do + describe '::default_period', db: false, settings: false do + it 'returns default period' do + expect(described_class.default_period).to eq('1y') + end + end +end