diff options
author | Matija Čupić <matteeyah@gmail.com> | 2018-05-17 14:23:57 +0300 |
---|---|---|
committer | Matija Čupić <matteeyah@gmail.com> | 2018-05-17 14:23:57 +0300 |
commit | 17c4e53e80af6c652f427733dc7dce4b7f88c8b6 (patch) | |
tree | 4c141b5ce455cb5d70dabd00c45c1d2462ca42d5 /spec/models/concerns | |
parent | 13298bb3d1f1d8f10be5568d1617348e6ec0c0b1 (diff) |
Remove rails5 specific tests for #cast_value_from_cache
Diffstat (limited to 'spec/models/concerns')
-rw-r--r-- | spec/models/concerns/redis_cacheable_spec.rb | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/spec/models/concerns/redis_cacheable_spec.rb b/spec/models/concerns/redis_cacheable_spec.rb index 066021a32cd..23c6c6233e9 100644 --- a/spec/models/concerns/redis_cacheable_spec.rb +++ b/spec/models/concerns/redis_cacheable_spec.rb @@ -85,34 +85,12 @@ describe RedisCacheable do end describe '#cast_value_from_cache' do - let(:instance) { Ci::Runner.new } - subject { instance.__send__(:cast_value_from_cache, attribute, value) } - shared_context 'runner contacted_at context' do + context 'with runner contacted_at' do + let(:instance) { Ci::Runner.new } let(:attribute) { :contacted_at } let(:value) { '2018-05-07 13:53:08 UTC' } - end - - context 'on rails5' do - include_context 'runner contacted_at context' - - before do - allow(Gitlab).to receive(:rails5?).and_return(true) - end - - it 'converts cache string to appropriate type' do - pending 'Migration to rails5' - expect(subject).to be_an_instance_of(ActiveSupport::TimeWithZone) - end - end - - context 'not on rails5' do - include_context 'runner contacted_at context' - - before do - allow(Gitlab).to receive(:rails5?).and_return(false) - end it 'converts cache string to appropriate type' do expect(subject).to be_an_instance_of(ActiveSupport::TimeWithZone) |