github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-25 00:32:52 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Upgrade Rails to version 7.1 (#27539)

Browse Source 
* DEV: Upgrade Rails to 7.1

* FIX: Remove references to `Rails.logger.chained`

`Rails.logger.chained` was provided by Logster before Rails 7.1
introduced their broadcast logger. Now all the loggers are added to
`Rails.logger.broadcasts`.

Some code in our initializers was still using `chained` instead of
`broadcasts`.

* DEV: Make parameters optional to all FakeLogger methods

* FIX: Set `override_level` on Logster loggers (#27519)

A followup to f595d599dd361b7fb39fb3c82cbc11d19d518c19

* FIX: Don’t duplicate Rack response

---------

Co-authored-by: Jarek Radosz <jradosz@gmail.com>
This commit is contained in:
Loïc Guitaut
2024-06-20 10:33:01 +02:00
committed by GitHub
parent 920aa2dfce
commit 2301dddcff
46 changed files with 436 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spec/lib/email/message_builder_spec.rb
View File

@ -14,9 +14,9 @@ RSpec.describe Email::MessageBuilder do
let(:body_modifier_block) { Proc.new { |subject, opts| "modified body" } }
let(:visit_link_to_respond_modifier_block) do
Proc.new { |subject, opts| "modified visit_link_to_respond" }
Proc.new { |subject, opts| "modified_visit_link_to_respond" }
end
let(:reply_by_email_modifier_block) { Proc.new { |subject, opts| "modified reply_by_email" } }
let(:reply_by_email_modifier_block) { Proc.new { |subject, opts| "modified_reply_by_email" } }
it "has the correct to address" do
expect(build_args[:to]).to eq(to_address)
@ -69,7 +69,7 @@ RSpec.describe Email::MessageBuilder do
include_respond_instructions: true,
url: "http://localhost",
)
expect(builder2.reply_by_email_key).to equal("modified reply_by_email")
expect(builder2.reply_by_email_key).to equal("modified_reply_by_email")
ensure
DiscoursePluginRegistry.unregister_modifier(
plugin_instance,
@ -93,7 +93,7 @@ RSpec.describe Email::MessageBuilder do
url: "http://localhost",
)
expect(builder2.template_args[:respond_instructions]).to include(
"modified visit_link_to_respond",
"modified_visit_link_to_respond",
)
ensure
DiscoursePluginRegistry.unregister_modifier(