mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-24 06:06:49 +00:00
Fixing atom feeds for accounts, adding tests that would catch such bugs in future
This commit is contained in:
parent
499beb4484
commit
87576e1ab1
|
@ -126,7 +126,7 @@ module AtomBuilderHelper
|
||||||
end
|
end
|
||||||
|
|
||||||
def link_enclosure(xml, media)
|
def link_enclosure(xml, media)
|
||||||
xml.link(rel: 'enclosure', href: full_asset_url(media.file.url), type: media.file_content_type, length: media.file_size)
|
xml.link(rel: 'enclosure', href: full_asset_url(media.file.url), type: media.file_content_type, length: media.file_file_size)
|
||||||
end
|
end
|
||||||
|
|
||||||
def link_avatar(xml, account)
|
def link_avatar(xml, account)
|
||||||
|
|
|
@ -1,17 +1,37 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe AccountsController, type: :controller do
|
RSpec.describe AccountsController, type: :controller do
|
||||||
|
render_views
|
||||||
|
|
||||||
let(:alice) { Fabricate(:account, username: 'alice') }
|
let(:alice) { Fabricate(:account, username: 'alice') }
|
||||||
|
|
||||||
describe 'GET #show' do
|
describe 'GET #show' do
|
||||||
it 'returns http success' do
|
before do
|
||||||
get :show, params: { username: alice.username }
|
status1 = Status.create!(account: alice, text: 'Hello world')
|
||||||
expect(response).to have_http_status(:success)
|
status2 = Status.create!(account: alice, text: 'Boop', thread: status1)
|
||||||
|
status3 = Status.create!(account: alice, text: 'Picture!')
|
||||||
|
status3.media_attachments.create!(account: alice, file: fixture_file_upload('files/attachment.jpg', 'image/jpeg'))
|
||||||
|
status4 = Status.create!(account: alice, text: 'Mentioning @alice')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns http success with Atom' do
|
context 'atom' do
|
||||||
get :show, params: { username: alice.username }, format: 'atom'
|
before do
|
||||||
expect(response).to have_http_status(:success)
|
get :show, params: { username: alice.username }, format: 'atom'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns http success with Atom' do
|
||||||
|
expect(response).to have_http_status(:success)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'html' do
|
||||||
|
before do
|
||||||
|
get :show, params: { username: alice.username }
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns http success' do
|
||||||
|
expect(response).to have_http_status(:success)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe Api::Accounts::LookupController, type: :controller do
|
RSpec.describe Api::Accounts::LookupController, type: :controller do
|
||||||
|
render_views
|
||||||
|
|
||||||
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
|
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
|
||||||
let(:token) { double acceptable?: true, resource_owner_id: user.id }
|
let(:token) { double acceptable?: true, resource_owner_id: user.id }
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe Api::AccountsController, type: :controller do
|
RSpec.describe Api::AccountsController, type: :controller do
|
||||||
|
render_views
|
||||||
|
|
||||||
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
|
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
|
||||||
let(:token) { double acceptable?: true, resource_owner_id: user.id }
|
let(:token) { double acceptable?: true, resource_owner_id: user.id }
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe Api::FollowsController, type: :controller do
|
RSpec.describe Api::FollowsController, type: :controller do
|
||||||
|
render_views
|
||||||
|
|
||||||
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
|
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
|
||||||
let(:token) { double acceptable?: true, resource_owner_id: user.id }
|
let(:token) { double acceptable?: true, resource_owner_id: user.id }
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe Api::SalmonController, type: :controller do
|
RSpec.describe Api::SalmonController, type: :controller do
|
||||||
|
render_views
|
||||||
|
|
||||||
let(:account) { Fabricate(:user, account: Fabricate(:account, username: 'catsrgr8')).account }
|
let(:account) { Fabricate(:user, account: Fabricate(:account, username: 'catsrgr8')).account }
|
||||||
|
|
||||||
before do
|
before do
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe Api::SubscriptionsController, type: :controller do
|
RSpec.describe Api::SubscriptionsController, type: :controller do
|
||||||
|
render_views
|
||||||
|
|
||||||
let(:account) { Fabricate(:account, username: 'gargron', domain: 'quitter.no', verify_token: '123', remote_url: 'topic_url', secret: 'abc') }
|
let(:account) { Fabricate(:account, username: 'gargron', domain: 'quitter.no', verify_token: '123', remote_url: 'topic_url', secret: 'abc') }
|
||||||
|
|
||||||
describe 'GET #show' do
|
describe 'GET #show' do
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe StreamEntriesController, type: :controller do
|
RSpec.describe StreamEntriesController, type: :controller do
|
||||||
|
render_views
|
||||||
|
|
||||||
let(:alice) { Fabricate(:account, username: 'alice') }
|
let(:alice) { Fabricate(:account, username: 'alice') }
|
||||||
let(:status) { Fabricate(:status, account: alice) }
|
let(:status) { Fabricate(:status, account: alice) }
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe XrdController, type: :controller do
|
RSpec.describe XrdController, type: :controller do
|
||||||
|
render_views
|
||||||
|
|
||||||
describe 'GET #host_meta' do
|
describe 'GET #host_meta' do
|
||||||
it 'returns http success' do
|
it 'returns http success' do
|
||||||
get :host_meta
|
get :host_meta
|
||||||
|
|
Loading…
Reference in a new issue