mirror of
https://github.com/redmine/redmine.git
synced 2025-11-04 20:35:57 +01:00
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -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',
|
||||
|
||||
Reference in New Issue
Block a user