jro_apps/redmine Commit - r3714:56af944afa14

Extend changes.path and changes.from_path to support longer paths. #5771...

Eric Davis -

r3714:56af944afa14

parent child

Context file:

r3714:56af944afa14

Collapse all files

db/migrate/20100705164950_change_changes_path_length_limit.rb created 644 +11 0

@@ -0,0 +1,11
	1	class ChangeChangesPathLengthLimit < ActiveRecord::Migration
	2	def self.up
	3	change_column :changes, :path, :text, :default => "", :null => false
	4	change_column :changes, :from_path, :text
	5	end
	6
	7	def self.down
	8	change_column :changes, :path, :string, :default => "", :null => false
	9	change_column :changes, :from_path, :string
	10	end
	11	end

test/fixtures/repositories/git_repository.tar.gz binary modified 0 0

NO CONTENT: modified file, binary diff hidden

test/functional/repositories_git_controller_test.rb +2 -1

             # 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 RepositoriesGitControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
               REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
               def setup
                 @controller = RepositoriesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 Repository::Git.create(:project => Project.find(3), :url => REPOSITORY_PATH)
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_show
                   get :show, :id => 3
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_not_nil assigns(:changesets)
                 end
                 def test_browse_root
                   get :show, :id => 3
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
-                  assert_equal 6, assigns(:entries).size
+                  assert_equal 7, assigns(:entries).size
                   assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
+                  assert assigns(:entries).detect {|e| e.name == 'this_is_a_really_long_and_verbose_directory_name' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == 'copied_README' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == 'new_file.txt' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == 'renamed_test.txt' && e.kind == 'file'}
                 end
                 def test_browse_branch
                   get :show, :id => 3, :rev => 'test_branch'
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal 4, assigns(:entries).size
                   assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == 'test.txt' && e.kind == 'file'}
                 end
                 def test_browse_directory
                   get :show, :id => 3, :path => ['images']
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['edit.png'], assigns(:entries).collect(&:name)
                   entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
                   assert_not_nil entry
                   assert_equal 'file', entry.kind
                   assert_equal 'images/edit.png', entry.path
                 end
                 def test_browse_at_given_revision
                   get :show, :id => 3, :path => ['images'], :rev => '7234cb2750b63f47bff735edc50a1c0a433c2518'
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['delete.png'], assigns(:entries).collect(&:name)
                 end
                 def test_changes
                   get :changes, :id => 3, :path => ['images', 'edit.png']
                   assert_response :success
                   assert_template 'changes'
                   assert_tag :tag => 'h2', :content => 'edit.png'
                 end
                 def test_entry_show
                   get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb']
                   assert_response :success
                   assert_template 'entry'
                   # Line 19
                   assert_tag :tag => 'th',
                              :content => /11/,
                              :attributes => { :class => /line-num/ },
                              :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
                 end
                 def test_entry_download
                   get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
                   assert_response :success
                   # File content
                   assert @response.body.include?('WITHOUT ANY WARRANTY')
                 end
                 def test_directory_entry
                   get :entry, :id => 3, :path => ['sources']
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entry)
                   assert_equal 'sources', assigns(:entry).name
                 end
                 def test_diff
                   # Full diff of changeset 2f9c0091
                   get :diff, :id => 3, :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
                   assert_response :success
                   assert_template 'diff'
                   # Line 22 removed
                   assert_tag :tag => 'th',
                              :content => /22/,
                              :sibling => { :tag => 'td',
                                            :attributes => { :class => /diff_out/ },
                                            :content => /def remove/ }
                 end
                 def test_annotate
                   get :annotate, :id => 3, :path => ['sources', 'watchers_controller.rb']
                   assert_response :success
                   assert_template 'annotate'
                   # Line 23, changeset 2f9c0091
                   assert_tag :tag => 'th', :content => /24/,
                              :sibling => { :tag => 'td', :child => { :tag => 'a', :content => /2f9c0091/ } },
                              :sibling => { :tag => 'td', :content => /jsmith/ },
                              :sibling => { :tag => 'td', :content => /watcher =/ }
                 end
                 def test_annotate_binary_file
                   get :annotate, :id => 3, :path => ['images', 'edit.png']
                   assert_response 500
                   assert_tag :tag => 'div', :attributes => { :class => /error/ },
                                             :content => /can not be annotated/
                 end
               else
                 puts "Git test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             end

