Skip to content

Commit ae075c2

Browse files
committed
[#1570] remove multi-browser support for playwright tests
- the functionality will be re-implemented later on via a test matrix in GH actions
1 parent 93259ef commit ae075c2

File tree

10 files changed

+26
-12
lines changed

10 files changed

+26
-12
lines changed

.github/workflows/ci.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,11 @@ jobs:
7373
python src/manage.py collectstatic --noinput --link
7474
coverage run \
7575
--concurrency=multiprocessing \
76-
--parallel-mode \
7776
src/manage.py test src \
7877
--parallel \
79-
--exclude-tag no-parallel
78+
--exclude-tag=elastic
8079
coverage run src/manage.py test src --tag no-parallel
8180
coverage combine
82-
coverage report
8381
8482
env:
8583
DJANGO_SETTINGS_MODULE: open_inwoner.conf.ci

src/open_inwoner/accounts/tests/test_action_views.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from django.contrib.messages import get_messages
55
from django.core.files.uploadedfile import SimpleUploadedFile
6-
from django.test import override_settings, tag
6+
from django.test import override_settings
77
from django.urls import reverse
88
from django.utils.translation import gettext as _
99

@@ -314,7 +314,10 @@ def test_action_status_not_your_action(self):
314314
self.assertEqual(response.status_code, 404)
315315

316316

317+
<<<<<<< HEAD
317318
@tag("e2e")
319+
=======
320+
>>>>>>> 3cf095c4 ([#1570] remove multi-browser support for playwright tests)
318321
@override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
319322
@patch("open_inwoner.configurations.models.SiteConfiguration.get_solo")
320323
class ActionsPlaywrightTests(PlaywrightSyncLiveServerTestCase):

src/open_inwoner/accounts/tests/test_inbox_page.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from unittest import skip
22

3-
from django.test import override_settings, tag
3+
from django.test import override_settings
44
from django.urls import reverse
55
from django.utils.translation import ugettext_lazy as _
66

@@ -230,7 +230,10 @@ def test_file_cannot_be_uploaded_when_sharing_disabled(self):
230230
)
231231

232232

233+
<<<<<<< HEAD
233234
@tag("e2e")
235+
=======
236+
>>>>>>> 3cf095c4 ([#1570] remove multi-browser support for playwright tests)
234237
@override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
235238
class InboxPagePlaywrightTests(PlaywrightSyncLiveServerTestCase):
236239
@classmethod

src/open_inwoner/cms/cases/tests/test_htmx.py

+7
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
DOCUMENTEN_ROOT,
3333
ZAKEN_ROOT,
3434
)
35+
<<<<<<< HEAD
3536
from open_inwoner.utils.test import (
3637
ClearCachesMixin,
3738
DisableRequestLogMixin,
@@ -42,6 +43,12 @@
4243

4344

4445
@tag("e2e")
46+
=======
47+
from open_inwoner.utils.test import ClearCachesMixin, paginated_response
48+
from open_inwoner.utils.tests.playwright import PlaywrightSyncLiveServerTestCase
49+
50+
51+
>>>>>>> 3cf095c4 ([#1570] remove multi-browser support for playwright tests)
4552
@requests_mock.Mocker()
4653
@override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
4754
class CasesPlaywrightTests(

src/open_inwoner/plans/tests/test_views.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from django.contrib.messages import get_messages
44
from django.core import mail
5-
from django.test import override_settings, tag
5+
from django.test import override_settings
66
from django.urls import reverse
77
from django.utils.translation import ugettext as _
88

@@ -1136,7 +1136,10 @@ def test_plan_contact_new_count(self):
11361136
self.assertEqual(len(links), 1)
11371137

11381138

1139+
<<<<<<< HEAD
11391140
@tag("e2e")
1141+
=======
1142+
>>>>>>> 3cf095c4 ([#1570] remove multi-browser support for playwright tests)
11401143
@override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
11411144
class PlanActionStatusPlaywrightTests(ActionsPlaywrightTests):
11421145
def setUp(self) -> None:

src/open_inwoner/search/tests/test_feedback.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from .utils import ESMixin
1717

1818

19-
@tag("no-parallel")
19+
@tag("elastic")
2020
class TestFeedbackFunctionality(ESMixin, WebTest):
2121
def setUp(self):
2222
self.user = UserFactory()

src/open_inwoner/search/tests/test_logging.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from .utils import ESMixin
1313

1414

15-
@tag("no-parallel")
15+
@tag("elastic")
1616
@freeze_time("2021-10-18 13:00:00")
1717
class TestLogging(ESMixin, WebTest):
1818
def test_search_query_of_logged_in_user_is_logged(self):

src/open_inwoner/search/tests/test_page.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from .utils import ESMixin
1515

1616

17-
@tag("no-parallel")
17+
@tag("elastic")
1818
@override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
1919
class SearchPageTests(ESMixin, WebTest):
2020
url = reverse_lazy("search:search")

src/open_inwoner/search/tests/test_search_autocomplete.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from .utils import ESMixin
77

88

9-
@tag("no-parallel")
9+
@tag("elastic")
1010
class AutocompleteTests(ESMixin, TestCase):
1111
def test_autocomplete_on_name(self):
1212
ProductFactory.create(name="Name", keywords=["Keyword"])

src/open_inwoner/search/tests/test_search_products.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from .utils import ESMixin
1414

1515

16-
@tag("no-parallel")
16+
@tag("elastic")
1717
class SearchQueryTests(ESMixin, TestCase):
1818
def setUp(self):
1919
super().setUp()
@@ -84,7 +84,7 @@ def test_search_product_with_typo(self):
8484
self.assertEqual(int(results[0].meta.id), self.product1.id)
8585

8686

87-
@tag("no-parallel")
87+
@tag("elastic")
8888
class SearchFacetTests(ESMixin, TestCase):
8989
def setUp(self):
9090
super().setUp()

0 commit comments

Comments
 (0)