Skip to content

Commit 3ebc688

Browse files
powersurge360powersurge360
authored
Removed limitations for faq visibility (#6108)
Removed limitations for faq visibility
1 parent 003f67e commit 3ebc688

File tree

3 files changed

+6
-152
lines changed

3 files changed

+6
-152
lines changed

‎app/controllers/state_file/faq_controller.rb‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ class StateFile::FaqController < ApplicationController
22
layout "state_file"
33

44
def index
5-
years_to_show = filing_years_to_show # calculate once per request
65
visible_state_code_names = StateFile::StateInformationService.state_code_to_name_map
7-
.filter { |state_code, _| (years_to_show - StateFile::StateInformationService.filing_years(state_code)).empty? }
86
.transform_values { |state_name| { state_name: } }
97
visible_state_code_names.slice!(params[:us_state]) unless params[:us_state] == "us"
108
product_types = visible_state_code_names.keys.map do |code|
@@ -20,10 +18,6 @@ def index
2018
end
2119

2220
def show
23-
if params[:us_state] == 'ny'
24-
redirect_to state_landing_page_path(us_state: "ny")
25-
return
26-
end
2721
@section_key = params[:section_key]
2822
@faq_category = FaqCategory.find_by(slug: @section_key, product_type: FaqCategory.state_to_product_type(params[:us_state]))
2923

@@ -32,6 +26,7 @@ def show
3226

3327
private
3428

29+
# @deprecated FYST is retired now, show all categories all the time!
3530
def filing_years_to_show
3631
faq_show_start = Rails.configuration.state_file_show_faq_date_start
3732
faq_show_end = Rails.configuration.state_file_show_faq_date_end
@@ -48,12 +43,10 @@ def filing_years_to_show
4843
# show states that were open this year and will open next year
4944
[tax_year, tax_year + 1]
5045
end
46+
elsif app_time > faq_show_end
47+
[tax_year + 1]
5148
else
52-
if app_time > faq_show_end
53-
[tax_year + 1]
54-
else
55-
[tax_year]
56-
end
49+
[tax_year]
5750
end
5851
end
5952
end

‎config/application.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class Application < Rails::Application
128128
config.state_file_end_of_new_intakes = et.parse('2025-10-22 23:59:59')
129129
config.state_file_end_of_in_progress_intakes = et.parse('2025-10-31 23:59:59')
130130
config.state_file_show_faq_date_start = pt.parse('2024-12-10 00:00:00')
131-
config.state_file_show_faq_date_end = pt.parse('2025-11-18 23:59:59')
131+
config.state_file_show_faq_date_end = pt.parse('2025-11-15 23:59:59')
132132

133133
config.allow_magic_verification_code = (Rails.env.demo? || Rails.env.development? || Rails.env.heroku? || Rails.env.staging?)
134134
config.allow_magic_ssn = (Rails.env.demo? || Rails.env.development? || Rails.env.heroku? || Rails.env.staging?)

‎spec/controllers/state_file/faq_controller_spec.rb‎

Lines changed: 1 addition & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -15,135 +15,6 @@
1515

1616
expect(response).to be_ok
1717
end
18-
19-
context "showing the right states" do
20-
let(:last_year_state_name) { "state that was open last year but not this year" }
21-
let(:continuing_state_name) { "state that was open last year and open this year" }
22-
let(:new_this_year_state_name) { "new state that will open this year" }
23-
let(:new_next_year_state_name) { "new state that will open next year" }
24-
before do
25-
allow(StateFile::StateInformationService).to receive(:filing_years).with(:last_year_state).and_return([tax_year - 1])
26-
allow(StateFile::StateInformationService).to receive(:filing_years).with(:continuing_state).and_return([tax_year + 1, tax_year, tax_year - 1])
27-
allow(StateFile::StateInformationService).to receive(:filing_years).with(:new_this_year_state).and_return([tax_year, tax_year + 1])
28-
allow(StateFile::StateInformationService).to receive(:filing_years).with(:new_next_year_state).and_return([tax_year + 1])
29-
30-
allow(StateFile::StateInformationService).to receive(:state_code_to_name_map).and_return(
31-
{
32-
last_year_state: last_year_state_name,
33-
continuing_state: continuing_state_name,
34-
new_this_year_state: new_this_year_state_name,
35-
new_next_year_state: new_next_year_state_name,
36-
}
37-
)
38-
end
39-
40-
context "when FYST has not opened yet for the year" do
41-
around do |example|
42-
Timecop.freeze(Rails.configuration.state_file_show_faq_date_start - 1.hour) do
43-
example.run
44-
end
45-
end
46-
47-
context "in production" do
48-
before do
49-
allow(Rails).to receive(:env).and_return("production".inquiry)
50-
end
51-
52-
it "shows only states that were open before and will reopen" do
53-
get :index, params: { us_state: "us" }
54-
55-
expect(response.body).not_to have_text I18n.t("state_file.faq.index.title", state: last_year_state_name)
56-
expect(response.body).to have_text I18n.t("state_file.faq.index.title", state: continuing_state_name)
57-
expect(response.body).not_to have_text I18n.t("state_file.faq.index.title", state: new_this_year_state_name)
58-
expect(response.body).not_to have_text I18n.t("state_file.faq.index.title", state: new_next_year_state_name)
59-
end
60-
end
61-
62-
context "in any other environment" do
63-
["demo", "heroku", "development"].each do |environment|
64-
before do
65-
allow(Rails).to receive(:env).and_return(environment.inquiry)
66-
end
67-
68-
it "shows states that will open this season" do
69-
get :index, params: { us_state: "us" }
70-
71-
expect(response.body).not_to have_text I18n.t("state_file.faq.index.title", state: last_year_state_name)
72-
expect(response.body).to have_text I18n.t("state_file.faq.index.title", state: continuing_state_name)
73-
expect(response.body).to have_text I18n.t("state_file.faq.index.title", state: new_this_year_state_name)
74-
expect(response.body).not_to have_text I18n.t("state_file.faq.index.title", state: new_next_year_state_name)
75-
end
76-
end
77-
end
78-
end
79-
80-
context "when FYST is either open or has closed for the year" do
81-
context "open" do
82-
around do |example|
83-
Timecop.freeze(Rails.configuration.state_file_show_faq_date_end - 1.day) do
84-
example.run
85-
end
86-
end
87-
88-
context "in any environment" do
89-
["production", "demo", "heroku", "development"].each do |environment|
90-
before do
91-
allow(Rails).to receive(:env).and_return(environment.inquiry)
92-
end
93-
94-
it "shows states that are currently open" do
95-
get :index, params: { us_state: "us" }
96-
97-
expect(response.body).not_to have_text I18n.t("state_file.faq.index.title", state: last_year_state_name)
98-
expect(response.body).to have_text I18n.t("state_file.faq.index.title", state: continuing_state_name)
99-
expect(response.body).to have_text I18n.t("state_file.faq.index.title", state: new_this_year_state_name)
100-
expect(response.body).not_to have_text I18n.t("state_file.faq.index.title", state: new_next_year_state_name)
101-
end
102-
end
103-
end
104-
end
105-
106-
context "after close" do
107-
around do |example|
108-
Timecop.freeze(Rails.configuration.state_file_end_of_in_progress_intakes + 1.day) do
109-
example.run
110-
end
111-
end
112-
113-
context "in production" do
114-
before do
115-
allow(Rails).to receive(:env).and_return("production".inquiry)
116-
end
117-
118-
it "shows only states that were open before and will reopen" do
119-
get :index, params: { us_state: "us" }
120-
121-
expect(response.body).not_to have_text I18n.t("state_file.faq.index.title", state: last_year_state_name)
122-
expect(response.body).to have_text I18n.t("state_file.faq.index.title", state: continuing_state_name)
123-
expect(response.body).to have_text I18n.t("state_file.faq.index.title", state: new_this_year_state_name)
124-
expect(response.body).not_to have_text I18n.t("state_file.faq.index.title", state: new_next_year_state_name)
125-
end
126-
end
127-
128-
context "in any other environment" do
129-
["demo", "heroku", "development"].each do |environment|
130-
before do
131-
allow(Rails).to receive(:env).and_return(environment.inquiry)
132-
end
133-
134-
it "shows states that will open next season" do
135-
get :index, params: { us_state: "us" }
136-
137-
expect(response.body).not_to have_text I18n.t("state_file.faq.index.title", state: last_year_state_name)
138-
expect(response.body).to have_text I18n.t("state_file.faq.index.title", state: continuing_state_name)
139-
expect(response.body).to have_text I18n.t("state_file.faq.index.title", state: new_this_year_state_name)
140-
expect(response.body).to have_text I18n.t("state_file.faq.index.title", state: new_next_year_state_name)
141-
end
142-
end
143-
end
144-
end
145-
end
146-
end
14718
end
14819

14920
describe "#show" do
@@ -155,15 +26,5 @@
15526

15627
expect(response.body).to have_text faq_category.description_en
15728
end
158-
159-
context "for new york" do
160-
let!(:faq_category) { create :faq_category, slug: section_key, product_type: "state_file_ny" }
161-
162-
it "redirects to the ny landing page" do
163-
get :show, params: { section_key: section_key, us_state: "ny" }
164-
165-
expect(response).to redirect_to state_landing_page_path(us_state: "ny")
166-
end
167-
end
16829
end
169-
end
30+
end

0 commit comments

Comments
 (0)