From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 18 Sep 2013 10:12:53 +0000 (+0000)
Subject: scm: bazaar: split REPOSITORY_PATH to trunk in functional test (#14931)
X-Git-Tag: 2.4.0~108
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=23c56501de3701a1996e658354d704e9dd9c74cb;p=redmine.git

scm: bazaar: split REPOSITORY_PATH to trunk in functional test (#14931)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12146 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/functional/repositories_bazaar_controller_test.rb b/test/functional/repositories_bazaar_controller_test.rb
index 892a08fb8..915d9062e 100644
--- a/test/functional/repositories_bazaar_controller_test.rb
+++ b/test/functional/repositories_bazaar_controller_test.rb
@@ -23,7 +23,8 @@ class RepositoriesBazaarControllerTest < ActionController::TestCase
   fixtures :projects, :users, :roles, :members, :member_roles,
            :repositories, :enabled_modules
 
-  REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository/trunk').to_s
+  REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository').to_s
+  REPOSITORY_PATH_TRUNK = File.join(REPOSITORY_PATH, "trunk")
   PRJ_ID = 3
 
   def setup
@@ -31,7 +32,7 @@ class RepositoriesBazaarControllerTest < ActionController::TestCase
     @project = Project.find(PRJ_ID)
     @repository = Repository::Bazaar.create(
                     :project      => @project,
-                    :url          => REPOSITORY_PATH,
+                    :url          => REPOSITORY_PATH_TRUNK,
                     :log_encoding => 'UTF-8')
     assert @repository
   end