Fix our build_url patching in our unit test helpers

sigmavirus24 · sigmavirus24 · commit ea08bdc4ac4a · 2018-03-21T15:41:39.000-05:00
diff --git a/tests/unit/helper.py b/tests/unit/helper.py
@@ -44,15 +44,29 @@ def build_url(self, *args, **kwargs):
     return github3.session.GitHubSession().build_url(*args, **kwargs)
 
 
-class UnitHelper(unittest.TestCase):
+def enterprise_build_url(self, *args, **kwargs)
+    """A function to proxy to the actual GitHubSession#build_url method."""
+    # We want to assert what is happening with the actual calls to the
+    # Internet. We can proxy this.
+    return github3.session.GitHubSession().build_url(
+        *args,
+        base_url=self.enterprise_url,
+        **kwargs
+    )
+
 
+class UnitHelper(unittest.TestCase):
     """Base class for unittests."""
 
     # Sub-classes must assign the class to this during definition
     described_class = None
     # Sub-classes must also assign a dictionary to this during definition
     example_data = {}
 
+    @staticmethod
+    def get_build_url_proxy():
+        return build_url
+
     def create_mocked_session(self):
         """Use mock to auto-spec a GitHubSession and return an instance."""
         MockedSession = mock.create_autospec(github3.session.GitHubSession)
@@ -158,7 +172,7 @@ def setUp(self):
         # we can assert things about the call that will be attempted to the
         # internet
         self.old_build_url = self.described_class._build_url
-        self.described_class._build_url = build_url
+        self.described_class._build_url = self.get_build_url_proxy()
         self.instance = self.create_instance_of_described_class()
         self.after_setup()
 
@@ -239,42 +253,18 @@ def assert_requires_auth(self, func, *args, **kwargs):
 
 
 class UnitGitHubObjectHelper(UnitHelper):
-
     """Base class for GitHubObject unit tests."""
+    # TODO(sigmavirus24): delete me
 
-    def setUp(self):
-        self.session = None
-        self.instance = self.create_instance_of_described_class()
-        # Proxy the build_url method to the class so it can build the URL and
-        # we can assert things about the call that will be attempted to the
-        # internet
-        self.described_class._build_url = build_url
-        self.after_setup()
-        pass
+    pass
 
 
 @pytest.mark.usefixtures('enterprise_url')
 class UnitGitHubEnterpriseHelper(UnitHelper):
 
-    def build_url(self, *args, **kwargs):
-        """A function to proxy to the actual GitHubSession#build_url method."""
-        # We want to assert what is happening with the actual calls to the
-        # Internet. We can proxy this.
-        return github3.session.GitHubSession().build_url(
-            *args,
-            base_url=self.enterprise_url,
-            **kwargs
-        )
-
-    def setUp(self):
-        self.session = self.create_session_mock()
-        self.instance = github3.GitHubEnterprise(self.enterprise_url)
-        self.instance.session = self.session
-        # Proxy the build_url method to the class so it can build the URL and
-        # we can assert things about the call that will be attempted to the
-        # internet
-        self.instance._build_url = self.build_url
-        self.after_setup()
+    @staticmethod
+    def get_build_url_proxy():
+        return enterprise_build_url
 
 
 is_py3 = (3, 0) <= sys.version_info < (4, 0)
