diff options
| -rw-r--r-- | app/views/enumerations/destroy.html.erb | 2 | ||||
| -rw-r--r-- | test/functional/enumerations_controller_test.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/views/enumerations/destroy.html.erb b/app/views/enumerations/destroy.html.erb index 02e66bd9f..3b47b40b2 100644 --- a/app/views/enumerations/destroy.html.erb +++ b/app/views/enumerations/destroy.html.erb @@ -4,7 +4,7 @@ <div class="box"> <p><strong><%= l(:text_enumeration_destroy_question, @enumeration.objects_count) %></strong></p> <p><label for='reassign_to_id'><%= l(:text_enumeration_category_reassign_to) %></label> -<%= select_tag 'reassign_to_id', ("<option>--- #{l(:actionview_instancetag_blank_option)} ---</option>" + options_from_collection_for_select(@enumerations, 'id', 'name')) %></p> +<%= select_tag 'reassign_to_id', (content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---") + options_from_collection_for_select(@enumerations, 'id', 'name')) %></p> </div> <%= submit_tag l(:button_apply) %> diff --git a/test/functional/enumerations_controller_test.rb b/test/functional/enumerations_controller_test.rb index 7378e6f46..b13fc86f7 100644 --- a/test/functional/enumerations_controller_test.rb +++ b/test/functional/enumerations_controller_test.rb @@ -105,6 +105,9 @@ class EnumerationsControllerTest < ActionController::TestCase assert_response :success assert_template 'destroy' assert_not_nil Enumeration.find_by_id(4) + assert_select 'select[name=reassign_to_id]' do + assert_select 'option[value=6]', :text => 'High' + end end def test_destroy_enumeration_in_use_with_reassignment |