diff options
author | Robert Speicher <robert@gitlab.com> | 2018-05-08 17:47:24 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-05-08 17:47:24 +0000 |
commit | 8194d3e464cfe07e223688dc1fcb874fed255b13 (patch) | |
tree | cb041b0cfbf9d5bdc220918433f91e371259062d | |
parent | b215db37f878bfc4a753705e453f74b8db6546e4 (diff) | |
parent | 065d44538b0fdf8ee6a2fb9e676123a790ddcb29 (diff) | |
download | gitlab-ce-8194d3e464cfe07e223688dc1fcb874fed255b13.tar.gz |
Merge branch 'fix_plural_handling_for_migration_to_ghost_user' into 'master'
Cleanly handle plural name for ghost user migration
See merge request gitlab-org/gitlab-ce!18798
-rw-r--r-- | app/services/users/migrate_to_ghost_user_service.rb | 4 | ||||
-rw-r--r-- | spec/support/services/migrate_to_ghost_user_service_shared_examples.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/services/users/migrate_to_ghost_user_service.rb b/app/services/users/migrate_to_ghost_user_service.rb index 976017dfa82..a2833b1e051 100644 --- a/app/services/users/migrate_to_ghost_user_service.rb +++ b/app/services/users/migrate_to_ghost_user_service.rb @@ -49,7 +49,7 @@ module Users migrate_merge_requests migrate_notes migrate_abuse_reports - migrate_award_emojis + migrate_award_emoji end def migrate_issues @@ -70,7 +70,7 @@ module Users user.reported_abuse_reports.update_all(reporter_id: ghost_user.id) end - def migrate_award_emojis + def migrate_award_emoji user.award_emoji.update_all(user_id: ghost_user.id) end end diff --git a/spec/support/services/migrate_to_ghost_user_service_shared_examples.rb b/spec/support/services/migrate_to_ghost_user_service_shared_examples.rb index adfd256dff1..1478c6b5a47 100644 --- a/spec/support/services/migrate_to_ghost_user_service_shared_examples.rb +++ b/spec/support/services/migrate_to_ghost_user_service_shared_examples.rb @@ -86,7 +86,7 @@ shared_examples "migrating a deleted user's associated records to the ghost user end it "blocks the user before #{record_class_name} migration begins" do - expect(service).to receive("migrate_#{record_class_name.parameterize('_')}s".to_sym) do + expect(service).to receive("migrate_#{record_class_name.parameterize('_').pluralize}".to_sym) do expect(user.reload).to be_blocked end |