test: harden repr assertions and sponsor_info handling

Signed-off-by: Venu Vardhan Reddy Tekula <venuvrtekula@gmail.com>

Author: vchrombie

contributor_stats.py

@@ -59,7 +59,8 @@ def __repr__(self) -> str:
             f"contributor_stats(username={self.username}, "
             f"new_contributor={self.new_contributor}, "
             f"avatar_url={self.avatar_url}, "
-            f"contribution_count={self.contribution_count}, commit_url={self.commit_url})"
+            f"contribution_count={self.contribution_count}, "
+            f"commit_url={self.commit_url}, "
             f"sponsor_info={self.sponsor_info})"
         )
 

contributors.py

@@ -67,7 +67,7 @@ def main():
             )
 
     # Get sponsor information on the contributor
-    if sponsor_info == "true":
+    if sponsor_info:
         contributors = contributor_stats.get_sponsor_information(
             contributors, token, ghe
         )

test_contributor_stats.py

@@ -47,14 +47,15 @@ def test_init(self):
 
     def test_repr(self):
         """Test the __repr__ method includes key fields."""
-        representation = repr(self.contributor)
-        self.assertIn("contributor_stats(username=zkoppert", representation)
-        self.assertIn("new_contributor=False", representation)
-        self.assertIn(
-            "avatar_url=https://avatars.githubusercontent.com/u/29484535?v=4",
-            representation,
+        expected = (
+            "contributor_stats(username=zkoppert, "
+            "new_contributor=False, "
+            "avatar_url=https://avatars.githubusercontent.com/u/29484535?v=4, "
+            "contribution_count=1261, "
+            "commit_url=commit_url5, "
+            "sponsor_info=)"
         )
-        self.assertIn("contribution_count=1261", representation)
+        self.assertEqual(repr(self.contributor), expected)
 
     def test_merge_contributors(self):
         """

test_contributors.py

@@ -6,7 +6,6 @@
 
 import contributors as contributors_module
 from contributor_stats import ContributorStats
-from contributors import get_all_contributors, get_contributors
 
 
 class TestContributors(unittest.TestCase):
@@ -27,7 +26,7 @@ def test_get_contributors(self, mock_contributor_stats):
         mock_repo.contributors.return_value = [mock_user]
         mock_repo.full_name = "owner/repo"
 
-        get_contributors(mock_repo, "2022-01-01", "2022-12-31", "")
+        contributors_module.get_contributors(mock_repo, "2022-01-01", "2022-12-31", "")
 
         mock_contributor_stats.assert_called_once_with(
             "user",
@@ -60,7 +59,7 @@ def test_get_all_contributors_with_organization(self, mock_get_contributors):
         ]
         ghe = ""
 
-        result = get_all_contributors(
+        result = contributors_module.get_all_contributors(
             "org", "", "2022-01-01", "2022-12-31", mock_github_connection, ghe
         )
 
@@ -99,7 +98,7 @@ def test_get_all_contributors_with_repository(self, mock_get_contributors):
         ]
         ghe = ""
 
-        result = get_all_contributors(
+        result = contributors_module.get_all_contributors(
             "", ["owner/repo"], "2022-01-01", "2022-12-31", mock_github_connection, ghe
         )
 
@@ -140,7 +139,7 @@ def test_get_contributors_skip_users_with_no_commits(self, mock_contributor_stat
         mock_repo.get_commits.side_effect = StopIteration
         ghe = ""
 
-        get_contributors(mock_repo, "2022-01-01", "2022-12-31", ghe)
+        contributors_module.get_contributors(mock_repo, "2022-01-01", "2022-12-31", ghe)
 
         # Note that only user is returned and user2 is not returned here because there were no commits in the date range
         mock_contributor_stats.assert_called_once_with(
@@ -168,7 +167,7 @@ def test_get_contributors_skip_bot(self, mock_contributor_stats):
         mock_repo.get_commits.side_effect = StopIteration
         ghe = ""
 
-        get_contributors(mock_repo, "2022-01-01", "2022-12-31", ghe)
+        contributors_module.get_contributors(mock_repo, "2022-01-01", "2022-12-31", ghe)
 
         # Note that only user is returned and user2 is not returned here because there were no commits in the date range
         mock_contributor_stats.isEmpty()
@@ -189,7 +188,7 @@ def test_get_contributors_no_commit_end_date(self, mock_contributor_stats):
         mock_repo.get_commits.side_effect = StopIteration
         ghe = ""
 
-        get_contributors(mock_repo, "2022-01-01", "", ghe)
+        contributors_module.get_contributors(mock_repo, "2022-01-01", "", ghe)
 
         # Note that only user is returned and user2 is not returned here because there were no commits in the date range
         mock_contributor_stats.assert_called_once_with(
@@ -212,7 +211,9 @@ def test_get_contributors_skips_when_no_commits_in_range(self):
         mock_repo.full_name = "owner/repo"
         mock_repo.commits.return_value = iter([])
 
-        result = get_contributors(mock_repo, "2022-01-01", "2022-12-31", "")
+        result = contributors_module.get_contributors(
+            mock_repo, "2022-01-01", "2022-12-31", ""
+        )
 
         self.assertEqual(result, [])
 
@@ -230,7 +231,9 @@ def __iter__(self):
         mock_repo.contributors.return_value = BoomIterable()
 
         with patch("builtins.print") as mock_print:
-            result = get_contributors(mock_repo, "2022-01-01", "2022-12-31", "")
+            result = contributors_module.get_contributors(
+                mock_repo, "2022-01-01", "2022-12-31", ""
+            )
 
         self.assertIsNone(result)
         mock_print.assert_any_call(
@@ -251,7 +254,7 @@ def test_main_runs_under_main_guard(self):
             "",
             "2022-01-01",
             "2022-12-31",
-            "true",
+            True,
             False,
         )