Add test changes

Author: embarnard

app/helpers/year_selection_helper.rb

@@ -1,7 +1,7 @@
 module YearSelectionHelper
   # Year selection for separated, divorced and widowed GYR flow questions
   def year_options_from_2018_to_current_tax_yr_plus_one
-    #investigate
-    (MultiTenantService.new(:gyr).current_tax_year + 1).downto(2018).map { |year| [year.to_s, year.to_s] } + [[t("general.before_2018"), "before 2018"]]
+    (MultiTenantService.new(:gyr).current_tax_year(app_time) + 1)
+      .downto(2018).map { |year| [year.to_s, year.to_s] } + [[t("general.before_2018"), "before 2018"]]
   end
 end

app/services/multi_tenant_service.rb

@@ -91,15 +91,6 @@ def current_tax_year(time = DateTime.now)
     end
   end
 
-  def gyr_current_tax_year(time)
-    filing_seasons = Rails.configuration.tax_year_filing_seasons.select do |key, val|
-      # val = open, closed date
-      time > val[0]
-    end
-
-    filing_seasons.keys.max
-  end
-
   def end_of_current_tax_year
     DateTime.new(current_tax_year).end_of_year
   end
@@ -124,12 +115,6 @@ def filing_years(now = DateTime.now)
       years
     end
   end
-  # not showing 2025 when we are not in 2026
-  #
-
-  # latest_filing_year = MultiTenantService.new(:gyr).current_tax_year #Rails.configuration.tax_year_filing_seasons.keys.max
-  # raise StandardError, "check year" if latest_filing_year != current_tax_year
-  # years = [latest_filing_year, latest_filing_year - 1, latest_filing_year - 2, latest_filing_year - 3]
 
   def backtax_years(now = DateTime.now)
     filing_years(now).without(current_tax_year)
@@ -163,4 +148,15 @@ def statefile
       new(:statefile)
     end
   end
+
+  private
+
+  def gyr_current_tax_year(time)
+    filing_seasons = Rails.configuration.tax_year_filing_seasons.select do |key, val|
+      # val = open, closed date
+      time > val[0]
+    end
+
+    filing_seasons.keys.max
+  end
 end

app/views/questions/backtaxes/edit.html.erb

@@ -33,6 +33,7 @@
                          MultiTenantService.gyr.current_tax_year.to_s,
                          options: { checked_value: "yes", unchecked_value: "no" }) %>
     </div>
+    <% binding.pry %>
 
     <%= f.continue %>
   <% end %>

spec/controllers/hub/clients_controller_spec.rb

