1
0
Fork 0
forked from fedi/mastodon

Redirect from Web tag timeline to public tag timeline if not signed in (#6633)

This is also implemented in Pawoo:
ceafdbd1bb
This commit is contained in:
Akihiko Odaki 2018-03-06 03:29:36 +09:00 committed by Eugen Rochko
parent f6a8d835d3
commit a38dbd9c8a
2 changed files with 11 additions and 7 deletions

View file

@ -34,7 +34,8 @@ class HomeController < ApplicationController
end
end
redirect_to(default_redirect_path)
matches = request.path.match(%r{\A/web/timelines/tag/(?<tag>.+)\z})
redirect_to(matches ? tag_path(CGI.unescape(matches[:tag])) : default_redirect_path)
end
def set_initial_state_json

View file

@ -4,21 +4,24 @@ RSpec.describe HomeController, type: :controller do
render_views
describe 'GET #index' do
subject { get :index }
context 'when not signed in' do
context 'when requested path is tag timeline' do
before { @request.path = '/web/timelines/tag/name' }
it { is_expected.to redirect_to '/tags/name' }
end
it 'redirects to about page' do
@request.path = '/'
get :index
expect(response).to redirect_to(about_path)
is_expected.to redirect_to(about_path)
end
end
context 'when signed in' do
let(:user) { Fabricate(:user) }
subject do
sign_in(user)
get :index
end
before { sign_in(user) }
it 'assigns @body_classes' do
subject