From 78fa926ed560e6a9738144bec7e152fa42104139 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 18 Aug 2018 03:03:12 +0200 Subject: Add remote interaction dialog for toots (#8202) * Add remote interaction dialog for toots * Change AuthorizeFollow into AuthorizeInteraction, support statuses * Update brakeman.ignore * Adjust how interaction buttons are display on public pages * Fix tests --- .../authorize_follows_controller_spec.rb | 110 -------------------- .../authorize_interactions_controller_spec.rb | 111 +++++++++++++++++++++ spec/controllers/intents_controller_spec.rb | 2 +- 3 files changed, 112 insertions(+), 111 deletions(-) delete mode 100644 spec/controllers/authorize_follows_controller_spec.rb create mode 100644 spec/controllers/authorize_interactions_controller_spec.rb (limited to 'spec') diff --git a/spec/controllers/authorize_follows_controller_spec.rb b/spec/controllers/authorize_follows_controller_spec.rb deleted file mode 100644 index 52971c724..000000000 --- a/spec/controllers/authorize_follows_controller_spec.rb +++ /dev/null @@ -1,110 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -describe AuthorizeFollowsController do - render_views - - describe 'GET #show' do - describe 'when signed out' do - it 'redirects to sign in page' do - get :show - - expect(response).to redirect_to(new_user_session_path) - end - end - - describe 'when signed in' do - let(:user) { Fabricate(:user) } - let(:account) { Fabricate(:account, user: user) } - - before do - sign_in(user) - end - - it 'renders error without acct param' do - get :show - - expect(response).to render_template(:error) - end - - it 'renders error when account cant be found' do - service = double - allow(ResolveAccountService).to receive(:new).and_return(service) - allow(service).to receive(:call).with('missing@hostname').and_return(nil) - - get :show, params: { acct: 'acct:missing@hostname' } - - expect(response).to render_template(:error) - expect(service).to have_received(:call).with('missing@hostname') - end - - it 'sets account from url' do - account = Account.new - service = double - allow(FetchRemoteAccountService).to receive(:new).and_return(service) - allow(service).to receive(:call).with('http://example.com').and_return(account) - - get :show, params: { acct: 'http://example.com' } - - expect(response).to have_http_status(200) - expect(assigns(:account)).to eq account - end - - it 'sets account from acct uri' do - account = Account.new - service = double - allow(ResolveAccountService).to receive(:new).and_return(service) - allow(service).to receive(:call).with('found@hostname').and_return(account) - - get :show, params: { acct: 'acct:found@hostname' } - - expect(response).to have_http_status(200) - expect(assigns(:account)).to eq account - end - end - end - - describe 'POST #create' do - describe 'when signed out' do - it 'redirects to sign in page' do - post :create - - expect(response).to redirect_to(new_user_session_path) - end - end - - describe 'when signed in' do - let(:user) { Fabricate(:user) } - let(:account) { Fabricate(:account, user: user) } - - before do - sign_in(user) - end - - it 'shows error when account not found' do - service = double - allow(FollowService).to receive(:new).and_return(service) - allow(service).to receive(:call).with(account, 'user@hostname').and_return(nil) - - post :create, params: { acct: 'acct:user@hostname' } - - expect(service).to have_received(:call).with(account, 'user@hostname') - expect(response).to render_template(:error) - end - - it 'follows account when found' do - target_account = Fabricate(:account) - result_account = double(target_account: target_account) - service = double - allow(FollowService).to receive(:new).and_return(service) - allow(service).to receive(:call).with(account, 'user@hostname').and_return(result_account) - - post :create, params: { acct: 'acct:user@hostname' } - - expect(service).to have_received(:call).with(account, 'user@hostname') - expect(response).to render_template(:success) - end - end - end -end diff --git a/spec/controllers/authorize_interactions_controller_spec.rb b/spec/controllers/authorize_interactions_controller_spec.rb new file mode 100644 index 000000000..81fd9ceb7 --- /dev/null +++ b/spec/controllers/authorize_interactions_controller_spec.rb @@ -0,0 +1,111 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe AuthorizeInteractionsController do + render_views + + describe 'GET #show' do + describe 'when signed out' do + it 'redirects to sign in page' do + get :show + + expect(response).to redirect_to(new_user_session_path) + end + end + + describe 'when signed in' do + let(:user) { Fabricate(:user) } + let(:account) { Fabricate(:account, user: user) } + + before do + sign_in(user) + end + + it 'renders error without acct param' do + get :show + + expect(response).to render_template(:error) + end + + it 'renders error when account cant be found' do + service = double + allow(ResolveAccountService).to receive(:new).and_return(service) + allow(service).to receive(:call).with('missing@hostname').and_return(nil) + + get :show, params: { acct: 'acct:missing@hostname' } + + expect(response).to render_template(:error) + expect(service).to have_received(:call).with('missing@hostname') + end + + it 'sets resource from url' do + account = Account.new + service = double + allow(ResolveURLService).to receive(:new).and_return(service) + allow(service).to receive(:call).with('http://example.com').and_return(account) + + get :show, params: { acct: 'http://example.com' } + + expect(response).to have_http_status(200) + expect(assigns(:resource)).to eq account + end + + it 'sets resource from acct uri' do + account = Account.new + service = double + allow(ResolveAccountService).to receive(:new).and_return(service) + allow(service).to receive(:call).with('found@hostname').and_return(account) + + get :show, params: { acct: 'acct:found@hostname' } + + expect(response).to have_http_status(200) + expect(assigns(:resource)).to eq account + end + end + end + + describe 'POST #create' do + describe 'when signed out' do + it 'redirects to sign in page' do + post :create + + expect(response).to redirect_to(new_user_session_path) + end + end + + describe 'when signed in' do + let!(:user) { Fabricate(:user) } + let!(:account) { user.account } + + before do + sign_in(user) + end + + it 'shows error when account not found' do + service = double + + allow(ResolveAccountService).to receive(:new).and_return(service) + allow(service).to receive(:call).with('user@hostname').and_return(nil) + + post :create, params: { acct: 'acct:user@hostname' } + + expect(response).to render_template(:error) + end + + it 'follows account when found' do + target_account = Fabricate(:account) + service = double + + allow(ResolveAccountService).to receive(:new).and_return(service) + allow(service).to receive(:call).with('user@hostname').and_return(target_account) + + post :create, params: { acct: 'acct:user@hostname' } + + expect(service).to have_received(:call).with('user@hostname') + expect(account.following?(target_account)).to be true + expect(response).to render_template(:success) + end + end + end +end diff --git a/spec/controllers/intents_controller_spec.rb b/spec/controllers/intents_controller_spec.rb index 3dde7f835..ddfd5ea36 100644 --- a/spec/controllers/intents_controller_spec.rb +++ b/spec/controllers/intents_controller_spec.rb @@ -13,7 +13,7 @@ RSpec.describe IntentsController, type: :controller do context 'when host is follow' do let(:uri) { 'web+mastodon://follow?uri=test' } - it { is_expected.to redirect_to authorize_follow_path(acct: 'test') } + it { is_expected.to redirect_to authorize_interaction_path(uri: 'test') } end context 'when host is share' do -- cgit From d010816ba876bf4f749749e9d7432a843e8a1ff9 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 18 Aug 2018 03:03:23 +0200 Subject: Fix error when trying to update counters for statuses that are gone (#8251) --- app/models/favourite.rb | 4 ++-- app/models/status.rb | 10 ++++++---- spec/models/status_spec.rb | 21 +++++++++++++++++++++ 3 files changed, 29 insertions(+), 6 deletions(-) (limited to 'spec') diff --git a/app/models/favourite.rb b/app/models/favourite.rb index ce7a6a336..17f8c9fa6 100644 --- a/app/models/favourite.rb +++ b/app/models/favourite.rb @@ -32,11 +32,11 @@ class Favourite < ApplicationRecord private def increment_cache_counters - status.increment_count!(:favourites_count) + status&.increment_count!(:favourites_count) end def decrement_cache_counters return if association(:status).loaded? && (status.marked_for_destruction? || status.marked_for_mass_destruction?) - status.decrement_count!(:favourites_count) + status&.decrement_count!(:favourites_count) end end diff --git a/app/models/status.rb b/app/models/status.rb index 2eed33659..533d12354 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -396,6 +396,8 @@ class Status < ApplicationRecord private def update_status_stat!(attrs) + return if marked_for_destruction? || destroyed? + record = status_stat || build_status_stat record.update(attrs) end @@ -456,8 +458,8 @@ class Status < ApplicationRecord Account.where(id: account_id).update_all('statuses_count = COALESCE(statuses_count, 0) + 1') end - reblog.increment_count!(:reblogs_count) if reblog? - thread.increment_count!(:replies_count) if in_reply_to_id.present? && (public_visibility? || unlisted_visibility?) + reblog&.increment_count!(:reblogs_count) if reblog? + thread&.increment_count!(:replies_count) if in_reply_to_id.present? && (public_visibility? || unlisted_visibility?) end def decrement_counter_caches @@ -469,7 +471,7 @@ class Status < ApplicationRecord Account.where(id: account_id).update_all('statuses_count = GREATEST(COALESCE(statuses_count, 0) - 1, 0)') end - reblog.decrement_count!(:reblogs_count) if reblog? - thread.decrement_count!(:replies_count) if in_reply_to_id.present? && (public_visibility? || unlisted_visibility?) + reblog&.decrement_count!(:reblogs_count) if reblog? + thread&.decrement_count!(:replies_count) if in_reply_to_id.present? && (public_visibility? || unlisted_visibility?) end end diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb index b3e475d99..d03005107 100644 --- a/spec/models/status_spec.rb +++ b/spec/models/status_spec.rb @@ -182,6 +182,27 @@ RSpec.describe Status, type: :model do reblog.destroy expect(subject.reblogs_count).to eq 0 end + + it 'does not fail when original is deleted before reblog' do + reblog = Fabricate(:status, account: bob, reblog: subject) + expect(subject.reblogs_count).to eq 1 + expect { subject.destroy }.to_not raise_error + expect(Status.find_by(id: reblog.id)).to be_nil + end + end + + describe '#replies_count' do + it 'is the number of replies' do + reply = Fabricate(:status, account: bob, thread: subject) + expect(subject.replies_count).to eq 1 + end + + it 'is decremented when reply is removed' do + reply = Fabricate(:status, account: bob, thread: subject) + expect(subject.replies_count).to eq 1 + reply.destroy + expect(subject.replies_count).to eq 0 + end end describe '#favourites_count' do -- cgit