diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-05-05 05:29:58 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-05-05 05:29:58 +0000 |
| commit | 6bcbdd44fce35c580e764d4328df60bbf48430bb (patch) | |
| tree | d4887562d91575dbe34cb1a06e4d5737931c21e6 | |
| parent | 66d62504ef2d88b2a673e40b827fdd1c3c407e16 (diff) | |
| download | redmine-6bcbdd44fce35c580e764d4328df60bbf48430bb.tar.gz redmine-6bcbdd44fce35c580e764d4328df60bbf48430bb.zip | |
route: scm: fix diff of two revisions
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9628 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | config/routes.rb | 4 | ||||
| -rw-r--r-- | test/integration/repositories_git_test.rb | 33 |
2 files changed, 35 insertions, 2 deletions
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 |