f5cb3ac14d
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.
27 lines
1.2 KiB
Ruby
27 lines
1.2 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe Gitlab::Redis::Wrapper do
|
|
let(:config_file_name) { "config/resque.yml" }
|
|
let(:environment_config_file_name) { "GITLAB_REDIS_CONFIG_FILE" }
|
|
let(:config_old_format_socket) { "spec/fixtures/config/redis_old_format_socket.yml" }
|
|
let(:config_new_format_socket) { "spec/fixtures/config/redis_new_format_socket.yml" }
|
|
let(:old_socket_path) {"/path/to/old/redis.sock" }
|
|
let(:new_socket_path) {"/path/to/redis.sock" }
|
|
let(:config_old_format_host) { "spec/fixtures/config/redis_old_format_host.yml" }
|
|
let(:config_new_format_host) { "spec/fixtures/config/redis_new_format_host.yml" }
|
|
let(:redis_port) { 6379 }
|
|
let(:redis_database) { 99 }
|
|
let(:sentinel_port) { redis_port + 20000 }
|
|
let(:config_with_environment_variable_inside) { "spec/fixtures/config/redis_config_with_env.yml"}
|
|
let(:config_env_variable_url) {"TEST_GITLAB_REDIS_URL"}
|
|
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
|