Skip to content

Commit 7797447

Browse files
authored
chore: clean test output by removing deprecation on rendered_component (#5604)
**Story card:** [sc-15268](https://app.shortcut.com/simpledotorg/story/15268/versioning-adopt-semantic-versioning) ## Because Building in Github surfaces the noise Semaphore hides ## This addresses ``` DEPRECATION WARNING: `rendered_component` is deprecated and will be removed in v3.0.0. Use `page` instead. (called from block (3 levels) in <top (required)> at /home/runner/work/simple-server/simple-server/spec/components/which/uses/rendered_component_spec.rb:##) ``` ## Test instructions suite tests
1 parent 00ffdce commit 7797447

File tree

6 files changed

+49
-49
lines changed

6 files changed

+49
-49
lines changed

spec/components/progress_tab/diabetes/blood_sugar200_to299_component_spec.rb

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,24 @@ def render_component_with(use_who_standard: nil)
6363
end
6464

6565
it "renders the correct uncontrolled threshold long text for Sri Lanka" do
66-
expect(rendered_component).to have_text(I18n.t("bs_over_200_copy.reports_card_title_dm_fbs"))
66+
expect(page).to have_text(I18n.t("bs_over_200_copy.reports_card_title_dm_fbs"))
6767
end
6868

6969
it "renders the correct uncontrolled threshold short text for Sri Lanka" do
70-
expect(rendered_component).to have_text(I18n.t("bs_over_200_copy.bs_200_to_299.title_dm_fbs"))
70+
expect(page).to have_text(I18n.t("bs_over_200_copy.bs_200_to_299.title_dm_fbs"))
7171
end
7272

7373
it "renders the correct denominator text for Sri Lanka" do
74-
expect(rendered_component).to have_text(I18n.t("progress_tab.diagnosis_report.patient_treatment_outcomes.uncontrolled_card.help_tooltip.denominator", facility_name: "Region 1", diagnosis: "Diabetes"))
74+
expect(page).to have_text(I18n.t("progress_tab.diagnosis_report.patient_treatment_outcomes.uncontrolled_card.help_tooltip.denominator", facility_name: "Region 1", diagnosis: "Diabetes"))
7575
end
7676

7777
it "renders the bar chart with correct data" do
78-
expect(rendered_component).to have_selector('.d-flex[data-graph-type="bar-chart"]')
79-
expect(rendered_component).to have_selector(".w-32px.bgc-yellow")
78+
expect(page).to have_selector('.d-flex[data-graph-type="bar-chart"]')
79+
expect(page).to have_selector(".w-32px.bgc-yellow")
8080
end
8181

8282
it "renders the correct uncontrolled bar text for Sri Lanka" do
83-
expect(rendered_component).to have_text(I18n.t("bs_over_200_copy.bs_200_to_299.title_dm_fbs"))
83+
expect(page).to have_text(I18n.t("bs_over_200_copy.bs_200_to_299.title_dm_fbs"))
8484
end
8585
end
8686

@@ -90,24 +90,24 @@ def render_component_with(use_who_standard: nil)
9090
end
9191

9292
it "renders the correct uncontrolled threshold long text for non-Sri Lanka countries" do
93-
expect(rendered_component).to have_text(I18n.t("bs_over_200_copy.reports_card_title_dm"))
93+
expect(page).to have_text(I18n.t("bs_over_200_copy.reports_card_title_dm"))
9494
end
9595

9696
it "renders the correct uncontrolled threshold short text for non-Sri Lanka countries" do
97-
expect(rendered_component).to have_text(I18n.t("bs_over_200_copy.bs_200_to_299.title_dm_bs"))
97+
expect(page).to have_text(I18n.t("bs_over_200_copy.bs_200_to_299.title_dm_bs"))
9898
end
9999

100100
it "renders the correct denominator text for non-Sri Lanka countries" do
101-
expect(rendered_component).to have_text(I18n.t("progress_tab.diagnosis_report.patient_treatment_outcomes.uncontrolled_card.help_tooltip.denominator", facility_name: "Region 1", diagnosis: "Diabetes"))
101+
expect(page).to have_text(I18n.t("progress_tab.diagnosis_report.patient_treatment_outcomes.uncontrolled_card.help_tooltip.denominator", facility_name: "Region 1", diagnosis: "Diabetes"))
102102
end
103103

104104
it "renders the bar chart with correct data for non-Sri Lanka countries" do
105-
expect(rendered_component).to have_selector('.d-flex[data-graph-type="bar-chart"]')
106-
expect(rendered_component).to have_selector(".w-32px.bgc-yellow")
105+
expect(page).to have_selector('.d-flex[data-graph-type="bar-chart"]')
106+
expect(page).to have_selector(".w-32px.bgc-yellow")
107107
end
108108

109109
it "renders the correct uncontrolled bar text for non-Sri Lanka countries" do
110-
expect(rendered_component).to have_text(I18n.t("bs_over_200_copy.bs_200_to_299.title_dm"))
110+
expect(page).to have_text(I18n.t("bs_over_200_copy.bs_200_to_299.title_dm"))
111111
end
112112
end
113113
end

spec/components/progress_tab/diabetes/blood_sugar300_and_above_component_spec.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ def render_component_with(use_who_standard: nil)
6464
end
6565

6666
it "displays the correct uncontrolled threshold long text" do
67-
expect(rendered_component).to have_text(I18n.t("bs_over_200_copy.bs_over_300.numerator_dm_fbs"))
67+
expect(page).to have_text(I18n.t("bs_over_200_copy.bs_over_300.numerator_dm_fbs"))
6868
end
6969

7070
it "displays the correct uncontrolled threshold short text" do
71-
expect(rendered_component).to have_text(I18n.t("bs_over_200_copy.bs_over_300.title_dm_fbs"))
71+
expect(page).to have_text(I18n.t("bs_over_200_copy.bs_over_300.title_dm_fbs"))
7272
end
7373

7474
it "displays the correct denominator text" do
75-
expect(rendered_component).to have_text(
75+
expect(page).to have_text(
7676
I18n.t(
7777
"progress_tab.diagnosis_report.patient_treatment_outcomes.controlled_card.help_tooltip.denominator",
7878
facility_name: region.name,
@@ -82,8 +82,8 @@ def render_component_with(use_who_standard: nil)
8282
end
8383

8484
it "renders the bar chart with correct styling and tooltip enabled" do
85-
expect(rendered_component).to have_selector('.d-flex[data-graph-type="bar-chart"]')
86-
expect(rendered_component).to have_selector(".w-32px.bgc-yellow-dark-new")
85+
expect(page).to have_selector('.d-flex[data-graph-type="bar-chart"]')
86+
expect(page).to have_selector(".w-32px.bgc-yellow-dark-new")
8787
end
8888
end
8989

@@ -93,11 +93,11 @@ def render_component_with(use_who_standard: nil)
9393
end
9494

9595
it "displays the correct uncontrolled threshold short text" do
96-
expect(rendered_component).to have_text(I18n.t("bs_over_200_copy.bs_over_300.title"))
96+
expect(page).to have_text(I18n.t("bs_over_200_copy.bs_over_300.title"))
9797
end
9898

9999
it "displays the correct denominator text" do
100-
expect(rendered_component).to have_text(
100+
expect(page).to have_text(
101101
I18n.t(
102102
"progress_tab.diagnosis_report.patient_treatment_outcomes.controlled_card.help_tooltip.denominator",
103103
facility_name: region.name,
@@ -107,8 +107,8 @@ def render_component_with(use_who_standard: nil)
107107
end
108108

109109
it "renders the bar chart with correct styling and tooltip enabled" do
110-
expect(rendered_component).to have_selector('.d-flex[data-graph-type="bar-chart"]')
111-
expect(rendered_component).to have_selector(".w-32px.bgc-yellow-dark-new")
110+
expect(page).to have_selector('.d-flex[data-graph-type="bar-chart"]')
111+
expect(page).to have_selector(".w-32px.bgc-yellow-dark-new")
112112
end
113113
end
114114
end

spec/components/progress_tab/diabetes/control_component_spec.rb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ def render_component_with(use_who_standard: nil)
6161
end
6262

6363
it "renders the controlled threshold long text for WHO standard" do
64-
expect(rendered_component).to have_text("Numerator: Patients with FBS <126mg/dL or HbA1c <7% at their last visit in the last 3 months")
64+
expect(page).to have_text("Numerator: Patients with FBS <126mg/dL or HbA1c <7% at their last visit in the last 3 months")
6565
end
6666

6767
it "renders the controlled threshold short text for WHO standard" do
68-
expect(rendered_component).to have_text(I18n.t("bs_below_200_copy.reports_card_title_dm_fbs"))
68+
expect(page).to have_text(I18n.t("bs_below_200_copy.reports_card_title_dm_fbs"))
6969
end
7070

7171
it "renders the correct subtitle for WHO standard" do
72-
expect(rendered_component).to have_text(I18n.t(
72+
expect(page).to have_text(I18n.t(
7373
"bs_below_200_copy.reports_card_subtitle_dm_fbs",
7474
region_name: "Region 1",
7575
diagnosis: "Diabetes",
@@ -78,8 +78,8 @@ def render_component_with(use_who_standard: nil)
7878
end
7979

8080
it "renders the bar chart with correct data" do
81-
expect(rendered_component).to have_selector('.d-flex[data-graph-type="bar-chart"]')
82-
expect(rendered_component).to have_selector(".w-32px.bgc-green-dark-new", count: 3)
81+
expect(page).to have_selector('.d-flex[data-graph-type="bar-chart"]')
82+
expect(page).to have_selector(".w-32px.bgc-green-dark-new", count: 3)
8383
end
8484
end
8585

@@ -89,15 +89,15 @@ def render_component_with(use_who_standard: nil)
8989
end
9090

9191
it "renders the controlled threshold long text for non-WHO standard" do
92-
expect(rendered_component).to have_text(I18n.t("bs_below_200_copy.numerator"))
92+
expect(page).to have_text(I18n.t("bs_below_200_copy.numerator"))
9393
end
9494

9595
it "renders the controlled threshold short text for non-WHO standard" do
96-
expect(rendered_component).to have_text(I18n.t("bs_below_200_copy.reports_card_title_dm_bs"))
96+
expect(page).to have_text(I18n.t("bs_below_200_copy.reports_card_title_dm_bs"))
9797
end
9898

9999
it "renders the correct subtitle for non-WHO standard" do
100-
expect(rendered_component).to have_text(I18n.t(
100+
expect(page).to have_text(I18n.t(
101101
"bs_below_200_copy.reports_card_subtitle_dm",
102102
region_name: "Region 1",
103103
diagnosis: "Diabetes",
@@ -106,8 +106,8 @@ def render_component_with(use_who_standard: nil)
106106
end
107107

108108
it "renders the bar chart with correct data" do
109-
expect(rendered_component).to have_selector('.d-flex[data-graph-type="bar-chart"]')
110-
expect(rendered_component).to have_selector(".w-32px.bgc-green-dark-new", count: 3)
109+
expect(page).to have_selector('.d-flex[data-graph-type="bar-chart"]')
110+
expect(page).to have_selector(".w-32px.bgc-green-dark-new", count: 3)
111111
end
112112
end
113113
end

spec/components/progress_tab/hypertension/control_component_spec.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,18 @@ def render_component
5858
before { render_component }
5959

6060
it "renders the controlled threshold long text" do
61-
expect(rendered_component).to have_text(I18n.t(
61+
expect(page).to have_text(I18n.t(
6262
"progress_tab.diagnosis_report.patient_treatment_outcomes.controlled_card.help_tooltip.numerator",
6363
controlled_threshold: I18n.t("progress_tab.diagnosis_report.diagnosis_thresholds.hypertension_controlled_long")
6464
))
6565
end
6666

6767
it "renders the controlled threshold short text" do
68-
expect(rendered_component).to have_text(I18n.t("progress_tab.diagnosis_report.diagnosis_thresholds.hypertension_controlled_short"))
68+
expect(page).to have_text(I18n.t("progress_tab.diagnosis_report.diagnosis_thresholds.hypertension_controlled_short"))
6969
end
7070

7171
it "renders the correct subtitle" do
72-
expect(rendered_component).to have_text(I18n.t(
72+
expect(page).to have_text(I18n.t(
7373
"progress_tab.diagnosis_report.patient_treatment_outcomes.controlled_card.subtitle",
7474
facility_name: "Region 1",
7575
diagnosis: "Hypertension",
@@ -78,8 +78,8 @@ def render_component
7878
end
7979

8080
it "renders the bar chart with correct data" do
81-
expect(rendered_component).to have_selector('.d-flex[data-graph-type="bar-chart"]')
82-
expect(rendered_component).to have_selector(".w-32px.bgc-green-dark-new", count: 3)
81+
expect(page).to have_selector('.d-flex[data-graph-type="bar-chart"]')
82+
expect(page).to have_selector(".w-32px.bgc-green-dark-new", count: 3)
8383
end
8484
end
8585
end

spec/components/progress_tab/hypertension/uncontrolled_component_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,28 +60,28 @@ def render_component
6060
end
6161

6262
it "renders the correct title text" do
63-
expect(rendered_component).to have_text(I18n.t("progress_tab.diagnosis_report.diagnosis_thresholds.hypertension_uncontrolled_short"))
63+
expect(page).to have_text(I18n.t("progress_tab.diagnosis_report.diagnosis_thresholds.hypertension_uncontrolled_short"))
6464
end
6565

6666
it "renders the correct subtitle text" do
67-
expect(rendered_component).to have_text(I18n.t("progress_tab.diagnosis_report.patient_treatment_outcomes.uncontrolled_card.subtitle",
67+
expect(page).to have_text(I18n.t("progress_tab.diagnosis_report.patient_treatment_outcomes.uncontrolled_card.subtitle",
6868
facility_name: "Region 1", diagnosis: "Hypertension",
6969
uncontrolled_threshold: I18n.t("progress_tab.diagnosis_report.diagnosis_thresholds.hypertension_uncontrolled_long")))
7070
end
7171

7272
it "renders the tooltip with correct numerator and denominator text" do
73-
expect(rendered_component).to have_text(I18n.t("progress_tab.diagnosis_report.patient_treatment_outcomes.uncontrolled_card.help_tooltip.numerator",
73+
expect(page).to have_text(I18n.t("progress_tab.diagnosis_report.patient_treatment_outcomes.uncontrolled_card.help_tooltip.numerator",
7474
uncontrolled_threshold: I18n.t("progress_tab.diagnosis_report.diagnosis_thresholds.hypertension_uncontrolled_long")))
75-
expect(rendered_component).to have_text(I18n.t("progress_tab.diagnosis_report.patient_treatment_outcomes.uncontrolled_card.help_tooltip.denominator",
75+
expect(page).to have_text(I18n.t("progress_tab.diagnosis_report.patient_treatment_outcomes.uncontrolled_card.help_tooltip.denominator",
7676
facility_name: "Region 1", diagnosis: "Hypertension"))
7777
end
7878

7979
it "renders the bar chart with correct data" do
80-
expect(rendered_component).to have_selector("[data-graph-type='bar-chart']")
80+
expect(page).to have_selector("[data-graph-type='bar-chart']")
8181
end
8282

8383
it "includes the correct graph colors" do
84-
expect(rendered_component).to have_selector(".bgc-yellow-dark-new")
84+
expect(page).to have_selector(".bgc-yellow-dark-new")
8585
end
8686
end
8787
end

spec/components/reports/progress_monthly_follow_ups_component_spec.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
monthly_follow_ups_data.map { |date_str, value| [Period.new(type: :month, value: date_str), value] }.to_h
3434
end
3535

36-
let(:rendered_component) do
36+
let(:page) do
3737
render_inline(described_class.new(
3838
monthly_follow_ups: monthly_follow_ups,
3939
period_info: period_info,
@@ -44,25 +44,25 @@
4444

4545
describe "rendering the component" do
4646
it "renders the title correctly" do
47-
expect(rendered_component).to have_css("h2", text: I18n.t("progress_tab.diagnosis_report.monthly_follow_up_patients.title"))
47+
expect(page).to have_text(I18n.t("progress_tab.diagnosis_report.monthly_follow_up_patients.title"))
4848
end
4949

5050
it "renders the subtitle with correct facility name and diagnosis" do
51-
expect(rendered_component).to have_selector("p", text: I18n.t("progress_tab.diagnosis_report.monthly_follow_up_patients.subtitle_dm", facility_name: region.name, diagnosis: diagnosis))
51+
expect(page).to have_selector("p", text: I18n.t("progress_tab.diagnosis_report.monthly_follow_up_patients.subtitle_dm", facility_name: region.name, diagnosis: diagnosis))
5252
end
5353

5454
it "displays the correct number of total registrations" do
5555
monthly_follow_ups_data.values.each do |value|
56-
expect(rendered_component).to have_text(value.to_s)
56+
expect(page).to have_text(value.to_s)
5757
end
5858
end
5959

6060
it "passes the correct data to the data bar graph partial" do
61-
expect(rendered_component).to have_selector('div[data-graph-type="bar-chart"]')
61+
expect(page).to have_selector('div[data-graph-type="bar-chart"]')
6262
monthly_follow_ups_data.keys.each do |date_str|
63-
expect(rendered_component).to have_text(period_info_data[date_str][:name])
63+
expect(page).to have_text(period_info_data[date_str][:name])
6464
end
65-
monthly_follow_ups_data.values.each { |value| expect(rendered_component).to have_text(value.to_s) }
65+
monthly_follow_ups_data.values.each { |value| expect(page).to have_text(value.to_s) }
6666
end
6767
end
6868

0 commit comments

Comments
 (0)