tests: Remove unittest usage (#1290)

tests/form_elements.py

@@ -3,7 +3,6 @@
 # license that can be found in the LICENSE file.
 import re
 import time
-import unittest
 
 import pytest
 
@@ -12,8 +11,8 @@
 
 def skip_if_zope(f):
     def wrapper(self, *args, **kwargs):
-        if self.__class__.__name__ == "ZopeTestBrowserDriverTest":
-            return unittest.skip("skipping this test for zope testbrowser")
+        if self.__class__.__name__ == "TestZopeTestBrowserDriver":
+            return pytest.skip("skipping this test for zope testbrowser")
         else:
             f(self, *args, **kwargs)
 
@@ -22,8 +21,8 @@ def wrapper(self, *args, **kwargs):
 
 def skip_if_django(f):
     def wrapper(self, *args, **kwargs):
-        if self.__class__.__name__ == "DjangoClientDriverTest":
-            return unittest.skip("skipping this test for django")
+        if self.__class__.__name__ == "TestDjangoClientDriver":
+            return pytest.skip("skipping this test for django")
         else:
             f(self, *args, **kwargs)
 

tests/get_browser.py

@@ -41,13 +41,15 @@ def get_browser(browser_name, config=None, **kwargs):
             wait_time=0.1,
             client_SERVER_NAME=components.hostname,
             client_SERVER_PORT=components.port,
+            **kwargs,
         )
 
     elif browser_name == "flask":
-        return Browser("flask", app=app, wait_time=0.1)
+        _app = kwargs.pop("app", app)
+        return Browser("flask", app=_app, **kwargs)
 
     elif browser_name == "zope.testbrowser":
-        return Browser("zope.testbrowser", wait_time=0.1)
+        return Browser("zope.testbrowser", **kwargs)
 
     elif browser_name == "edge":
         # Github Actions Windows EdgeDriver path

tests/test_djangoclient.py

@@ -4,7 +4,6 @@
 import os
 import sys
 import time
-import unittest
 
 import django
 import pytest
@@ -22,7 +21,7 @@
 django.setup()
 
 
-class DjangoClientDriverTest(BaseBrowserTests, unittest.TestCase):
+class TestDjangoClientDriver(BaseBrowserTests):
     @pytest.fixture(autouse=True, scope="class")
     def setup_browser(self, request):
         request.cls.browser = get_browser("django")
@@ -150,21 +149,18 @@ def test_cookies_extra_parameters(self):
         assert timestamp == cookie["expires"]
 
 
-class DjangoClientDriverTestWithCustomHeaders(unittest.TestCase):
-    @classmethod
-    def setUpClass(cls):
+class TestDjangoClientDriverWithCustomHeaders:
+    @pytest.fixture(autouse=True, scope="class")
+    def setup_browser(self, request):
         custom_headers = {
             "X-Splinter-Customheaders-1": "Hello",
             "X-Splinter-Customheaders-2": "Bye",
         }
-        cls.browser = Browser("django", custom_headers=custom_headers)
+        request.cls.browser = get_browser("django", custom_headers=custom_headers)
+        request.addfinalizer(request.cls.browser.quit)
 
     def test_create_a_phantomjs_with_custom_headers(self):
         self.browser.visit(EXAMPLE_APP + "headers")
         assert self.browser.is_text_present("X-Splinter-Customheaders-1: Hello")
 
         assert self.browser.is_text_present("X-Splinter-Customheaders-2: Bye")
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.browser.quit()

tests/test_flaskclient.py

@@ -3,28 +3,26 @@
 # license that can be found in the LICENSE file.
 import os
 import time
-import unittest
 
 import pytest
 
 from .base import BaseBrowserTests
+from .base import get_browser
 from .fake_webapp import app
 from .fake_webapp import EXAMPLE_APP
 from splinter import Browser
 
 
-class FlaskClientDriverTest(BaseBrowserTests, unittest.TestCase):
-    @classmethod
-    def setUpClass(cls):
-        cls.browser = Browser("flask", app=app, wait_time=0.1)
+class TestFlaskClientDriver(BaseBrowserTests):
+    @pytest.fixture(autouse=True, scope="class")
+    def setup_browser(self, request):
+        request.cls.browser = get_browser("flask", app=app, wait_time=0.1)
+        request.addfinalizer(request.cls.browser.quit)
 
-    def setUp(self):
+    @pytest.fixture(autouse=True)
+    def visit_example_app(self, request):
         self.browser.visit(EXAMPLE_APP)
 
