diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /spec/lib/gitlab/redis/shared_state_spec.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'spec/lib/gitlab/redis/shared_state_spec.rb')
-rw-r--r-- | spec/lib/gitlab/redis/shared_state_spec.rb | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/spec/lib/gitlab/redis/shared_state_spec.rb b/spec/lib/gitlab/redis/shared_state_spec.rb index bd90e4c750d..d240abfbf5b 100644 --- a/spec/lib/gitlab/redis/shared_state_spec.rb +++ b/spec/lib/gitlab/redis/shared_state_spec.rb @@ -3,20 +3,16 @@ require 'spec_helper' RSpec.describe Gitlab::Redis::SharedState do - let(:config_file_name) { "config/redis.shared_state.yml" } + let(:instance_specific_config_file) { "config/redis.shared_state.yml" } let(:environment_config_file_name) { "GITLAB_REDIS_SHARED_STATE_CONFIG_FILE" } - let(:config_old_format_socket) { "spec/fixtures/config/redis_shared_state_old_format_socket.yml" } - let(:config_new_format_socket) { "spec/fixtures/config/redis_shared_state_new_format_socket.yml" } - let(:old_socket_path) {"/path/to/old/redis.shared_state.sock" } - let(:new_socket_path) {"/path/to/redis.shared_state.sock" } - let(:config_old_format_host) { "spec/fixtures/config/redis_shared_state_old_format_host.yml" } - let(:config_new_format_host) { "spec/fixtures/config/redis_shared_state_new_format_host.yml" } - let(:redis_port) { 6382 } - let(:redis_database) { 12 } - let(:sentinel_port) { redis_port + 20000 } - let(:config_with_environment_variable_inside) { "spec/fixtures/config/redis_shared_state_config_with_env.yml"} - let(:config_env_variable_url) {"TEST_GITLAB_REDIS_SHARED_STATE_URL"} - let(:class_redis_url) { Gitlab::Redis::SharedState::DEFAULT_REDIS_SHARED_STATE_URL } include_examples "redis_shared_examples" + + describe '#raw_config_hash' do + it 'has a legacy default URL' do + expect(subject).to receive(:fetch_config) { false } + + expect(subject.send(:raw_config_hash)).to eq(url: 'redis://localhost:6382' ) + end + end end |