Skip to content

Commit

Permalink
Fix project version checking.
Browse files Browse the repository at this point in the history
  • Loading branch information
NathanW2 committed Mar 20, 2014
1 parent 70e4979 commit c9ab26d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/roam/project.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ def versiontuple(v):

min = versiontuple(roamversion)
project = versiontuple(projectversion)
# Only match major for now because API is only broken between major versions.
majormatch = min[0] == project[0]
return majormatch and (project > min or project == min)
return majormatch


def getProjects(projectpath):
Expand Down
9 changes: 7 additions & 2 deletions tests/test_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import roam

minversion = '2.0.0'
minversion = '2.0.2'

class TestVersionCheck:
def test_should_return_invalid_for_version_less_then_min(self):
Expand All @@ -16,6 +16,7 @@ def test_should_return_valid_for_version_higher_then_min(self):
assert checkversion(minversion, projectversion)

def test_should_return_valid_for_version_equal_to_min(self):
minversion = '2.0.0'
projectversion = '2.0.0'
assert checkversion(minversion, projectversion)

Expand All @@ -25,4 +26,8 @@ def test_should_handle_two_part_versions(self):

def test_should_return_valid_same_major_version(self):
projectversion = '2.0'
assert checkversion(minversion, projectversion)
assert checkversion(minversion, projectversion)

def test_should_return_valid_same_patch_version(self):
projectversion = '2.0.0'
assert checkversion(minversion, projectversion)

0 comments on commit c9ab26d

Please sign in to comment.