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

diff --git a/app/helpers/atom_builder_helper.rb b/app/helpers/atom_builder_helper.rb
index ea54b9fdb6df4cc2d49f4cffe2d0a925e358a1e6..99b3414cda48a8e63a251b257c1e6033b0202f37 100644 (file)
--- a/app/helpers/atom_builder_helper.rb
+++ b/app/helpers/atom_builder_helper.rb
@@ -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)

diff --git a/spec/controllers/accounts_controller_spec.rb b/spec/controllers/accounts_controller_spec.rb
index c5abe63a8d0eb68b95e4f08a1362bb53bbd93e47..322b26f0b8f08909f18406ef3b88164bf2a84086 100644 (file)
--- a/spec/controllers/accounts_controller_spec.rb
+++ b/spec/controllers/accounts_controller_spec.rb
@@ -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
 

diff --git a/spec/controllers/api/accounts/lookup_controller_spec.rb b/spec/controllers/api/accounts/lookup_controller_spec.rb
index 043df8c86ce4acaccf66c714973506010334f252..3f590b82f0b4487e7574f153f6b508099815e823 100644 (file)
--- a/spec/controllers/api/accounts/lookup_controller_spec.rb
+++ b/spec/controllers/api/accounts/lookup_controller_spec.rb
@@ -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 }
 

diff --git a/spec/controllers/api/accounts_controller_spec.rb b/spec/controllers/api/accounts_controller_spec.rb
index dd060ddaa4a296e989667cae1f249bfa37c41b51..d8b26f815a0b6b29449d9848a8905d6dd28afe33 100644 (file)
--- a/spec/controllers/api/accounts_controller_spec.rb
+++ b/spec/controllers/api/accounts_controller_spec.rb
@@ -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 }
 

diff --git a/spec/controllers/api/follows_controller_spec.rb b/spec/controllers/api/follows_controller_spec.rb
index 28646525131cbd2327abe4d097263f6392bd9cb6..f1775dfbcb0456aaae7ddaeda0e6b1e729d2e3a6 100644 (file)
--- a/spec/controllers/api/follows_controller_spec.rb
+++ b/spec/controllers/api/follows_controller_spec.rb
@@ -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 }
 

diff --git a/spec/controllers/api/salmon_controller_spec.rb b/spec/controllers/api/salmon_controller_spec.rb
index 785e1723b133e239d87811fd8cb56e6c58437909..6897caeebbeb425014bdc992175104df1efe082a 100644 (file)
--- a/spec/controllers/api/salmon_controller_spec.rb
+++ b/spec/controllers/api/salmon_controller_spec.rb
@@ -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

diff --git a/spec/controllers/api/subscriptions_controller_spec.rb b/spec/controllers/api/subscriptions_controller_spec.rb
index e13ec4939e346755f6e48fd5db464dd814d9f2a3..a0b0b441358d3bfd93b1381a50f9cf3c08b4eeb3 100644 (file)
--- a/spec/controllers/api/subscriptions_controller_spec.rb
+++ b/spec/controllers/api/subscriptions_controller_spec.rb
@@ -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

diff --git a/spec/controllers/stream_entries_controller_spec.rb b/spec/controllers/stream_entries_controller_spec.rb
index 56b636ab4026ee2a086c160ef29045d09ad9ae23..6f270af9d65189022e8944b77659b7fb816e89e3 100644 (file)
--- a/spec/controllers/stream_entries_controller_spec.rb
+++ b/spec/controllers/stream_entries_controller_spec.rb
@@ -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) }
 

diff --git a/spec/controllers/xrd_controller_spec.rb b/spec/controllers/xrd_controller_spec.rb
index 9152a714b5e190d1a81eeff17fca976062a95356..eeaaaa786f0a5bbc1c0a30c16616b981dcb6e6ed 100644 (file)
--- a/spec/controllers/xrd_controller_spec.rb
+++ b/spec/controllers/xrd_controller_spec.rb
@@ -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