From: Go MAEDA Date: Tue, 9 Jun 2020 05:50:52 +0000 (+0000) Subject: Some tests in ApplicationHelperTest are declared as private (#33562). X-Git-Tag: 4.2.0~975 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cb33cc2cf2008b1018e4a5a98d2f37fe77db339e;p=redmine.git Some tests in ApplicationHelperTest are declared as private (#33562). Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@19814 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index c02733880..516f3436c 100644 --- a/test/helpers/application_helper_test.rb +++ b/test/helpers/application_helper_test.rb @@ -1921,6 +1921,22 @@ class ApplicationHelperTest < Redmine::HelperTest assert_nil render_if_exist(:partial => 'non_exist_partial') end + def test_export_csv_encoding_select_tag_should_return_nil_when_general_csv_encoding_is_UTF8 + with_locale 'az' do + assert_equal l(:general_csv_encoding), 'UTF-8' + assert_nil export_csv_encoding_select_tag + end + end + + def test_export_csv_encoding_select_tag_should_have_two_option_when_general_csv_encoding_is_not_UTF8 + with_locale 'en' do + assert_not_equal l(:general_csv_encoding), 'UTF-8' + result = export_csv_encoding_select_tag + assert_select_in result, "option[selected='selected'][value=#{l(:general_csv_encoding)}]", :text => l(:general_csv_encoding) + assert_select_in result, "option[value='UTF-8']", :text => 'UTF-8' + end + end + private def wiki_links_with_special_characters @@ -1951,20 +1967,4 @@ class ApplicationHelperTest < Redmine::HelperTest :class => "wiki-page new"), } end - - def test_export_csv_encoding_select_tag_should_return_nil_when_general_csv_encoding_is_UTF8 - with_locale 'az' do - assert_equal l(:general_csv_encoding), 'UTF-8' - assert_nil export_csv_encoding_select_tag - end - end - - def test_export_csv_encoding_select_tag_should_have_two_option_when_general_csv_encoding_is_not_UTF8 - with_locale 'en' do - assert_not_equal l(:general_csv_encoding), 'UTF-8' - result = export_csv_encoding_select_tag - assert_select_in result, "option[selected='selected'][value=#{l(:general_csv_encoding)}]", :text => l(:general_csv_encoding) - assert_select_in result, "option[value='UTF-8']", :text => 'UTF-8' - end - end end