0
0
Fork 0

Redesign public hashtag pages (#5237)

This commit is contained in:
Eugen Rochko 2017-10-07 20:00:35 +02:00 committed by GitHub
parent d2dee6ea43
commit f486ef2666
12 changed files with 253 additions and 62 deletions

View file

@ -5,9 +5,9 @@ RSpec.describe TagsController, type: :controller do
describe 'GET #show' do
let!(:tag) { Fabricate(:tag, name: 'test') }
let!(:local) { Fabricate(:status, tags: [ tag ], text: 'local #test') }
let!(:remote) { Fabricate(:status, tags: [ tag ], text: 'remote #test', account: Fabricate(:account, domain: 'remote')) }
let!(:late) { Fabricate(:status, tags: [ tag ], text: 'late #test') }
let!(:local) { Fabricate(:status, tags: [tag], text: 'local #test') }
let!(:remote) { Fabricate(:status, tags: [tag], text: 'remote #test', account: Fabricate(:account, domain: 'remote')) }
let!(:late) { Fabricate(:status, tags: [tag], text: 'late #test') }
context 'when tag exists' do
it 'returns http success' do
@ -15,41 +15,9 @@ RSpec.describe TagsController, type: :controller do
expect(response).to have_http_status(:success)
end
it 'renders public layout' do
it 'renders application layout' do
get :show, params: { id: 'test', max_id: late.id }
expect(response).to render_template layout: 'public'
end
it 'renders only local statuses if local parameter is specified' do
get :show, params: { id: 'test', local: true, max_id: late.id }
expect(assigns(:tag)).to eq tag
statuses = assigns(:statuses).to_a
expect(statuses.size).to eq 1
expect(statuses[0]).to eq local
end
it 'renders local and remote statuses if local parameter is not specified' do
get :show, params: { id: 'test', max_id: late.id }
expect(assigns(:tag)).to eq tag
statuses = assigns(:statuses).to_a
expect(statuses.size).to eq 2
expect(statuses[0]).to eq remote
expect(statuses[1]).to eq local
end
it 'filters statuses by the current account' do
user = Fabricate(:user)
user.account.block!(remote.account)
sign_in(user)
get :show, params: { id: 'test', max_id: late.id }
expect(assigns(:tag)).to eq tag
statuses = assigns(:statuses).to_a
expect(statuses.size).to eq 1
expect(statuses[0]).to eq local
expect(response).to render_template layout: 'application'
end
end