Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream

Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.

spec/controllers/.rubocop.yml

@@ -1,6 +0,0 @@
-inherit_from: ../../.rubocop.yml
-
-# Anonymous controllers in specs cannot access `described_class`, explanation:
-# https://github.com/rubocop/rubocop-rspec/blob/v2.26.1/lib/rubocop/cop/rspec/described_class.rb#L36-L56
-RSpec/DescribedClass:
-  SkipBlocks: true

spec/controllers/admin/account_moderation_notes_controller_spec.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::AccountModerationNotesController do
-  render_views
-
-  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-  let(:target_account) { Fabricate(:account) }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'POST #create' do
-    subject { post :create, params: params }
-
-    context 'when parameters are valid' do
-      let(:params) { { account_moderation_note: { target_account_id: target_account.id, content: 'test content' } } }
-
-      it 'successfully creates a note' do
-        expect { subject }.to change(AccountModerationNote, :count).by(1)
-        expect(response).to redirect_to admin_account_path(target_account.id)
-      end
-    end
-
-    context 'when the content is too short' do
-      let(:params) { { account_moderation_note: { target_account_id: target_account.id, content: '' } } }
-
-      it 'fails to create a note' do
-        expect { subject }.to_not change(AccountModerationNote, :count)
-        expect(response).to render_template 'admin/accounts/show'
-      end
-    end
-
-    context 'when the content is too long' do
-      let(:params) { { account_moderation_note: { target_account_id: target_account.id, content: 'test' * AccountModerationNote::CONTENT_SIZE_LIMIT } } }
-
-      it 'fails to create a note' do
-        expect { subject }.to_not change(AccountModerationNote, :count)
-        expect(response).to render_template 'admin/accounts/show'
-      end
-    end
-  end
-
-  describe 'DELETE #destroy' do
-    subject { delete :destroy, params: { id: note.id } }
-
-    let!(:note) { Fabricate(:account_moderation_note, account: account, target_account: target_account) }
-    let(:account) { Fabricate(:account) }
-
-    it 'destroys note' do
-      expect { subject }.to change(AccountModerationNote, :count).by(-1)
-      expect(response).to redirect_to admin_account_path(target_account.id)
-    end
-  end
-end

spec/controllers/admin/custom_emojis_controller_spec.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::CustomEmojisController do
-  render_views
-
-  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'GET #index' do
-    before do
-      Fabricate(:custom_emoji)
-    end
-
-    it 'renders index page' do
-      get :index
-
-      expect(response).to have_http_status 200
-      expect(response).to render_template :index
-    end
-  end
-
-  describe 'GET #new' do
-    it 'renders new page' do
-      get :new
-
-      expect(response).to have_http_status 200
-      expect(response).to render_template :new
-    end
-  end
-
-  describe 'POST #create' do
-    subject { post :create, params: { custom_emoji: params } }
-
-    let(:image) { fixture_file_upload(Rails.root.join('spec', 'fixtures', 'files', 'emojo.png'), 'image/png') }
-
-    context 'when parameter is valid' do
-      let(:params) { { shortcode: 'test', image: image } }
-
-      it 'creates custom emoji' do
-        expect { subject }.to change(CustomEmoji, :count).by(1)
-      end
-    end
-
-    context 'when parameter is invalid' do
-      let(:params) { { shortcode: 't', image: image } }
-
-      it 'renders new' do
-        expect(subject).to render_template :new
-      end
-    end
-  end
-end

spec/controllers/admin/domain_allows_controller_spec.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::DomainAllowsController do
-  render_views
-
-  before do
-    sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
-  end
-
-  describe 'GET #new' do
-    it 'assigns a new domain allow' do
-      get :new
-
-      expect(response).to have_http_status(200)
-    end
-  end
-
-  describe 'POST #create' do
-    it 'blocks the domain when succeeded to save' do
-      post :create, params: { domain_allow: { domain: 'example.com' } }
-
-      expect(flash[:notice]).to eq I18n.t('admin.domain_allows.created_msg')
-      expect(response).to redirect_to(admin_instances_path)
-    end
-
-    it 'renders new when failed to save' do
-      Fabricate(:domain_allow, domain: 'example.com')
-
-      post :create, params: { domain_allow: { domain: 'example.com' } }
-
-      expect(response).to render_template :new
-    end
-  end
-
-  describe 'DELETE #destroy' do
-    it 'disallows the domain' do
-      service = instance_double(UnallowDomainService, call: true)
-      allow(UnallowDomainService).to receive(:new).and_return(service)
-      domain_allow = Fabricate(:domain_allow)
-      delete :destroy, params: { id: domain_allow.id }
-
-      expect(service).to have_received(:call).with(domain_allow)
-      expect(flash[:notice]).to eq I18n.t('admin.domain_allows.destroyed_msg')
-      expect(response).to redirect_to(admin_instances_path)
-    end
-  end
-end

