fix test mocks, and revert basename changes

Author: Swatinem

graphql_api/tests/test_branch.py

@@ -154,6 +154,11 @@ class MockSession(object):
     pass
 
 
+class MockFile:
+    def __init__(self, name: str):
+        self.name = name
+
+
 class MockReport(object):
     def __init__(self):
         self.sessions = {1: MockSession()}
@@ -171,6 +176,10 @@ def files(self):
             "folder/subfolder/fileD.py",
         ]
 
+    def __iter__(self):
+        for name in self.files:
+            yield MockFile(name)
+
     @property
     def flags(self):
         return {"flag-a": MockFlag()}
@@ -774,11 +783,9 @@ def test_fetch_path_contents_component_filter_missing_coverage(
     @patch("services.components.component_filtered_report")
     @patch("services.components.commit_components")
     @patch("shared.reports.api_report_service.build_report_from_commit")
-    @patch("services.report.files_in_sessions")
     def test_fetch_path_contents_component_filter_has_coverage(
-        self, session_files_mock, report_mock, commit_components_mock, filtered_mock
+        self, report_mock, commit_components_mock, filtered_mock
     ):
-        session_files_mock.return_value = MockReport().files
         components = ["Global"]
         variables = {
             "org": self.org.username,

services/path.py

@@ -98,7 +98,7 @@ def relative_path(self) -> str:
         if not self.prefix:
             return self.full_path
         else:
-            return self.full_path.replace(f"{self.prefix}/", "", 1)
+            return self.full_path.removeprefix(f"{self.prefix}/")
 
     @property
     def is_file(self) -> bool:
@@ -111,9 +111,9 @@ def basename(self) -> str:
         The base path name (including the prefix).  For example, if `full_path`
         is `a/b/c/d.txt` and `prefix` is `a/b` then this method would return `a/b/c`.
         """
-        name = self.full_path.rsplit("/", 1)[0]
-        if name == self.prefix:
-            return self.full_path
+        name = self.relative_path.split("/", 1)[0]
+        if self.prefix:
+            return f"{self.prefix}/{name}"
         else:
             return name