From 973b599e11f578a654782bd5a7c8bde6f232e340 Mon Sep 17 00:00:00 2001 From: Krzysztof Kotlarek Date: Wed, 6 Nov 2024 13:39:52 +1100 Subject: [PATCH] FIX: correctly display category name in replace text modal (#29612) Bug introduced in this PR https://github.com/discourse/discourse/pull/23232 The previous modal was using `category.name` https://github.com/discourse/discourse/pull/23232/files#diff-bfae353a2f3457780e5c281b6a165261cfe552dd9dd791f3859e52d60e22be7fL20 --- .../javascripts/admin/addon/components/modal/reseed.hbs | 2 +- spec/system/admin_site_texts_spec.rb | 7 +++++++ spec/system/page_objects/pages/admin_site_texts.rb | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/addon/components/modal/reseed.hbs b/app/assets/javascripts/admin/addon/components/modal/reseed.hbs index eb746b98ada..46d26972f48 100644 --- a/app/assets/javascripts/admin/addon/components/modal/reseed.hbs +++ b/app/assets/javascripts/admin/addon/components/modal/reseed.hbs @@ -19,7 +19,7 @@ @type="checkbox" @checked={{category.selected}} /> - {{category.displayName}} + {{category.name}} {{/each}} diff --git a/spec/system/admin_site_texts_spec.rb b/spec/system/admin_site_texts_spec.rb index e78ae5c06f5..d8332718f4f 100644 --- a/spec/system/admin_site_texts_spec.rb +++ b/spec/system/admin_site_texts_spec.rb @@ -121,4 +121,11 @@ describe "Admin Site Texts Page", type: :system do expect(site_texts_page).to have_translation_value("Some overridden value") expect(TranslationOverride.exists?(translation_key: "js.skip_to_main_content")).to eq(true) end + + it "properly display category names in replace text modal" do + site_texts_page.visit + site_texts_page.click_replace_text_button + + expect(page.all(".modal label span").map(&:text)).to eq(["Uncategorized"]) + end end diff --git a/spec/system/page_objects/pages/admin_site_texts.rb b/spec/system/page_objects/pages/admin_site_texts.rb index 41bce154c9f..3d16833a604 100644 --- a/spec/system/page_objects/pages/admin_site_texts.rb +++ b/spec/system/page_objects/pages/admin_site_texts.rb @@ -48,6 +48,10 @@ module PageObjects find(".site-text-value").fill_in(with: value) find(".save-changes").click end + + def click_replace_text_button + find(".reseed button").click + end end end end