-    @classmethod
-    def tearDownClass(cls):
-        cls.browser.quit()
-
     def test_should_support_with_statement(self):
         with Browser("flask", app=app) as internet:
             assert internet is not None
@@ -174,20 +172,17 @@ def test_cookies_extra_parameters(self):
         assert timestamp == int(cookie.expires.timestamp())
 
 
-class FlaskClientDriverTestWithCustomHeaders(unittest.TestCase):
-    @classmethod
-    def setUpClass(cls):
+class TestFlaskClientDriverWithCustomHeaders:
+    @pytest.fixture(autouse=True, scope="class")
+    def setup_browser(self, request):
         custom_headers = {
             "X-Splinter-Customheaders-1": "Hello",
             "X-Splinter-Customheaders-2": "Bye",
         }
-        cls.browser = Browser("flask", app=app, custom_headers=custom_headers)
+        request.cls.browser = get_browser("flask", app=app, wait_time=0.1, custom_headers=custom_headers)
+        request.addfinalizer(request.cls.browser.quit)
 
     def test_create_a_flask_client_with_custom_headers(self):
         self.browser.visit(EXAMPLE_APP + "headers")
         assert self.browser.is_text_present("X-Splinter-Customheaders-1: Hello")
         assert self.browser.is_text_present("X-Splinter-Customheaders-2: Bye")
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.browser.quit()

tests/test_request_handler.py

@@ -1,17 +1,19 @@
 # Copyright 2012 splinter authors. All rights reserved.
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
-import unittest
+import pytest
 
 from splinter.request_handler.status_code import StatusCode
 
 
-class RequestHandlerTestCase(unittest.TestCase):
-    def setUp(self):
-        self.status_code = StatusCode(200, "OK")
+@pytest.fixture()
+def valid_status_code():
+    return StatusCode(200, "OK")
 
-    def test_should_receive_an_url_and_get_a_success_response(self):
-        assert self.status_code.is_success()
 
-    def test_should_compare_app_index_with_404_and_get_false(self):
-        assert self.status_code != 404
+def test_should_receive_an_url_and_get_a_success_response(valid_status_code):
+    assert valid_status_code.is_success()
+
+
+def test_should_compare_app_index_with_404_and_get_false(valid_status_code):
+    assert valid_status_code != 404

tests/test_webdriver_chrome.py

@@ -1,16 +1,14 @@
 # Copyright 2013 splinter authors. All rights reserved.
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
-import unittest
-
 import pytest
 
 from .base import get_browser
 from .base import WebDriverTests
 from .fake_webapp import EXAMPLE_APP
 
 
-class ChromeBrowserTest(WebDriverTests, unittest.TestCase):
+class TestChromeBrowser(WebDriverTests):
     @pytest.fixture(autouse=True, scope="class")
     def setup_browser(self, request):
         request.cls.browser = get_browser("chrome", fullscreen=False)
@@ -22,7 +20,7 @@ def visit_example_app(self, request):
         self.browser.visit(EXAMPLE_APP)
 
 
-class ChromeBrowserFullscreenTest(WebDriverTests, unittest.TestCase):
+class TestChromeBrowserFullscreen(WebDriverTests):
     @pytest.fixture(autouse=True, scope="class")
     def setup_browser(self, request):
         request.cls.browser = get_browser("chrome", fullscreen=True)

tests/test_webdriver_edge_chromium.py

@@ -1,16 +1,14 @@
 # Copyright 2021 splinter authors. All rights reserved.
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
-import unittest
-
 import pytest
 
 from .base import get_browser
 from .base import WebDriverTests
 from .fake_webapp import EXAMPLE_APP
 
 
-class EdgeChromiumBrowserTest(WebDriverTests, unittest.TestCase):
+class TestEdgeChromiumBrowser(WebDriverTests):
     @pytest.fixture(autouse=True, scope="class")
     def setup_browser(self, request):
         request.cls.browser = get_browser("edge", fullscreen=False)
@@ -22,7 +20,7 @@ def visit_example_app(self, request):
         self.browser.visit(EXAMPLE_APP)
 
 
-class EdgeChromiumBrowserFullscreenTest(WebDriverTests, unittest.TestCase):
+class TestEdgeChromiumBrowserFullscreen(WebDriverTests):
     @pytest.fixture(autouse=True, scope="class")
     def setup_browser(self, request):
         request.cls.browser = get_browser("edge", fullscreen=True)

