diff options
author | Stan Hu <stanhu@gmail.com> | 2017-08-11 23:22:20 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2017-08-11 23:22:20 -0700 |
commit | 07f8105f9786493d327716026a37875f7c7ef0d6 (patch) | |
tree | d417d106e27b831e7c26bd44377af877c41a7e5f /spec/support | |
parent | 7b70d01279ea7de784b63ce41c52d460b93afbf9 (diff) | |
parent | 2b950014c35534c817c58ebf43dcbf4bbf490b9e (diff) | |
download | gitlab-ce-07f8105f9786493d327716026a37875f7c7ef0d6.tar.gz |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'spec/support')
-rw-r--r-- | spec/support/redis/redis_shared_examples.rb | 4 | ||||
-rw-r--r-- | spec/support/unique_ip_check_shared_examples.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/support/redis/redis_shared_examples.rb b/spec/support/redis/redis_shared_examples.rb index f9552e41894..8676f895a83 100644 --- a/spec/support/redis/redis_shared_examples.rb +++ b/spec/support/redis/redis_shared_examples.rb @@ -3,12 +3,12 @@ RSpec.shared_examples "redis_shared_examples" do let(:test_redis_url) { "redis://redishost:#{redis_port}"} - before(:each) do + before do stub_env(environment_config_file_name, Rails.root.join(config_file_name)) clear_raw_config end - after(:each) do + after do clear_raw_config end diff --git a/spec/support/unique_ip_check_shared_examples.rb b/spec/support/unique_ip_check_shared_examples.rb index ff0b47899f5..2dfa5fbecea 100644 --- a/spec/support/unique_ip_check_shared_examples.rb +++ b/spec/support/unique_ip_check_shared_examples.rb @@ -1,6 +1,6 @@ shared_context 'unique ips sign in limit' do include StubENV - before(:each) do + before do Gitlab::Redis::Cache.with(&:flushall) Gitlab::Redis::Queues.with(&:flushall) Gitlab::Redis::SharedState.with(&:flushall) |