mirror of
https://github.com/discourse/discourse.git
synced 2025-05-23 22:11:26 +08:00
Fix all the errors to get our tests green on Rails 5.1.
This commit is contained in:
@ -5,7 +5,7 @@ describe PermalinksController do
|
||||
it "should redirect to a permalink's target_url with status 301" do
|
||||
permalink = Fabricate(:permalink)
|
||||
Permalink.any_instance.stubs(:target_url).returns('/t/the-topic-slug/42')
|
||||
get :show, url: permalink.url
|
||||
get :show, params: { url: permalink.url }
|
||||
expect(response).to redirect_to('/t/the-topic-slug/42')
|
||||
expect(response.status).to eq(301)
|
||||
end
|
||||
@ -15,7 +15,7 @@ describe PermalinksController do
|
||||
Discourse.stubs(:base_uri).returns("/forum")
|
||||
permalink = Fabricate(:permalink)
|
||||
Permalink.any_instance.stubs(:target_url).returns('/forum/t/the-topic-slug/42')
|
||||
get :show, url: permalink.url
|
||||
get :show, params: { url: permalink.url }
|
||||
expect(response).to redirect_to('/forum/t/the-topic-slug/42')
|
||||
expect(response.status).to eq(301)
|
||||
end
|
||||
@ -25,20 +25,20 @@ describe PermalinksController do
|
||||
|
||||
permalink = Fabricate(:permalink, url: '/topic/bla', external_url: '/topic/100')
|
||||
|
||||
get :show, url: permalink.url, test: "hello"
|
||||
get :show, params: { url: permalink.url, test: "hello" }
|
||||
|
||||
expect(response).to redirect_to('/topic/100')
|
||||
expect(response.status).to eq(301)
|
||||
|
||||
SiteSetting.permalink_normalizations = "/(.*)\\?.*/\\1X"
|
||||
|
||||
get :show, url: permalink.url, test: "hello"
|
||||
get :show, params: { url: permalink.url, test: "hello" }
|
||||
|
||||
expect(response.status).to eq(404)
|
||||
end
|
||||
|
||||
it 'return 404 if permalink record does not exist' do
|
||||
get :show, url: '/not/a/valid/url'
|
||||
get :show, params: { url: '/not/a/valid/url' }
|
||||
expect(response.status).to eq(404)
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user