summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-01-05 16:26:06 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-01-05 16:26:06 +0000
commitb72af2b9c78527ea988bc6a69c62ec95645a6c48 (patch)
tree261a11340015ea094a8a26a9634c8fe54c100acc /spec/lib/gitlab
parentae46ceaab097923b46099a87d8ca63443aa85248 (diff)
parent153ea1830153b7d7c3be5ac2e7ca60486c9b2700 (diff)
downloadgitlab-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/lib/gitlab')
-rw-r--r--spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb13
1 files changed, 1 insertions, 12 deletions
diff --git a/spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb b/spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb
index cd3f1a45270..8bb9ebe0419 100644
--- a/spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb
+++ b/spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb
@@ -2,21 +2,10 @@ require 'spec_helper'
describe Gitlab::BackgroundMigration::PrepareUntrackedUploads, :sidekiq do
include TrackUntrackedUploadsHelpers
+ include MigrationsHelpers
let!(:untracked_files_for_uploads) { described_class::UntrackedFile }
- matcher :be_scheduled_migration do |*expected|
- match do |migration|
- BackgroundMigrationWorker.jobs.any? do |job|
- job['args'] == [migration, expected]
- end
- end
-
- failure_message do |migration|
- "Migration `#{migration}` with args `#{expected.inspect}` not scheduled!"
- end
- end
-
before do
DatabaseCleaner.clean