From 1c262be44c57471bb4d569103486f00c43c081d7 Mon Sep 17 00:00:00 2001 From: Matt Wildig Date: Tue, 29 May 2012 21:30:54 +0100 Subject: [PATCH] Resolve test name conflict There are two tests named 'allows passing time objects'. Rename tests so they don't clash. --- test/helpers_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/helpers_test.rb b/test/helpers_test.rb index 24ce4637..53d6980b 100644 --- a/test/helpers_test.rb +++ b/test/helpers_test.rb @@ -812,12 +812,12 @@ class HelpersTest < Test::Unit::TestCase assert_not_nil response['Expires'] end - it 'allows passing time objects' do + it 'allows passing Time.now objects' do get '/bar' assert_not_nil response['Expires'] end - it 'allows passing time objects' do + it 'allows passing Time.at objects' do get '/baz' assert_equal 'Thu, 01 Jan 1970 00:00:00 GMT', response['Expires'] end