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

FIX: show an error page on click tracking error

Browse Source
This commit is contained in:
Régis Hanol
2018-03-17 00:33:11 +01:00
parent 864bdbd9b6
commit 89f5c90ce0
5 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
spec/controllers/clicks_controller_spec.rb
View File

@ -5,15 +5,13 @@ describe ClicksController do
context 'create' do
context 'missing params' do
it 'raises a 404 without the url param' do
get :track, params: { post_id: 123 }, format: :json
it 'raises a 404 without a url' do
get :track, params: { post_id: 123 }
expect(response).to be_not_found
end
it "redirects to the url even without the topic_id or post_id params" do
get :track, params: { url: 'http://google.com' }, format: :json
expect(response).not_to be_redirect
end
end
context 'correct params' do
@ -24,24 +22,23 @@ describe ClicksController do
end
context "with a made up url" do
render_views
it "doesn't redirect" do
TopicLinkClick.expects(:create_from).returns(nil)
get :track,
params: { url: 'http://discourse.org', post_id: 123 },
format: :json
get :track, params: { url: 'http://discourse.org', post_id: 123 }
expect(response).not_to be_redirect
expect(response.body).to include(I18n.t("redirect_warning"))
end
end
context "with a query string" do
context "with a valid url" do
it "redirects" do
TopicLinkClick.expects(:create_from).with(has_entries('url' => 'http://discourse.org/?hello=123')).returns(url)
get :track, params: {
url: 'http://discourse.org/?hello=123', post_id: 123, format: :json
}
get :track, params: { url: 'http://discourse.org/?hello=123', post_id: 123 }
expect(response).to redirect_to(url)
end
@ -51,7 +48,7 @@ describe ClicksController do
it 'redirects' do
TopicLinkClick.expects(:create_from).with('url' => url, 'post_id' => '123', 'ip' => '192.168.0.1').returns(url)
get :track, params: { url: url, post_id: 123, format: :json }
get :track, params: { url: url, post_id: 123 }
expect(response).to redirect_to(url)
end
@ -60,7 +57,7 @@ describe ClicksController do
log_in(:admin)
whisper = Fabricate(:post, post_type: Post.types[:whisper])
get :track, params: { url: url, post_id: whisper.id, format: :json }
get :track, params: { url: url, post_id: whisper.id }
expect(response).to redirect_to(url)
end
@ -68,9 +65,7 @@ describe ClicksController do
it "doesn't redirect with the redirect=false param" do
TopicLinkClick.expects(:create_from).with('url' => url, 'post_id' => '123', 'ip' => '192.168.0.1', 'redirect' => 'false').returns(url)
get :track, params: {
url: url, post_id: 123, redirect: 'false', format: :json
}
get :track, params: { url: url, post_id: 123, redirect: 'false' }
expect(response).not_to be_redirect
end
@ -79,7 +74,9 @@ describe ClicksController do
context 'with a topic_id' do
it 'redirects' do
TopicLinkClick.expects(:create_from).with('url' => url, 'topic_id' => '789', 'ip' => '192.168.0.1').returns(url)
get :track, params: { url: url, topic_id: 789, format: :json }
get :track, params: { url: url, topic_id: 789 }
expect(response).to redirect_to(url)
end
end