comparison test/unit/repository_cvs_test.rb @ 909:cbb26bc654de redmine-1.3

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)

 require File.expand_path('../../test_helper', __FILE__)
 require 'pp'
 class RepositoryCvsTest < ActiveSupport::TestCase
   fixtures :projects
 
-  # No '..' in the repository path
-  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository'
+  REPOSITORY_PATH = Rails.root.join('tmp/test/cvs_repository').to_s
   REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
   # CVS module
   MODULE_NAME    = 'test'
   CHANGESETS_NUM = 7
 

 
   if File.directory?(REPOSITORY_PATH)
     def test_fetch_changesets_from_scratch
       assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets
-      @repository.reload
+      @project.reload
 
       assert_equal CHANGESETS_NUM, @repository.changesets.count
       assert_equal 16, @repository.changes.count
       assert_not_nil @repository.changesets.find_by_comments('Two files changed')
 

     end
 
     def test_deleted_files_should_not_be_listed
       assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets
-      @repository.reload
+      @project.reload
       assert_equal CHANGESETS_NUM, @repository.changesets.count
 
       entries = @repository.entries('sources')
       assert entries.detect {|e| e.name == 'watchers_controller.rb'}
       assert_nil entries.detect {|e| e.name == 'welcome_controller.rb'}
     end
 
     def test_entries_rev3
+      assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets
-      @repository.reload
+      @project.reload
+      assert_equal CHANGESETS_NUM, @repository.changesets.count
       entries = @repository.entries('', '3')
       assert_equal 3, entries.size
       assert_equal entries[2].name, "README"
       assert_equal entries[2].lastrev.time, Time.gm(2007, 12, 13, 16, 27, 22)
       assert_equal entries[2].lastrev.identifier, '3'
       assert_equal entries[2].lastrev.revision, '3'
       assert_equal entries[2].lastrev.author, 'LANG'
     end
 
     def test_entries_invalid_path
+      assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets
-      @repository.reload
+      @project.reload
+      assert_equal CHANGESETS_NUM, @repository.changesets.count
       assert_nil @repository.entries('missing')
       assert_nil @repository.entries('missing', '3')
     end
 
     def test_entries_invalid_revision
+      assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets
-      @repository.reload
+      @project.reload
+      assert_equal CHANGESETS_NUM, @repository.changesets.count
       assert_nil @repository.entries('', '123')
     end
 
     def test_cat
+      assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets
-      @repository.reload
+      @project.reload
+      assert_equal CHANGESETS_NUM, @repository.changesets.count
       buf = @repository.cat('README')
       assert buf
       lines = buf.split("\n")
       assert_equal 3, lines.length
       buf = lines[1].gsub(/\r$/, "")

       # invalid revision
       assert @repository.cat('README', '123').blank?
     end
 
     def test_annotate
+      assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets
-      @repository.reload
+      @project.reload
+      assert_equal CHANGESETS_NUM, @repository.changesets.count
       ann = @repository.annotate('README')
       assert ann
       assert_equal 3, ann.revisions.length
       assert_equal '1.2', ann.revisions[1].revision
       assert_equal 'LANG', ann.revisions[1].author