From 09c436115bc8dbbfdc601afa113d139e5abbad22 Mon Sep 17 00:00:00 2001 From: Ryan Eddy <44847768+RyanEddyIC@users.noreply.github.com> Date: Tue, 24 Dec 2024 13:03:56 -0500 Subject: [PATCH] temporary fix for broken faa cucumber steps (#4854) * temporary fix for broken faa cucumber steps * fix income forms * add bs4 to date validation * fix back to household buttons * fix deduction form ids * tax info cucumber fix * cucumber step fixes * add driver alert accept to step * remove javascript void from anchors --------- Co-authored-by: Brad Bodine --- .../financial_assistance/fa_integration.js | 5 + .../inline_replacements.js | 99 +++++++++++++++++++ .../financial_assistance/shared.js | 10 +- .../applicants/_dependent_form.html.erb | 85 +--------------- .../applicants/new.js.erb | 7 +- .../applicants/tax_info.html.erb | 2 +- .../applications/preferences.html.erb | 2 +- .../submit_your_application.html.erb | 2 +- .../benefits/index.html.erb | 2 +- .../deductions/_deduction_form.html.erb | 8 +- .../deductions/index.html.erb | 2 +- .../incomes/_ai_an_income_form.erb | 15 +-- .../incomes/_job_income_form.html.erb | 13 +-- .../incomes/_other_income_form.html.erb | 8 +- .../incomes/_self_employed_income_form.erb | 14 +-- .../_unemployment_income_form.html.erb | 17 ++-- .../incomes/index.html.erb | 2 +- .../incomes/other.html.erb | 2 +- .../_immigration_document_fields.html.erb | 12 +-- .../app/views/workflow/step.html.erb | 8 +- .../applicant_personal_info_page_steps.rb | 4 +- .../financial_assistance_steps.rb | 3 + .../other_income_page_steps.rb | 3 +- .../other_questions_page_steps.rb | 9 ++ .../step_definitions/tax_info_steps.rb | 2 + .../household_info_continue_button_steps.rb | 3 + 26 files changed, 193 insertions(+), 146 deletions(-) create mode 100644 components/financial_assistance/app/assets/javascripts/financial_assistance/inline_replacements.js diff --git a/components/financial_assistance/app/assets/javascripts/financial_assistance/fa_integration.js b/components/financial_assistance/app/assets/javascripts/financial_assistance/fa_integration.js index 1cac4b1e096..baf81d13a15 100644 --- a/components/financial_assistance/app/assets/javascripts/financial_assistance/fa_integration.js +++ b/components/financial_assistance/app/assets/javascripts/financial_assistance/fa_integration.js @@ -46,6 +46,11 @@ function notifyUserPrompt(element) { $('#backModal').modal('show'); } +$(document).on('click', '.back-to-household-link', function(e) { + e.preventDefault() + notifyUserPrompt(this) +}) + function backToHouseHolds() { $('#backModal').modal('hide'); window.location = toLocation; diff --git a/components/financial_assistance/app/assets/javascripts/financial_assistance/inline_replacements.js b/components/financial_assistance/app/assets/javascripts/financial_assistance/inline_replacements.js new file mode 100644 index 00000000000..65d5e7601d4 --- /dev/null +++ b/components/financial_assistance/app/assets/javascripts/financial_assistance/inline_replacements.js @@ -0,0 +1,99 @@ +function init_faa_immigration_doc_fields() { + $(document).ready(function(){ + if ($("[data-vlp-doc-subject]").length) { + showOnly($("[data-vlp-doc-subject]").data('vlp-doc-subject')); + } + }); +} + + +function init_faa_dependent_form() { + // components/financial_assistance/app/views/financial_assistance/applicants/_dependent_form.html.erb + var bs4 = document.documentElement.dataset.bs4 + + if (bs4) { + $(document).ready(function() { + $.inputMasks(); + + $('.field_with_errors > *').unwrap(); + + $('#applicant_same_with_primary').click(function(){ + if($(this).is(':checked')){ + $('#applicant-home-address-area').addClass("hidden"); + } else { + $('#applicant-home-address-area').removeClass("hidden"); + } + }); + + $("#dependent_first_name").change(function() { + var text = $("#dependent_first_name").val() == '' ? "This person" : $("#dependent_first_name").val() + $("#is_applying_coverage_value_dep").text("Does "+ text +" need coverage? *"); + $("#is_applying_coverage_value_dep_1").text(text); + }); + }); + + $(document).off('click', '#confirm-dependent'); + $(document).on('click', '#confirm-dependent', function(e) { + if($("input#applicant_same_with_primary").is(":checked")){ + $("#dependent-address input.required, dependent-address select.required, #dependent-address .address_required").removeAttr('required'); + } else { + $("#dependent-address input.required, dependent-address select.required, #dependent-address .address_required").attr('required', true); + } + + $(".btn-confirmation").removeAttr('disabled'); + + var form = $('#new_dependent')[0] || $('#edit_dependent')[0]; + + if (!$("input#applicant_same_with_primary").is(":checked")) { + $('#addressChangeConfirmation').modal('show'); + } else { + PersonValidations.manageRequiredValidations($('#confirm-dependent')); + } + + }); + } else { + $(document).ready(function() { + $.inputMasks(); + + $('.field_with_errors > *').unwrap(); + Freebies.floatlabels(); + if($("input#applicant_same_with_primary").is(":checked")){ + $("#dependent-address input, dependent-address select").removeAttr('required'); + }; + $("#dependent_first_name").change(function() { + var text = $("#dependent_first_name").val() == '' ? "this person" : $("#dependent_first_name").val() + $("#is_applying_coverage_value_dep").text("Does "+ text +" need coverage? *"); + $("#is_applying_coverage_value_dep_1").text(text); + }); + }); + + function confirmMember(element) { + const form = element.closest('form')[0]; + const maleRadio = document.getElementById('radio_male'); + const femaleRadio = document.getElementById('radio_female'); + const confirmButtonText = "<%= l10n('confirm_member') %>"; + const applicantSSN = document.getElementById('applicant_ssn') + const applicantNoSSN = document.getElementById('applicant_no_ssn') + + element.text("Please Wait...").addClass("disabled"); + + ApplicantValidations.manageRequiredValidations(element); + + if (!form.checkValidity() || !isGenderSelected(maleRadio, femaleRadio) || !isSsnSelected(applicantSSN, applicantNoSSN)) { + element.text(confirmButtonText).removeClass("disabled"); + } + } + + function isGenderSelected(maleRadio, femaleRadio) { + return (maleRadio && maleRadio.checked) || (femaleRadio && femaleRadio.checked); + } + + function isSsnSelected(applicantSSN, applicantNoSSN) { + return (applicantSSN && applicantSSN.value.replace(/-/g, '').length == 9) || (applicantNoSSN && applicantNoSSN.checked); + } + + $(document).on('click', '.applicant-confirm-member', function() { + confirmMember($(this)) + }) + } +} diff --git a/components/financial_assistance/app/assets/javascripts/financial_assistance/shared.js b/components/financial_assistance/app/assets/javascripts/financial_assistance/shared.js index 0f15ee282a4..8e3d8818619 100644 --- a/components/financial_assistance/app/assets/javascripts/financial_assistance/shared.js +++ b/components/financial_assistance/app/assets/javascripts/financial_assistance/shared.js @@ -1,5 +1,5 @@ function getDateFieldDate(id) { - const dateValue = $(id).val(); + const dateValue = $(id).val(); return dateValue ? new Date(dateValue) : null; }; @@ -20,3 +20,11 @@ function validateDateWarnings(id) { if (requiresStartDateWarning) warning_div.add(startDateWarning).removeClass('hidden'); if (requiresEndDateWarning) warning_div.add(endDateWarning).removeClass('hidden'); }; + +$(document).on('change', "[data-validate-date-id]", function() { + let id = $(this).data('validate-date-id') + let bs4 = $(this).data('use-bs4') + if (id.length) { + validateDateWarnings(id, bs4) + } +}) diff --git a/components/financial_assistance/app/views/financial_assistance/applicants/_dependent_form.html.erb b/components/financial_assistance/app/views/financial_assistance/applicants/_dependent_form.html.erb index 1ffe5756b4c..924f1983dfa 100644 --- a/components/financial_assistance/app/views/financial_assistance/applicants/_dependent_form.html.erb +++ b/components/financial_assistance/app/views/financial_assistance/applicants/_dependent_form.html.erb @@ -143,47 +143,6 @@ <% end %> <%= render partial: 'shared/address_change_confirmation_modal' %> - <% else %> @@ -416,53 +375,11 @@ <%= l10n("confirm_member") %> <% end %> - + <%= l10n("confirm_member") %> <% end %> - <% end %> diff --git a/components/financial_assistance/app/views/financial_assistance/applicants/new.js.erb b/components/financial_assistance/app/views/financial_assistance/applicants/new.js.erb index 6a6772777f6..270d3e14966 100644 --- a/components/financial_assistance/app/views/financial_assistance/applicants/new.js.erb +++ b/components/financial_assistance/app/views/financial_assistance/applicants/new.js.erb @@ -13,7 +13,7 @@ $('#btn-continue').addClass('disabled'); $("#new_employee_dependent_form").each(function(idx, ele) { $(ele).remove(); }); - $("#dependent_ul").append("<%= escape_javascript(render 'dependent_form') %>"); + $("#dependent_ul").append("<%= escape_javascript(render 'dependent_form') %>").ready(init_faa_partials_js()); $('#' + $("#dependent_ul").children().last().attr('id')).get(0).scrollIntoView({behavior: 'smooth'}); <% end %> @@ -39,3 +39,8 @@ applyFaaListeners(); changeApplyingCoverageText(); applicantDemographicValidations(); + +function init_faa_partials_js() { + init_faa_dependent_form() + init_faa_immigration_doc_fields() +} diff --git a/components/financial_assistance/app/views/financial_assistance/applicants/tax_info.html.erb b/components/financial_assistance/app/views/financial_assistance/applicants/tax_info.html.erb index 37be9c76735..1e2a2846b51 100644 --- a/components/financial_assistance/app/views/financial_assistance/applicants/tax_info.html.erb +++ b/components/financial_assistance/app/views/financial_assistance/applicants/tax_info.html.erb @@ -207,7 +207,7 @@
- <%= l10n("faa.tax_info.back") %> <%= l10n("faa.tax_info.back_paranthetical") %> + <%= l10n("faa.tax_info.back") %> <%= l10n("faa.tax_info.back_paranthetical") %>
diff --git a/components/financial_assistance/app/views/financial_assistance/applications/preferences.html.erb b/components/financial_assistance/app/views/financial_assistance/applications/preferences.html.erb index 63054e6b641..16ade46fbfe 100644 --- a/components/financial_assistance/app/views/financial_assistance/applications/preferences.html.erb +++ b/components/financial_assistance/app/views/financial_assistance/applications/preferences.html.erb @@ -190,7 +190,7 @@
- BACK TO ALL HOUSEHOLD MEMBERS (Go back and work on another person) + BACK TO ALL HOUSEHOLD MEMBERS (Go back and work on another person)
diff --git a/components/financial_assistance/app/views/financial_assistance/applications/submit_your_application.html.erb b/components/financial_assistance/app/views/financial_assistance/applications/submit_your_application.html.erb index 94081884875..008fd40d727 100644 --- a/components/financial_assistance/app/views/financial_assistance/applications/submit_your_application.html.erb +++ b/components/financial_assistance/app/views/financial_assistance/applications/submit_your_application.html.erb @@ -263,7 +263,7 @@
- BACK TO ALL HOUSEHOLD MEMBERS (Go back and work on another person) + BACK TO ALL HOUSEHOLD MEMBERS (Go back and work on another person)
diff --git a/components/financial_assistance/app/views/financial_assistance/benefits/index.html.erb b/components/financial_assistance/app/views/financial_assistance/benefits/index.html.erb index 5853b52283e..5a387977fb7 100644 --- a/components/financial_assistance/app/views/financial_assistance/benefits/index.html.erb +++ b/components/financial_assistance/app/views/financial_assistance/benefits/index.html.erb @@ -571,7 +571,7 @@
- BACK TO ALL HOUSEHOLD MEMBERS (Go back and work on another person) + BACK TO ALL HOUSEHOLD MEMBERS (Go back and work on another person)
diff --git a/components/financial_assistance/app/views/financial_assistance/deductions/_deduction_form.html.erb b/components/financial_assistance/app/views/financial_assistance/deductions/_deduction_form.html.erb index e2320e970ef..95123c4dc6f 100644 --- a/components/financial_assistance/app/views/financial_assistance/deductions/_deduction_form.html.erb +++ b/components/financial_assistance/app/views/financial_assistance/deductions/_deduction_form.html.erb @@ -35,7 +35,7 @@ <% else %> <%= deduction_form_for @application, @applicant, deduction do |f| %> <% deduction_id = deduction.id %> - <% onchange_date = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? (raw "validateDateWarnings('#{deduction_id}')") : "" %> + <% onchange_deduction_id = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? deduction_id : "" %>
<%= f.hidden_field :deduction_type, value: kind %> @@ -52,15 +52,15 @@
- <%= f.text_field :start_on, placeholder: 'FROM *', required: true, id: "start_on_#{deduction_id}", class: "datepicker-js floatlabel", onchange: onchange_date %> + <%= f.text_field :start_on, placeholder: 'FROM *', required: true, id: "start_on_#{deduction_id}", class: "datepicker-js floatlabel", data: {validate_date_id: "#{onchange_deduction_id}", use_bs4: false} %>
- <%= f.text_field :end_on, placeholder: 'TO', id: "end_on_#{deduction_id}", class: "datepicker-js floatlabel", onchange: onchange_date %> + <%= f.text_field :end_on, placeholder: 'TO', id: "end_on_#{deduction_id}", class: "datepicker-js floatlabel", data: {validate_date_id: "#{onchange_deduction_id}", use_bs4: false} %>
- Cancel + Cancel <%= f.submit 'Save', class: 'btn btn-save', :data => { :cuke => "income-adjustments-save-button" } %>
diff --git a/components/financial_assistance/app/views/financial_assistance/deductions/index.html.erb b/components/financial_assistance/app/views/financial_assistance/deductions/index.html.erb index ab677f2f0b8..e6b0864d637 100644 --- a/components/financial_assistance/app/views/financial_assistance/deductions/index.html.erb +++ b/components/financial_assistance/app/views/financial_assistance/deductions/index.html.erb @@ -274,7 +274,7 @@
- BACK TO ALL HOUSEHOLD MEMBERS (Go back and work on another person) + BACK TO ALL HOUSEHOLD MEMBERS (Go back and work on another person)
diff --git a/components/financial_assistance/app/views/financial_assistance/incomes/_ai_an_income_form.erb b/components/financial_assistance/app/views/financial_assistance/incomes/_ai_an_income_form.erb index d536e8acdf7..159783b4218 100644 --- a/components/financial_assistance/app/views/financial_assistance/incomes/_ai_an_income_form.erb +++ b/components/financial_assistance/app/views/financial_assistance/incomes/_ai_an_income_form.erb @@ -5,6 +5,7 @@ <% income_id = income.id %> <% new_form = local_assigns[:new_form].present? ? local_assigns[:new_form] : false %> <% dummy_income_id = "#{income_id}#{new_form ? 'dummy' : ''}" # needed to prevent Multiple Form Label accessibility error %> + <% onchange_income_id = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? income_id : "" %> <%= f.hidden_field :kind, value: 'american_indian_and_alaskan_native' %>
@@ -17,15 +18,15 @@
<%= f.label :start_on, l10n("start_date"), class: "required", for: "start_on_#{dummy_income_id}" %> - <%= f.date_field :start_on, required: true, id: "start_on_#{dummy_income_id}", min: 110.years.ago, max:"9999-12-31", class: "w-100" %> + <%= f.date_field :start_on, required: true, id: "start_on_#{dummy_income_id}", min: 110.years.ago, max:"9999-12-31", data: {validate_date_id: "#{onchange_income_id}", use_bs4: true}, class: "w-100" %>
<%= f.label :end_on, l10n("end_date"), for: "end_on_#{dummy_income_id}" %> - <%= f.date_field :end_on, id: "end_on_#{dummy_income_id}", min: 110.years.ago, max:"9999-12-31", class: "w-100" %> + <%= f.date_field :end_on, id: "end_on_#{dummy_income_id}", min: 110.years.ago, max:"9999-12-31", data: {validate_date_id: "#{onchange_income_id}", use_bs4: true}, class: "w-100" %>
- <%= l10n("cancel") %> + <%= l10n("cancel") %> <%= f.submit l10n("faa.other_incomes.save"), class: "btn btn-save", :data => { :cuke => "income-adjustments-save-button" } %>
@@ -36,7 +37,7 @@ <% else %> <%= income_form_for @application, @applicant, income do |f| %> <% income_id = income.id %> - <% onchange_date = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? (raw "validateDateWarnings('#{income_id}')") : "" %> + <% onchange_income_id = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? income_id : "" %>
<%= f.hidden_field :kind, value: 'american_indian_and_alaskan_native' %> @@ -53,15 +54,15 @@
- <%= f.text_field :start_on, placeholder: 'FROM *', required: true, id: "start_on_#{income.id}", class: "datepicker-js floatlabel", onchange: onchange_date %> + <%= f.text_field :start_on, placeholder: 'FROM *', required: true, id: "start_on_#{income.id}", class: "datepicker-js floatlabel", data: {validate_date_id: "#{onchange_income_id}", use_bs4: false} %>
- <%= f.text_field :end_on, placeholder: 'TO', id: "end_on_#{income.id}", class: "datepicker-js floatlabel", onchange: onchange_date %> + <%= f.text_field :end_on, placeholder: 'TO', id: "end_on_#{income.id}", class: "datepicker-js floatlabel", data: {validate_date_id: "#{onchange_income_id}", use_bs4: false} %>
- Cancel + Cancel <%= f.submit 'Save', class: "btn btn-save", onclick: "checkDate('#{income.id}')" %>
diff --git a/components/financial_assistance/app/views/financial_assistance/incomes/_job_income_form.html.erb b/components/financial_assistance/app/views/financial_assistance/incomes/_job_income_form.html.erb index 839167c267e..6a66de02bad 100644 --- a/components/financial_assistance/app/views/financial_assistance/incomes/_job_income_form.html.erb +++ b/components/financial_assistance/app/views/financial_assistance/incomes/_job_income_form.html.erb @@ -2,6 +2,7 @@ <%= income_form_for @application, @applicant, income do |f| %> <%= hidden_field_tag :bs4, true %> <% income_id = income.id %> + <% onchange_income_id = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? income_id : "" %> <% new_form = local_assigns[:new_form].present? ? local_assigns[:new_form] : false %> <% dummy_income_id = "#{income_id}#{new_form ? 'dummy' : ''}" # needed to prevent Multiple Form Label accessibility error %> <%= f.hidden_field :kind, value: 'wages_and_salaries' %> @@ -37,11 +38,11 @@
<%= f.label :start_on, l10n("faa.other_incomes.start_date"), class: "required", for: "start_on_#{dummy_income_id}" %> - <%= f.date_field :start_on, min: 110.years.ago, max:"9999-12-31", required: true, id: "start_on_#{dummy_income_id}", class: "w-100" %> + <%= f.date_field :start_on, min: 110.years.ago, max:"9999-12-31", required: true, id: "start_on_#{dummy_income_id}", data: {validate_date_id: "#{onchange_income_id}", use_bs4: true}, class: "w-100" %>
<%= f.label :end_on, l10n("faa.other_incomes.end_date"), for: "end_on_#{dummy_income_id}" %> - <%= f.date_field :end_on, min: 110.years.ago, max:"9999-12-31", id: "end_on_#{dummy_income_id}", class: "w-100 end-on-field" %> + <%= f.date_field :end_on, min: 110.years.ago, max:"9999-12-31", id: "end_on_#{dummy_income_id}", data: {validate_date_id: "#{onchange_income_id}", use_bs4: true}, class: "w-100 end-on-field" %>
@@ -60,7 +61,7 @@ <% else %> <%= income_form_for @application, @applicant, income do |f| %> <% income_id = income.id %> - <% onchange_date = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? (raw "validateDateWarnings('#{income_id}')") : "" %> + <% onchange_income_id = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? income_id : "" %> <%= f.hidden_field :kind, value: 'wages_and_salaries' %>
@@ -82,10 +83,10 @@
- <%= f.text_field :start_on, placeholder: 'FROM *', required: true, id: "start_on_#{income_id}", class: "datepicker-js floatlabel", onchange: onchange_date %> + <%= f.text_field :start_on, placeholder: 'FROM *', required: true, id: "start_on_#{income_id}", class: "datepicker-js floatlabel", data: {validate_date_id: "#{onchange_income_id}", use_bs4: false} %>
- <%= f.text_field :end_on, placeholder: 'TO', id: "end_on_#{income_id}", class: "datepicker-js floatlabel", onchange: onchange_date %> + <%= f.text_field :end_on, placeholder: 'TO', id: "end_on_#{income_id}", class: "datepicker-js floatlabel", data: {validate_date_id: "#{onchange_income_id}", use_bs4: false} %>
<% if !FinancialAssistanceRegistry.feature_enabled?(:disable_employer_address_fields) %> @@ -127,7 +128,7 @@
- Cancel + Cancel <%= f.submit 'Save', class: 'btn btn-save', :data => { :cuke => "job-income-save-button" }, onclick: "checkDate('#{income_id}')" %>
diff --git a/components/financial_assistance/app/views/financial_assistance/incomes/_other_income_form.html.erb b/components/financial_assistance/app/views/financial_assistance/incomes/_other_income_form.html.erb index 82369c8a926..6390cff631d 100644 --- a/components/financial_assistance/app/views/financial_assistance/incomes/_other_income_form.html.erb +++ b/components/financial_assistance/app/views/financial_assistance/incomes/_other_income_form.html.erb @@ -51,7 +51,7 @@ <%= income_form_for @application, @applicant, other_income do |f| %> <% income_id = other_income.id %> - <% onchange_date = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? (raw "validateDateWarnings('#{income_id}')") : "" %> + <% onchange_income_id = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? income_id : "" %>
<%= f.hidden_field :kind, value: kind %> @@ -76,15 +76,15 @@
- <%= f.text_field :start_on, placeholder: 'FROM *', required: true, id: "start_on_#{income_id}", class: "datepicker-js floatlabel", onchange: onchange_date %> + <%= f.text_field :start_on, placeholder: 'FROM *', required: true, id: "start_on_#{income_id}", class: "datepicker-js floatlabel", data: {validate_date_id: "#{onchange_income_id}"} %>
- <%= f.text_field :end_on, placeholder: 'TO', id: "end_on_#{income_id}", class: "datepicker-js floatlabel", onchange: onchange_date %> + <%= f.text_field :end_on, placeholder: 'TO', id: "end_on_#{income_id}", class: "datepicker-js floatlabel", data: {validate_date_id: "#{onchange_income_id}"} %>
- Cancel + Cancel <%= f.submit 'Save', class: "btn btn-save #{'disabled' if disabled }", :data => { :cuke => "other-income-save-button" } %>
diff --git a/components/financial_assistance/app/views/financial_assistance/incomes/_self_employed_income_form.erb b/components/financial_assistance/app/views/financial_assistance/incomes/_self_employed_income_form.erb index e9a6ee8c9d1..675062beb2b 100644 --- a/components/financial_assistance/app/views/financial_assistance/incomes/_self_employed_income_form.erb +++ b/components/financial_assistance/app/views/financial_assistance/incomes/_self_employed_income_form.erb @@ -8,7 +8,7 @@ <%= render partial: 'financial_assistance/shared/end_date_warning_alert', locals: { applicant: @applicant, kind: "note_self_employment_income_field" } %> - <% onchange_date = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? (raw "validateDateWarnings('#{income_id}', true)") : "" %> + <% onchange_income_id = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? income_id : "" %> <%= f.hidden_field :kind, value: 'net_self_employment' %>
@@ -21,11 +21,11 @@
<%= f.label :start_on, l10n("faa.other_incomes.start_date"), class: "required", for: "start_on_#{dummy_income_id}" %> - <%= f.date_field :start_on, min: 110.years.ago, max:"9999-12-31", required: true, id: "start_on_#{dummy_income_id}", onchange: onchange_date, class: "w-100" %> + <%= f.date_field :start_on, min: 110.years.ago, max:"9999-12-31", required: true, id: "start_on_#{dummy_income_id}", data: {validate_date_id: "#{onchange_income_id}", use_bs4: true}, class: "w-100" %>
<%= f.label :end_on, l10n("faa.other_incomes.end_date"), for: "end_on_#{dummy_income_id}" %> - <%= f.date_field :end_on, min: 110.years.ago, max:"9999-12-31", id: "end_on_#{dummy_income_id}", onchange: onchange_date, class: "w-100 end-on-field" %> + <%= f.date_field :end_on, min: 110.years.ago, max:"9999-12-31", id: "end_on_#{dummy_income_id}", data: {validate_date_id: "#{onchange_income_id}", use_bs4: true}, class: "w-100 end-on-field" %>
@@ -43,7 +43,7 @@ <% else %> <%= income_form_for @application, @applicant, income do |f| %> <% income_id = income.id %> - <% onchange_date = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? (raw "validateDateWarnings('#{income_id}')") : "" %> + <% onchange_income_id = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? income_id : "" %> <%= f.hidden_field :kind, value: 'net_self_employment' %>
@@ -60,17 +60,17 @@
- <%= f.text_field :start_on, placeholder: 'FROM *', required: true, id: "start_on_#{income_id}", class: "datepicker-js floatlabel", onchange: onchange_date %> + <%= f.text_field :start_on, placeholder: 'FROM *', required: true, id: "start_on_#{income_id}", class: "datepicker-js floatlabel", data: {validate_date_id: "#{onchange_income_id}", use_bs4: false} %>
- <%= f.text_field :end_on, placeholder: 'TO', id: "end_on_#{income_id}", class: "datepicker-js floatlabel", onchange: onchange_date %> + <%= f.text_field :end_on, placeholder: 'TO', id: "end_on_#{income_id}", class: "datepicker-js floatlabel", data: {validate_date_id: "#{onchange_income_id}", use_bs4: false} %>
- Cancel + Cancel <%= f.submit 'Save', class: 'btn btn-save ml-1', :data => { :cuke => "self-employed-income-save-button" } %>
diff --git a/components/financial_assistance/app/views/financial_assistance/incomes/_unemployment_income_form.html.erb b/components/financial_assistance/app/views/financial_assistance/incomes/_unemployment_income_form.html.erb index c7bce4728f7..69a4d5d58a4 100644 --- a/components/financial_assistance/app/views/financial_assistance/incomes/_unemployment_income_form.html.erb +++ b/components/financial_assistance/app/views/financial_assistance/incomes/_unemployment_income_form.html.erb @@ -5,6 +5,7 @@ <% income_id = income.id %> <% new_form = local_assigns[:new_form].present? ? local_assigns[:new_form] : false %> <% dummy_income_id = "#{income_id}#{new_form ? 'dummy' : ''}" # needed to prevent Multiple Form Label accessibility error %> + <% onchange_income_id = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? income_id : "" %> <%= f.hidden_field :kind, value: 'unemployment_income' %> <% if FinancialAssistanceRegistry.feature_enabled?(:other_income_end_date_warning) %> @@ -22,16 +23,16 @@
<%= f.label :start_on, l10n("start_date"), class: "required", for: "start_on_#{dummy_income_id}" %> - <%= f.date_field :start_on, min: 110.years.ago, max:"9999-12-31", required: true, id: "start_on_#{dummy_income_id}", class: "w-100" %> + <%= f.date_field :start_on, min: 110.years.ago, max:"9999-12-31", required: true, id: "start_on_#{dummy_income_id}", data: {validate_date_id: "#{onchange_income_id}", use_bs4: true}, class: "w-100" %>
<%= f.label :end_on, l10n("end_date"), for: "end_on_#{dummy_income_id}" %> - <%= f.date_field :end_on, min: 110.years.ago, max:"9999-12-31", id: "end_on_#{dummy_income_id}", class: "w-100 #{'end-on-field' if FinancialAssistanceRegistry.feature_enabled?(:other_income_end_date_warning)}" %> + <%= f.date_field :end_on, min: 110.years.ago, max:"9999-12-31", id: "end_on_#{dummy_income_id}", data: {validate_date_id: "#{onchange_income_id}", use_bs4: true}, class: "w-100 #{'end-on-field' if FinancialAssistanceRegistry.feature_enabled?(:other_income_end_date_warning)}" %>
<%= l10n("cancel") %> - <%= f.submit l10n("faa.other_incomes.save"), class: "button btn-save", :data => { :cuke => "unemployment-income-save-button" } %> + <%= f.submit l10n("faa.other_incomes.save"), class: "button btn-save unemployment-income-save", :data => { :cuke => "unemployment-income-save-button", :income_id => "income_id" } %>
@@ -42,7 +43,7 @@ <% else %> <%= income_form_for @application, @applicant, income do |f| %> <% income_id = income.id %> - <% onchange_date = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? (raw "validateDateWarnings('#{income_id}')") : "" %> + <% onchange_income_id = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? income_id : "" %>
<%= f.hidden_field :kind, value: 'unemployment_income' %> @@ -59,16 +60,16 @@
- <%= f.text_field :start_on, placeholder: 'FROM *', required: true, id: "start_on_#{income_id}", class: "datepicker-js floatlabel", onchange: onchange_date %> + <%= f.text_field :start_on, placeholder: 'FROM *', required: true, id: "start_on_#{income_id}", class: "datepicker-js floatlabel", data: {validate_date_id: "#{onchange_income_id}", use_bs4: false} %>
- <%= f.text_field :end_on, placeholder: 'TO', id: "end_on_#{income_id}", class: "datepicker-js floatlabel", onchange: onchange_date %> + <%= f.text_field :end_on, placeholder: 'TO', id: "end_on_#{income_id}", class: "datepicker-js floatlabel", data: {validate_date_id: "#{onchange_income_id}", use_bs4: false} %>
- Cancel - <%= f.submit 'Save', class: "btn btn-save", :data => { :cuke => "unemployment-income-save-button" }, onclick: "checkDate('#{income_id}')" %> + Cancel + <%= f.submit l10n("faa.other_incomes.save"), class: "btn btn-save unemployment-income-save", :data => { :cuke => "unemployment-income-save-button", :income_id => "#{income_id}" } %>
diff --git a/components/financial_assistance/app/views/financial_assistance/incomes/index.html.erb b/components/financial_assistance/app/views/financial_assistance/incomes/index.html.erb index ae24605691f..9958c80cc9c 100755 --- a/components/financial_assistance/app/views/financial_assistance/incomes/index.html.erb +++ b/components/financial_assistance/app/views/financial_assistance/incomes/index.html.erb @@ -337,7 +337,7 @@
- BACK TO ALL HOUSEHOLD MEMBERS (Go back and work on another person) + BACK TO ALL HOUSEHOLD MEMBERS (Go back and work on another person)
diff --git a/components/financial_assistance/app/views/financial_assistance/incomes/other.html.erb b/components/financial_assistance/app/views/financial_assistance/incomes/other.html.erb index 8039c859f30..0ce20176d99 100755 --- a/components/financial_assistance/app/views/financial_assistance/incomes/other.html.erb +++ b/components/financial_assistance/app/views/financial_assistance/incomes/other.html.erb @@ -529,7 +529,7 @@
- BACK TO ALL HOUSEHOLD MEMBERS (Go back and work on another person) + BACK TO ALL HOUSEHOLD MEMBERS (Go back and work on another person)
diff --git a/components/financial_assistance/app/views/financial_assistance/shared/_immigration_document_fields.html.erb b/components/financial_assistance/app/views/financial_assistance/shared/_immigration_document_fields.html.erb index 34ffb2e0ccb..afc29ebe490 100644 --- a/components/financial_assistance/app/views/financial_assistance/shared/_immigration_document_fields.html.erb +++ b/components/financial_assistance/app/views/financial_assistance/shared/_immigration_document_fields.html.erb @@ -16,7 +16,7 @@ -
+
<% else %> @@ -33,15 +33,7 @@ -
+
<% end %> - -<% if vlp_doc_subject.present? %> - -<% end %> diff --git a/components/ui_helpers/app/views/workflow/step.html.erb b/components/ui_helpers/app/views/workflow/step.html.erb index 3389edce35a..b59c528d3f0 100755 --- a/components/ui_helpers/app/views/workflow/step.html.erb +++ b/components/ui_helpers/app/views/workflow/step.html.erb @@ -41,7 +41,7 @@
- BACK TO ALL HOUSEHOLD MEMBERS (Go back and work on another person) + BACK TO ALL HOUSEHOLD MEMBERS (Go back and work on another person)
@@ -65,19 +65,19 @@
  • <% if @current_step.to_i == 1 %> <%= link_to find_previous_from_step_one do %> - <%# <%= image_tag 'icons/list.png' %> + <%# <%= image_tag 'icons/list.png' %> PREVIOUS <% end %> <% else %> <%= link_to previous_step_for do %> - <%# <%= image_tag 'icons/list.png' %> + <%# <%= image_tag 'icons/list.png' %> PREVIOUS <% end %> <% end %>
  • - <%# <%= image_tag 'icons/list.png' %> + <%# <%= image_tag 'icons/list.png' %> SAVE & EXIT
    diff --git a/features/financial_assistance/step_definitions/applicant_personal_info_page_steps.rb b/features/financial_assistance/step_definitions/applicant_personal_info_page_steps.rb index f90f7605d90..aca233422e4 100644 --- a/features/financial_assistance/step_definitions/applicant_personal_info_page_steps.rb +++ b/features/financial_assistance/step_definitions/applicant_personal_info_page_steps.rb @@ -30,7 +30,7 @@ end And(/user clicks comfirm member$/) do - find(".btn", text: "CONFIRM MEMBER").click + find(".btn.applicant-confirm-member").click end Then(/form should not submit due to required relationship options popup$/) do @@ -39,4 +39,4 @@ And(/user fills in the missing relationship$/) do find(:xpath, FinancialAssistance::ApplicantForm.applicant_spouse_select).click -end \ No newline at end of file +end diff --git a/features/financial_assistance/step_definitions/financial_assistance_steps.rb b/features/financial_assistance/step_definitions/financial_assistance_steps.rb index af1099b214e..94c2f525bf7 100644 --- a/features/financial_assistance/step_definitions/financial_assistance_steps.rb +++ b/features/financial_assistance/step_definitions/financial_assistance_steps.rb @@ -51,6 +51,9 @@ end # should be on checklist page now find('a.interaction-click-control-continue').click + + # temporary fix for content_security_policy_nonce returning nil on page load + refresh end When(/^.+ click 'Start New Application' button$/) do diff --git a/features/financial_assistance/step_definitions/other_income_page_steps.rb b/features/financial_assistance/step_definitions/other_income_page_steps.rb index 08d55737699..d8667da0183 100644 --- a/features/financial_assistance/step_definitions/other_income_page_steps.rb +++ b/features/financial_assistance/step_definitions/other_income_page_steps.rb @@ -9,6 +9,7 @@ end Then(/^the user will navigate to the Other Income page for the corresponding applicant$/) do + refresh sleep 2 expect(page).to have_content l10n('faa.nav.other_income') end @@ -103,7 +104,7 @@ end Then(/^the other income information should be saved on the page$/) do - expect(page).to have_content '100.00' + expect(page).to have_content '100' expect(page).to have_content '1/01/2018' end diff --git a/features/financial_assistance/step_definitions/other_questions_page_steps.rb b/features/financial_assistance/step_definitions/other_questions_page_steps.rb index ddcea18f2d9..80eb0e94b4f 100644 --- a/features/financial_assistance/step_definitions/other_questions_page_steps.rb +++ b/features/financial_assistance/step_definitions/other_questions_page_steps.rb @@ -34,6 +34,10 @@ find(IvlIapJobIncomeInformationPage.continue_btn).click if FinancialAssistanceRegistry[:unemployment_income].enabled? + # temporary fix for content_security_policy_nonce returning nil on page load + refresh + sleep 1 + find(IvlIapOtherIncomePage.has_unemployment_income_yes_radiobtn).click sleep 1 fill_in IvlIapOtherIncomePage.income_amount, with: '100' @@ -52,6 +56,11 @@ find(IvlIapOtherIncomePage.interest_select_yearly).click find(IvlIapOtherIncomePage.has_other_income_save_btn).click find(IvlIapOtherIncomePage.continue_btn).click + + # temporary fix for content_security_policy_nonce returning nil on page load + refresh + sleep 1 + find(IvlIapIncomeAdjustmentsPage.income_adjustments_yes_radiobtn).click find(:css, IvlIapIncomeAdjustmentsPage.moving_expenses_checkbox).set(true) fill_in IvlIapIncomeAdjustmentsPage.amount, with: '50' diff --git a/features/financial_assistance/step_definitions/tax_info_steps.rb b/features/financial_assistance/step_definitions/tax_info_steps.rb index e86ffe641e1..143f026f0e7 100644 --- a/features/financial_assistance/step_definitions/tax_info_steps.rb +++ b/features/financial_assistance/step_definitions/tax_info_steps.rb @@ -78,6 +78,8 @@ Given(/^the user is editing an application for financial assistance$/) do click_link(l10n('faa.nav.my_household')) + # temporary fix for content_security_policy_nonce returning nil on page load + refresh end When(/^the user navigates to the Tax Info page for a given applicant$/) do diff --git a/features/step_definitions/household_info_continue_button_steps.rb b/features/step_definitions/household_info_continue_button_steps.rb index 3c07b898d2e..438dcb7e072 100644 --- a/features/step_definitions/household_info_continue_button_steps.rb +++ b/features/step_definitions/household_info_continue_button_steps.rb @@ -25,6 +25,9 @@ sleep 2 end click_link 'Continue' + + # temporary fix for content_security_policy_nonce returning nil on page load + refresh end Given(/^the applicant only has one home address and one mailing address$/) do