@@ -134,22 +134,40 @@ def test_event_group_for_wiki_content_version
134134
135135 def test_activity_contains_issue_status_update_events
136136 issue = Issue . generate! ( :status_id => 1 )
137- issue . init_journal ( User . first , "Change Status" )
137+
138+ events = find_events ( User . anonymous , :project => @project )
139+ target_issue_events = events . find_all { |event | event == issue || ( event . is_a? ( Journal ) && event . issue == issue ) }
140+ target_issue_events . sort! { |x , y | x . event_datetime <=> y . event_datetime }
141+ event_titles = target_issue_events . map { |e | e . event_title }
142+ assert_equal ( "Bug ##{ issue . id } (New): Generated" , event_titles [ 0 ] , "event title should includes (New)" )
143+
144+ issue = Issue . find ( issue . id )
145+ issue . init_journal ( User . first , "Assign" )
138146 issue . status_id = 2
139147 assert issue . save
140-
148+
141149 events = find_events ( User . anonymous , :project => @project )
142150 target_issue_events = events . find_all { |event | event == issue || ( event . is_a? ( Journal ) && event . issue == issue ) }
143151 target_issue_events . sort! { |x , y | x . event_datetime <=> y . event_datetime }
152+ event_titles = target_issue_events . map { |e | e . event_title }
153+ assert_equal ( "Bug ##{ issue . id } (New): Generated" , event_titles [ 0 ] , "event title should includes (New)" )
154+ assert_equal ( "Bug ##{ issue . id } (Assigned): Generated" , event_titles [ 1 ] , "event title should includes (Assinged)" )
155+
156+ issue = Issue . find ( issue . id )
157+ issue . init_journal ( User . first , "Resolve" )
158+ issue . status_id = 3
159+ assert issue . save
144160
161+ events = find_events ( User . anonymous , :project => @project )
162+ target_issue_events = events . find_all { |event | event == issue || ( event . is_a? ( Journal ) && event . issue == issue ) }
163+ target_issue_events . sort! { |x , y | x . event_datetime <=> y . event_datetime }
145164 event_titles = target_issue_events . map { |e | e . event_title }
146165 assert_equal ( "Bug ##{ issue . id } (New): Generated" , event_titles [ 0 ] , "event title should includes (New)" )
147166 assert_equal ( "Bug ##{ issue . id } (Assigned): Generated" , event_titles [ 1 ] , "event title should includes (Assinged)" )
167+ assert_equal ( "Bug ##{ issue . id } (Resolved): Generated" , event_titles [ 2 ] , "event title should includes (Resolved)" )
168+
148169 end
149170
150- # TODO: test when no journal
151- # TODO: test when three or more journal
152-
153171 class TestActivityProviderWithPermission
154172 def self . activity_provider_options
155173 { 'test' => { :permission => :custom_permission } }
0 commit comments