jro_apps/redmine Commit - r4876:b7dffa44c92c

scm: mercurial: update test repository for path encoding (#2664)....

Toshi MARUYAMA -

r4876:b7dffa44c92c

parent child

Context file:

r4876:b7dffa44c92c

Collapse all files

test/fixtures/repositories/mercurial_repository.hg binary modified 0 0

NO CONTENT: modified file, binary diff hidden

test/functional/repositories_mercurial_controller_test.rb +5 -1

                  @request    = ActionController::TestRequest.new
                  @response   = ActionController::TestResponse.new
                  User.current = nil
-                 @repository = Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)
+                 @repository = Repository::Mercurial.create(
+                                   :project => Project.find(3),
+                                   :url     => REPOSITORY_PATH,
+                                   :path_encoding => 'ISO-8859-1'
+                                   )
                  assert @repository
                  @diff_c_support = true
                end

test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb +25 -8

                  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'
+                 CHAR_1_HEX = "\xc3\x9c"
                  if File.directory?(REPOSITORY_PATH)
                    def setup
                      @adapter = Redmine::Scm::Adapters::MercurialAdapter.new(REPOSITORY_PATH)
                      @diff_c_support = true
+                     @tag_char_1    = "tag-#{CHAR_1_HEX}-00"
+                     @branch_char_1 = "branch-#{CHAR_1_HEX}-00"
+                     if @tag_char_1.respond_to?(:force_encoding)
+                       @tag_char_1.force_encoding('UTF-8')
+                       @branch_char_1.force_encoding('UTF-8')
+                     end
                    end
                    def test_hgversion
                        adp = Redmine::Scm::Adapters::MercurialAdapter.new(repo)
                        repo_path =  adp.info.root_url.gsub(/\\/, "/")
                        assert_equal REPOSITORY_PATH, repo_path
-                       assert_equal '16', adp.info.lastrev.revision
+                       assert_equal '24', adp.info.lastrev.revision
                        assert_equal '4cddb4e45f52',adp.info.lastrev.scmid
                      end
                    end
                    def test_diff_made_by_revision
                      if @diff_c_support
-                       [16, '16', '4cddb4e45f52'].each do |r1|
+                       [24, '24', '4cddb4e45f52'].each do |r1|
                          diff1 = @adapter.diff(nil, r1)
                          assert_equal 5, diff1.size
                          buf = diff1[4].gsub(/\r\n|\r|\n/, "")
                    end
                    def test_tags
-                     assert_equal ['tag_test.00', 'tag-init-revision'], @adapter.tags
+                     assert_equal [@tag_char_1, 'tag_test.00', 'tag-init-revision'], @adapter.tags
                    end
                    def test_tagmap
-                     tm = { 'tag_test.00'       => '6987191f453a',
-                            'tag-init-revision' => '0885933ad4f6' }
+                     tm = {
+                       @tag_char_1         => 'adf805632193',
+                       'tag_test.00'       => '6987191f453a',
+                       'tag-init-revision' => '0885933ad4f6',
+                       }
                      assert_equal tm, @adapter.tagmap
                    end
                    def test_branches
-                     assert_equal ['default', 'branch (1)[2]&,%.-3_4', 'test-branch-00'],
+                     assert_equal ['default', @branch_char_1,
+                                   'test_branch.latin-1', 'branch (1)[2]&,%.-3_4', 'test-branch-00'],
-                                  @adapter.branches
                    end
                    def test_branchmap
-                     bm = { 'default'               => '4cddb4e45f52',
+                     bm = {
+                        'default'               => '4cddb4e45f52',
+                        @branch_char_1          => 'c8d3e4887474',
+                        'test_branch.latin-1'   => 'c2ffe7da686a',
-                            'branch (1)[2]&,%.-3_4' => '933ca60293d7',
-                            'test-branch-00'        => '3a330eb32958' }
+                        'test-branch-00'        => '3a330eb32958'
+                      }
                      assert_equal bm, @adapter.branchmap
                    end

test/unit/repository_mercurial_test.rb +9 -5

                def setup
                  @project = Project.find(3)
-                 @repository = Repository::Mercurial.create(:project => @project, :url => REPOSITORY_PATH)
+                 @repository = Repository::Mercurial.create(
+                                   :project => @project,
+                                   :url     => REPOSITORY_PATH,
+                                   :path_encoding => 'ISO-8859-1'
+                                   )
                  assert @repository
                end
                  def test_fetch_changesets_from_scratch
                    @repository.fetch_changesets
                    @repository.reload
-                   assert_equal 17, @repository.changesets.count
-                   assert_equal 25, @repository.changes.count
+                   assert_equal 25, @repository.changesets.count
+                   assert_equal 32, @repository.changes.count
                    assert_equal "Initial import.\nThe repository contains 3 files.",
                                 @repository.changesets.find_by_revision('0').comments
                  end
                    assert_equal 3, @repository.changesets.count
                    @repository.fetch_changesets
-                   assert_equal 17, @repository.changesets.count
+                   assert_equal 25, @repository.changesets.count
                  end
                  def test_isodatesec
                    @repository.fetch_changesets
                    @repository.reload
                    changesets = @repository.latest_changesets('README', nil)
-                   assert_equal %w|8 6 1 0|, changesets.collect(&:revision)
+                   assert_equal %w|17 8 6 1 0|, changesets.collect(&:revision)
                    path = 'sql_escape/percent%dir/percent%file1.txt'
                    changesets = @repository.latest_changesets(path, nil)

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