summaryrefslogtreecommitdiffstats
path: root/test/functional/timelog_controller_test.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-12-22 12:24:43 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-12-22 12:24:43 +0000
commitad246e81ad522362916f9a37cc8cdb96d2a325eb (patch)
treeb81a72c7d5f8ed8b51c2bfaca4aae38b9b9dbb48 /test/functional/timelog_controller_test.rb
parenta4f989a5e098a4b48659c5f436c327eca0220219 (diff)
downloadredmine-ad246e81ad522362916f9a37cc8cdb96d2a325eb.tar.gz
redmine-ad246e81ad522362916f9a37cc8cdb96d2a325eb.zip
Code cleanup, use named routes.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11071 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/timelog_controller_test.rb')
-rw-r--r--test/functional/timelog_controller_test.rb19
1 files changed, 13 insertions, 6 deletions
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index 407581e5e..59de92490 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -293,13 +293,20 @@ class TimelogControllerTest < ActionController::TestCase
assert_response :success
assert_template 'bulk_edit'
- # System wide custom field
- assert_tag :select, :attributes => {:name => 'time_entry[custom_field_values][10]'}
+ assert_select 'ul#bulk-selection' do
+ assert_select 'li', 2
+ assert_select 'li a', :text => '03/23/2007 - eCookbook: 4.25 hours'
+ end
- # Activities
- assert_select 'select[name=?]', 'time_entry[activity_id]' do
- assert_select 'option[value=]', :text => '(No change)'
- assert_select 'option[value=9]', :text => 'Design'
+ assert_select 'form#bulk_edit_form[action=?]', '/time_entries/bulk_update' do
+ # System wide custom field
+ assert_select 'select[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
end