| @@ -240,7 +240,7 class ProjectsController < ApplicationController | |||||
| 240 | render :layout => false if request.xhr? |
|
240 | render :layout => false if request.xhr? | |
| 241 | } |
|
241 | } | |
| 242 | format.atom { |
|
242 | format.atom { | |
| 243 | title = (@scope.size == 1) ? l("label_#{@scope.first.singularize}_plural") : l(:label_activity) |
|
243 | title = (@activity.scope.size == 1) ? l("label_#{@activity.scope.first.singularize}_plural") : l(:label_activity) | |
| 244 | render_feed(events, :title => "#{@project || Setting.app_title}: #{title}") |
|
244 | render_feed(events, :title => "#{@project || Setting.app_title}: #{title}") | |
| 245 | } |
|
245 | } | |
| 246 | end |
|
246 | end | |
| @@ -202,6 +202,12 class ProjectsControllerTest < Test::Unit::TestCase | |||||
| 202 | } |
|
202 | } | |
| 203 | end |
|
203 | end | |
| 204 |
|
204 | |||
|
|
205 | def test_activity_atom_feed | |||
|
|
206 | get :activity, :format => 'atom' | |||
|
|
207 | assert_response :success | |||
|
|
208 | assert_template 'common/feed.atom.rxml' | |||
|
|
209 | end | |||
|
|
210 | ||||
| 205 | def test_calendar |
|
211 | def test_calendar | |
| 206 | get :calendar, :id => 1 |
|
212 | get :calendar, :id => 1 | |
| 207 | assert_response :success |
|
213 | assert_response :success | |
General Comments 0
You need to be logged in to leave comments.
Login now