From 4289ed1d13b9c3b91663581c44635105c4bc0412 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Tue, 23 May 2017 12:11:39 -0400 Subject: 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 --- .../api/v1/timelines/home_controller_spec.rb | 44 +++++++++++++++ .../api/v1/timelines/public_controller_spec.rb | 56 +++++++++++++++++++ .../api/v1/timelines/tag_controller_spec.rb | 41 ++++++++++++++ .../api/v1/timelines_controller_spec.rb | 65 ---------------------- 4 files changed, 141 insertions(+), 65 deletions(-) create mode 100644 spec/controllers/api/v1/timelines/home_controller_spec.rb create mode 100644 spec/controllers/api/v1/timelines/public_controller_spec.rb create mode 100644 spec/controllers/api/v1/timelines/tag_controller_spec.rb delete mode 100644 spec/controllers/api/v1/timelines_controller_spec.rb (limited to 'spec/controllers/api/v1') 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/public_controller_spec.rb b/spec/controllers/api/v1/timelines/public_controller_spec.rb new file mode 100644 index 000000000..353ab9bc2 --- /dev/null +++ b/spec/controllers/api/v1/timelines/public_controller_spec.rb @@ -0,0 +1,56 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe Api::V1::Timelines::PublicController 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, 'New status from user for federated public 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 + + describe 'GET #show with local only' do + before do + PostStatusService.new.call(user.account, 'New status from user for local public timeline.') + end + + it 'returns http success' do + get :show, params: { local: true } + + 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 + + expect(response).to have_http_status(:success) + expect(response.headers['Link']).to be_nil + end + 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/controllers/api/v1/timelines_controller_spec.rb b/spec/controllers/api/v1/timelines_controller_spec.rb deleted file mode 100644 index 72eed1e5a..000000000 --- a/spec/controllers/api/v1/timelines_controller_spec.rb +++ /dev/null @@ -1,65 +0,0 @@ -require 'rails_helper' - -RSpec.describe Api::V1::TimelinesController, type: :controller 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 #home' do - it 'returns http success' do - get :home - expect(response).to have_http_status(:success) - end - end - - describe 'GET #public' do - it 'returns http success' do - get :public - expect(response).to have_http_status(:success) - end - end - - describe 'GET #tag' do - before do - PostStatusService.new.call(user.account, 'It is a #test') - end - - it 'returns http success' do - get :tag, params: { id: 'test' } - expect(response).to have_http_status(:success) - end - end - end - - 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 - it 'returns http success' do - get :public - expect(response).to have_http_status(:success) - end - end - - describe 'GET #tag' do - it 'returns http success' do - get :tag, params: { id: 'test' } - expect(response).to have_http_status(:success) - end - end - end -end -- cgit