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/requests/admin/instances/moderation_notes_spec.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Report Notes' do
+  describe 'POST /admin/instance/moderation_notes' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post admin_instance_moderation_notes_path(instance_id: 'mastodon.test', instance_note: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end

spec/requests/admin/instances_spec.rb

@@ -4,9 +4,9 @@ require 'rails_helper'
 
 RSpec.describe 'Admin Instances' do
   describe 'GET /admin/instances/:id' do
-    context 'with an unknown domain' do
-      before { sign_in Fabricate(:admin_user) }
+    before { sign_in Fabricate(:admin_user) }
 
+    context 'with an unknown domain' do
       it 'returns http success' do
         get admin_instance_path(id: 'unknown.example')
 
@@ -14,5 +14,14 @@ RSpec.describe 'Admin Instances' do
           .to have_http_status(200)
       end
     end
+
+    context 'with an invalid domain' do
+      it 'returns http success' do
+        get admin_instance_path(id: ' ')
+
+        expect(response)
+          .to have_http_status(200)
+      end
+    end
   end
 end

spec/requests/oauth/userinfo_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Oauth Userinfo Endpoint' do
+RSpec.describe 'OAuth Userinfo Endpoint' do
   include RoutingHelper
 
   let(:user)     { Fabricate(:user) }