spec/controllers/admin/export_domain_allows_controller_spec.rb

@@ -32,15 +32,16 @@ RSpec.describe Admin::ExportDomainAllowsController do
     it 'allows imported domains' do
       post :import, params: { admin_import: { data: fixture_file_upload('domain_allows.csv') } }
 
-      expect(response).to redirect_to(admin_instances_path)
+      expect(response)
+        .to redirect_to(admin_instances_path)
 
-      # Header should not be imported
-      expect(DomainAllow.where(domain: '#domain').present?).to be(false)
-
-      # Domains should now be added
-      get :export, params: { format: :csv }
-      expect(response).to have_http_status(200)
-      expect(response.body).to eq(domain_allows_csv_file)
+      # Header row should not be imported, but domains should
+      expect(DomainAllow)
+        .to_not exist(domain: '#domain')
+      expect(DomainAllow)
+        .to exist(domain: 'good.domain')
+      expect(DomainAllow)
+        .to exist(domain: 'better.domain')
     end
 
     it 'displays error on no file selected' do

spec/controllers/admin/ip_blocks_controller_spec.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::IpBlocksController do
-  render_views
-
-  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'GET #index' do
-    it 'returns http success' do
-      get :index
-
-      expect(response).to have_http_status(:success)
-    end
-  end
-
-  describe 'GET #new' do
-    it 'returns http success and renders view' do
-      get :new
-
-      expect(response).to have_http_status(:success)
-      expect(response).to render_template(:new)
-    end
-  end
-
-  describe 'POST #create' do
-    context 'with valid data' do
-      it 'creates a new ip block and redirects' do
-        expect do
-          post :create, params: { ip_block: { ip: '1.1.1.1', severity: 'no_access', expires_in: 1.day.to_i.to_s } }
-        end.to change(IpBlock, :count).by(1)
-
-        expect(response).to redirect_to(admin_ip_blocks_path)
-        expect(flash.notice).to match(I18n.t('admin.ip_blocks.created_msg'))
-      end
-    end
-
-    context 'with invalid data' do
-      it 'does not create new a ip block and renders new' do
-        expect do
-          post :create, params: { ip_block: { ip: '1.1.1.1' } }
-        end.to_not change(IpBlock, :count)
-
-        expect(response).to have_http_status(:success)
-        expect(response).to render_template(:new)
-      end
-    end
-  end
-end

spec/controllers/admin/terms_of_service/distributions_controller_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Admin::TermsOfService::DistributionsController do
+  render_views
+
+  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+  let(:terms_of_service) { Fabricate(:terms_of_service, notification_sent_at: nil) }
+
+  before do
+    sign_in user, scope: :user
+  end
+
+  describe 'POST #create' do
+    it 'returns http success' do
+      post :create, params: { terms_of_service_id: terms_of_service.id }
+
+      expect(response).to redirect_to(admin_terms_of_service_index_path)
+    end
+  end
+end

spec/controllers/admin/terms_of_service/drafts_controller_spec.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Admin::TermsOfService::DraftsController do
+  render_views
+
+  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+
+  before do
+    sign_in user, scope: :user
+  end
+
+  describe 'GET #show' do
+    it 'returns http success' do
+      get :show
+
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+  describe 'PUT #update' do
+    subject { put :update, params: params }
+
+    let!(:terms) { Fabricate :terms_of_service, published_at: nil }
+
+    context 'with publishing params' do
+      let(:params) { { terms_of_service: { text: 'new' }, action_type: 'publish' } }
+
+      it 'publishes the record' do
+        expect { subject }
+          .to change(Admin::ActionLog, :count).by(1)
+
+        expect(response)
+          .to redirect_to(admin_terms_of_service_index_path)
+        expect(terms.reload.published_at)
+          .to_not be_nil
+      end
+    end
+
+    context 'with non publishing params' do
+      let(:params) { { terms_of_service: { text: 'new' }, action_type: 'save_draft' } }
+
+      it 'updates but does not publish the record' do
+        expect { subject }
+          .to_not change(Admin::ActionLog, :count)
+
+        expect(response)
+          .to redirect_to(admin_terms_of_service_draft_path)
+        expect(terms.reload.published_at)
+          .to be_nil
+      end
+    end
+
+    context 'with invalid params' do
+      let(:params) { { terms_of_service: { text: '' }, action_type: 'save_draft' } }
+
+      it 'does not update the record' do
+        subject
+
+        expect(response)
+          .to have_http_status(:success)
+      end
+    end
+  end
+end

