summaryrefslogtreecommitdiffstats
path: root/test/functional
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-05-05 16:09:27 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-05-05 16:09:27 +0000
commitee8dcab9db0ad3bb3818051b7a1fd5211b9cdf0d (patch)
tree6c8b02e482762169e18d56f85f6b37e582af91fd /test/functional
parent02f704bb01a2d2bc273cab69c7f3047177ac72d4 (diff)
downloadredmine-ee8dcab9db0ad3bb3818051b7a1fd5211b9cdf0d.tar.gz
redmine-ee8dcab9db0ad3bb3818051b7a1fd5211b9cdf0d.zip
Fixed that activities option tags on the time entry bulk edit form are escaped.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9643 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional')
-rw-r--r--test/functional/timelog_controller_test.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index f91f33c7c..410bbd3e5 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -278,6 +278,12 @@ class TimelogControllerTest < ActionController::TestCase
# System wide custom field
assert_tag :select, :attributes => {:name => 'time_entry[custom_field_values][10]'}
+
+ # Activities
+ assert_select 'select[name=?]', 'time_entry[activity_id]' do
+ assert_select 'option[value=]', :text => '(No change)'
+ assert_select 'option[value=9]', :text => 'Design'
+ end
end
def test_get_bulk_edit_on_different_projects