diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-01-09 20:54:24 +0000 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-01-09 20:54:24 +0000 |
| commit | 882cfbcc32f7a4a01b59b7fae14f8133e24cfea8 (patch) | |
| tree | 047d5fea437483a3e5ed846a9fbfb6405209dc88 /spec/migrations/schedule_merge_request_latest_merge_request_diff_id_migrations_spec.rb | |
| parent | 1003bc22abc6d9cb49c872b6f23c6c13fd0409cd (diff) | |
| parent | a8a37764e277ecc88ae4f748dac50eb6cf744443 (diff) | |
| download | gitlab-ce-882cfbcc32f7a4a01b59b7fae14f8133e24cfea8.tar.gz | |
Merge branch 'last-weekend-commit' into 10-4-stable-prepare-rc3-with-weekend-commits10-4-stable-prepare-rc3-with-weekend-commits
Diffstat (limited to 'spec/migrations/schedule_merge_request_latest_merge_request_diff_id_migrations_spec.rb')
| -rw-r--r-- | spec/migrations/schedule_merge_request_latest_merge_request_diff_id_migrations_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/migrations/schedule_merge_request_latest_merge_request_diff_id_migrations_spec.rb b/spec/migrations/schedule_merge_request_latest_merge_request_diff_id_migrations_spec.rb index 158d0bc02ed..c9fdbe95d13 100644 --- a/spec/migrations/schedule_merge_request_latest_merge_request_diff_id_migrations_spec.rb +++ b/spec/migrations/schedule_merge_request_latest_merge_request_diff_id_migrations_spec.rb @@ -44,9 +44,9 @@ describe ScheduleMergeRequestLatestMergeRequestDiffIdMigrations, :migration, :si Timecop.freeze do migrate! - expect(described_class::MIGRATION).to be_scheduled_migration(5.minutes, merge_request_1.id, merge_request_1.id) - expect(described_class::MIGRATION).to be_scheduled_migration(10.minutes, merge_request_2.id, merge_request_2.id) - expect(described_class::MIGRATION).to be_scheduled_migration(15.minutes, merge_request_4.id, merge_request_4.id) + expect(described_class::MIGRATION).to be_scheduled_delayed_migration(5.minutes, merge_request_1.id, merge_request_1.id) + expect(described_class::MIGRATION).to be_scheduled_delayed_migration(10.minutes, merge_request_2.id, merge_request_2.id) + expect(described_class::MIGRATION).to be_scheduled_delayed_migration(15.minutes, merge_request_4.id, merge_request_4.id) expect(BackgroundMigrationWorker.jobs.size).to eq 3 end end |