summaryrefslogtreecommitdiffstats
path: root/test/functional/time_entry_reports_controller_test.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-25 17:17:49 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-25 17:17:49 +0000
commit5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7 (patch)
tree93e57765139714bd82dede475725516c448c0d55 /test/functional/time_entry_reports_controller_test.rb
parent34e20c4373b7f5a20ab3a132feae3f70f21ec477 (diff)
downloadredmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.tar.gz
redmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.zip
Merged rails-3.2 branch.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/time_entry_reports_controller_test.rb')
-rw-r--r--test/functional/time_entry_reports_controller_test.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/functional/time_entry_reports_controller_test.rb b/test/functional/time_entry_reports_controller_test.rb
index e4ea8b8ec..44a5037d8 100644
--- a/test/functional/time_entry_reports_controller_test.rb
+++ b/test/functional/time_entry_reports_controller_test.rb
@@ -136,7 +136,7 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
get :report, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30",
:criteria => ["project", "member", "activity"], :format => "csv"
assert_response :success
- assert_equal 'text/csv', @response.content_type
+ assert_equal 'text/csv; header=present', @response.content_type
lines = @response.body.chomp.split("\n")
# Headers
assert_equal 'Project,Member,Activity,2007-1,2007-2,2007-3,2007-4,2007-5,2007-6,Total',
@@ -150,7 +150,7 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
:from => "2007-01-01", :to => "2007-06-30",
:criteria => ["project", "member", "activity"], :format => "csv"
assert_response :success
- assert_equal 'text/csv', @response.content_type
+ assert_equal 'text/csv; header=present', @response.content_type
lines = @response.body.chomp.split("\n")
# Headers
assert_equal 'Project,Member,Activity,2007-1,2007-2,2007-3,2007-4,2007-5,2007-6,Total',
@@ -188,7 +188,7 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
:from => "2011-11-11", :to => "2011-11-11",
:criteria => ["member"], :format => "csv"
assert_response :success
- assert_equal 'text/csv', @response.content_type
+ assert_equal 'text/csv; header=present', @response.content_type
lines = @response.body.chomp.split("\n")
# Headers
s1 = "\xa6\xa8\xad\xfb,2011-11-11,\xc1`\xadp"
@@ -239,7 +239,7 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
:from => "2011-11-11", :to => "2011-11-11",
:criteria => ["member"], :format => "csv"
assert_response :success
- assert_equal 'text/csv', @response.content_type
+ assert_equal 'text/csv; header=present', @response.content_type
lines = @response.body.chomp.split("\n")
# Headers
s1 = "\xa6\xa8\xad\xfb,2011-11-11,\xc1`\xadp"
@@ -280,7 +280,7 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
:from => "2011-11-11", :to => "2011-11-11",
:criteria => ["member"], :format => "csv"
assert_response :success
- assert_equal 'text/csv', @response.content_type
+ assert_equal 'text/csv; header=present', @response.content_type
lines = @response.body.chomp.split("\n")
# Headers
s1 = "Membre;2011-11-11;Total"