Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 4 deletions

diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb
index e042fc58f82..febc18e497a 100644
--- a/spec/tasks/gitlab/backup_rake_spec.rb
+++ b/spec/tasks/gitlab/backup_rake_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'rake'
 
-describe 'gitlab:app namespace rake task' do
+describe 'gitlab:app namespace rake task', :delete do
   let(:enable_registry) { true }
 
   def tars_glob
diff --git a/spec/tasks/gitlab/storage_rake_spec.rb b/spec/tasks/gitlab/storage_rake_spec.rb
index 54a84c73a57..226d3aaab4e 100644
--- a/spec/tasks/gitlab/storage_rake_spec.rb
+++ b/spec/tasks/gitlab/storage_rake_spec.rb
@@ -128,10 +128,10 @@ describe 'rake gitlab:storage:*' do
 
     context 'with same id in range' do
       it 'displays message when project cant be found' do
-        stub_env('ID_FROM', 99999)
-        stub_env('ID_TO', 99999)
+        stub_env('ID_FROM', non_existing_record_id)
+        stub_env('ID_TO', non_existing_record_id)
 
-        expect { run_rake_task(task) }.to abort_execution.with_message(/There are no projects requiring storage migration with ID=99999/)
+        expect { run_rake_task(task) }.to abort_execution.with_message(/There are no projects requiring storage migration with ID=#{non_existing_record_id}/)
       end
 
       it 'displays a message when project exists but its already migrated' do