Merge branch 'main' into glitch-soc/merge-upstream

2022-08-25 05:07:39 +02:00
parent 5a3d09dc8e 861b35dd54
commit 2d1d4210f9
67 changed files with 1420 additions and 194 deletions
--- a/spec/services/app_sign_up_service_spec.rb
+++ b/spec/services/app_sign_up_service_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe AppSignUpService, type: :service do
    it 'returns nil when registrations are closed' do
      tmp = Setting.registrations_mode
      Setting.registrations_mode = 'none'
-      expect(subject.call(app, remote_ip, good_params)).to be_nil
+      expect { subject.call(app, remote_ip, good_params) }.to raise_error Mastodon::NotPermittedError
      Setting.registrations_mode = tmp
    end