test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +1 -1

             require File.dirname(__FILE__) + '/../../../../../test_helper'
             class GitAdapterTest < ActiveSupport::TestCase
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
               if File.directory?(REPOSITORY_PATH)
                 def setup
                   @adapter = Redmine::Scm::Adapters::GitAdapter.new(REPOSITORY_PATH)
                 end
                 def test_branches
                   assert_equal @adapter.branches, ['master', 'test_branch']
                 end
                 def test_getting_all_revisions
-                  assert_equal 12, @adapter.revisions('',nil,nil,:all => true).length
+                  assert_equal 13, @adapter.revisions('',nil,nil,:all => true).length
                 end
                 def test_annotate
                   annotate = @adapter.annotate('sources/watchers_controller.rb')
                   assert_kind_of Redmine::Scm::Adapters::Annotate, annotate
                   assert_equal 41, annotate.lines.size
                   assert_equal "# This program is free software; you can redistribute it and/or", annotate.lines[4].strip
                   assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518", annotate.revisions[4].identifier
                   assert_equal "jsmith", annotate.revisions[4].author
                 end
                 def test_annotate_moved_file
                   annotate = @adapter.annotate('renamed_test.txt')
                   assert_kind_of Redmine::Scm::Adapters::Annotate, annotate
                   assert_equal 2, annotate.lines.size
                 end
               else
                 puts "Git test repository NOT FOUND. Skipping unit tests !!!"
                 def test_fake; assert true end
               end
             end

test/unit/repository_git_test.rb +4 -4

             # redMine - project management software
             # Copyright (C) 2006-2007  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'
             class RepositoryGitTest < ActiveSupport::TestCase
               fixtures :projects
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
               REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
               def setup
                 @project = Project.find(1)
                 assert @repository = Repository::Git.create(:project => @project, :url => REPOSITORY_PATH)
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_fetch_changesets_from_scratch
                   @repository.fetch_changesets
                   @repository.reload
-                  assert_equal 12, @repository.changesets.count
+                  assert_equal 13, @repository.changesets.count
-                  assert_equal 21, @repository.changes.count
+                  assert_equal 22, @repository.changes.count
                   commit = @repository.changesets.find(:first, :order => 'committed_on ASC')
                   assert_equal "Initial import.\nThe repository contains 3 files.", commit.comments
                   assert_equal "jsmith <jsmith@foo.bar>", commit.committer
                   assert_equal User.find_by_login('jsmith'), commit.user
                   # TODO: add a commit with commit time <> author time to the test repository
                   assert_equal "2007-12-14 09:22:52".to_time, commit.committed_on
                   assert_equal "2007-12-14".to_date, commit.commit_date
                   assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518", commit.revision
                   assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518", commit.scmid
                   assert_equal 3, commit.changes.count
                   change = commit.changes.sort_by(&:path).first
                   assert_equal "README", change.path
                   assert_equal "A", change.action
                 end
                 def test_fetch_changesets_incremental
                   @repository.fetch_changesets
                   # Remove the 3 latest changesets
                   @repository.changesets.find(:all, :order => 'committed_on DESC', :limit => 3).each(&:destroy)
                   @repository.reload
-                  assert_equal 9, @repository.changesets.count
+                  assert_equal 10, @repository.changesets.count
                   @repository.fetch_changesets
-                  assert_equal 12, @repository.changesets.count
+                  assert_equal 13, @repository.changesets.count
                 end
               else
                 puts "Git test repository NOT FOUND. Skipping unit tests !!!"
                 def test_fake; assert true end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages