summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2019-06-20 13:47:00 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2019-06-20 13:47:00 +0000
commit62e13f7913d8d4bc38c64350826074d93df0feb0 (patch)
treee10b78f1d95e6888cb78a8956bc8c01fb604c196
parentcbc537de0a09814210489ef8d657a5c4ae4dd54f (diff)
downloadredmine-62e13f7913d8d4bc38c64350826074d93df0feb0.tar.gz
redmine-62e13f7913d8d4bc38c64350826074d93df0feb0.zip
Remove code related to JRuby and unsupported Ruby versions (#29441).
Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@18294 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--test/functional/repositories_git_controller_test.rb12
-rw-r--r--test/unit/repository_bazaar_test.rb6
-rw-r--r--test/unit/repository_git_test.rb12
3 files changed, 0 insertions, 30 deletions
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index a69328769..5ecc377cb 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -30,14 +30,6 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
PRJ_ID = 3
NUM_REV = 28
- ## Git, Mercurial and CVS path encodings are binary.
- ## Subversion supports URL encoding for path.
- ## Redmine Mercurial adapter and extension use URL encoding.
- ## Git accepts only binary path in command line parameter.
- ## So, there is no way to use binary command line parameter in JRuby.
- JRUBY_SKIP = (RUBY_PLATFORM == 'java')
- JRUBY_SKIP_STR = "TODO: This test fails in JRuby"
-
def setup
super
@ruby19_non_utf8_pass = Encoding.default_external.to_s != 'UTF-8'
@@ -259,8 +251,6 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
puts_ruby19_non_utf8_pass()
elsif WINDOWS_PASS
puts WINDOWS_SKIP_STR
- elsif JRUBY_SKIP
- puts JRUBY_SKIP_STR
else
with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
@@ -558,8 +548,6 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
puts_ruby19_non_utf8_pass()
elsif WINDOWS_PASS
puts WINDOWS_SKIP_STR
- elsif JRUBY_SKIP
- puts JRUBY_SKIP_STR
else
with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
diff --git a/test/unit/repository_bazaar_test.rb b/test/unit/repository_bazaar_test.rb
index d1ab6b49a..5e35573e4 100644
--- a/test/unit/repository_bazaar_test.rb
+++ b/test/unit/repository_bazaar_test.rb
@@ -34,12 +34,6 @@ class RepositoryBazaarTest < ActiveSupport::TestCase
# "bzr" command output and command line parameter depend on locale.
# So, non ASCII path tests cannot run independent locale.
#
- # If you want to run Bazaar non ASCII path tests on Linux *Ruby 1.9*,
- # you need to set locale character set "ISO-8859-1".
- # E.g. "LANG=en_US.ISO-8859-1".
- # On Linux other platforms (e.g. Ruby 1.8, JRuby),
- # you need to set "RUN_LATIN1_OUTPUT_TEST = true" manually.
- #
# On Windows, because it is too hard to change system locale,
# you cannot run Bazaar non ASCII path tests.
#
diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb
index 7696c752f..05c94b51c 100644
--- a/test/unit/repository_git_test.rb
+++ b/test/unit/repository_git_test.rb
@@ -30,14 +30,6 @@ class RepositoryGitTest < ActiveSupport::TestCase
NUM_REV = 28
NUM_HEAD = 8
- ## Git, Mercurial and CVS path encodings are binary.
- ## Subversion supports URL encoding for path.
- ## Redmine Mercurial adapter and extension use URL encoding.
- ## Git accepts only binary path in command line parameter.
- ## So, there is no way to use binary command line parameter in JRuby.
- JRUBY_SKIP = (RUBY_PLATFORM == 'java')
- JRUBY_SKIP_STR = "TODO: This test fails in JRuby"
-
def setup
User.current = nil
@project = Project.find(3)
@@ -461,8 +453,6 @@ class RepositoryGitTest < ActiveSupport::TestCase
if WINDOWS_PASS
puts WINDOWS_SKIP_STR
- elsif JRUBY_SKIP
- puts JRUBY_SKIP_STR
else
# latin-1 encoding path
changesets = @repository.latest_changesets(
@@ -483,8 +473,6 @@ class RepositoryGitTest < ActiveSupport::TestCase
def test_latest_changesets_latin_1_dir
if WINDOWS_PASS
puts WINDOWS_SKIP_STR
- elsif JRUBY_SKIP
- puts JRUBY_SKIP_STR
else
assert_equal 0, @repository.changesets.count
@repository.fetch_changesets