From 5282ba862a75cbbec81892a6a4cca7e798850178 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 9 Jun 2017 14:12:40 -0400 Subject: Move reblogged_by and favourited_by actions out of api/v1/statuses and into unique controllers (#3646) * Add specs for api statuses routes * Update favourited_by and reblogged_by api routes * Move methods into new controllers * Use load_accounts methods to simplify index actions * Clean up load_accounts methods * Clean up link header generation * Check for link headers in specs * Remove unused actions from api/v1/statuses controller * Remove specs for moved actions --- .../favourited_by_accounts_controller_spec.rb | 66 ++++++++++++++++++++ .../reblogged_by_accounts_controller_spec.rb | 65 ++++++++++++++++++++ .../controllers/api/v1/statuses_controller_spec.rb | 70 ---------------------- 3 files changed, 131 insertions(+), 70 deletions(-) create mode 100644 spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb create mode 100644 spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb (limited to 'spec/controllers') diff --git a/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb b/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb new file mode 100644 index 000000000..1acb990a0 --- /dev/null +++ b/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb @@ -0,0 +1,66 @@ +require 'rails_helper' + +RSpec.describe Api::V1::Statuses::FavouritedByAccountsController, type: :controller do + render_views + + let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) } + let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') } + let(:token) { double acceptable?: true, resource_owner_id: user.id, application: app } + + context 'with an oauth token' do + before do + allow(controller).to receive(:doorkeeper_token) { token } + end + + describe 'GET #index' do + let(:status) { Fabricate(:status, account: user.account) } + + before do + Fabricate(:favourite, status: status) + end + + it 'returns http success' do + get :index, params: { status_id: status.id, limit: 1 } + expect(response).to have_http_status(:success) + expect(response.headers['Link'].links.size).to eq(2) + end + end + + end + + context 'without an oauth token' do + before do + allow(controller).to receive(:doorkeeper_token) { nil } + end + + context 'with a private status' do + let(:status) { Fabricate(:status, account: user.account, visibility: :private) } + + describe 'GET #index' do + before do + Fabricate(:favourite, status: status) + end + + it 'returns http unautharized' do + get :index, params: { status_id: status.id } + expect(response).to have_http_status(:missing) + end + end + end + + context 'with a public status' do + let(:status) { Fabricate(:status, account: user.account, visibility: :public) } + + describe 'GET #index' do + before do + Fabricate(:favourite, status: status) + end + + it 'returns http success' do + get :index, params: { status_id: status.id } + expect(response).to have_http_status(:success) + end + end + end + end +end diff --git a/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb b/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb new file mode 100644 index 000000000..c5624023f --- /dev/null +++ b/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb @@ -0,0 +1,65 @@ +require 'rails_helper' + +RSpec.describe Api::V1::Statuses::RebloggedByAccountsController, type: :controller do + render_views + + let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) } + let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') } + let(:token) { double acceptable?: true, resource_owner_id: user.id, application: app } + + context 'with an oauth token' do + before do + allow(controller).to receive(:doorkeeper_token) { token } + end + + describe 'GET #index' do + let(:status) { Fabricate(:status, account: user.account) } + + before do + Fabricate(:status, reblog_of_id: status.id) + end + + it 'returns http success' do + get :index, params: { status_id: status.id, limit: 1 } + expect(response).to have_http_status(:success) + expect(response.headers['Link'].links.size).to eq(2) + end + end + end + + context 'without an oauth token' do + before do + allow(controller).to receive(:doorkeeper_token) { nil } + end + + context 'with a private status' do + let(:status) { Fabricate(:status, account: user.account, visibility: :private) } + + describe 'GET #index' do + before do + Fabricate(:status, reblog_of_id: status.id) + end + + it 'returns http unautharized' do + get :index, params: { status_id: status.id } + expect(response).to have_http_status(:missing) + end + end + end + + context 'with a public status' do + let(:status) { Fabricate(:status, account: user.account, visibility: :public) } + + describe 'GET #index' do + before do + Fabricate(:status, reblog_of_id: status.id) + end + + it 'returns http success' do + get :index, params: { status_id: status.id } + expect(response).to have_http_status(:success) + end + end + end + end +end diff --git a/spec/controllers/api/v1/statuses_controller_spec.rb b/spec/controllers/api/v1/statuses_controller_spec.rb index ac3b2dc7d..8754c03a2 100644 --- a/spec/controllers/api/v1/statuses_controller_spec.rb +++ b/spec/controllers/api/v1/statuses_controller_spec.rb @@ -34,32 +34,6 @@ RSpec.describe Api::V1::StatusesController, type: :controller do end end - describe 'GET #reblogged_by' do - let(:status) { Fabricate(:status, account: user.account) } - - before do - post :reblog, params: { id: status.id } - end - - it 'returns http success' do - get :reblogged_by, params: { id: status.id } - expect(response).to have_http_status(:success) - end - end - - describe 'GET #favourited_by' do - let(:status) { Fabricate(:status, account: user.account) } - - before do - post :favourite, params: { id: status.id } - end - - it 'returns http success' do - get :favourited_by, params: { id: status.id } - expect(response).to have_http_status(:success) - end - end - describe 'POST #create' do before do post :create, params: { status: 'Hello world' } @@ -250,28 +224,6 @@ RSpec.describe Api::V1::StatusesController, type: :controller do expect(response).to have_http_status(:missing) end end - - describe 'GET #reblogged_by' do - before do - post :reblog, params: { id: status.id } - end - - it 'returns http unautharized' do - get :reblogged_by, params: { id: status.id } - expect(response).to have_http_status(:missing) - end - end - - describe 'GET #favourited_by' do - before do - post :favourite, params: { id: status.id } - end - - it 'returns http unautharized' do - get :favourited_by, params: { id: status.id } - expect(response).to have_http_status(:missing) - end - end end context 'with a public status' do @@ -301,28 +253,6 @@ RSpec.describe Api::V1::StatusesController, type: :controller do expect(response).to have_http_status(:success) end end - - describe 'GET #reblogged_by' do - before do - post :reblog, params: { id: status.id } - end - - it 'returns http success' do - get :reblogged_by, params: { id: status.id } - expect(response).to have_http_status(:success) - end - end - - describe 'GET #favourited_by' do - before do - post :favourite, params: { id: status.id } - end - - it 'returns http success' do - get :favourited_by, params: { id: status.id } - expect(response).to have_http_status(:success) - end - end end end end -- cgit