jro_apps/redmine Commit - r4503:8487e0a5b83f

Fix subversion and git activities test reffering r4621....

Toshi MARUYAMA -

r4503:8487e0a5b83f

parent child

Context file:

r4503:8487e0a5b83f

Collapse all files

test/unit/repository_git_test.rb +6 -9

             # 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.expand_path('../../test_helper', __FILE__)
             class RepositoryGitTest < ActiveSupport::TestCase
               fixtures :projects, :repositories, :enabled_modules, :users, :roles
               # 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 15, @repository.changesets.count
                   assert_equal 24, @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 12, @repository.changesets.count
                   @repository.fetch_changesets
                   assert_equal 15, @repository.changesets.count
                 end
                 def test_identifier
                   @repository.fetch_changesets
                   @repository.reload
                   c = @repository.changesets.find_by_revision('7234cb2750b63f47bff735edc50a1c0a433c2518')
                   assert_equal c.scmid, c.identifier
                 end
                 def test_format_identifier
                   @repository.fetch_changesets
                   @repository.reload
                   c = @repository.changesets.find_by_revision('7234cb2750b63f47bff735edc50a1c0a433c2518')
                   assert_equal c.format_identifier, '7234cb27'
                 end
                 def test_activities
-                  @repository.fetch_changesets
+                  c = Changeset.new(:repository => @repository, :committed_on => Time.now,
-                  @repository.reload
+                                    :revision => 'abc7234cb2750b63f47bff735edc50a1c0a433c2',
-                  f = Redmine::Activity::Fetcher.new(User.anonymous, :project => Project.find(1))
+                                    :scmid    => 'abc7234cb2750b63f47bff735edc50a1c0a433c2',
-                  f.scope = ['changesets']
+                                    :comments => 'test')
-                  events = f.events
+                  assert c.event_title.include?('abc7234c:')
-                  assert_kind_of Array, events
+                  assert_equal c.event_url[:rev], 'abc7234cb2750b63f47bff735edc50a1c0a433c2'
-                  eve = events[-9]
-                  assert eve.event_title.include?('7234cb27:')
-                  assert_equal eve.event_url[:rev], '7234cb2750b63f47bff735edc50a1c0a433c2518'
                 end
               else
                 puts "Git test repository NOT FOUND. Skipping unit tests !!!"
                 def test_fake; assert true end
               end
             end

test/unit/repository_subversion_test.rb +1 -3

             # 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.expand_path('../../test_helper', __FILE__)
             class RepositorySubversionTest < ActiveSupport::TestCase
               fixtures :projects, :repositories, :enabled_modules, :users, :roles
               def setup
                 @project = Project.find(1)
                 assert @repository = Repository::Subversion.create(:project => @project, :url => "file:///#{self.class.repository_path('subversion')}")
               end
               if repository_configured?('subversion')
                 def test_fetch_changesets_from_scratch
                   @repository.fetch_changesets
                   @repository.reload
                   assert_equal 11, @repository.changesets.count
                   assert_equal 20, @repository.changes.count
                   assert_equal 'Initial import.', @repository.changesets.find_by_revision('1').comments
                 end
                 def test_fetch_changesets_incremental
                   @repository.fetch_changesets
                   # Remove changesets with revision > 5
                   @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 5}
                   @repository.reload
                   assert_equal 5, @repository.changesets.count
                   @repository.fetch_changesets
                   assert_equal 11, @repository.changesets.count
                 end
                 def test_latest_changesets
                   @repository.fetch_changesets
                   # with limit
                   changesets = @repository.latest_changesets('', nil, 2)
                   assert_equal 2, changesets.size
                   assert_equal @repository.latest_changesets('', nil).slice(0,2), changesets
                   # with path
                   changesets = @repository.latest_changesets('subversion_test/folder', nil)
                   assert_equal ["10", "9", "7", "6", "5", "2"], changesets.collect(&:revision)
                   # with path and revision
                   changesets = @repository.latest_changesets('subversion_test/folder', 8)
                   assert_equal ["7", "6", "5", "2"], changesets.collect(&:revision)
                 end
                 def test_directory_listing_with_square_brackets_in_path
                   @repository.fetch_changesets
                   @repository.reload
                   entries = @repository.entries('subversion_test/[folder_with_brackets]')
                   assert_not_nil entries, 'Expect to find entries in folder_with_brackets'
                   assert_equal 1, entries.size, 'Expect one entry in folder_with_brackets'
                   assert_equal 'README.txt', entries.first.name
                 end
                 def test_directory_listing_with_square_brackets_in_base
                   @project = Project.find(1)
                   @repository = Repository::Subversion.create(:project => @project, :url => "file:///#{self.class.repository_path('subversion')}/subversion_test/[folder_with_brackets]")
                   @repository.fetch_changesets
                   @repository.reload
                   assert_equal 1, @repository.changesets.count, 'Expected to see 1 revision'
                   assert_equal 2, @repository.changes.count, 'Expected to see 2 changes, dir add and file add'
                   entries = @repository.entries('')
                   assert_not_nil entries, 'Expect to find entries'
                   assert_equal 1, entries.size, 'Expect a single entry'
                   assert_equal 'README.txt', entries.first.name
                 end
                 def test_identifier
                   @repository.fetch_changesets
                   @repository.reload
                   c = @repository.changesets.find_by_revision('1')
                   assert_equal c.revision, c.identifier
                 end
                 def test_identifier_nine_digit
                   c = Changeset.new(:repository => @repository, :committed_on => Time.now,
                                     :revision => '123456789', :comments => 'test')
                   assert_equal c.identifier, c.revision
                 end
                 def test_format_identifier
                   @repository.fetch_changesets
                   @repository.reload
                   c = @repository.changesets.find_by_revision('1')
                   assert_equal c.format_identifier, c.revision
                 end
                 def test_format_identifier_nine_digit
                   c = Changeset.new(:repository => @repository, :committed_on => Time.now,
                                     :revision => '123456789', :comments => 'test')
                   assert_equal c.format_identifier, c.revision
                 end
                 def test_activities
                   c = Changeset.new(:repository => @repository, :committed_on => Time.now,
                                     :revision => '1', :comments => 'test')
+                  assert c.event_title.include?('1:')
-                  assert c.event_title.include?('1:'), c.event_title
                   assert_equal c.event_url[:rev], '1'
                 end
                 def test_activities_nine_digit
                   c = Changeset.new(:repository => @repository, :committed_on => Time.now,
                                     :revision => '123456789', :comments => 'test')
                   assert c.event_title.include?('123456789:')
                   assert_equal c.event_url[:rev], '123456789'
                 end
               else
                 puts "Subversion 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