content-viewer-controller-test: adapt tests to new file_presenter infras

Rodrigo Souto
1 parent 67f6ebd9
Showing 1 changed file with 3 additions and 13 deletions Show diff stats
test/functional/content_viewer_controller_test.rb
@@ -72,9 +72,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     get :view_page, :profile => 'someone', :page => [ '500.html' ]
     assert_response :success
-    assert_match /^text\/html/, @response.headers['Content-Type']
-    assert @response.headers['Content-Disposition'].present?
-    assert_match /attachment/, @response.headers['Content-Disposition']
+    assert_match /#{html.public_filename}/, @response.body
   end
   should 'produce a download-link when article is not text/html' do
@@ -548,14 +546,6 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_template 'view_page'
   end
-  should 'download data for image when not view' do
-    file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => profile)
-    get :view_page, :profile => profile.identifier, :page => file.explode_path
-
-    assert_response :success
-    assert_template nil
-  end
-
   should "display 'Upload files' when create children of image gallery" do
     login_as(profile.identifier)
     f = Gallery.create!(:name => 'gallery', :profile => profile)
@@ -1299,8 +1289,8 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'display link to download of non-recognized file types on its page' do
     file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'bin/unknown'), :profile => profile)
-    get :view_page, file.url.merge(:view=>:true)
-    assert_match /this is a sample text file/, @response.body
+    get :view_page, file.url
+    assert_match /#{file.public_filename}/, @response.body
   end
   should 'not count hit from bots' do