Reverts r13805 (#18679).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13809 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/views/labelled_form_builder.rb b/lib/redmine/views/labelled_form_builder.rb
index 2feb8acf44595e3c7711f87546225f06478a9ce5..74374164bed8607aa769a2d8c7825e4f0d16821c 100644 (file)
--- 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 (file)
index 15a8940..0000000
--- 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, '<label for="issue_subject">Subject</label>'
-    end
-  end
-end