diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 21:08:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 21:08:08 +0300 |
| commit | 83731155d997ae24c7e0cd5ffa6f0dba41bec6dc (patch) | |
| tree | 31f785012137fda4ac9a470f4f07c961b42d0299 /spec/support | |
| parent | 57a37ce99f297cddae12cb4d982b6d572f932bb4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/shared_examples/lib/gitlab/background_migration/mentions_migration_shared_examples.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/shared_examples/lib/gitlab/background_migration/mentions_migration_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/background_migration/mentions_migration_shared_examples.rb index f5b889ef720..8f5bfdacc3a 100644 --- a/spec/support/shared_examples/lib/gitlab/background_migration/mentions_migration_shared_examples.rb +++ b/spec/support/shared_examples/lib/gitlab/background_migration/mentions_migration_shared_examples.rb @@ -72,7 +72,7 @@ shared_examples 'schedules resource mentions migration' do |resource_class, is_f it 'schedules background migrations' do Sidekiq::Testing.fake! do Timecop.freeze do - resource_count = is_for_notes ? Note.where(noteable_type: resource_class.to_s).count : resource_class.count + resource_count = is_for_notes ? Note.count : resource_class.count expect(resource_count).to eq 5 migrate! |