Skip to content

Commit 1db141c

Browse files
authored
Merge pull request #628 from splitrb/bump-minimum-required-redis
Bump minimum required redis to 4.2
2 parents 38058d3 + b93a485 commit 1db141c

File tree

9 files changed

+16
-27
lines changed

9 files changed

+16
-27
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ rvm:
44
- 2.6.6
55
- 2.7.1
66

7+
services:
8+
- redis-server
9+
710
gemfile:
811
- gemfiles/5.0.gemfile
912
- gemfiles/5.1.gemfile

lib/split/experiment.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def validate!
9494
end
9595

9696
def new_record?
97-
!redis.exists(name)
97+
!redis.exists?(name)
9898
end
9999

100100
def ==(obj)

lib/split/experiment_catalog.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def self.all_active_first
1313
end
1414

1515
def self.find(name)
16-
return unless Split.redis.exists(name)
16+
return unless Split.redis.exists?(name)
1717
Experiment.new(name).tap { |exp| exp.load_from_redis }
1818
end
1919

spec/alternative_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126

127127
it "should save to redis" do
128128
alternative.save
129-
expect(Split.redis.exists('basket_text:Basket')).to be true
129+
expect(Split.redis.exists?('basket_text:Basket')).to be true
130130
end
131131

132132
it "should increment participation count" do

spec/configuration_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@
240240
it "should use the ENV variable" do
241241
ENV['REDIS_URL'] = "env_redis_url"
242242
expect(Split::Configuration.new.redis).to eq("env_redis_url")
243+
ENV.delete('REDIS_URL')
243244
end
244245
end
245246
end

spec/experiment_spec.rb

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def alternative(color)
3737

3838
it "should save to redis" do
3939
experiment.save
40-
expect(Split.redis.exists('basket_text')).to be true
40+
expect(Split.redis.exists?('basket_text')).to be true
4141
end
4242

4343
it "should save the start time to redis" do
@@ -85,7 +85,7 @@ def alternative(color)
8585
it "should not create duplicates when saving multiple times" do
8686
experiment.save
8787
experiment.save
88-
expect(Split.redis.exists('basket_text')).to be true
88+
expect(Split.redis.exists?('basket_text')).to be true
8989
expect(Split.redis.lrange('basket_text', 0, -1)).to eq(['{"Basket":1}', '{"Cart":1}'])
9090
end
9191

@@ -197,7 +197,7 @@ def alternative(color)
197197
experiment.save
198198

199199
experiment.delete
200-
expect(Split.redis.exists('link_color')).to be false
200+
expect(Split.redis.exists?('link_color')).to be false
201201
expect(Split::ExperimentCatalog.find('link_color')).to be_nil
202202
end
203203

@@ -414,18 +414,6 @@ def alternative(color)
414414
end
415415
end
416416

417-
describe "#disable_cohorting" do
418-
it "saves a new key in redis" do
419-
expect(experiment.disable_cohorting).to eq true
420-
end
421-
end
422-
423-
describe "#enable_cohorting" do
424-
it "saves a new key in redis" do
425-
expect(experiment.enable_cohorting).to eq true
426-
end
427-
end
428-
429417
describe 'changing an existing experiment' do
430418
def same_but_different_alternative
431419
Split::ExperimentCatalog.find_or_create('link_color', 'blue', 'yellow', 'orange')

spec/goals_collection_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
goals_collection.save
4949

5050
goals_collection.delete
51-
expect(Split.redis.exists(goals_key)).to be false
51+
expect(Split.redis.exists?(goals_key)).to be false
5252
end
5353
end
5454

spec/spec_helper.rb

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,15 @@
1313

1414
Dir['./spec/support/*.rb'].each { |f| require f }
1515

16-
require "fakeredis"
17-
18-
G_fakeredis = Redis.new
19-
2016
module GlobalSharedContext
2117
extend RSpec::SharedContext
2218
let(:mock_user){ Split::User.new(double(session: {})) }
19+
2320
before(:each) do
2421
Split.configuration = Split::Configuration.new
25-
Split.redis = G_fakeredis
26-
Split.redis.flushall
22+
Split.redis = Redis.new
23+
Split.redis.select(10)
24+
Split.redis.flushdb
2725
@ab_user = mock_user
2826
params = nil
2927
end

split.gemspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
2929
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
3030
s.require_paths = ["lib"]
3131

32-
s.add_dependency 'redis', '>= 2.1'
32+
s.add_dependency 'redis', '>= 4.2'
3333
s.add_dependency 'sinatra', '>= 1.2.6'
3434
s.add_dependency 'rubystats', '>= 0.3.0'
3535

@@ -39,6 +39,5 @@ Gem::Specification.new do |s|
3939
s.add_development_dependency 'rake', '~> 13'
4040
s.add_development_dependency 'rspec', '~> 3.7'
4141
s.add_development_dependency 'pry', '~> 0.10'
42-
s.add_development_dependency 'fakeredis', '~> 0.7'
4342
s.add_development_dependency 'rails', '>= 5.0'
4443
end

0 commit comments

Comments
 (0)