Merged r16059, r16060, r16064, r16072.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16106 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2016-12-20 16:02:38 +00:00
parent 21a847d01d
commit 5dd1fe1345
29 changed files with 75 additions and 50 deletions

View File

@@ -447,7 +447,11 @@ class MercurialAdapterTest < ActiveSupport::TestCase
def test_hgversion_for(hgversion, version)
@adapter.class.expects(:hgversion_from_command_line).returns(hgversion)
assert_equal version, @adapter.class.hgversion
if version
assert_equal version, @adapter.class.hgversion
else
assert_nil @adapter.class.hgversion
end
end
def test_template_path_for(version, template)