Merge pull request #3 from code-yeongyu/feature/fix-tests

code-yeongyu · web-flow · commit d81412be42a1 · 2023-04-16T00:12:26.000+09:00
Fix tests that are not passing
diff --git a/revChatGPTAuth/openai_cookie_parser.py b/revChatGPTAuth/openai_cookie_parser.py
@@ -7,7 +7,7 @@
 
 class OpenAICookieParser:
 
-    SUPPORTED_BROWSERS = [browser.value for browser in SupportedBrowser]
+    SUPPORTED_BROWSERS: list[str] = [browser.value for browser in SupportedBrowser]
 
     def __init__(self, browser_name: SupportedBrowser):
         self.BROWSER_NAME = browser_name
diff --git a/revChatGPTAuth/test/test_chatgpt_access_token_parser.py b/revChatGPTAuth/test/test_chatgpt_access_token_parser.py
@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock, patch
 
 from revChatGPTAuth.chatgpt_access_token_parser import ChatGPTAccessTokenParser, get_access_token
+from revChatGPTAuth.supported_browser import SupportedBrowser
 
 
 class TestChatGPTAccessTokenParser:
@@ -24,7 +25,7 @@ def test_get_openai_chatgpt_access_token(
         mock_response.json.return_value = {'accessToken': expected_access_token}
         mock_httpx_get.return_value = mock_response
 
-        chatgpt_access_token_parser = ChatGPTAccessTokenParser('chrome')
+        chatgpt_access_token_parser = ChatGPTAccessTokenParser(SupportedBrowser.CHROME)
 
         # when
         access_token = chatgpt_access_token_parser.get_access_token()
@@ -43,11 +44,11 @@ def test_get_openai_chatgpt_access_token(
 def test_get_access_token(mock_chatgpt_access_token_parser: MagicMock) -> None:
     # given
     expected_access_token = 'access_token'
-    mock_chatgpt_access_token_parser.return_value.get_openai_chatgpt_access_token.return_value = expected_access_token
+    mock_chatgpt_access_token_parser.return_value.get_access_token.return_value = expected_access_token
 
     # when
-    access_token = get_access_token('chrome')
+    access_token = get_access_token(SupportedBrowser.CHROME)
 
     # then
-    mock_chatgpt_access_token_parser.assert_called_once_with('chrome')
+    mock_chatgpt_access_token_parser.assert_called_once_with(SupportedBrowser.CHROME)
     assert access_token == expected_access_token
diff --git a/revChatGPTAuth/test/test_openai_cookie_parser.py b/revChatGPTAuth/test/test_openai_cookie_parser.py
@@ -1,33 +1,29 @@
-from http.cookiejar import Cookie
+from http.cookiejar import Cookie, CookieJar
 from unittest.mock import MagicMock, patch
 
 import pytest
-from yt_dlp.cookies import SUPPORTED_BROWSERS
-from yt_dlp.utils import YoutubeDLCookieJar
 
 from revChatGPTAuth.openai_cookie_parser import OpenAICookieParser
+from revChatGPTAuth.supported_browser import SupportedBrowser
 
 
 class TestOpenAICookieParser:
-
-    def test_init_with_unsupported_browser(self):
-        with pytest.raises(ValueError):
-            OpenAICookieParser(browser_name='Internet Explorer Holy Shit')
+    SUPPORTED_BROWSERS = [SupportedBrowser(browser_name) for browser_name in OpenAICookieParser.SUPPORTED_BROWSERS]
 
     @pytest.mark.parametrize('supported_browser', SUPPORTED_BROWSERS)
-    def test_init_with_supported_browser(self, supported_browser: str):
+    def test_init_with_supported_browser(self, supported_browser: SupportedBrowser):
         parser = OpenAICookieParser(browser_name=supported_browser)
         assert parser.BROWSER_NAME == supported_browser
 
     @pytest.mark.parametrize('supported_browser', SUPPORTED_BROWSERS)
-    @patch('revChatGPTAuth.openai_cookie_parser.extract_cookies_from_browser')
+    @patch('revChatGPTAuth.openai_cookie_parser.load_cookies')
     def test_parse_cookie_with_supported_browser(
         self,
-        mock_extract_cookies: MagicMock,
-        supported_browser: str,
+        mock_load_cookies: MagicMock,
+        supported_browser: SupportedBrowser,
     ):
         # given
-        cookie_jar = YoutubeDLCookieJar()
+        cookie_jar = CookieJar()
         cookie_jar.set_cookie(
             Cookie(
                 version=0,
@@ -85,7 +81,7 @@ def test_parse_cookie_with_supported_browser(
                 comment_url=None,
                 rest={},
             ))
-        mock_extract_cookies.return_value = cookie_jar
+        mock_load_cookies.return_value = cookie_jar
         parser = OpenAICookieParser(browser_name=supported_browser)
 
         # when
