From 5b0300963e8c3a87fb1186de87b7f48c9d23178b Mon Sep 17 00:00:00 2001 From: Sony Mathew <2040199+sony-mathew@users.noreply.github.com> Date: Tue, 16 Jun 2026 18:39:48 +0530 Subject: [PATCH] test(storage): isolate migrator spec service state Restore ActiveStorage::Blob service globals after migrator specs so later attachment specs do not inherit leaked test doubles. --- spec/lib/active_storage/migrator_spec.rb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/spec/lib/active_storage/migrator_spec.rb b/spec/lib/active_storage/migrator_spec.rb index 11bf8a120..748e18174 100644 --- a/spec/lib/active_storage/migrator_spec.rb +++ b/spec/lib/active_storage/migrator_spec.rb @@ -4,9 +4,19 @@ require 'stringio' require 'tmpdir' RSpec.describe ActiveStorage::Migrator do + around do |example| + original_services = ActiveStorage::Blob.services + original_service = ActiveStorage::Blob.service + + example.run + ensure + ActiveStorage::Blob.services = original_services + ActiveStorage::Blob.service = original_service + end + describe '.migrate' do - let(:from_service_stub) { instance_double(ActiveStorage::Service) } - let(:to_service_stub) { instance_double(ActiveStorage::Service) } + let(:from_service_stub) { instance_double(ActiveStorage::Service, name: 'local') } + let(:to_service_stub) { instance_double(ActiveStorage::Service, name: 'amazon') } before do allow(ActiveStorage::Service).to receive(:configure).with('local', any_args).and_return(from_service_stub)