github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-22 18:35:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Make i18n spec ignore these test-only settings (#15329)

Browse Source 
Fixes flakyness introduced in #15324
This commit is contained in:
Jarek Radosz 2021-12-16 15:49:20 +01:00 committed by GitHub
parent 81b0ac1766
commit c46b351888
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spec/requests/static_controller_spec.rb
View File

@ -291,9 +291,9 @@ describe StaticController do
Discourse::Application.routes.send(:eval_block, routes) Discourse::Application.routes.send(:eval_block, routes)
topic_id = Fabricate(:post, cooked: "contact info").topic_id topic_id = Fabricate(:post, cooked: "contact info").topic_id
SiteSetting.setting(:contact_topic_id, topic_id) SiteSetting.setting(:test_contact_topic_id, topic_id)
Plugin::Instance.new.add_topic_static_page("contact", topic_id: "contact_topic_id") Plugin::Instance.new.add_topic_static_page("contact", topic_id: "test_contact_topic_id")
get "/contact" get "/contact"
@ -303,12 +303,12 @@ describe StaticController do
it "replaces existing topic-backed pages" do it "replaces existing topic-backed pages" do
topic_id = Fabricate(:post, cooked: "Regular FAQ").topic_id topic_id = Fabricate(:post, cooked: "Regular FAQ").topic_id
SiteSetting.setting(:faq_topic_id, topic_id) SiteSetting.setting(:test_faq_topic_id, topic_id)
polish_topic_id = Fabricate(:post, cooked: "Polish FAQ").topic_id polish_topic_id = Fabricate(:post, cooked: "Polish FAQ").topic_id
SiteSetting.setting(:polish_faq_topic_id, polish_topic_id) SiteSetting.setting(:test_polish_faq_topic_id, polish_topic_id)
Plugin::Instance.new.add_topic_static_page("faq") do Plugin::Instance.new.add_topic_static_page("faq") do
current_user&.locale == "pl" ? "polish_faq_topic_id" : "faq_topic_id" current_user&.locale == "pl" ? "test_polish_faq_topic_id" : "test_faq_topic_id"
end end
get "/faq" get "/faq"