summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/redis
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-08-15 15:08:56 -0400
committerRobert Speicher <rspeicher@gmail.com>2017-08-15 15:08:56 -0400
commitf5cb3ac14da14a527a9a259d8a1bfb372868f352 (patch)
treeb7d1e4976b671ae655be18ed8aee1ba250c9d230 /spec/lib/gitlab/redis
parenta2918d56899fbbe2fb2c4cfe8c0d6c2dffd32253 (diff)
downloadgitlab-ce-f5cb3ac14da14a527a9a259d8a1bfb372868f352.tar.gz
Don't depend on `Rails` for Redis configuration file pathsrs-redis-config-paths
The `Rails` object was not always available in all tasks that require Redis access, such as `mail_room`, so the constant pointing to the configuration path was never defined, but we still attempted to access it in `config_file_name`, resulting in a `NameError` exception. Further, there was no benefit to defining these paths in a constant to begin with -- they're only accessed in one place, and it was within the class where they were being defined. We can just provide them at run-time instead. Further _still_, we were calling `File.expand_path` on the absolute path returned by `Rails.root.join`, which was rather pointless.
Diffstat (limited to 'spec/lib/gitlab/redis')
-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