Refactor of API timeline actions (#3263)

- Increase coverage to exercise all parts of each action
- Move into namespace to share common code
- Misc refactor of each action for smaller methods, simpler code

4 files changed, 120 insertions, 26 deletions

diff --git a/spec/controllers/api/v1/timelines/home_controller_spec.rb b/spec/controllers/api/v1/timelines/home_controller_spec.rb
new file mode 100644
index 000000000..faa6c60ce
--- /dev/null
+++ b/spec/controllers/api/v1/timelines/home_controller_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Api::V1::Timelines::HomeController do
+  render_views
+
+  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice'), current_sign_in_at: 1.day.ago) }
+
+  before do
+    allow(controller).to receive(:doorkeeper_token) { token }
+  end
+
+  context 'with a user context' do
+    let(:token) { double acceptable?: true, resource_owner_id: user.id }
+
+    describe 'GET #show' do
+      before do
+        follow = Fabricate(:follow, account: user.account)
+        PostStatusService.new.call(follow.target_account, 'New status for user home timeline.')
+      end
+
+      it 'returns http success' do
+        get :show
+
+        expect(response).to have_http_status(:success)
+        expect(response.headers['Link'].links.size).to eq(2)
+      end
+    end
+  end
+
+  context 'without a user context' do
+    let(:token) { double acceptable?: true, resource_owner_id: nil }
+
+    describe 'GET #show' do
+      it 'returns http unprocessable entity' do
+        get :show
+
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response.headers['Link']).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/timelines_controller_spec.rb b/spec/controllers/api/v1/timelines/public_controller_spec.rb
index 72eed1e5a..353ab9bc2 100644
--- a/spec/controllers/api/v1/timelines_controller_spec.rb
+++ b/spec/controllers/api/v1/timelines/public_controller_spec.rb
@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
-RSpec.describe Api::V1::TimelinesController, type: :controller do
+describe Api::V1::Timelines::PublicController do
   render_views
 
   let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
@@ -12,28 +14,29 @@ RSpec.describe Api::V1::TimelinesController, type: :controller do
   context 'with a user context' do
     let(:token) { double acceptable?: true, resource_owner_id: user.id }
 
-    describe 'GET #home' do
-      it 'returns http success' do
-        get :home
-        expect(response).to have_http_status(:success)
+    describe 'GET #show' do
+      before do
+        PostStatusService.new.call(user.account, 'New status from user for federated public timeline.')
       end
-    end
 
-    describe 'GET #public' do
       it 'returns http success' do
-        get :public
+        get :show
+
         expect(response).to have_http_status(:success)
+        expect(response.headers['Link'].links.size).to eq(2)
       end
     end
 
-    describe 'GET #tag' do
+    describe 'GET #show with local only' do
       before do
-        PostStatusService.new.call(user.account, 'It is a #test')
+        PostStatusService.new.call(user.account, 'New status from user for local public timeline.')
       end
 
       it 'returns http success' do
-        get :tag, params: { id: 'test' }
+        get :show, params: { local: true }
+
         expect(response).to have_http_status(:success)
+        expect(response.headers['Link'].links.size).to eq(2)
       end
     end
   end
@@ -41,24 +44,12 @@ RSpec.describe Api::V1::TimelinesController, type: :controller do
   context 'without a user context' do
     let(:token) { double acceptable?: true, resource_owner_id: nil }
 
-    describe 'GET #home' do
-      it 'returns http unprocessable entity' do
-        get :home
-        expect(response).to have_http_status(:unprocessable_entity)
-      end
-    end
-
-    describe 'GET #public' do
+    describe 'GET #show' do
       it 'returns http success' do
-        get :public
-        expect(response).to have_http_status(:success)
-      end
-    end
+        get :show
 
-    describe 'GET #tag' do
-      it 'returns http success' do
-        get :tag, params: { id: 'test' }
         expect(response).to have_http_status(:success)
+        expect(response.headers['Link']).to be_nil
       end
     end
   end
diff --git a/spec/controllers/api/v1/timelines/tag_controller_spec.rb b/spec/controllers/api/v1/timelines/tag_controller_spec.rb
new file mode 100644
index 000000000..f743f0cde
--- /dev/null
+++ b/spec/controllers/api/v1/timelines/tag_controller_spec.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Api::V1::Timelines::TagController do
+  render_views
+
+  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+
+  before do
+    allow(controller).to receive(:doorkeeper_token) { token }
+  end
+
+  context 'with a user context' do
+    let(:token) { double acceptable?: true, resource_owner_id: user.id }
+
+    describe 'GET #show' do
+      before do
+        PostStatusService.new.call(user.account, 'It is a #test')
+      end
+
+      it 'returns http success' do
+        get :show, params: { id: 'test' }
+        expect(response).to have_http_status(:success)
+        expect(response.headers['Link'].links.size).to eq(2)
+      end
+    end
+  end
+
+  context 'without a user context' do
+    let(:token) { double acceptable?: true, resource_owner_id: nil }
+
+    describe 'GET #show' do
+      it 'returns http success' do
+        get :show, params: { id: 'test' }
+        expect(response).to have_http_status(:success)
+        expect(response.headers['Link']).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/routing/api_timelines_spec.rb b/spec/routing/api_timelines_spec.rb
new file mode 100644
index 000000000..31717209f
--- /dev/null
+++ b/spec/routing/api_timelines_spec.rb
@@ -0,0 +1,18 @@
+require 'rails_helper'
+
+describe 'API timeline routes' do
+  it 'routes to home timeline' do
+    expect(get('/api/v1/timelines/home')).
+      to route_to('api/v1/timelines/home#show')
+  end
+
+  it 'routes to public timeline' do
+    expect(get('/api/v1/timelines/public')).
+      to route_to('api/v1/timelines/public#show')
+  end
+
+  it 'routes to tag timeline' do
+    expect(get('/api/v1/timelines/tag/test')).
+      to route_to('api/v1/timelines/tag#show', id: 'test')
+  end
+end