jro_apps/redmine Commit - r12658:5e031bce4703

Merged r12929 from trunk to 2.4-stable (#16177)...

Toshi MARUYAMA -

r12658:5e031bce4703

parent child

Context file:

r12658:5e031bce4703

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

NO CONTENT: modified file, binary diff hidden

test/functional/repositories_mercurial_controller_test.rb +1 -1

               REPOSITORY_PATH = Rails.root.join('tmp/test/mercurial_repository').to_s
               CHAR_1_HEX = "\xc3\x9c"
               PRJ_ID     = 3
-              NUM_REV    = 32
+              NUM_REV    = 34
               ruby19_non_utf8_pass =
                  (RUBY_VERSION >= '1.9' && Encoding.default_external.to_s != 'UTF-8')

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

                       adp = Redmine::Scm::Adapters::MercurialAdapter.new(repo)
                       repo_path =  adp.info.root_url.gsub(/\\/, "/")
                       assert_equal REPOSITORY_PATH, repo_path
-                      assert_equal '31', adp.info.lastrev.revision
+                      assert_equal '33', adp.info.lastrev.revision
-                      assert_equal '31eeee7395c8',adp.info.lastrev.scmid
+                      assert_equal '2e6d54642923',adp.info.lastrev.scmid
                     end
                   end

test/unit/repository_mercurial_test.rb +3 -3

               include Redmine::I18n
               REPOSITORY_PATH = Rails.root.join('tmp/test/mercurial_repository').to_s
-              NUM_REV = 32
+              NUM_REV = 34
               CHAR_1_HEX = "\xc3\x9c"
               def setup
                   # with_limit
                   changesets = @repository.latest_changesets('', nil, 2)
-                  assert_equal %w|31 30|, changesets.collect(&:revision)
+                  assert_equal ["#{NUM_REV - 1}", "#{NUM_REV - 2}"], changesets.collect(&:revision)
                   # with_filepath
                   changesets = @repository.latest_changesets(
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
-                  %w|31 31eeee7395c8 31eee|.each do |r1|
+                  ["#{NUM_REV - 1}", "2e6d54642923", "2e6d5"].each do |r1|
                     changeset = @repository.find_changeset_by_name(r1)
                     assert_nil changeset.next
                   end

General Comments 0

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

No TODOs yet

	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