Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream

spec/models/media_attachment_spec.rb

@@ -291,7 +291,7 @@ RSpec.describe MediaAttachment, :attachment_processing do
     let(:media) { Fabricate(:media_attachment) }
 
     before do
-      allow(Rails.configuration.x).to receive(:cache_buster_enabled).and_return(true)
+      allow(Rails.configuration.x.cache_buster).to receive(:enabled).and_return(true)
     end
 
     it 'queues CacheBusterWorker jobs' do

spec/requests/api/v1/apps/credentials_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe 'Credentials' do
             redirect_uris: token.application.redirect_uris,
             # Deprecated properties as of 4.3:
             redirect_uri: token.application.redirect_uri.split.first,
-            vapid_key: Rails.configuration.x.vapid_public_key
+            vapid_key: Rails.configuration.x.vapid.public_key
           )
         )
       end
@@ -69,7 +69,7 @@ RSpec.describe 'Credentials' do
             redirect_uris: token.application.redirect_uris,
             # Deprecated properties as of 4.3:
             redirect_uri: token.application.redirect_uri.split.first,
-            vapid_key: Rails.configuration.x.vapid_public_key
+            vapid_key: Rails.configuration.x.vapid.public_key
           )
         )
       end

spec/requests/api/v1/apps_spec.rb

@@ -49,7 +49,7 @@ RSpec.describe 'Apps' do
             redirect_uris: redirect_uris,
             # Deprecated properties as of 4.3:
             redirect_uri: redirect_uri,
-            vapid_key: Rails.configuration.x.vapid_public_key
+            vapid_key: Rails.configuration.x.vapid.public_key
           )
         )
       end

spec/serializers/rest/instance_serializer_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe REST::InstanceSerializer do
   describe 'configuration' do
     it 'returns the VAPID public key' do
       expect(serialization['configuration']['vapid']).to eq({
-        'public_key' => Rails.configuration.x.vapid_public_key,
+        'public_key' => Rails.configuration.x.vapid.public_key,
       })
     end
 

spec/services/suspend_account_service_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe SuspendAccountService do
 
     before do
       allow(FeedManager.instance).to receive_messages(unmerge_from_home: nil, unmerge_from_list: nil)
-      allow(Rails.configuration.x).to receive(:cache_buster_enabled).and_return(true)
+      allow(Rails.configuration.x.cache_buster).to receive(:enabled).and_return(true)
 
       local_follower.follow!(account)
       list.accounts << account

spec/support/capybara.rb

@@ -30,6 +30,10 @@ end
 
 Capybara.javascript_driver = :headless_chrome
 
+# Some of the flaky tests seem to be caused by github runners being too slow for the
+# default timeout of 2 seconds
+Capybara.default_max_wait_time = 8
+
 RSpec.configure do |config|
   config.before(:each, type: :system) do
     driven_by :rack_test

spec/workers/web/push_notification_worker_spec.rb

@@ -38,13 +38,13 @@ RSpec.describe Web::PushNotificationWorker do
 
   describe 'perform' do
     around do |example|
-      original_private = Rails.configuration.x.vapid_private_key
-      original_public = Rails.configuration.x.vapid_public_key
-      Rails.configuration.x.vapid_private_key = vapid_private_key
-      Rails.configuration.x.vapid_public_key = vapid_public_key
+      original_private = Rails.configuration.x.vapid.private_key
+      original_public = Rails.configuration.x.vapid.public_key
+      Rails.configuration.x.vapid.private_key = vapid_private_key
+      Rails.configuration.x.vapid.public_key = vapid_public_key
       example.run
-      Rails.configuration.x.vapid_private_key = original_private
-      Rails.configuration.x.vapid_public_key = original_public
+      Rails.configuration.x.vapid.private_key = original_private
+      Rails.configuration.x.vapid.public_key = original_public
     end
 
     before do