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/calendars_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/calendars_controller_test.rb')
| -rw-r--r-- | test/functional/calendars_controller_test.rb | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb index e67d05dfb..01f9a8ce1 100644 --- a/test/functional/calendars_controller_test.rb +++ b/test/functional/calendars_controller_test.rb @@ -48,10 +48,10 @@ class CalendarsControllerTest < ActionController::TestCase end def test_week_number_calculation - Setting.start_of_week = 7 - - get :show, :month => '1', :year => '2010' - assert_response :success + with_settings :start_of_week => 7 do + get :show, :month => '1', :year => '2010' + assert_response :success + end assert_select 'tr' do assert_select 'td.week-number', :text => '53' @@ -65,9 +65,10 @@ class CalendarsControllerTest < ActionController::TestCase assert_select 'td.even', :text => '9' end - Setting.start_of_week = 1 - get :show, :month => '1', :year => '2010' - assert_response :success + with_settings :start_of_week => 1 do + get :show, :month => '1', :year => '2010' + assert_response :success + end assert_select 'tr' do assert_select 'td.week-number', :text => '53' |