This commit is contained in:
Karel Picman 2017-11-03 09:28:31 +01:00
parent 0218c91c74
commit 9943abdaf4
2 changed files with 40 additions and 1 deletions

View File

@ -239,7 +239,7 @@ class DmsfFileRevision < ActiveRecord::Base
when 1
DmsfUploadHelper.increase_version(self.minor_version, 1)
when 2
0
(self.major_version < 0) ? -(' '.ord) : 0
else
self.minor_version
end

View File

@ -171,4 +171,43 @@ class DmsfFileRevisionTest < RedmineDmsf::Test::UnitTest
assert_equal 'A.0', @revision1.version
end
def test_increase_version
# 1.0 -> 1.1
@revision1.major_version = 1
@revision1.minor_version = 0
@revision1.increase_version(1)
assert_equal 1, @revision1.major_version
assert_equal 1, @revision1.minor_version
# 1.0 -> 2.0
@revision1.major_version = 1
@revision1.minor_version = 0
@revision1.increase_version(2)
assert_equal 2, @revision1.major_version
assert_equal 0, @revision1.minor_version
# 1.1 -> 2.0
@revision1.major_version = 1
@revision1.minor_version = 1
@revision1.increase_version(2)
assert_equal 2, @revision1.major_version
assert_equal 0, @revision1.minor_version
# A -> A.1
@revision1.major_version = -('A'.ord)
@revision1.minor_version = -(' '.ord)
@revision1.increase_version(1)
assert_equal -('A'.ord), @revision1.major_version
assert_equal 1, @revision1.minor_version
# A -> B
@revision1.major_version = -('A'.ord)
@revision1.minor_version = -(' '.ord)
@revision1.increase_version(2)
assert_equal -('B'.ord), @revision1.major_version
assert_equal -(' '.ord), @revision1.minor_version
# A.1 -> B
@revision1.major_version = -('A'.ord)
@revision1.minor_version = 1
@revision1.increase_version(2)
assert_equal -('B'.ord), @revision1.major_version
assert_equal -(' '.ord), @revision1.minor_version
end
end