From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 5 May 2012 05:29:58 +0000 (+0000)
Subject: route: scm: fix diff of two revisions
X-Git-Tag: 2.0.0~55
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6bcbdd44fce35c580e764d4328df60bbf48430bb;p=redmine.git

route: scm: fix diff of two revisions

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

diff --git a/config/routes.rb b/config/routes.rb
index 384f6b938..3e89a88e4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -249,11 +249,11 @@ RedmineApp::Application.routes.draw do
   get 'projects/:id/repository/:repository_id/:action(/*path(.:ext))',
       :controller => 'repositories',
       :action => /(browse|show|entry|raw|changes|annotate|diff)/
-  get 'projects/:id/repository/:repository_id', :to => 'repositories#show', :path => nil
-
   get 'projects/:id/repository/:action(/*path(.:ext))',
       :controller => 'repositories',
       :action => /(browse|show|entry|raw|changes|annotate|diff)/
+
+  get 'projects/:id/repository/:repository_id', :to => 'repositories#show', :path => nil
   get 'projects/:id/repository', :to => 'repositories#show', :path => nil
 
   # additional routes for having the file name at the end of url
diff --git a/test/integration/repositories_git_test.rb b/test/integration/repositories_git_test.rb
new file mode 100644
index 000000000..edc7d61e8
--- /dev/null
+++ b/test/integration/repositories_git_test.rb
@@ -0,0 +1,33 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+class RepositoriesGitTest < ActionController::IntegrationTest
+  fixtures :projects, :users, :roles, :members, :member_roles,
+           :repositories, :enabled_modules
+
+  REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s
+  REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
+  PRJ_ID     = 3
+
+  def setup
+    User.current = nil
+    @project    = Project.find(PRJ_ID)
+    @repository = Repository::Git.create(
+                      :project       => @project,
+                      :url           => REPOSITORY_PATH,
+                      :path_encoding => 'ISO-8859-1'
+                      )
+    assert @repository
+  end
+
+  if File.directory?(REPOSITORY_PATH)
+    def test_index
+      get '/projects/subproject1/repository/'
+      assert_response :success
+    end
+
+    def test_diff_two_revs
+      get '/projects/subproject1/repository/diff?rev=61b685fbe&rev_to=2f9c0091'
+      assert_response :success
+    end
+  end
+end