spec/controllers/admin/terms_of_service/generates_controller_spec.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Admin::TermsOfService::GeneratesController do
+  render_views
+
+  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+
+  before do
+    sign_in user, scope: :user
+  end
+
+  describe 'GET #show' do
+    it 'returns http success' do
+      get :show
+
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+  describe 'POST #create' do
+    subject { post :create, params: params }
+
+    context 'with valid params' do
+      let(:params) do
+        {
+          terms_of_service_generator: {
+            admin_email: 'test@host.example',
+            arbitration_address: '123 Main Street',
+            arbitration_website: 'https://host.example',
+            dmca_address: '123 DMCA Ave',
+            dmca_email: 'dmca@host.example',
+            domain: 'host.example',
+            jurisdiction: 'Europe',
+          },
+        }
+      end
+
+      it 'saves new record' do
+        expect { subject }
+          .to change(TermsOfService, :count).by(1)
+        expect(response)
+          .to redirect_to(admin_terms_of_service_draft_path)
+      end
+    end
+
+    context 'with invalid params' do
+      let(:params) do
+        {
+          terms_of_service_generator: {
+            admin_email: 'what the',
+          },
+        }
+      end
+
+      it 'does not save new record' do
+        expect { subject }
+          .to_not change(TermsOfService, :count)
+        expect(response)
+          .to have_http_status(200)
+      end
+    end
+  end
+end

spec/controllers/admin/terms_of_service/histories_controller_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Admin::TermsOfService::HistoriesController do
+  render_views
+
+  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+
+  before do
+    sign_in user, scope: :user
+  end
+
+  describe 'GET #show' do
+    it 'returns http success' do
+      get :show
+
+      expect(response).to have_http_status(:success)
+    end
+  end
+end

spec/controllers/admin/terms_of_service/previews_controller_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Admin::TermsOfService::PreviewsController do
+  render_views
+
+  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+  let(:terms_of_service) { Fabricate(:terms_of_service, notification_sent_at: nil) }
+
+  before do
+    sign_in user, scope: :user
+  end
+
+  describe 'GET #show' do
+    it 'returns http success' do
+      get :show, params: { terms_of_service_id: terms_of_service.id }
+
+      expect(response).to have_http_status(:success)
+    end
+  end
+end

spec/controllers/admin/terms_of_service/tests_controller_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Admin::TermsOfService::TestsController do
+  render_views
+
+  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+  let(:terms_of_service) { Fabricate(:terms_of_service, notification_sent_at: nil) }
+
+  before do
+    sign_in user, scope: :user
+  end
+
+  describe 'POST #create' do
+    it 'returns http success' do
+      post :create, params: { terms_of_service_id: terms_of_service.id }
+
+      expect(response).to redirect_to(admin_terms_of_service_preview_path(terms_of_service))
+    end
+  end
+end

spec/controllers/admin/terms_of_service_controller_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Admin::TermsOfServiceController do
+  render_views
+
+  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+
+  before do
+    sign_in user, scope: :user
+  end
+
+  describe 'GET #index' do
+    it 'returns http success' do
+      get :index
+
+      expect(response).to have_http_status(:success)
+    end
+  end
+end

spec/controllers/admin/webhooks_controller_spec.rb

