de-branch test

adlius · Sep 4, 2024 · 4f85155 · 4f85155
1 parent 70e19d4
commit 4f85155
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/addons/base/tests/views.py b/addons/base/tests/views.py
@@ -22,6 +22,14 @@
 
 class OAuthAddonAuthViewsTestCaseMixin(OAuthAddonTestCaseMixin):
 
+    def setUp(self):
+
+        super().setUp()
+        if self.Provider._oauth_version == 1:
+            self.expected_oauth_callback_url_path = '/v1/oauth1/callback'
+        elif self.Provider._oauth_version == 2 :
+            self.expected_oauth_callback_url_path = '/v1/oauth2/callback'
+
     @property
     def ADDON_SHORT_NAME(self):
         raise NotImplementedError()
@@ -78,10 +86,7 @@ def test_oauth_finish_enable_gv(self, mock_requests_get):
         gv_callback_url = mock_requests_get.call_args[0][0]
         parsed_callback_url = urlparse(gv_callback_url)
         assert parsed_callback_url.netloc == urlparse(GRAVYVALET_URL).netloc
-        if self.Provider._oauth_version == 1:
-            assert parsed_callback_url.path == '/v1/oauth1/callback'
-        elif self.Provider._oauth_version == 2:
-            assert parsed_callback_url.path == '/v1/oauth2/callback'
+        assert parsed_callback_url.path == self.expected_oauth_callback_url_path
         assert dict(parse_qsl(parsed_callback_url.query)) == query_params
 
     def test_delete_external_account(self):