From 821ea2a75751af707f1becb5d34757c3cebc878e Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Mon, 21 May 2012 18:59:31 +0000 Subject: [PATCH] Merged r9702 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9705 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/queries/_form.html.erb | 2 +- test/functional/queries_controller_test.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/queries/_form.html.erb b/app/views/queries/_form.html.erb index cee8fbaa8..ba8c58070 100644 --- a/app/views/queries/_form.html.erb +++ b/app/views/queries/_form.html.erb @@ -44,7 +44,7 @@ <% end %> -<% content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %> +<%= content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %> <%= l(:field_column_names) %> <%= render :partial => 'queries/columns', :locals => {:query => query}%> <% end %> diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb index b9e4f417c..7cd823e6f 100644 --- a/test/functional/queries_controller_test.rb +++ b/test/functional/queries_controller_test.rb @@ -36,6 +36,10 @@ class QueriesControllerTest < ActionController::TestCase :name => 'query_is_for_all', :checked => nil, :disabled => nil } + assert_select 'select[name=?]', 'c[]' do + assert_select 'option[value=tracker]' + assert_select 'option[value=subject]' + end end def test_new_global_query -- 2.39.5