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:
parent
f6a8d835d3
commit
a38dbd9c8a
|
@ -34,7 +34,8 @@ class HomeController < ApplicationController
|
||||||
end
|
end
|
||||||
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
|
end
|
||||||
|
|
||||||
def set_initial_state_json
|
def set_initial_state_json
|
||||||
|
|
|
@ -4,21 +4,24 @@ RSpec.describe HomeController, type: :controller do
|
||||||
render_views
|
render_views
|
||||||
|
|
||||||
describe 'GET #index' do
|
describe 'GET #index' do
|
||||||
|
subject { get :index }
|
||||||
|
|
||||||
context 'when not signed in' do
|
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
|
it 'redirects to about page' do
|
||||||
@request.path = '/'
|
@request.path = '/'
|
||||||
get :index
|
is_expected.to redirect_to(about_path)
|
||||||
expect(response).to redirect_to(about_path)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when signed in' do
|
context 'when signed in' do
|
||||||
let(:user) { Fabricate(:user) }
|
let(:user) { Fabricate(:user) }
|
||||||
|
|
||||||
subject do
|
before { sign_in(user) }
|
||||||
sign_in(user)
|
|
||||||
get :index
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'assigns @body_classes' do
|
it 'assigns @body_classes' do
|
||||||
subject
|
subject
|
||||||
|
|
Loading…
Reference in a new issue