Browse Source

Fixing atom feeds for accounts, adding tests that would catch such bugs in future

closed-social-glitch-2
Eugen Rochko 7 years ago
parent
commit
87576e1ab1
9 changed files with 41 additions and 7 deletions
  1. +1
    -1
      app/helpers/atom_builder_helper.rb
  2. +26
    -6
      spec/controllers/accounts_controller_spec.rb
  3. +2
    -0
      spec/controllers/api/accounts/lookup_controller_spec.rb
  4. +2
    -0
      spec/controllers/api/accounts_controller_spec.rb
  5. +2
    -0
      spec/controllers/api/follows_controller_spec.rb
  6. +2
    -0
      spec/controllers/api/salmon_controller_spec.rb
  7. +2
    -0
      spec/controllers/api/subscriptions_controller_spec.rb
  8. +2
    -0
      spec/controllers/stream_entries_controller_spec.rb
  9. +2
    -0
      spec/controllers/xrd_controller_spec.rb

+ 1
- 1
app/helpers/atom_builder_helper.rb View File

@ -126,7 +126,7 @@ module AtomBuilderHelper
end
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
def link_avatar(xml, account)

+ 26
- 6
spec/controllers/accounts_controller_spec.rb View File

@ -1,17 +1,37 @@
require 'rails_helper'
RSpec.describe AccountsController, type: :controller do
render_views
let(:alice) { Fabricate(:account, username: 'alice') }
describe 'GET #show' do
it 'returns http success' do
get :show, params: { username: alice.username }
expect(response).to have_http_status(:success)
before do
status1 = Status.create!(account: alice, text: 'Hello world')
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
it 'returns http success with Atom' do
get :show, params: { username: alice.username }, format: 'atom'
expect(response).to have_http_status(:success)
context 'atom' do
before do
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

+ 2
- 0
spec/controllers/api/accounts/lookup_controller_spec.rb View File

@ -1,6 +1,8 @@
require 'rails_helper'
RSpec.describe Api::Accounts::LookupController, type: :controller do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }

+ 2
- 0
spec/controllers/api/accounts_controller_spec.rb View File

@ -1,6 +1,8 @@
require 'rails_helper'
RSpec.describe Api::AccountsController, type: :controller do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }

+ 2
- 0
spec/controllers/api/follows_controller_spec.rb View File

@ -1,6 +1,8 @@
require 'rails_helper'
RSpec.describe Api::FollowsController, type: :controller do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }

+ 2
- 0
spec/controllers/api/salmon_controller_spec.rb View File

@ -1,6 +1,8 @@
require 'rails_helper'
RSpec.describe Api::SalmonController, type: :controller do
render_views
let(:account) { Fabricate(:user, account: Fabricate(:account, username: 'catsrgr8')).account }
before do

+ 2
- 0
spec/controllers/api/subscriptions_controller_spec.rb View File

@ -1,6 +1,8 @@
require 'rails_helper'
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') }
describe 'GET #show' do

+ 2
- 0
spec/controllers/stream_entries_controller_spec.rb View File

@ -1,6 +1,8 @@
require 'rails_helper'
RSpec.describe StreamEntriesController, type: :controller do
render_views
let(:alice) { Fabricate(:account, username: 'alice') }
let(:status) { Fabricate(:status, account: alice) }

+ 2
- 0
spec/controllers/xrd_controller_spec.rb View File

@ -1,6 +1,8 @@
require 'rails_helper'
RSpec.describe XrdController, type: :controller do
render_views
describe 'GET #host_meta' do
it 'returns http success' do
get :host_meta

Loading…
Cancel
Save