summaryrefslogtreecommitdiffstats
path: root/test/functional/my_controller_test.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2017-03-15 17:52:41 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2017-03-15 17:52:41 +0000
commitd21627b70f5431de33a8c532b7b73799c5ae1700 (patch)
tree0b4b700e6b7093f085408d93a508ec363d28fed7 /test/functional/my_controller_test.rb
parent945f3f949d40ef3ef2e0a394b6f9062818029127 (diff)
downloadredmine-d21627b70f5431de33a8c532b7b73799c5ae1700.tar.gz
redmine-d21627b70f5431de33a8c532b7b73799c5ae1700.zip
Clear settings for blocks that are no longer used.
git-svn-id: http://svn.redmine.org/redmine/trunk@16405 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/my_controller_test.rb')
-rw-r--r--test/functional/my_controller_test.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/test/functional/my_controller_test.rb b/test/functional/my_controller_test.rb
index f79cca5d9..f6c9d5ab2 100644
--- a/test/functional/my_controller_test.rb
+++ b/test/functional/my_controller_test.rb
@@ -266,12 +266,12 @@ class MyControllerTest < Redmine::ControllerTest
user = User.generate!(:language => 'en')
@request.session[:user_id] = user.id
- xhr :post, :update_page, :settings => {'timelog' => {'days' => '14'}}
+ xhr :post, :update_page, :settings => {'issuesassignedtome' => {'columns' => ['subject', 'due_date']}}
assert_response :success
- assert_include '$("#block-timelog").replaceWith(', response.body
- assert_include '14 days', response.body
+ assert_include '$("#block-issuesassignedtome").replaceWith(', response.body
+ assert_include 'Due date', response.body
- assert_equal({:days => "14"}, user.reload.pref.my_page_settings('timelog'))
+ assert_equal({:columns => ['subject', 'due_date']}, user.reload.pref.my_page_settings('issuesassignedtome'))
end
def test_add_block
@@ -321,6 +321,7 @@ class MyControllerTest < Redmine::ControllerTest
end
def test_reset_rss_key_without_existing_key
+ Token.delete_all
assert_nil User.find(2).rss_token
post :reset_rss_key