Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream

Conflicts:
- `tsconfig.json`:
  glitch-soc had extra paths under `app/javascript/flavours`, but upstream
  added `app/javascript` as a whole, so updated to upstream's.

spec/system/admin/account_moderation_notes_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe 'Admin::AccountModerationNotes' do
     end
 
     def delete_note
-      within('.report-notes__item__actions') do
+      within('.report-notes__item:first-child .report-notes__item__actions') do
         click_on I18n.t('admin.reports.notes.delete')
       end
     end

spec/system/admin/instance/moderation_notes_spec.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin::Instances::ModerationNotesController' do
+  let(:current_user) { Fabricate(:admin_user) }
+  let(:instance_domain) { 'mastodon.example' }
+
+  before { sign_in current_user }
+
+  describe 'Managing instance moderation notes' do
+    it 'saves and then deletes a record' do
+      visit admin_instance_path(instance_domain)
+
+      fill_in 'instance_moderation_note_content', with: ''
+      expect { submit_form }
+        .to not_change(InstanceModerationNote, :count)
+      expect(page)
+        .to have_content(/error below/)
+
+      fill_in 'instance_moderation_note_content', with: 'Test message ' * InstanceModerationNote::CONTENT_SIZE_LIMIT
+      expect { submit_form }
+        .to not_change(InstanceModerationNote, :count)
+      expect(page)
+        .to have_content(/error below/)
+
+      fill_in 'instance_moderation_note_content', with: 'Test message'
+      expect { submit_form }
+        .to change(InstanceModerationNote, :count).by(1)
+      expect(page)
+        .to have_current_path(admin_instance_path(instance_domain))
+      expect(page)
+        .to have_content(I18n.t('admin.instances.moderation_notes.created_msg'))
+
+      expect { delete_note }
+        .to change(InstanceModerationNote, :count).by(-1)
+      expect(page)
+        .to have_content(I18n.t('admin.instances.moderation_notes.destroyed_msg'))
+    end
+
+    def submit_form
+      click_on I18n.t('admin.instances.moderation_notes.create')
+    end
+
+    def delete_note
+      within('.report-notes__item:first-child .report-notes__item__actions') do
+        click_on I18n.t('admin.reports.notes.delete')
+      end
+    end
+  end
+end