From 00ada5db8ce043522f47614c76d12975200b9a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20S=C3=A1nchez=20de=20Le=C3=B3n=20Peque?= Date: Wed, 4 Oct 2017 19:05:20 +0200 Subject: [PATCH] Use `verbose_name` for stable tag commit name --- readthedocs/builds/models.py | 5 +++++ readthedocs/rtd_tests/tests/test_version_commit_name.py | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/readthedocs/builds/models.py b/readthedocs/builds/models.py index a91222594cf..24d431d7a84 100644 --- a/readthedocs/builds/models.py +++ b/readthedocs/builds/models.py @@ -120,6 +120,11 @@ def commit_name(self): # the underlying commits. if self.identifier.startswith('origin/'): return self.identifier[len('origin/'):] + if self.type == TAG: + # If this version is a tag, the verbose_name will contain the + # actual name. A tag would contain the hash in indentifier, + # which is not as pretty as the actual tag name. + return self.verbose_name return self.identifier # By now we must have handled all special versions. diff --git a/readthedocs/rtd_tests/tests/test_version_commit_name.py b/readthedocs/rtd_tests/tests/test_version_commit_name.py index e9ffd833ee7..f37896faf5c 100644 --- a/readthedocs/rtd_tests/tests/test_version_commit_name.py +++ b/readthedocs/rtd_tests/tests/test_version_commit_name.py @@ -45,9 +45,8 @@ def test_branch_with_name_stable(self): def test_stable_version_tag(self): version = new(Version, identifier=u'3d92b728b7d7b842259ac2020c2fa389f13aff0d', - slug=STABLE, verbose_name=STABLE, type=TAG) - self.assertEqual(version.commit_name, - u'3d92b728b7d7b842259ac2020c2fa389f13aff0d') + slug=STABLE, verbose_name=u'stable_verbose', type=TAG) + self.assertEqual(version.commit_name, u'stable_verbose') def test_hg_latest_branch(self): hg_project = get(Project, repo_type=REPO_TYPE_HG)