diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb index 5b9a029..91282a1 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 FELIX_HEX = "Felix Sch\xC3\xA4fer".force_encoding('UTF-8') 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' @@ -63,7 +55,7 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest :is_default => '0', :identifier => 'test-create', :report_last_commit => '1', - + } } end @@ -77,7 +69,7 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest :id => repository.id, :repository => { :report_last_commit => '0' - + } } assert_response 302 @@ -248,8 +240,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| @@ -547,8 +537,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 51d18fe..82315d0 100644 --- a/test/unit/repository_bazaar_test.rb +++ b/test/unit/repository_bazaar_test.rb @@ -32,12 +32,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 4f223a9..b7191d6 100644 --- a/test/unit/repository_git_test.rb +++ b/test/unit/repository_git_test.rb @@ -31,14 +31,6 @@ class RepositoryGitTest < ActiveSupport::TestCase FELIX_HEX = "Felix Sch\xC3\xA4fer".force_encoding('UTF-8') CHAR_1_HEX = "\xc3\x9c".force_encoding('UTF-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 @project = Project.find(3) @repository = Repository::Git.create( @@ -462,8 +454,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( @@ -484,8 +474,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