Merge branch 'ce-5928-geo-rake-task-to-force-housekeeping-on-next-sync' into 'master'

Backport from EE: Adding Progressbar explicitly and spec extensions for it

See merge request gitlab-org/gitlab-ce!18885

3 files changed, 8 insertions, 0 deletions

diff --git a/Gemfile b/Gemfile
index a6cd0ca980a..ba1b3e93b7b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -174,6 +174,9 @@ gem 'httparty', '~> 0.13.3'
 # Colored output to console
 gem 'rainbow', '~> 2.2'
 
+# Progress bar
+gem 'ruby-progressbar'
+
 # GitLab settings
 gem 'settingslogic', '~> 2.0.9'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 18c25cc34b6..2a33c08512a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1150,6 +1150,7 @@ DEPENDENCIES
   rubocop-rspec (~> 1.22.1)
   ruby-fogbugz (~> 0.2.1)
   ruby-prof (~> 0.17.0)
+  ruby-progressbar
   ruby_parser (~> 3.8)
   rufus-scheduler (~> 3.4)
   rugged (~> 0.27)
diff --git a/spec/support/helpers/rake_helpers.rb b/spec/support/helpers/rake_helpers.rb
index 86bfeed107c..acd9cce6a67 100644
--- a/spec/support/helpers/rake_helpers.rb
+++ b/spec/support/helpers/rake_helpers.rb
@@ -13,6 +13,10 @@ module RakeHelpers
     allow(main_object).to receive(:print)
   end
 
+  def silence_progress_bar
+    allow_any_instance_of(ProgressBar::Output).to receive(:stream).and_return(double().as_null_object)
+  end
+
   def main_object
     @main_object ||= TOPLEVEL_BINDING.eval('self')
   end