From c59765a50abd6a235220fd895f5de78038c243a8 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 24 Jun 2020 18:09:03 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/lib/gitlab/redis/boolean_spec.rb | 2 +- spec/lib/gitlab/redis/cache_spec.rb | 2 +- spec/lib/gitlab/redis/queues_spec.rb | 2 +- spec/lib/gitlab/redis/shared_state_spec.rb | 2 +- spec/lib/gitlab/redis/wrapper_spec.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'spec/lib/gitlab/redis') diff --git a/spec/lib/gitlab/redis/boolean_spec.rb b/spec/lib/gitlab/redis/boolean_spec.rb index bfacf0c448b..9c233ba089f 100644 --- a/spec/lib/gitlab/redis/boolean_spec.rb +++ b/spec/lib/gitlab/redis/boolean_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -describe Gitlab::Redis::Boolean do +RSpec.describe Gitlab::Redis::Boolean do subject(:redis_boolean) { described_class.new(bool) } let(:bool) { true } diff --git a/spec/lib/gitlab/redis/cache_spec.rb b/spec/lib/gitlab/redis/cache_spec.rb index 0718998f981..5f73b84288d 100644 --- a/spec/lib/gitlab/redis/cache_spec.rb +++ b/spec/lib/gitlab/redis/cache_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Redis::Cache do +RSpec.describe Gitlab::Redis::Cache do let(:config_file_name) { "config/redis.cache.yml" } let(:environment_config_file_name) { "GITLAB_REDIS_CACHE_CONFIG_FILE" } let(:config_old_format_socket) { "spec/fixtures/config/redis_cache_old_format_socket.yml" } diff --git a/spec/lib/gitlab/redis/queues_spec.rb b/spec/lib/gitlab/redis/queues_spec.rb index 93207b6f469..8a32c991943 100644 --- a/spec/lib/gitlab/redis/queues_spec.rb +++ b/spec/lib/gitlab/redis/queues_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Redis::Queues do +RSpec.describe Gitlab::Redis::Queues do let(:config_file_name) { "config/redis.queues.yml" } let(:environment_config_file_name) { "GITLAB_REDIS_QUEUES_CONFIG_FILE" } let(:config_old_format_socket) { "spec/fixtures/config/redis_queues_old_format_socket.yml" } diff --git a/spec/lib/gitlab/redis/shared_state_spec.rb b/spec/lib/gitlab/redis/shared_state_spec.rb index aa61fd99eb5..bd90e4c750d 100644 --- a/spec/lib/gitlab/redis/shared_state_spec.rb +++ b/spec/lib/gitlab/redis/shared_state_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Redis::SharedState do +RSpec.describe Gitlab::Redis::SharedState do let(:config_file_name) { "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" } diff --git a/spec/lib/gitlab/redis/wrapper_spec.rb b/spec/lib/gitlab/redis/wrapper_spec.rb index 51a36eb062c..283853ee863 100644 --- a/spec/lib/gitlab/redis/wrapper_spec.rb +++ b/spec/lib/gitlab/redis/wrapper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Redis::Wrapper do +RSpec.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" } -- cgit v1.2.3