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

FIX: Permalink.create didn't work as expected anymore (#29895)

Browse Source 
This moves the logic of setting the correct permalink values back into the controller. And it replaces the validation with a simpler one, that always works, even when the model is loaded from the DB.

Follow-up to #29634 which broke import scripts and lots of documentation on Meta.
This commit is contained in:
Gerhard Schlager
2024-11-22 21:11:26 +01:00
committed by GitHub
parent 44fbf1048c
commit 0295b4165c
9 changed files with 78 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spec/requests/permalinks_controller_spec.rb
View File

@ -2,12 +2,10 @@
RSpec.describe PermalinksController do
fab!(:topic)
fab!(:permalink) { Fabricate(:permalink, url: "deadroute/topic/546") }
fab!(:permalink) { Fabricate(:permalink, url: "deadroute/topic/546", topic_id: topic.id) }
describe "show" do
it "should redirect to a permalink's target_url with status 301" do
permalink.update!(permalink_type_value: topic.id, permalink_type: "topic")
get "/#{permalink.url}"
expect(response).to redirect_to(topic.relative_url)
@ -15,7 +13,6 @@ RSpec.describe PermalinksController do
end
it "should work for subfolder installs too" do
permalink.update!(permalink_type_value: topic.id, permalink_type: "topic")
set_subfolder "/forum"
get "/#{permalink.url}"
@ -25,7 +22,7 @@ RSpec.describe PermalinksController do
end
it "should apply normalizations" do
permalink.update!(permalink_type_value: "/topic/100", permalink_type: "external_url")
permalink.update!(external_url: "/topic/100", topic_id: nil)
SiteSetting.permalink_normalizations = "/(.*)\\?.*/\\1"
get "/#{permalink.url}", params: { test: "hello" }
@ -46,14 +43,9 @@ RSpec.describe PermalinksController do
end
context "when permalink's target_url is an external URL" do
before do
permalink.update!(
permalink_type_value: "https://github.com/discourse/discourse",
permalink_type: "external_url",
)
end
it "redirects to it properly" do
permalink.update!(external_url: "https://github.com/discourse/discourse", topic_id: nil)
get "/#{permalink.url}"
expect(response).to redirect_to(permalink.external_url)
end