diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-03-04 12:43:55 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-03-04 12:43:55 +0000 |
| commit | 7ec8a9a1009f87a2d38d5d48be50408bc75ce578 (patch) | |
| tree | eb04dd5e4dadadc5f6beff74bb071b44b5627d95 /test/functional | |
| parent | b06223738e2df0cc0251e08009241cf08f9f5be7 (diff) | |
| download | redmine-7ec8a9a1009f87a2d38d5d48be50408bc75ce578.tar.gz redmine-7ec8a9a1009f87a2d38d5d48be50408bc75ce578.zip | |
Rails 3.1 compatibility.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9082 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional')
| -rw-r--r-- | test/functional/activities_controller_test.rb | 6 | ||||
| -rw-r--r-- | test/functional/boards_controller_test.rb | 2 | ||||
| -rw-r--r-- | test/functional/projects_controller_test.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/test/functional/activities_controller_test.rb b/test/functional/activities_controller_test.rb index b6fd3b509..934b01785 100644 --- a/test/functional/activities_controller_test.rb +++ b/test/functional/activities_controller_test.rb @@ -98,7 +98,7 @@ class ActivitiesControllerTest < ActionController::TestCase def test_index_atom_feed get :index, :format => 'atom', :with_subprojects => 0 assert_response :success - assert_template 'common/feed.atom' + assert_template 'common/feed' assert_tag :tag => 'link', :parent => {:tag => 'feed', :parent => nil }, :attributes => {:rel => 'self', :href => 'http://test.host/activity.atom?with_subprojects=0'} @@ -122,7 +122,7 @@ class ActivitiesControllerTest < ActionController::TestCase :show_wiki_edits => 1 assert_response :success - assert_template 'common/feed.atom' + assert_template 'common/feed' assert_tag :tag => 'link', :parent => {:tag => 'feed', :parent => nil }, :attributes => {:rel => 'self', :href => 'http://test.host/activity.atom?show_changesets=1&show_documents=1&show_files=1&show_issues=1&show_messages=1&show_news=1&show_time_entries=1&show_wiki_edits=1&with_subprojects=0'} @@ -137,7 +137,7 @@ class ActivitiesControllerTest < ActionController::TestCase def test_index_atom_feed_with_one_item_type get :index, :format => 'atom', :show_issues => '1' assert_response :success - assert_template 'common/feed.atom' + assert_template 'common/feed' assert_tag :tag => 'title', :content => /Issues/ end end diff --git a/test/functional/boards_controller_test.rb b/test/functional/boards_controller_test.rb index 73ec98dae..c848b3e1a 100644 --- a/test/functional/boards_controller_test.rb +++ b/test/functional/boards_controller_test.rb @@ -68,7 +68,7 @@ class BoardsControllerTest < ActionController::TestCase def test_show_atom get :show, :project_id => 1, :id => 1, :format => 'atom' assert_response :success - assert_template 'common/feed.atom' + assert_template 'common/feed' assert_not_nil assigns(:board) assert_not_nil assigns(:project) assert_not_nil assigns(:messages) diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index 9b7fca3c0..8f2d56767 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -55,7 +55,7 @@ class ProjectsControllerTest < ActionController::TestCase def test_index_atom get :index, :format => 'atom' assert_response :success - assert_template 'common/feed.atom' + assert_template 'common/feed' assert_select 'feed>title', :text => 'Redmine: Latest projects' assert_select 'feed>entry', :count => Project.count(:conditions => Project.visible_condition(User.current)) end |