diff --git a/test/unit/ticket_test.rb b/test/unit/ticket_test.rb index ff67e859e..b4b581abd 100644 --- a/test/unit/ticket_test.rb +++ b/test/unit/ticket_test.rb @@ -23,6 +23,13 @@ class TicketTest < ActiveSupport::TestCase end test 'ticket sla' do + + # cleanup + delete = Sla.destroy_all + assert( delete, "sla destroy_all" ) + delete = Ticket.destroy_all + assert( delete, "ticket destroy_all" ) + ticket = Ticket.create( :title => 'some title äöüß', :group => Group.lookup( :name => 'Users'), diff --git a/test/unit/working_time_test.rb b/test/unit/working_time_test.rb index 90f8cb124..abee11931 100644 --- a/test/unit/working_time_test.rb +++ b/test/unit/working_time_test.rb @@ -118,8 +118,8 @@ class WorkingTimeTest < ActiveSupport::TestCase ] tests.each { |test| TimeCalculation.config( test[:config] ) - dest_time = TimeCalculation.dest_time( test[:start], test[:diff] ) - assert_equal( dest_time, Time.parse( test[:dest_time] + ' UTC' ), 'dest time' ) + dest_time = TimeCalculation.dest_time( test[:start] + ' UTC', test[:diff] ) + assert_equal( dest_time.gmtime, Time.parse( test[:dest_time] + ' UTC' ), 'dest time' ) } end