mirror of
https://github.com/redmine/redmine.git
synced 2025-11-15 17:56:03 +01:00
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
This commit is contained in:
@@ -30,14 +30,6 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
|||||||
PRJ_ID = 3
|
PRJ_ID = 3
|
||||||
NUM_REV = 28
|
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
|
def setup
|
||||||
super
|
super
|
||||||
@ruby19_non_utf8_pass = Encoding.default_external.to_s != 'UTF-8'
|
@ruby19_non_utf8_pass = Encoding.default_external.to_s != 'UTF-8'
|
||||||
@@ -259,8 +251,6 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
|||||||
puts_ruby19_non_utf8_pass()
|
puts_ruby19_non_utf8_pass()
|
||||||
elsif WINDOWS_PASS
|
elsif WINDOWS_PASS
|
||||||
puts WINDOWS_SKIP_STR
|
puts WINDOWS_SKIP_STR
|
||||||
elsif JRUBY_SKIP
|
|
||||||
puts JRUBY_SKIP_STR
|
|
||||||
else
|
else
|
||||||
with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
|
with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
|
||||||
['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
|
['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
|
||||||
@@ -558,8 +548,6 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
|||||||
puts_ruby19_non_utf8_pass()
|
puts_ruby19_non_utf8_pass()
|
||||||
elsif WINDOWS_PASS
|
elsif WINDOWS_PASS
|
||||||
puts WINDOWS_SKIP_STR
|
puts WINDOWS_SKIP_STR
|
||||||
elsif JRUBY_SKIP
|
|
||||||
puts JRUBY_SKIP_STR
|
|
||||||
else
|
else
|
||||||
with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
|
with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
|
||||||
['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
|
['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
|
||||||
|
|||||||
@@ -34,12 +34,6 @@ class RepositoryBazaarTest < ActiveSupport::TestCase
|
|||||||
# "bzr" command output and command line parameter depend on locale.
|
# "bzr" command output and command line parameter depend on locale.
|
||||||
# So, non ASCII path tests cannot run independent 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,
|
# On Windows, because it is too hard to change system locale,
|
||||||
# you cannot run Bazaar non ASCII path tests.
|
# you cannot run Bazaar non ASCII path tests.
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -30,14 +30,6 @@ class RepositoryGitTest < ActiveSupport::TestCase
|
|||||||
NUM_REV = 28
|
NUM_REV = 28
|
||||||
NUM_HEAD = 8
|
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
|
def setup
|
||||||
User.current = nil
|
User.current = nil
|
||||||
@project = Project.find(3)
|
@project = Project.find(3)
|
||||||
@@ -461,8 +453,6 @@ class RepositoryGitTest < ActiveSupport::TestCase
|
|||||||
|
|
||||||
if WINDOWS_PASS
|
if WINDOWS_PASS
|
||||||
puts WINDOWS_SKIP_STR
|
puts WINDOWS_SKIP_STR
|
||||||
elsif JRUBY_SKIP
|
|
||||||
puts JRUBY_SKIP_STR
|
|
||||||
else
|
else
|
||||||
# latin-1 encoding path
|
# latin-1 encoding path
|
||||||
changesets = @repository.latest_changesets(
|
changesets = @repository.latest_changesets(
|
||||||
@@ -483,8 +473,6 @@ class RepositoryGitTest < ActiveSupport::TestCase
|
|||||||
def test_latest_changesets_latin_1_dir
|
def test_latest_changesets_latin_1_dir
|
||||||
if WINDOWS_PASS
|
if WINDOWS_PASS
|
||||||
puts WINDOWS_SKIP_STR
|
puts WINDOWS_SKIP_STR
|
||||||
elsif JRUBY_SKIP
|
|
||||||
puts JRUBY_SKIP_STR
|
|
||||||
else
|
else
|
||||||
assert_equal 0, @repository.changesets.count
|
assert_equal 0, @repository.changesets.count
|
||||||
@repository.fetch_changesets
|
@repository.fetch_changesets
|
||||||
|
|||||||
Reference in New Issue
Block a user