diff --git a/.rubocop.yml b/.rubocop.yml index a83324d7..2105cfb1 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -53,10 +53,13 @@ RSpec/NestedGroups: Max: 6 RSpec/MultipleExpectations: - Max: 7 + Max: 20 RSpec/ExampleLength: - Max: 15 + Max: 40 + +RSpec/RSpec/MultipleMemoizedHelpers: + Max: 6 Rails/I18nLocaleTexts: Enabled: false diff --git a/app/controllers/setup_controller.rb b/app/controllers/setup_controller.rb index 3c89e34d..ca45ccf9 100644 --- a/app/controllers/setup_controller.rb +++ b/app/controllers/setup_controller.rb @@ -16,16 +16,17 @@ class SetupController < ApplicationController def create @account = Account.new(account_params) @account.timezone = Accounts.normalize_timezone(@account.timezone) - @user = @account.users.new(user_params) + @encrypted_config = EncryptedConfig.new(encrypted_config_params) unless URI.parse(encrypted_config_params[:value].to_s).class.in?([URI::HTTP, URI::HTTPS]) - @encrypted_config = EncryptedConfig.new(encrypted_config_params) @encrypted_config.errors.add(:value, 'should be a valid URL') return render :index, status: :unprocessable_entity end + return render :index, status: :unprocessable_entity unless @account.valid? + if @user.save encrypted_configs = [ { key: EncryptedConfig::APP_URL_KEY, value: encrypted_config_params[:value] }, diff --git a/app/javascript/submission_form/signature_step.vue b/app/javascript/submission_form/signature_step.vue index af749b30..ff2269c5 100644 --- a/app/javascript/submission_form/signature_step.vue +++ b/app/javascript/submission_form/signature_step.vue @@ -10,6 +10,7 @@ data-tip="Type text" >