@@ -87,22 +87,22 @@
           vita_partner_id: vita_partner_id,
           tax_returns_attributes: {
             "0": {
-              year: Rails.configuration.gyr_current_tax_year.to_s,
+              year: MultiTenantService.new(:gyr).current_tax_year.to_s,
               is_hsa: true,
               certification_level: "advanced"
             },
             "1": {
-              year: (Rails.configuration.gyr_current_tax_year - 1).to_s,
+              year: (MultiTenantService.new(:gyr).current_tax_year - 1).to_s,
               is_hsa: false,
               certification_level: "basic"
             },
             "2": {
-              year: (Rails.configuration.gyr_current_tax_year - 2).to_s,
+              year: (MultiTenantService.new(:gyr).current_tax_year - 2).to_s,
               is_hsa: false,
               certification_level: "basic"
             },
             "3": {
-              year: (Rails.configuration.gyr_current_tax_year - 3).to_s,
+              year: (MultiTenantService.new(:gyr).current_tax_year - 3).to_s,
               is_hsa: false,
               certification_level: "advanced"
             },

spec/controllers/portal/portal_controller_spec.rb

@@ -38,8 +38,8 @@
       let(:client) { create :client, intake: (build :intake) }
 
       before do
-        create :tax_return, :intake_in_progress, year: (Rails.configuration.gyr_current_tax_year - 2), client: client
-        create :tax_return, :prep_ready_for_prep, year: (Rails.configuration.gyr_current_tax_year - 1), client: client
+        create :tax_return, :intake_in_progress, year: (MultiTenantService.new(:gyr).current_tax_year - 2), client: client
+        create :tax_return, :prep_ready_for_prep, year: (MultiTenantService.new(:gyr).current_tax_year - 1), client: client
         create :gyr_tax_return, :intake_ready_for_call, client: client
       end
 
@@ -52,7 +52,7 @@
       it "loads the client tax returns in desc order" do
         get :home
 
-        expect(assigns(:tax_returns).map(&:year)).to eq [Rails.configuration.gyr_current_tax_year, (Rails.configuration.gyr_current_tax_year - 1), (Rails.configuration.gyr_current_tax_year - 2)]
+        expect(assigns(:tax_returns).map(&:year)).to eq [MultiTenantService.new(:gyr).current_tax_year, (MultiTenantService.new(:gyr).current_tax_year - 1), (MultiTenantService.new(:gyr).current_tax_year - 2)]
         expect(assigns(:current_step)).to eq nil
       end
     end

spec/features/web_intake/returning_filer_spec.rb

@@ -37,7 +37,7 @@
     click_on I18n.t('general.continue')
 
     # backtaxes
-    check (Rails.configuration.gyr_current_tax_year - 2).to_s
+    check (MultiTenantService.new(:gyr).current_tax_year - 2).to_s
     click_on I18n.t('general.continue')
 
     # start with current year
@@ -72,7 +72,7 @@
     click_on I18n.t('general.continue')
 
     # backtaxes
-    check (Rails.configuration.gyr_current_tax_year - 2).to_s
+    check (MultiTenantService.new(:gyr).current_tax_year - 2).to_s
     click_on I18n.t('general.continue')
 
     # start with current year

spec/features/web_intake/routing_spec.rb

@@ -93,7 +93,7 @@ def fill_out_notification_preferences(fill_out_optional_consent: true)
     click_on I18n.t('general.continue')
 
     expect(page).to have_text I18n.t('views.questions.backtaxes.title')
-    check (Rails.configuration.gyr_current_tax_year - 2).to_s
+    check (MultiTenantService.new(:gyr).current_tax_year - 2).to_s
     click_on I18n.t('general.continue')
 
     expect(page).to have_text I18n.t('views.questions.start_with_current_year.title', year: current_tax_year)
@@ -119,7 +119,7 @@ def fill_out_notification_preferences(fill_out_optional_consent: true)
     click_on I18n.t('general.continue')
 
     expect(page).to have_text I18n.t('views.questions.backtaxes.title')
-    check (Rails.configuration.gyr_current_tax_year - 2).to_s
+    check (MultiTenantService.new(:gyr).current_tax_year - 2).to_s
     click_on I18n.t('general.continue')
 
     expect(page).to have_text I18n.t('views.questions.start_with_current_year.title', year: current_tax_year)
@@ -147,7 +147,7 @@ def fill_out_notification_preferences(fill_out_optional_consent: true)
     click_on I18n.t('general.continue')
 
     expect(page).to have_text I18n.t('views.questions.backtaxes.title')
-    check (Rails.configuration.gyr_current_tax_year - 2).to_s
+    check (MultiTenantService.new(:gyr).current_tax_year - 2).to_s
     click_on I18n.t('general.continue')
 
     expect(page).to have_text I18n.t('views.questions.start_with_current_year.title', year: current_tax_year)
@@ -181,7 +181,7 @@ def fill_out_notification_preferences(fill_out_optional_consent: true)
       click_on I18n.t('general.continue')
 
       expect(page).to have_text I18n.t('views.questions.backtaxes.title')
-      check (Rails.configuration.gyr_current_tax_year - 2).to_s
+      check (MultiTenantService.new(:gyr).current_tax_year - 2).to_s
       click_on I18n.t('general.continue')
 
       expect(page).to have_text I18n.t('views.questions.start_with_current_year.title', year: current_tax_year)

spec/forms/hub/create_client_form_spec.rb

@@ -66,22 +66,22 @@
         primary_tin_type: "ssn",
         tax_returns_attributes: {
           "0" => {
-            year: Rails.configuration.gyr_current_tax_year.to_s,
+            year: MultiTenantService.new(:gyr).current_tax_year.to_s,
             is_hsa: "1",
             certification_level: "basic"
           },
           "1" => {
-            year: (Rails.configuration.gyr_current_tax_year - 1).to_s,
+            year: (MultiTenantService.new(:gyr).current_tax_year - 1).to_s,
             is_hsa: "0",
             certification_level: "basic"
           },
           "2" => {
-            year: (Rails.configuration.gyr_current_tax_year - 2).to_s,
+            year: (MultiTenantService.new(:gyr).current_tax_year - 2).to_s,
             is_hsa: "1",
             certification_level: "basic"
           },
           "3" => {
-            year: (Rails.configuration.gyr_current_tax_year - 3).to_s,
+            year: (MultiTenantService.new(:gyr).current_tax_year - 3).to_s,
             is_hsa: "0",
             certification_level: "advanced"
           },
@@ -166,7 +166,7 @@
         expect(intake.needs_help_previous_year_3).to eq "yes"
         expect(intake.needs_help_previous_year_1).to eq "yes"
         expect(intake.needs_help_current_year).to eq "yes"
-        current_tax_year = Rails.configuration.gyr_current_tax_year
+        current_tax_year = MultiTenantService.new(:gyr).current_tax_year
         expect(tax_returns.map(&:year)).to match_array [current_tax_year, (current_tax_year - 1), (current_tax_year - 2), (current_tax_year - 3)]
         expect(tax_returns.map(&:client).uniq).to eq [intake.client]
         expect(tax_returns.map(&:service_type).uniq).to eq ["drop_off"]

spec/jobs/bulk_action_job_spec.rb

@@ -397,7 +397,7 @@
           form_params: params
         )
 
-        expect(client.reload.system_notes.map(&:body)).to include "#{team_member.name_with_role} updated #{Rails.configuration.gyr_current_tax_year} tax return status from Final steps/Ready to file to Quality review/Ready for call"
+        expect(client.reload.system_notes.map(&:body)).to include "#{team_member.name_with_role} updated #{MultiTenantService.new(:gyr).current_tax_year} tax return status from Final steps/Ready to file to Quality review/Ready for call"
       end
 
       context "when 'Keep current status' is selected" do

spec/models/intake_spec.rb

@@ -764,12 +764,12 @@
 
     context "with a couple filing years selected" do
       let!(:client) { create :client, tax_returns: [
-        build(:tax_return, year: (Rails.configuration.gyr_current_tax_year - 1)),
+        build(:tax_return, year: (MultiTenantService.new(:gyr).current_tax_year - 1)),
         build(:gyr_tax_return)
       ], intake: intake }
 
       it "returns them as an array" do
-        expect(intake.filing_years).to eq([Rails.configuration.gyr_current_tax_year, (Rails.configuration.gyr_current_tax_year - 1)])
+        expect(intake.filing_years).to eq([MultiTenantService.new(:gyr).current_tax_year, (MultiTenantService.new(:gyr).current_tax_year - 1)])
       end
     end
   end