From e2daacfa34a4583b9f1b1e53410c03edd43b4074 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Tue, 20 Aug 2024 09:04:05 +0000 Subject: [PATCH] Fix RuboCop offense Style/UnlessElse (#36320). git-svn-id: https://svn.redmine.org/redmine/trunk@22968 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/search_test.rb | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/test/unit/search_test.rb b/test/unit/search_test.rb index d4f2f5f99..aa14b9f7e 100644 --- a/test/unit/search_test.rb +++ b/test/unit/search_test.rb @@ -175,27 +175,23 @@ class SearchTest < ActiveSupport::TestCase end def test_search_should_be_case_insensitive_with_accented_characters - unless sqlite? || postgresql? - issue1 = Issue.generate!(:subject => "Special chars: ÖÖ") - issue2 = Issue.generate!(:subject => "Special chars: Öö") - r = Issue.search_results('ÖÖ') - assert_include issue1, r - assert_include issue2, r - else - skip - end + skip if sqlite? || postgresql? + + issue1 = Issue.generate!(:subject => "Special chars: ÖÖ") + issue2 = Issue.generate!(:subject => "Special chars: Öö") + r = Issue.search_results('ÖÖ') + assert_include issue1, r + assert_include issue2, r end def test_search_should_be_case_and_accent_insensitive_with_mysql - if mysql? - issue1 = Issue.generate!(:subject => "OO") - issue2 = Issue.generate!(:subject => "oo") - r = Issue.search_results('ÖÖ') - assert_include issue1, r - assert_include issue2, r - else - skip - end + skip unless mysql? + + issue1 = Issue.generate!(:subject => "OO") + issue2 = Issue.generate!(:subject => "oo") + r = Issue.search_results('ÖÖ') + assert_include issue1, r + assert_include issue2, r end def test_search_should_be_case_and_accent_insensitive_with_postgresql_and_noaccent_extension