Fixed: CVS repository doesn't work if port is used in the url (#653).

Added functional tests for CVS adapter.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1156 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb
index 73dc9b6c4cddf1f0c7f0ea142029170db4ae458f..c0f60c02aaa88ad3a7efd00e9a8cb3f2fd7ba265 100644 (file)
--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -140,8 +140,8 @@ module Redmine
               
               if state=="entry_start"
                 branch_map=Hash.new
-                # gsub(/^:.*@[^:]+:/, '') is here to remove :pserver:anonymous@foo.bar: string if present in the url
-                if /^RCS file: #{Regexp.escape(root_url.gsub(/^:.*@[^:]+:/, ''))}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line
+                # gsub(/^:.*@[^:]+:\d*/, '') is here to remove :pserver:anonymous@foo.bar: string if present in the url
+                if /^RCS file: #{Regexp.escape(root_url.gsub(/^:.*@[^:]+:\d*/, ''))}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line
                   entry_path = normalize_cvs_path($1)
                   entry_name = normalize_path(File.basename($1))
                   logger.debug("Path #{entry_path} <=> Name #{entry_name}")

diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb
index 3a40b15a9abd38687072179dd8a53947405eaa47..6fcf8fe9a4e1710246b1a0ae42286701511d05bf 100644 (file)
--- a/test/functional/application_controller_test.rb
+++ b/test/functional/application_controller_test.rb
@@ -35,5 +35,6 @@ class ApplicationControllerTest < Test::Unit::TestCase
     GLoc.valid_languages.each do |lang|
       assert set_language_if_valid(lang)
     end
+    set_language_if_valid('en')
   end
 end

diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb
new file mode 100644 (file)
index 0000000..0598237
--- /dev/null
+++ b/test/functional/repositories_cvs_controller_test.rb
@@ -0,0 +1,133 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require File.dirname(__FILE__) + '/../test_helper'
+require 'repositories_controller'
+
+# Re-raise errors caught by the controller.
+class RepositoriesController; def rescue_action(e) raise e end; end
+
+class RepositoriesCvsControllerTest < Test::Unit::TestCase
+
+  # No '..' in the repository path
+  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository'
+  REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
+  # CVS module
+  MODULE_NAME = 'test'
+  
+  def setup
+    @controller = RepositoriesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    Setting.default_language = 'en'
+    User.current = nil
+
+    @project = Project.find(1)
+    @project.repository = Repository::Cvs.create(:root_url => REPOSITORY_PATH,
+                                                 :url => MODULE_NAME)
+  end
+  
+  if File.directory?(REPOSITORY_PATH)
+    def test_show
+      get :show, :id => 1
+      assert_response :success
+      assert_template 'show'
+      assert_not_nil assigns(:entries)
+      assert_not_nil assigns(:changesets)
+    end
+    
+    def test_browse_root
+      get :browse, :id => 1
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      assert_equal 3, assigns(:entries).size
+      
+      entry = assigns(:entries).detect {|e| e.name == 'images'}
+      assert_equal 'dir', entry.kind
+
+      entry = assigns(:entries).detect {|e| e.name == 'README'}
+      assert_equal 'file', entry.kind
+    end
+    
+    def test_browse_directory
+      get :browse, :id => 1, :path => ['sources']
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      entry = assigns(:entries).detect {|e| e.name == 'watchers_controller.rb'}
+      assert_equal 'file', entry.kind
+      assert_equal 'sources/watchers_controller.rb', entry.path
+    end
+  
+    def test_entry
+      get :entry, :id => 1, :path => ['sources', 'watchers_controller.rb']
+      assert_response :success
+      assert_template 'entry'
+    end
+    
+    def test_entry_not_found
+      get :entry, :id => 1, :path => ['sources', 'zzz.c']
+      assert_tag :tag => 'div', :attributes => { :class => /error/ },
+                                :content => /Entry and\/or revision doesn't exist/
+    end
+  
+    def test_entry_download
+      get :entry, :id => 1, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
+      assert_response :success
+    end
+    
+    def test_diff
+      Project.find(1).repository.fetch_changesets
+      get :diff, :id => 1, :rev => 3, :type => 'inline'
+      assert_response :success
+      assert_template 'diff'
+      assert_tag :tag => 'td', :attributes => { :class => 'line-code diff_out' },
+                               :content => /watched.remove_watcher/
+      assert_tag :tag => 'td', :attributes => { :class => 'line-code diff_in' },
+                               :content => /watched.remove_all_watcher/
+    end
+
+    def test_annotate
+      Project.find(1).repository.fetch_changesets
+      get :annotate, :id => 1, :path => ['sources', 'watchers_controller.rb']
+      assert_response :success
+      assert_template 'annotate'
+      # 1.1 line
+      assert_tag :tag => 'th', :attributes => { :class => 'line-num' },
+                               :content => '18',
+                               :sibling => { :tag => 'td', :attributes => { :class => 'revision' },
+                                             :content => /1.1/,
+                                             :sibling => { :tag => 'td', :attributes => { :class => 'author' },
+                                                           :content => /LANG/
+                                           }
+                               }
+      # 1.2 line
+      assert_tag :tag => 'th', :attributes => { :class => 'line-num' },
+                               :content => '32',
+                               :sibling => { :tag => 'td', :attributes => { :class => 'revision' },
+                                             :content => /1.2/,
+                                             :sibling => { :tag => 'td', :attributes => { :class => 'author' },
+                                                           :content => /LANG/
+                                           }
+                               }
+    end
+  else
+    puts "CVS test repository NOT FOUND. Skipping functional tests !!!"
+    def test_fake; assert true end
+  end
+end

diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index ab5ec14ca7bb9b8111dce3c08b714f545443f206..a706828184e0362a43ac037a008d06b2bde9485c 100644 (file)
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -31,6 +31,7 @@ class RepositoriesSubversionControllerTest < Test::Unit::TestCase
     @controller = RepositoriesController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    Setting.default_language = 'en'
     User.current = nil
   end