diff --git a/.circleci/config.yml b/.circleci/config.yml index 14ce6ddd0..9635a456d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 jobs: test: machine: - image: ubuntu-2004:2022.07.1 + image: ubuntu-2204:2024.01.2 steps: - checkout @@ -37,17 +37,21 @@ jobs: docker-compose -f docker-compose.yml -f docker-compose.selenium.yml up -d docker-compose -f docker-compose.yml -f docker-compose.selenium.yml exec django python manage.py collectstatic --noinput - - run: docker-compose exec django flake8 src/ + # - run: + # name: Migrate + # command: | + # docker compose exec django ./manage.py migrate - - run: - name: pytest - command: docker-compose -f docker-compose.yml -f docker-compose.selenium.yml exec django py.test src/ -m "not e2e" - run: name: e2e tests - command: docker-compose -f docker-compose.yml -f docker-compose.selenium.yml exec django py.test src/tests/functional/ -m e2e + command: docker compose -f docker-compose.yml -f docker-compose.selenium.yml exec django py.test src/tests/functional/ -m e2e no_output_timeout: 60m + # command: docker compose -f docker-compose.yml -f docker-compose.selenium.yml exec django py.test src/tests/functional/test_competitions.py + # - run: + # name: debug + # command: sleep 1800 - store_artifacts: path: artifacts/ diff --git a/docker-compose.selenium.yml b/docker-compose.selenium.yml index b918d72f7..5f1a04c96 100644 --- a/docker-compose.selenium.yml +++ b/docker-compose.selenium.yml @@ -8,7 +8,7 @@ services: - 36475:36475 selenium: - image: selenium/standalone-firefox-debug:3.141.59 + image: selenium/standalone-firefox:latest volumes: - ./src/tests/functional/test_files:/test_files/ - ./artifacts:/artifacts/:z diff --git a/src/apps/api/views/competitions.py b/src/apps/api/views/competitions.py index 774fd0df6..74f13e4e6 100644 --- a/src/apps/api/views/competitions.py +++ b/src/apps/api/views/competitions.py @@ -195,6 +195,8 @@ def get_permissions(self): def get_serializer_class(self): if self.action == 'list': return CompetitionSerializerSimple + if self.action == 'public': + return CompetitionSerializerSimple elif self.action in ['get_phases', 'results', 'get_leaderboard_frontend_object']: return LeaderboardPhaseSerializer elif self.request.method == 'GET': diff --git a/src/templates/pages/home.html b/src/templates/pages/home.html index 5dcdd03c2..e96046cba 100644 --- a/src/templates/pages/home.html +++ b/src/templates/pages/home.html @@ -233,7 +233,7 @@