MushroomObserver / mushroom-observer / 28773666516

99%

main: 99%

Pull #4697

github

Fix Location#merge's destroy step not carrying current_user over

log_and_destroy_location refetches a fresh (non-strict_loading)
Location instance for the actual destroy cascade - same pattern bug as
ObservationsController::Destroy fixed earlier in this sweep. The fresh
instance's current_user was never set, so UserStats/version-attribution
hooks on the destroyed old location would misattribute to nobody
regardless of who actually performed the merge. `user` was already
threaded into log_and_destroy_location for the rss_log orphan message;
just needed to also land on the refetched instance before destroying it.

Spotted via test/models/rss_log_test.rb's test_detail_for_merged_location,
which still set User.current as a workaround despite loc2.merge(mary, loc1)
already passing mary explicitly - removed now that the real fix makes it
unnecessary. Also dropped a stray commented-out User.current line in the
neighboring test_detail_for_destroyed_object.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

34 of 34 new or added lines in 13 files covered. (100.0%)

51659 of 52377 relevant lines covered (98.63%)

746.53 hits per line