From 9aecc0f48a046e0a05b8ca69511f8b72756fb431 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 8 Nov 2016 23:22:44 +0100 Subject: Move timelines API from statuses to its own controller, add a check for resources that require a user context vs those that don't (such as public timeline) /api/v1/statuses/public -> /api/v1/timelines/public /api/v1/statuses/home -> /api/v1/timelines/home /api/v1/statuses/mentions -> /api/v1/timelines/mentions /api/v1/statuses/tag/:tag -> /api/v1/timelines/tag/:tag --- .../controllers/api/v1/statuses_controller_spec.rb | 32 --------- .../api/v1/timelines_controller_spec.rb | 80 ++++++++++++++++++++++ 2 files changed, 80 insertions(+), 32 deletions(-) create mode 100644 spec/controllers/api/v1/timelines_controller_spec.rb (limited to 'spec/controllers/api/v1') diff --git a/spec/controllers/api/v1/statuses_controller_spec.rb b/spec/controllers/api/v1/statuses_controller_spec.rb index 9f9bb0c4f..9b027daf8 100644 --- a/spec/controllers/api/v1/statuses_controller_spec.rb +++ b/spec/controllers/api/v1/statuses_controller_spec.rb @@ -59,38 +59,6 @@ RSpec.describe Api::V1::StatusesController, type: :controller do end end - describe 'GET #home' do - it 'returns http success' do - get :home - expect(response).to have_http_status(:success) - end - end - - describe 'GET #mentions' do - it 'returns http success' do - get :mentions - 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 - post :create, params: { status: 'It is a #test' } - end - - it 'returns http success' do - get :tag, params: { id: 'test' } - expect(response).to have_http_status(:success) - end - end - describe 'POST #create' do before do post :create, params: { status: 'Hello world' } diff --git a/spec/controllers/api/v1/timelines_controller_spec.rb b/spec/controllers/api/v1/timelines_controller_spec.rb new file mode 100644 index 000000000..c94519ac5 --- /dev/null +++ b/spec/controllers/api/v1/timelines_controller_spec.rb @@ -0,0 +1,80 @@ +require 'rails_helper' + +RSpec.describe Api::V1::TimelinesController, type: :controller do + render_views + + let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) } + + before do + stub_request(:post, "https://pubsubhubbub.superfeedr.com/").to_return(:status => 200, :body => "", :headers => {}) + 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 #mentions' do + it 'returns http success' do + get :mentions + 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 #mentions' do + it 'returns http unprocessable entity' do + get :mentions + 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