@@ -1,117 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::WebhooksController do
-  render_views
-
-  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'GET #index' do
-    it 'returns http success' do
-      get :index
-
-      expect(response).to have_http_status(:success)
-    end
-  end
-
-  describe 'GET #new' do
-    it 'returns http success and renders view' do
-      get :new
-
-      expect(response).to have_http_status(:success)
-      expect(response).to render_template(:new)
-    end
-  end
-
-  describe 'POST #create' do
-    it 'creates a new webhook record with valid data' do
-      expect do
-        post :create, params: { webhook: { url: 'https://example.com/hook', events: ['account.approved'] } }
-      end.to change(Webhook, :count).by(1)
-
-      expect(response).to be_redirect
-    end
-
-    it 'does not create a new webhook record with invalid data' do
-      expect do
-        post :create, params: { webhook: { url: 'https://example.com/hook', events: [] } }
-      end.to_not change(Webhook, :count)
-
-      expect(response).to have_http_status(:success)
-      expect(response).to render_template(:new)
-    end
-  end
-
-  context 'with an existing record' do
-    let!(:webhook) { Fabricate(:webhook, events: ['account.created', 'report.created']) }
-
-    describe 'GET #show' do
-      it 'returns http success and renders view' do
-        get :show, params: { id: webhook.id }
-
-        expect(response).to have_http_status(:success)
-        expect(response).to render_template(:show)
-      end
-    end
-
-    describe 'GET #edit' do
-      it 'returns http success and renders view' do
-        get :edit, params: { id: webhook.id }
-
-        expect(response).to have_http_status(:success)
-        expect(response).to render_template(:edit)
-      end
-    end
-
-    describe 'PUT #update' do
-      it 'updates the record with valid data' do
-        put :update, params: { id: webhook.id, webhook: { url: 'https://example.com/new/location' } }
-
-        expect(webhook.reload.url).to match(%r{new/location})
-        expect(response).to redirect_to(admin_webhook_path(webhook))
-      end
-
-      it 'does not update the record with invalid data' do
-        expect do
-          put :update, params: { id: webhook.id, webhook: { url: '' } }
-        end.to_not change(webhook, :url)
-
-        expect(response).to have_http_status(:success)
-        expect(response).to render_template(:edit)
-      end
-    end
-
-    describe 'POST #enable' do
-      it 'enables the webhook' do
-        post :enable, params: { id: webhook.id }
-
-        expect(webhook.reload).to be_enabled
-        expect(response).to redirect_to(admin_webhook_path(webhook))
-      end
-    end
-
-    describe 'POST #disable' do
-      it 'disables the webhook' do
-        post :disable, params: { id: webhook.id }
-
-        expect(webhook.reload).to_not be_enabled
-        expect(response).to redirect_to(admin_webhook_path(webhook))
-      end
-    end
-
-    describe 'DELETE #destroy' do
-      it 'destroys the record' do
-        expect do
-          delete :destroy, params: { id: webhook.id }
-        end.to change(Webhook, :count).by(-1)
-
-        expect(response).to redirect_to(admin_webhooks_path)
-      end
-    end
-  end
-end

spec/controllers/concerns/account_controller_concern_spec.rb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 RSpec.describe AccountControllerConcern do
   controller(ApplicationController) do
-    include AccountControllerConcern
+    include AccountControllerConcern # rubocop:disable RSpec/DescribedClass
 
     def success
       render plain: @account.username # rubocop:disable RSpec/InstanceVariable

spec/controllers/concerns/api/rate_limit_headers_spec.rb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 RSpec.describe Api::RateLimitHeaders do
   controller(ApplicationController) do
-    include Api::RateLimitHeaders
+    include Api::RateLimitHeaders # rubocop:disable RSpec/DescribedClass
 
     def show
       head 200

spec/controllers/concerns/challengable_concern_spec.rb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 RSpec.describe ChallengableConcern do
   controller(ApplicationController) do
-    include ChallengableConcern
+    include ChallengableConcern # rubocop:disable RSpec/DescribedClass
 
     before_action :require_challenge!
 

spec/controllers/concerns/localized_spec.rb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 RSpec.describe Localized do
   controller(ApplicationController) do
-    include Localized
+    include Localized # rubocop:disable RSpec/DescribedClass
 
     def success
       render plain: I18n.locale, status: 200

spec/controllers/concerns/preloading_concern_spec.rb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 RSpec.describe PreloadingConcern do
   controller(ApplicationController) do
-    include PreloadingConcern
+    include PreloadingConcern # rubocop:disable RSpec/DescribedClass
 
     def empty_array
       render plain: preload_collection([], Status).size

