Commit 7e78eacd authored by Nick Thomas's avatar Nick Thomas

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
parents 1a748aa1 7fd0f5fc
......@@ -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'
......
......@@ -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)
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment