Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-05-08 20:47:24 +0300
committerFilipa Lacerda <filipa@gitlab.com>2018-05-09 12:01:59 +0300
commit7c3c068537d2186dba414f68a78e85fe34b36f78 (patch)
tree8fdba0b8cc4d0d52bb722801eacf98ea601d1fb3 /spec
parent84ea440042518659f95cb84a9f5254df93a24a01 (diff)
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
Diffstat (limited to 'spec')
-rw-r--r--spec/support/services/migrate_to_ghost_user_service_shared_examples.rb2
1 files changed, 1 insertions, 1 deletions
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