spec/controllers/concerns/settings/export_controller_concern_spec.rb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 RSpec.describe Settings::ExportControllerConcern do
   controller(ApplicationController) do
-    include Settings::ExportControllerConcern
+    include Settings::ExportControllerConcern # rubocop:disable RSpec/DescribedClass
 
     def index
       send_export_file

spec/controllers/concerns/user_tracking_concern_spec.rb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 RSpec.describe UserTrackingConcern do
   controller(ApplicationController) do
-    include UserTrackingConcern
+    include UserTrackingConcern # rubocop:disable RSpec/DescribedClass
 
     def show
       render plain: 'show'

spec/controllers/filters_controller_spec.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe FiltersController do
-  render_views
-
-  describe 'GET #index' do
-    context 'with signed out user' do
-      before do
-        get :index
-      end
-
-      it 'redirects' do
-        expect(response).to be_redirect
-      end
-    end
-
-    context 'with a signed in user' do
-      before do
-        sign_in(Fabricate(:user))
-        get :index
-      end
-
-      it 'returns http success' do
-        expect(response).to have_http_status(200)
-      end
-
-      it 'returns private cache control headers' do
-        expect(response.headers['Cache-Control']).to include('private, no-store')
-      end
-    end
-  end
-end

spec/controllers/settings/login_activities_controller_spec.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Settings::LoginActivitiesController do
-  render_views
-
-  let!(:user) { Fabricate(:user) }
-  let!(:login_activity) { Fabricate :login_activity, user: user }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'GET #index' do
-    before do
-      get :index
-    end
-
-    it 'returns http success with private cache control headers', :aggregate_failures do
-      expect(response).to have_http_status(200)
-      expect(response.headers['Cache-Control']).to include('private, no-store')
-      expect(response.body)
-        .to include(login_activity.user_agent)
-        .and include(login_activity.authentication_method)
-        .and include(login_activity.ip.to_s)
-    end
-  end
-end

spec/controllers/settings/preferences/appearance_controller_spec.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Settings::Preferences::AppearanceController do
-  render_views
-
-  let!(:user) { Fabricate(:user) }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'GET #show' do
-    before do
-      get :show
-    end
-
-    it 'returns http success with private cache control headers', :aggregate_failures do
-      expect(response).to have_http_status(200)
-      expect(response.headers['Cache-Control']).to include('private, no-store')
-    end
-  end
-
-  describe 'PUT #update' do
-    subject { put :update, params: { user: { settings_attributes: { skin: 'contrast' } } } }
-
-    it 'redirects correctly' do
-      expect { subject }
-        .to change { user.reload.settings.skin }.to('contrast')
-
-      expect(response).to redirect_to(settings_preferences_appearance_path)
-    end
-  end
-end

spec/controllers/settings/preferences/notifications_controller_spec.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Settings::Preferences::NotificationsController do
-  render_views
-
-  let(:user) { Fabricate(:user) }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'GET #show' do
-    before do
-      get :show
-    end
-
-    it 'returns http success with private cache control headers', :aggregate_failures do
-      expect(response).to have_http_status(200)
-      expect(response.headers['Cache-Control']).to include('private, no-store')
-    end
-  end
-
-  describe 'PUT #update' do
-    it 'updates notifications settings' do
-      user.settings.update('notification_emails.follow': false)
-      user.save
-
-      put :update, params: {
-        user: {
-          settings_attributes: {
-            'notification_emails.follow': '1',
-          },
-        },
-      }
-
-      expect(response).to redirect_to(settings_preferences_notifications_path)
-      user.reload
-      expect(user.settings['notification_emails.follow']).to be true
-    end
-  end
-end

