From 4da6874d05907d29345d014141f620197e52614f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Fri, 26 Dec 2014 11:43:59 +0000 Subject: [PATCH] Reverts r13805 (#18679). git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13809 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/views/labelled_form_builder.rb | 2 +- .../views/labelled_form_builder_test.rb | 29 ------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 test/unit/lib/redmine/views/labelled_form_builder_test.rb diff --git a/lib/redmine/views/labelled_form_builder.rb b/lib/redmine/views/labelled_form_builder.rb index 2feb8acf4..74374164b 100644 --- a/lib/redmine/views/labelled_form_builder.rb +++ b/lib/redmine/views/labelled_form_builder.rb @@ -20,7 +20,7 @@ require 'action_view/helpers/form_helper' class Redmine::Views::LabelledFormBuilder < ActionView::Helpers::FormBuilder include Redmine::I18n - (field_helpers.map(&:to_s) - %w(radio_button hidden_field fields_for check_box label) + + (field_helpers.map(&:to_s) - %w(radio_button hidden_field fields_for check_box) + %w(date_select)).each do |selector| src = <<-END_SRC def #{selector}(field, options = {}) diff --git a/test/unit/lib/redmine/views/labelled_form_builder_test.rb b/test/unit/lib/redmine/views/labelled_form_builder_test.rb deleted file mode 100644 index 15a89402a..000000000 --- a/test/unit/lib/redmine/views/labelled_form_builder_test.rb +++ /dev/null @@ -1,29 +0,0 @@ -# Redmine - project management software -# Copyright (C) 2006-2014 Jean-Philippe Lang -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -require File.expand_path('../../../../../test_helper', __FILE__) - -class Redmine::Views::LabelledFormBuilderTest < ActionView::TestCase - - def test_label_should_output_one_element - set_language_if_valid 'en' - labelled_form_for(Issue.new) do |f| - output = f.label :subject - assert_equal output, '' - end - end -end -- 2.39.5