summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Mazetto <brodock@gmail.com>2017-02-13 12:19:28 +0100
committerGabriel Mazetto <brodock@gmail.com>2017-05-31 14:33:03 +0200
commit442735978ca8f3e074a282edfc65c110bd06e079 (patch)
treed67ff769fb25b3aa88c8c3b1bf7ac1de91da730d
parentf182ea4ea5fe76349a584da12e5d4a9f681a8401 (diff)
downloadgitlab-ce-442735978ca8f3e074a282edfc65c110bd06e079.tar.gz
Move rainbow monkey patch to String to spec_helper
-rw-r--r--spec/db/production/settings.rb1
-rw-r--r--spec/spec_helper.rb3
2 files changed, 3 insertions, 1 deletions
diff --git a/spec/db/production/settings.rb b/spec/db/production/settings.rb
index 007b35bbb77..3cbb173c4cc 100644
--- a/spec/db/production/settings.rb
+++ b/spec/db/production/settings.rb
@@ -1,5 +1,4 @@
require 'spec_helper'
-require 'rainbow/ext/string'
describe 'seed production settings', lib: true do
include StubENV
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4c2eba8fa46..994c7dcbb46 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -26,6 +26,9 @@ if ENV['CI'] && !ENV['NO_KNAPSACK']
Knapsack::Adapters::RSpecAdapter.bind
end
+# require rainbow gem String monkeypatch, so we can test SystemChecks
+require 'rainbow/ext/string'
+
# Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories.
Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }