From 65ba8016384bd95a9306e488539bfb9244d4c947 Mon Sep 17 00:00:00 2001 From: Leonid Shevtsov Date: Thu, 27 Feb 2014 12:51:07 +0200 Subject: [PATCH] moved tests for TTL translation to the test_server file [#436] --- test/test_server.rb | 12 ++++++++++++ test/test_ttl.rb | 15 --------------- 2 files changed, 12 insertions(+), 15 deletions(-) delete mode 100644 test/test_ttl.rb diff --git a/test/test_server.rb b/test/test_server.rb index 379cef3c..54758717 100644 --- a/test/test_server.rb +++ b/test/test_server.rb @@ -65,4 +65,16 @@ assert_equal 2, s.weight end end + + describe 'ttl translation' do + it 'does not translate ttls under 30 days' do + s = Dalli::Server.new('localhost') + assert_equal s.send(:sanitize_ttl, 30*24*60*60), 30*24*60*60 + end + + it 'translates ttls over 30 days into timestamps' do + s = Dalli::Server.new('localhost') + assert_equal s.send(:sanitize_ttl, 30*24*60*60 + 1), Time.now.to_i + 30*24*60*60+1 + end + end end diff --git a/test/test_ttl.rb b/test/test_ttl.rb deleted file mode 100644 index f9f3cc4b..00000000 --- a/test/test_ttl.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'helper' - -describe Dalli::Server do - describe 'ttl translation' do - it 'does not translate ttls under 30 days' do - s = Dalli::Server.new('localhost') - assert_equal s.send(:sanitize_ttl, 30*24*60*60), 30*24*60*60 - end - - it 'translates ttls over 30 days into timestamps' do - s = Dalli::Server.new('localhost') - assert_equal s.send(:sanitize_ttl, 30*24*60*60 + 1), Time.now.to_i + 30*24*60*60+1 - end - end -end