spec/controllers/settings/preferences/other_controller_spec.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Settings::Preferences::OtherController do
-  render_views
-
-  let(:user) { Fabricate(:user, chosen_languages: []) }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'GET #show' do
-    before do
-      get :show
-    end
-
-    it 'returns http success with private cache control headers', :aggregate_failures do
-      expect(response).to have_http_status(200)
-      expect(response.headers['Cache-Control']).to include('private, no-store')
-    end
-  end
-
-  describe 'PUT #update' do
-    it 'updates the user record' do
-      put :update, params: { user: { locale: 'en', chosen_languages: ['es', 'fr', ''] } }
-
-      expect(response).to redirect_to(settings_preferences_other_path)
-      user.reload
-      expect(user.locale).to eq 'en'
-      expect(user.chosen_languages).to eq %w(es fr)
-    end
-
-    it 'updates user settings' do
-      user.settings.update('web.reblog_modal': false, 'web.delete_modal': true)
-      user.save
-
-      put :update, params: {
-        user: {
-          settings_attributes: {
-            'web.reblog_modal': '1',
-            'web.delete_modal': '0',
-          },
-        },
-      }
-
-      expect(response).to redirect_to(settings_preferences_other_path)
-      user.reload
-      expect(user.settings['web.reblog_modal']).to be true
-      expect(user.settings['web.delete_modal']).to be false
-    end
-  end
-end

spec/controllers/settings/profiles_controller_spec.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Settings::ProfilesController do
-  render_views
-
-  let!(:user) { Fabricate(:user) }
-  let(:account) { user.account }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'GET #show' do
-    before do
-      get :show
-    end
-
-    it 'returns http success with private cache control headers', :aggregate_failures do
-      expect(response).to have_http_status(200)
-      expect(response.headers['Cache-Control']).to include('private, no-store')
-    end
-  end
-
-  describe 'PUT #update' do
-    before do
-      user.account.update(display_name: 'Old name')
-    end
-
-    it 'updates the user profile' do
-      allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
-      put :update, params: { account: { display_name: 'New name' } }
-      expect(account.reload.display_name).to eq 'New name'
-      expect(response).to redirect_to(settings_profile_path)
-      expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(account.id)
-    end
-  end
-
-  describe 'PUT #update with new profile image' do
-    it 'updates profile image' do
-      allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
-      expect(account.avatar.instance.avatar_file_name).to be_nil
-
-      put :update, params: { account: { avatar: fixture_file_upload('avatar.gif', 'image/gif') } }
-      expect(response).to redirect_to(settings_profile_path)
-      expect(account.reload.avatar.instance.avatar_file_name).to_not be_nil
-      expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(account.id)
-    end
-  end
-end

spec/controllers/settings/verifications_controller_spec.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Settings::VerificationsController do
-  render_views
-
-  let!(:user) { Fabricate(:user) }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'GET #show' do
-    before do
-      get :show
-    end
-
-    it 'returns http success with private cache control headers', :aggregate_failures do
-      expect(response)
-        .to have_http_status(200)
-        .and have_attributes(
-          headers: include(
-            'Cache-Control' => 'private, no-store'
-          )
-        )
-    end
-  end
-end

spec/controllers/statuses_cleanup_controller_spec.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe StatusesCleanupController do
-  render_views
-
-  let!(:user) { Fabricate(:user) }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'GET #show' do
-    before do
-      get :show
-    end
-
-    it 'returns http success' do
-      expect(response).to have_http_status(200)
-    end
-
-    it 'returns private cache control headers' do
-      expect(response.headers['Cache-Control']).to include('private, no-store')
-    end
-  end
-
-  describe 'PUT #update' do
-    before do
-      put :update, params: { account_statuses_cleanup_policy: { enabled: true, min_status_age: 2.weeks.seconds, keep_direct: false, keep_polls: true } }
-    end
-
-    it 'updates the account status cleanup policy' do
-      expect(user.account.statuses_cleanup_policy.enabled).to be true
-      expect(user.account.statuses_cleanup_policy.keep_direct).to be false
-      expect(user.account.statuses_cleanup_policy.keep_polls).to be true
-    end
-
-    it 'redirects' do
-      expect(response).to redirect_to(statuses_cleanup_path)
-    end
-  end
-end

spec/controllers/statuses_controller_spec.rb

@@ -527,213 +527,4 @@ RSpec.describe StatusesController do
       end
     end
   end