tests/test_webdriver_firefox.py

@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 import os
-import unittest
 
 import pytest
 
@@ -12,7 +11,7 @@
 from splinter.config import Config
 
 
-class FirefoxBrowserTest(WebDriverTests, unittest.TestCase):
+class TestFirefoxBrowser(WebDriverTests):
     @pytest.fixture(autouse=True, scope="class")
     def setup_browser(self, request):
         request.cls.browser = get_browser("firefox", fullscreen=False)
@@ -23,7 +22,7 @@ def visit_example_app(self, request):
         self.browser.visit(EXAMPLE_APP)
 
 
-class FirefoxBrowserFullScreenTest(WebDriverTests, unittest.TestCase):
+class TestFirefoxBrowserFullScreen(WebDriverTests):
     @pytest.fixture(autouse=True, scope="class")
     def setup_browser(self, request):
         request.cls.browser = get_browser("firefox", fullscreen=True)

tests/test_webdriver_remote.py

@@ -1,7 +1,6 @@
 # Copyright 2013 splinter authors. All rights reserved.
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
-import unittest
 from unittest.mock import patch
 from urllib.request import urlopen
 
@@ -22,13 +21,14 @@ def selenium_server_is_running():
     return "WebDriver Hub" in page_contents
 
 
-class RemoteBrowserFirefoxTest(WebDriverTests, unittest.TestCase):
+class TestRemoteBrowserFirefox(WebDriverTests):
     @pytest.fixture(autouse=True, scope="class")
     def setup_browser(self, request):
         request.cls.browser = Browser("remote", browser="firefox")
         request.addfinalizer(request.cls.browser.quit)
 
-    def setUp(self):
+    @pytest.fixture(autouse=True)
+    def visit_example_app(self, request):
         self.browser.visit(EXAMPLE_APP)
 
     def test_support_with_statement(self):
@@ -41,13 +41,14 @@ def test_should_be_able_to_change_user_agent(self):
         pass
 
 
-class RemoteBrowserChromeTest(WebDriverTests, unittest.TestCase):
+class TestRemoteBrowserChrome(WebDriverTests):
     @pytest.fixture(autouse=True, scope="class")
     def setup_browser(self, request):
         request.cls.browser = Browser("remote", browser="chrome")
         request.addfinalizer(request.cls.browser.quit)
 
-    def setUp(self):
+    @pytest.fixture(autouse=True)
+    def visit_example_app(self, request):
         self.browser.visit(EXAMPLE_APP)
 
     def test_support_with_statement(self):
@@ -61,7 +62,7 @@ def test_should_be_able_to_change_user_agent(self):
 
 
 @pytest.mark.macos
-class RemoteBrowserSafariTest(WebDriverTests, unittest.TestCase):
+class TestRemoteBrowserSafari(WebDriverTests):
     @pytest.fixture(autouse=True, scope="class")
     def setup_browser(self, request):
         # test with statement. It can't be used as simple test
@@ -72,7 +73,8 @@ def setup_browser(self, request):
         request.cls.browser = Browser("remote", browser="safari")
         request.addfinalizer(request.cls.browser.quit)
 
-    def setUp(self):
+    @pytest.fixture(autouse=True)
+    def visit_example_app(self, request):
         self.browser.visit(EXAMPLE_APP)
 
     def test_support_with_statement(self):

tests/test_zopetestbrowser.py

@@ -2,27 +2,25 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 import os
-import unittest
 
 import pytest
 
 from .base import BaseBrowserTests
+from .base import get_browser
 from .fake_webapp import EXAMPLE_APP
 from splinter import Browser
 
 
-class ZopeTestBrowserDriverTest(BaseBrowserTests, unittest.TestCase):
-    @classmethod
-    def setUpClass(cls):
-        cls.browser = Browser("zope.testbrowser", wait_time=0.1)
+class TestZopeTestBrowserDriver(BaseBrowserTests):
+    @pytest.fixture(autouse=True, scope="class")
+    def setup_browser(self, request):
+        request.cls.browser = get_browser("zope.testbrowser", wait_time=0.1)
+        request.addfinalizer(request.cls.browser.quit)
 
-    def setUp(self):
+    @pytest.fixture(autouse=True)
+    def visit_example_app(self, request):
         self.browser.visit(EXAMPLE_APP)
 
-    @classmethod
-    def tearDownClass(cls):
-        cls.browser.quit()
-
     def test_should_support_with_statement(self):
         with Browser("zope.testbrowser"):
             pass