diff --git a/test/unit/activity_stream_test.rb b/test/unit/activity_stream_test.rb index 6d2bb0fe4..405f20324 100644 --- a/test/unit/activity_stream_test.rb +++ b/test/unit/activity_stream_test.rb @@ -349,14 +349,14 @@ class ActivityStreamTest < ActiveSupport::TestCase def activity_stream_check( activity_stream_list, checks ) puts 'AS ' + activity_stream_list.inspect checks.each { |check_item| -# puts '+++++++++++' -# puts check_item.inspect + puts '+++++++++++' + puts check_item.inspect match = false activity_stream_list.each { |item| next if match -# puts '--------' -# puts item.inspect -# puts item.object + puts '--------' + puts item.inspect + # puts item.object next if item['object'] != check_item[:object] next if item['type'] != check_item[:type] next if item['o_id'] != check_item[:o_id] @@ -366,7 +366,7 @@ class ActivityStreamTest < ActiveSupport::TestCase assert( match, "activity stream check not matched! #{check_item.inspect}") else assert( !match, "activity stream check matched but should not! #{check_item.inspect}") - end + end } end diff --git a/test/unit/notifiation_factory_test.rb b/test/unit/notifiation_factory_test.rb index 101b0332c..f20947bf6 100644 --- a/test/unit/notifiation_factory_test.rb +++ b/test/unit/notifiation_factory_test.rb @@ -1,8 +1,18 @@ # encoding: utf-8 require 'test_helper' - + class NotificationFactoryTest < ActiveSupport::TestCase test 'notifications' do + ticket = Ticket.create( + :title => 'some title äöüß', + :group => Group.lookup( :name => 'Users'), + :customer_id => 2, + :ticket_state => Ticket::State.lookup( :name => 'new' ), + :ticket_priority => Ticket::Priority.lookup( :name => '2 normal' ), + :updated_by_id => 1, + :created_by_id => 1, + ) + tests = [ { :locale => 'en', @@ -39,12 +49,14 @@ class NotificationFactoryTest < ActiveSupport::TestCase result = NotificationFactory.build( :string => test[:string], :objects => { - :ticket => Ticket.find(1), + :ticket => ticket, :recipient => User.find(2), }, :locale => test[:locale] ) assert_equal( result, test[:result], "verify result" ) } + + ticket.destroy end end \ No newline at end of file