Conflicts: - `CHANGELOG.md`: Upstream added newlines. Conflicts are because the CHANGELOG was independently merged from 3.4.6 on last security update. Took upstream's version. - `app/helpers/context_helper.rb`: Conflicts because of extra vocabulary in glitch-soc. The conflicts were actually handled in last security merge. Kept our version.main
Claire
3 years ago
commit
aa832d623a
@ -0,0 +1,55 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe InstanceActorsController, type: :controller do
|
||||||
|
describe 'GET #show' do
|
||||||
|
context 'as JSON' do
|
||||||
|
let(:format) { 'json' }
|
||||||
|
|
||||||
|
shared_examples 'shared behavior' do
|
||||||
|
before do
|
||||||
|
get :show, params: { format: format }
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns http success' do
|
||||||
|
expect(response).to have_http_status(200)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns application/activity+json' do
|
||||||
|
expect(response.media_type).to eq 'application/activity+json'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not set cookies' do
|
||||||
|
expect(response.cookies).to be_empty
|
||||||
|
expect(response.headers['Set-Cookies']).to be nil
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not set sessions' do
|
||||||
|
expect(session).to be_empty
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns public Cache-Control header' do
|
||||||
|
expect(response.headers['Cache-Control']).to include 'public'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'renders account' do
|
||||||
|
json = body_as_json
|
||||||
|
expect(json).to include(:id, :type, :preferredUsername, :inbox, :publicKey, :inbox, :outbox, :url)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
before do
|
||||||
|
allow(controller).to receive(:authorized_fetch_mode?).and_return(authorized_fetch_mode)
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'without authorized fetch mode' do
|
||||||
|
let(:authorized_fetch_mode) { false }
|
||||||
|
it_behaves_like 'shared behavior'
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'with authorized fetch mode' do
|
||||||
|
let(:authorized_fetch_mode) { true }
|
||||||
|
it_behaves_like 'shared behavior'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
Loading…
Reference in new issue