Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/coveralls-finish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Coveralls - Finish Parallel Build

on:
workflow_run:
workflows: ["Testy - Django, Playwright", "Testy - Selenium"]
workflows: ["Testy - Django, Playwright"]
types:
- completed

Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ src/django_bpp/components/bower_components/
src/django_bpp/node_modules/
src/django_bpp/wheelhouse/
node_modules/
splintershots/

.DS_Store
\#*
Expand Down
6 changes: 3 additions & 3 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ bin/ustaw-domyslne-haslo-admina.sh
- `uv run pytest --ds=django_bpp.settings.local` - Run tests with specific Django settings (rarely needed)

**Alternative make commands (these internally use `uv run pytest`):**
- `make tests-without-selenium` - Run tests excluding Selenium tests with parallelization (fast)
- `make tests-with-selenium` - Run only Selenium tests with parallelization (slow)
- `make tests-without-playwright` - Run tests excluding Playwright tests with parallelization (fast)
- `make tests-only-playwright` - Run only Playwright tests with parallelization (slow)
- `make tests` - Run full test suite
- `make full-tests` - Run complete test suite

Expand Down Expand Up @@ -389,7 +389,7 @@ class MyModelAdmin(ConstanceScoringFieldsMixin, admin.ModelAdmin):

### Development Notes
- Uses UV for Python dependency management (pyproject.toml and uv.lock)
- Extensive test suite with pytest and Selenium integration
- Extensive test suite with pytest and Playwright integration
- Pre-commit hooks for code quality
- Celery for background task processing
- Django Channels for WebSocket support
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ distclean: clean
rm -rf src/django_bpp/staticroot
rm -rf *backup .pytest-cache
rm -rf node_modules src/node_modules src/django_bpp/staticroot
rm -rf .vagrant splintershots src/components/bower_components src/media
rm -rf .vagrant src/components/bower_components src/media
rm -rf dist
rm src/bpp/static/scss/*.css
rm src/bpp/static/scss/*.map
Expand Down
7 changes: 0 additions & 7 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,6 @@
:target: https://github.com/iplweb/bpp/actions/workflows/build-docker-images.yml
:alt: Docker - oficjalne obrazy

.. image:: https://github.com/iplweb/bpp/actions/workflows/tests-no-selenium.yml/badge.svg?branch=master
:target: https://github.com/iplweb/bpp/actions/workflows/tests-no-selenium.yml
:alt: Testy - Django, Playwright

.. image:: https://github.com/iplweb/bpp/actions/workflows/tests-selenium.yml/badge.svg?branch=master
:target: https://github.com/iplweb/bpp/actions/workflows/tests-selenium.yml
:alt: Testy - Selenium

.. image:: https://readthedocs.org/projects/bpp/badge/?version=latest
:target: http://bpp.readthedocs.io/pl/latest/?badge=latest
Expand Down
2 changes: 1 addition & 1 deletion docs/CODEBASE_MAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ sequenceDiagram
### Testing
- **Framework**: pytest with Django plugin
- **Data Generation**: model_bakery (`baker.make()`)
- **Selenium**: Firefox driver for browser tests
- **Playwright**: Browser tests
- **Convention**: Standalone functions, no unittest.TestCase

---
Expand Down
1 change: 0 additions & 1 deletion pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@ filterwarnings = ignore
norecursedirs = src/bpp/media/

markers =
selenium: test uzywa selenium (czyli zajmuje duzo czasu)
serial: test musi byc wykonany sekwencyjnie (nie moze byc uruchomiony rownolegle z innymi testami)
xdist_group: grupuje testy do wykonania na tym samym workerze w pytest-xdist (uzywa pytest-xdist)
2 changes: 1 addition & 1 deletion src/bpp/tests/test_admin/test_crossref_api_sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def autor_m():
@pytest.mark.vcr(
match_on=("method", "scheme", "path", "query")
)
def test_crossref_api_autor_wo_selenium(admin_app, autor_m):
def test_crossref_api_autor(admin_app, autor_m):
url = "/admin/bpp/wydawnictwo_ciagle/pobierz-z-crossref/"
page = admin_app.get(url)
page.forms["crossref_form"]["identyfikator_doi"] = "10.12775/jehs.2022.12.07.045"
Expand Down
2 changes: 0 additions & 2 deletions src/django_bpp/settings/local.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ def setenv_default(varname, default_value):

SENDFILE_BACKEND = "django_sendfile.backends.simple"

SELENIUM_DRIVER = "Firefox"

SESSION_COOKIE_SECURE = False
CSRF_COOKIE_SECURE = False

Expand Down
3 changes: 0 additions & 3 deletions src/django_bpp/settings/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@

SENDFILE_BACKEND = "django_sendfile.backends.simple"

SELENIUM_DRIVER = "Firefox"


SESSION_COOKIE_SECURE = False
CSRF_COOKIE_SECURE = False
MEDIA_ROOT = os.path.abspath(
Expand Down
2 changes: 1 addition & 1 deletion src/fixtures/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- conftest_models: Core model fixtures (uczelnia, wydzial, jednostka, autor)
- conftest_publications: Publication fixtures (wydawnictwo_ciagle, wydawnictwo_zwarte, etc.)
- conftest_system: System data fixtures (typy_odpowiedzialnosci, jezyki, etc.)
- conftest_browser: Browser/Selenium fixtures
- conftest_browser: Browser/webtest fixtures
- conftest_disciplines: PBN discipline fixtures
"""

Expand Down
2 changes: 1 addition & 1 deletion src/fixtures/conftest_browser.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Browser and Selenium fixtures."""
"""Browser and webtest fixtures."""

import pytest
from django.apps import apps
Expand Down
Loading