diff options
| -rw-r--r-- | app/views/common/feed.atom.builder | 2 | ||||
| -rw-r--r-- | test/functional/activities_controller_test.rb | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/app/views/common/feed.atom.builder b/app/views/common/feed.atom.builder index d7f4c8b00..0fbe1063c 100644 --- a/app/views/common/feed.atom.builder +++ b/app/views/common/feed.atom.builder @@ -36,7 +36,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do @items.each do |item| xml.entry do url = url_for(item.event_url(:only_path => false, :protocol => protocol, :host => host)) - if @project + if @project == item.project xml.title truncate_single_line_raw(item.event_title, 100) else xml.title truncate_single_line_raw("#{item.project} - #{item.event_title}", 100) diff --git a/test/functional/activities_controller_test.rb b/test/functional/activities_controller_test.rb index 29fca5cda..7475d4996 100644 --- a/test/functional/activities_controller_test.rb +++ b/test/functional/activities_controller_test.rb @@ -181,6 +181,26 @@ class ActivitiesControllerTest < Redmine::ControllerTest assert_select 'title', :text => "Redmine: #{User.find(2).name}" end + def test_index_atom_feed_with_subprojects + get( + :index, + :params => { + :format => 'atom', + :id => 'ecookbook', + :with_subprojects => 1, + :show_issues => 1 + } + ) + assert_response :success + + assert_select 'feed' do + # eCookbook + assert_select 'title', text: 'Bug #1: Cannot print recipes' + # eCookbook Subproject 1 + assert_select 'title', text: 'eCookbook Subproject 1 - Bug #5 (New): Subproject issue' + end + end + def test_index_should_show_private_notes_with_permission_only journal = Journal.create!(:journalized => Issue.find(2), :notes => 'Private notes', :private_notes => true) @request.session[:user_id] = 2 |