-
-  describe 'GET #activity' do
-    let(:account) { Fabricate(:account) }
-    let(:status)  { Fabricate(:status, account: account) }
-
-    context 'when account is permanently suspended' do
-      before do
-        account.suspend!
-        account.deletion_request.destroy
-
-        get :activity, params: { account_username: account.username, id: status.id }
-      end
-
-      it 'returns http gone' do
-        expect(response).to have_http_status(410)
-      end
-    end
-
-    context 'when account is temporarily suspended' do
-      before do
-        account.suspend!
-
-        get :activity, params: { account_username: account.username, id: status.id }
-      end
-
-      it 'returns http forbidden' do
-        expect(response).to have_http_status(403)
-      end
-    end
-
-    context 'when status is public' do
-      before do
-        status.update(visibility: :public)
-        get :activity, params: { account_username: account.username, id: status.id }
-      end
-
-      it 'returns http success' do
-        expect(response).to have_http_status(:success)
-      end
-    end
-
-    context 'when status is private' do
-      before do
-        status.update(visibility: :private)
-        get :activity, params: { account_username: account.username, id: status.id }
-      end
-
-      it 'returns http not_found' do
-        expect(response).to have_http_status(404)
-      end
-    end
-
-    context 'when status is direct' do
-      before do
-        status.update(visibility: :direct)
-        get :activity, params: { account_username: account.username, id: status.id }
-      end
-
-      it 'returns http not_found' do
-        expect(response).to have_http_status(404)
-      end
-    end
-
-    context 'when signed-in' do
-      let(:user) { Fabricate(:user) }
-
-      before do
-        sign_in(user)
-      end
-
-      context 'when status is public' do
-        before do
-          status.update(visibility: :public)
-          get :activity, params: { account_username: account.username, id: status.id }
-        end
-
-        it 'returns http success' do
-          expect(response).to have_http_status(:success)
-        end
-      end
-
-      context 'when status is private' do
-        before do
-          status.update(visibility: :private)
-        end
-
-        context 'when user is authorized to see it' do
-          before do
-            user.account.follow!(account)
-            get :activity, params: { account_username: account.username, id: status.id }
-          end
-
-          it 'returns http success' do
-            expect(response).to have_http_status(200)
-          end
-        end
-
-        context 'when user is not authorized to see it' do
-          before do
-            get :activity, params: { account_username: account.username, id: status.id }
-          end
-
-          it 'returns http not_found' do
-            expect(response).to have_http_status(404)
-          end
-        end
-      end
-
-      context 'when status is direct' do
-        before do
-          status.update(visibility: :direct)
-        end
-
-        context 'when user is authorized to see it' do
-          before do
-            Fabricate(:mention, account: user.account, status: status)
-            get :activity, params: { account_username: account.username, id: status.id }
-          end
-
-          it 'returns http success' do
-            expect(response).to have_http_status(200)
-          end
-        end
-
-        context 'when user is not authorized to see it' do
-          before do
-            get :activity, params: { account_username: account.username, id: status.id }
-          end
-
-          it 'returns http not_found' do
-            expect(response).to have_http_status(404)
-          end
-        end
-      end
-    end
-
-    context 'with signature' do
-      let(:remote_account) { Fabricate(:account, domain: 'example.com') }
-
-      before do
-        allow(controller).to receive(:signed_request_actor).and_return(remote_account)
-      end
-
-      context 'when status is public' do
-        before do
-          status.update(visibility: :public)
-          get :activity, params: { account_username: account.username, id: status.id }
-        end
-
-        it 'returns http success' do
-          expect(response).to have_http_status(:success)
-        end
-      end
-
-      context 'when status is private' do
-        before do
-          status.update(visibility: :private)
-        end
-
-        context 'when user is authorized to see it' do
-          before do
-            remote_account.follow!(account)
-            get :activity, params: { account_username: account.username, id: status.id }
-          end
-
-          it 'returns http success' do
-            expect(response).to have_http_status(200)
-          end
-        end
-
-        context 'when user is not authorized to see it' do
-          before do
-            get :activity, params: { account_username: account.username, id: status.id }
-          end
-
-          it 'returns http not_found' do
-            expect(response).to have_http_status(404)
-          end
-        end
-      end
-
-      context 'when status is direct' do
-        before do
-          status.update(visibility: :direct)
-        end
-
-        context 'when user is authorized to see it' do
-          before do
-            Fabricate(:mention, account: remote_account, status: status)
-            get :activity, params: { account_username: account.username, id: status.id }
-          end
-
-          it 'returns http success' do
-            expect(response).to have_http_status(200)
-          end
-        end
-
-        context 'when user is not authorized to see it' do
-          before do
-            get :activity, params: { account_username: account.username, id: status.id }
-          end
-
-          it 'returns http not_found' do
-            expect(response).to have_http_status(404)
-          end
-        end
-      end
-    end
-  end
 end