Download as
Browse Code »

Commit 159de064d0e7d920ecb6475a55abcb22e865b284

Authored by Victor Costa
1 parent 24950c67
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

rails3: fix assert_template that references rhtml

Showing 6 changed files with 13 additions and 13 deletions   Show diff stats
test/functional/chat_controller_test.rb
  Diff comments   View file @159de06
... ... @@ -91,7 +91,7 @@ class ChatControllerTest < ActionController::TestCase
91 91 get :index
92 92  
93 93 assert_response 404
94   - assert_template 'not_found.rhtml'
  94 + assert_template 'not_found'
95 95 end
96 96  
97 97 should 'not update presence status from non-ajax requests' do
... ...
test/functional/cms_controller_test.rb
  Diff comments   View file @159de06
... ... @@ -1166,7 +1166,7 @@ class CmsControllerTest < ActionController::TestCase
1166 1166  
1167 1167 get :new, :profile => c.identifier
1168 1168 assert_response :forbidden
1169   - assert_template 'access_denied.rhtml'
  1169 + assert_template 'access_denied'
1170 1170 end
1171 1171  
1172 1172 should 'allow user with permission create an article in community' do
... ... @@ -1188,7 +1188,7 @@ class CmsControllerTest < ActionController::TestCase
1188 1188  
1189 1189 get :edit, :profile => c.identifier, :id => a.id
1190 1190 assert_response :forbidden
1191   - assert_template 'access_denied.rhtml'
  1191 + assert_template 'access_denied'
1192 1192 end
1193 1193  
1194 1194 should 'not allow user edit article if he is owner but has no publish permission' do
... ... @@ -1199,7 +1199,7 @@ class CmsControllerTest < ActionController::TestCase
1199 1199  
1200 1200 get :edit, :profile => c.identifier, :id => a.id
1201 1201 assert_response :forbidden
1202   - assert_template 'access_denied.rhtml'
  1202 + assert_template 'access_denied'
1203 1203 end
1204 1204  
1205 1205 should 'allow user edit article if he is owner and has publish permission' do
... ... @@ -1670,7 +1670,7 @@ class CmsControllerTest < ActionController::TestCase
1670 1670  
1671 1671 get :upload_files, :profile => c.identifier, :parent_id => a.id
1672 1672 assert_response :forbidden
1673   - assert_template 'access_denied.rhtml'
  1673 + assert_template 'access_denied'
1674 1674 end
1675 1675  
1676 1676 should 'filter profile folders to select' do
... ...
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @159de06
... ... @@ -169,7 +169,7 @@ class ContentViewerControllerTest < ActionController::TestCase
169 169  
170 170 get :view_page, :profile => community.identifier, :page => [ folder.path ]
171 171  
172   - assert_template 'access_denied.rhtml'
  172 + assert_template 'access_denied'
173 173 end
174 174  
175 175 should 'show private content to profile moderators' do
... ... @@ -250,7 +250,7 @@ class ContentViewerControllerTest < ActionController::TestCase
250 250  
251 251 get :view_page, :profile => 'test_profile', :page => [ 'my-intranet' ]
252 252  
253   - assert_template 'access_denied.rhtml'
  253 + assert_template 'access_denied'
254 254 end
255 255  
256 256 should 'not give access to private articles if logged in but not member' do
... ... @@ -260,7 +260,7 @@ class ContentViewerControllerTest < ActionController::TestCase
260 260  
261 261 get :view_page, :profile => 'test_profile', :page => [ 'my-intranet' ]
262 262  
263   - assert_template 'access_denied.rhtml'
  263 + assert_template 'access_denied'
264 264 end
265 265  
266 266 should 'not give access to private articles if logged in and only member' do
... ... @@ -272,7 +272,7 @@ class ContentViewerControllerTest < ActionController::TestCase
272 272  
273 273 get :view_page, :profile => 'test_profile', :page => [ 'my-intranet' ]
274 274  
275   - assert_template 'access_denied.rhtml'
  275 + assert_template 'access_denied'
276 276 end
277 277  
278 278 should 'give access to private articles if logged in and moderator' do
... ...
test/functional/manage_products_controller_test.rb
  Diff comments   View file @159de06
... ... @@ -31,7 +31,7 @@ class ManageProductsControllerTest < ActionController::TestCase
31 31 login_as :user_test
32 32 get 'index', :profile => @enterprise.identifier
33 33 assert :success
34   - assert_template 'access_denied.rhtml'
  34 + assert_template 'access_denied'
35 35 end
36 36  
37 37 should "get index" do
... ... @@ -198,7 +198,7 @@ class ManageProductsControllerTest < ActionController::TestCase
198 198 @enterprise.save!
199 199 get :index, :profile => @enterprise.identifier
200 200  
201   - assert_template 'not_found.rhtml'
  201 + assert_template 'not_found'
202 202 end
203 203  
204 204 should 'show top level product categories for the user to choose' do
... ...
test/functional/profile_members_controller_test.rb
  Diff comments   View file @159de06
... ... @@ -29,7 +29,7 @@ class ProfileMembersControllerTest < ActionController::TestCase
29 29 get 'index', :profile => 'test_enterprise'
30 30  
31 31 assert_response 403
32   - assert_template 'access_denied.rhtml'
  32 + assert_template 'access_denied'
33 33 end
34 34  
35 35 should 'access index' do
... ...
test/integration/exception_notification_test.rb
  Diff comments   View file @159de06
... ... @@ -29,7 +29,7 @@ begin
29 29  
30 30 should 'render not found when try to access invalid url' do
31 31 get '/profile/ze/tag/notexists'
32   - assert_template 'not_found.rhtml'
  32 + assert_template 'not_found'
33 33 end
34 34 end
35 35 rescue LoadError
... ...