diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
| commit | 2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch) | |
| tree | 7a733c1cc51448ab69b3f892285305dbfb0ae15e /test/functional/timelog_controller_test.rb | |
| parent | a6ec78a4dc658e3517ed682792016b6530458696 (diff) | |
| download | redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip | |
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/timelog_controller_test.rb')
| -rw-r--r-- | test/functional/timelog_controller_test.rb | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index cc76cba21..72a45f81b 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -702,16 +702,18 @@ class TimelogControllerTest < ActionController::TestCase end def test_index_csv_all_projects - Setting.date_format = '%m/%d/%Y' - get :index, :format => 'csv' - assert_response :success - assert_equal 'text/csv; header=present', response.content_type + with_settings :date_format => '%m/%d/%Y' do + get :index, :format => 'csv' + assert_response :success + assert_equal 'text/csv; header=present', response.content_type + end end def test_index_csv - Setting.date_format = '%m/%d/%Y' - get :index, :project_id => 1, :format => 'csv' - assert_response :success - assert_equal 'text/csv; header=present', response.content_type + with_settings :date_format => '%m/%d/%Y' do + get :index, :project_id => 1, :format => 'csv' + assert_response :success + assert_equal 'text/csv; header=present', response.content_type + end end end |