summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-08-16 09:54:06 +0000
committerJose Ivan Vargas <jvargas@gitlab.com>2017-08-16 12:28:21 -0500
commitc11aff40fad2f1e38762c7ab4356b0e3b82ca9e0 (patch)
treef5768d62df5bdbee16d617200b963dbf4746d617 /spec/lib
parent60e54da584eb601eb9bf12e8d36237d6f1ddb462 (diff)
downloadgitlab-ce-c11aff40fad2f1e38762c7ab4356b0e3b82ca9e0.tar.gz
Merge branch 'rs-redis-config-paths' into 'master'
Don't depend on `Rails` for Redis configuration file paths Closes #36514 See merge request !13575
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/redis/wrapper_spec.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/spec/lib/gitlab/redis/wrapper_spec.rb b/spec/lib/gitlab/redis/wrapper_spec.rb
index e1becd0a614..0c22a0d62cc 100644
--- a/spec/lib/gitlab/redis/wrapper_spec.rb
+++ b/spec/lib/gitlab/redis/wrapper_spec.rb
@@ -17,4 +17,11 @@ describe Gitlab::Redis::Wrapper do
let(:class_redis_url) { Gitlab::Redis::Wrapper::DEFAULT_REDIS_URL }
include_examples "redis_shared_examples"
+
+ describe '.config_file_path' do
+ it 'returns the absolute path to the configuration file' do
+ expect(described_class.config_file_path('foo.yml'))
+ .to eq Rails.root.join('config', 'foo.yml').to_s
+ end
+ end
end