diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
| commit | 2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch) | |
| tree | 7a733c1cc51448ab69b3f892285305dbfb0ae15e /test/unit/repository_cvs_test.rb | |
| parent | a6ec78a4dc658e3517ed682792016b6530458696 (diff) | |
| download | redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip | |
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/unit/repository_cvs_test.rb')
| -rw-r--r-- | test/unit/repository_cvs_test.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/test/unit/repository_cvs_test.rb b/test/unit/repository_cvs_test.rb index 223b8ec45..8b5ac6271 100644 --- a/test/unit/repository_cvs_test.rb +++ b/test/unit/repository_cvs_test.rb @@ -22,7 +22,7 @@ class RepositoryCvsTest < ActiveSupport::TestCase include Redmine::I18n - REPOSITORY_PATH = Rails.root.join('tmp/test/cvs_repository').to_s + REPOSITORY_PATH = repository_path('cvs') REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin? # CVS module MODULE_NAME = 'test' @@ -52,8 +52,7 @@ class RepositoryCvsTest < ActiveSupport::TestCase def test_blank_module_error_message_fr set_language_if_valid 'fr' - str = "Module doit \xc3\xaatre renseign\xc3\xa9(e)" - str.force_encoding('UTF-8') if str.respond_to?(:force_encoding) + str = "Module doit \xc3\xaatre renseign\xc3\xa9(e)".force_encoding('UTF-8') repo = Repository::Cvs.new( :project => @project, :identifier => 'test', @@ -81,8 +80,7 @@ class RepositoryCvsTest < ActiveSupport::TestCase def test_blank_cvsroot_error_message_fr set_language_if_valid 'fr' - str = "CVSROOT doit \xc3\xaatre renseign\xc3\xa9(e)" - str.force_encoding('UTF-8') if str.respond_to?(:force_encoding) + str = "CVSROOT doit \xc3\xaatre renseign\xc3\xa9(e)".force_encoding('UTF-8') repo = Repository::Cvs.new( :project => @project, :identifier => 'test', |