diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-05 16:26:06 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-05 16:26:06 +0000 |
commit | b72af2b9c78527ea988bc6a69c62ec95645a6c48 (patch) | |
tree | 261a11340015ea094a8a26a9634c8fe54c100acc /spec/support | |
parent | ae46ceaab097923b46099a87d8ca63443aa85248 (diff) | |
parent | 153ea1830153b7d7c3be5ac2e7ca60486c9b2700 (diff) | |
download | gitlab-ce-b72af2b9c78527ea988bc6a69c62ec95645a6c48.tar.gz |
Merge branch 'ce-backport=reorder-issues' into 'master'
CE Backport of reordering issues in epics
See merge request gitlab-org/gitlab-ce!16247
Diffstat (limited to 'spec/support')
-rw-r--r-- | spec/support/background_migrations_matchers.rb | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/spec/support/background_migrations_matchers.rb b/spec/support/background_migrations_matchers.rb index 423c0e4cefc..f4127efc6ae 100644 --- a/spec/support/background_migrations_matchers.rb +++ b/spec/support/background_migrations_matchers.rb @@ -1,4 +1,4 @@ -RSpec::Matchers.define :be_scheduled_migration do |delay, *expected| +RSpec::Matchers.define :be_scheduled_delayed_migration do |delay, *expected| match do |migration| BackgroundMigrationWorker.jobs.any? do |job| job['args'] == [migration, expected] && @@ -11,3 +11,16 @@ RSpec::Matchers.define :be_scheduled_migration do |delay, *expected| 'not scheduled in expected time!' end end + +RSpec::Matchers.define :be_scheduled_migration do |*expected| + match do |migration| + BackgroundMigrationWorker.jobs.any? do |job| + args = job['args'].size == 1 ? [BackgroundMigrationWorker.jobs[0]['args'][0], []] : job['args'] + args == [migration, expected] + end + end + + failure_message do |migration| + "Migration `#{migration}` with args `#{expected.inspect}` not scheduled!" + end +end |