github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 16:01:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Correct version comparison logic when comparing stable to beta (#10135)

Browse Source 
* FIX: Correct version comparison logic when comparing stable to beta

For example, version 1.3.0 should be considered higher than 1.3.0.beta3. So `Discourse.has_needed_version?('1.3.0', '1.3.0.beta3')` should return true

* Switch to use Gem::Version to compare versions
This commit is contained in:
David Taylor 2020-06-29 08:52:33 +01:00 committed by GitHub
parent c299d02287
commit 0edffcc47d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/version.rb
View File

@ -16,22 +16,6 @@ module Discourse
end
def self.has_needed_version?(current, needed)
current_split = current.split('.')
needed_split = needed.split('.')
(0..[current_split.size, needed_split.size].max).each do |idx|
current_str = current_split[idx] || ''
c0 = (needed_split[idx] || '').sub('beta', '').to_i
c1 = (current_str || '').sub('beta', '').to_i
# beta is less than stable
return false if current_str.include?('beta') && (c0 == 0) && (c1 > 0)
return true if c1 > c0
return false if c0 > c1
end
true
Gem::Version.new(current) >= Gem::Version.new(needed)
end
end

10
spec/components/version_spec.rb
View File

@ -30,12 +30,20 @@ describe Discourse::VERSION do
expect(Discourse.has_needed_version?('1.12.0', '2.12.5')).to eq(false)
end
it "works for beta comparisons" do
it "works for beta comparisons when current_version is beta" do
expect(Discourse.has_needed_version?('1.3.0.beta3', '1.2.9')).to eq(true)
expect(Discourse.has_needed_version?('1.3.0.beta3', '1.3.0.beta1')).to eq(true)
expect(Discourse.has_needed_version?('1.3.0.beta3', '1.3.0.beta4')).to eq(false)
expect(Discourse.has_needed_version?('1.3.0.beta3', '1.3.0')).to eq(false)
end
it "works for beta comparisons when needed_version is beta" do
expect(Discourse.has_needed_version?('1.2.0', '1.3.0.beta3')).to eq(false)
expect(Discourse.has_needed_version?('1.2.9', '1.3.0.beta3')).to eq(false)
expect(Discourse.has_needed_version?('1.3.0.beta1', '1.3.0.beta3')).to eq(false)
expect(Discourse.has_needed_version?('1.3.0.beta4', '1.3.0.beta3')).to eq(true)
expect(Discourse.has_needed_version?('1.3.0', '1.3.0.beta3')).to eq(true)
end
end
end