summaryrefslogtreecommitdiffstats
path: root/test/functional
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-04-12 16:53:01 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-04-12 16:53:01 +0000
commitdae1e6ab217987fe13a98a951b3aff390a80d33f (patch)
tree66f6e90e5dfd10c5039d69d1b8e9576b9ff2e69d /test/functional
parent5d7edf3393c2528b4d47af02b9e28f57223658a0 (diff)
downloadredmine-dae1e6ab217987fe13a98a951b3aff390a80d33f.tar.gz
redmine-dae1e6ab217987fe13a98a951b3aff390a80d33f.zip
Fix test failures (#22058).
git-svn-id: http://svn.redmine.org/redmine/trunk@15328 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional')
-rw-r--r--test/functional/repositories_mercurial_controller_test.rb5
-rw-r--r--test/functional/repositories_subversion_controller_test.rb4
2 files changed, 3 insertions, 6 deletions
diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index 24fe59acf..7078db471 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -265,10 +265,7 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
end
def test_entry_binary_force_download
- get :entry, :id => PRJ_ID, :rev => 1,
- :path => repository_path_hash(['images', 'edit.png'])[:param]
- assert_response :success
- assert_equal 'image/png', @response.content_type
+ # TODO: add a binary file which is not an image to the test repo
end
def test_directory_entry
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index d801040f0..41ea3ed37 100644
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -183,11 +183,11 @@ class RepositoriesSubversionControllerTest < ActionController::TestCase
end
end
- def test_entry_should_send_images_inline
+ def test_entry_should_display_images
get :entry, :id => PRJ_ID,
:path => repository_path_hash(['subversion_test', 'folder', 'subfolder', 'rubylogo.gif'])[:param]
assert_response :success
- assert_equal 'inline; filename="rubylogo.gif"', response.headers['Content-Disposition']
+ assert_template 'entry'
end
def test_entry_at_given_revision