fix probleme de match dans les calendriers et ajout de boutton delete pour les matchs
CI - Security, Lint & Tests / validate (push) Failing after 1m0s
CI - Security, Lint & Tests / validate (push) Failing after 1m0s
This commit is contained in:
+103
-3
@@ -168,7 +168,7 @@ class TestTheWindow:
|
||||
'/matches/api/events?start=2030-05-01T00:00:00-04:00&end=2030-05-31T00:00:00-04:00'
|
||||
).get_json()
|
||||
|
||||
assert _match_event(payload)['date'] == '2030-05-02'
|
||||
assert _match_event(payload)['start'] == '2030-05-02T18:00:00'
|
||||
|
||||
def test_a_match_outside_the_window_is_not(
|
||||
self, app, client, as_role, make_user, match_factory
|
||||
@@ -192,7 +192,7 @@ class TestTheWindow:
|
||||
|
||||
payload = client.get('/matches/api/events').get_json()
|
||||
|
||||
assert _match_event(payload)['date'] == '2030-05-02'
|
||||
assert _match_event(payload)['start'] == '2030-05-02T18:00:00'
|
||||
|
||||
def test_unparseable_bounds_are_ignored_rather_than_rejected(
|
||||
self, app, client, as_role, make_user, match_factory
|
||||
@@ -206,7 +206,7 @@ class TestTheWindow:
|
||||
response = client.get('/matches/api/events?start=whenever&end=')
|
||||
|
||||
assert response.status_code == 200
|
||||
assert _match_event(response.get_json())['date'] == '2030-05-02'
|
||||
assert _match_event(response.get_json())['start'] == '2030-05-02T18:00:00'
|
||||
|
||||
def test_the_viewers_own_participation_still_comes_back(
|
||||
self, app, client, as_role, make_user, match_factory
|
||||
@@ -258,3 +258,103 @@ class TestTheWindowParser:
|
||||
from flask import request
|
||||
|
||||
assert calendar_window(request.args) == (None, None)
|
||||
|
||||
|
||||
class TestTimedEvents:
|
||||
"""Matches with time fields render on the clock, not as all-day."""
|
||||
|
||||
def test_timed_match_has_start_and_end(self, app, client, as_role, make_user, match_factory):
|
||||
player_id = make_user('player')
|
||||
admin_id = as_role('admin')
|
||||
match_factory(admin_id, player_id)
|
||||
|
||||
ev = _match_event(client.get('/matches/api/events').get_json())
|
||||
|
||||
assert ev['start'] == '2030-05-02T18:00:00'
|
||||
assert ev['end'] == '2030-05-02T19:00:00'
|
||||
assert ev['allDay'] is False
|
||||
|
||||
def test_allday_match_has_date_when_no_time(
|
||||
self, app, client, as_role, make_user, match_factory
|
||||
):
|
||||
from datetime import date
|
||||
|
||||
from app.extensions import db
|
||||
from app.models import Match, MatchParticipant, Tryout, TryoutRegistration
|
||||
|
||||
player_id = make_user('player')
|
||||
admin_id = as_role('admin')
|
||||
|
||||
with app.app_context():
|
||||
tryout = Tryout(
|
||||
title='All-day tryout',
|
||||
game='Valorant',
|
||||
date=date(2030, 5, 1),
|
||||
created_by=admin_id,
|
||||
status='upcoming',
|
||||
)
|
||||
db.session.add(tryout)
|
||||
db.session.flush()
|
||||
db.session.add(TryoutRegistration(tryout_id=tryout.id, player_id=player_id))
|
||||
|
||||
match = Match(
|
||||
tryout_id=tryout.id,
|
||||
title='All-day scrim',
|
||||
description=None,
|
||||
date=date(2030, 5, 2),
|
||||
start_time=None,
|
||||
end_time=None,
|
||||
match_type='player_scrim',
|
||||
created_by=admin_id,
|
||||
)
|
||||
db.session.add(match)
|
||||
db.session.flush()
|
||||
db.session.add(MatchParticipant(match_id=match.id, player_id=player_id))
|
||||
db.session.commit()
|
||||
|
||||
payload = client.get('/matches/api/events').get_json()
|
||||
ev = next(e for e in payload if e['title'] == 'All-day scrim')
|
||||
|
||||
assert ev['date'] == '2030-05-02'
|
||||
assert ev['allDay'] is True
|
||||
assert 'start' not in ev
|
||||
|
||||
|
||||
class TestTeamMatchCalendarEvents:
|
||||
"""Regular-season team matches appear on the main calendar."""
|
||||
|
||||
def test_team_matches_appear_for_admin(self, app, client, as_role, make_user):
|
||||
from datetime import date, time
|
||||
|
||||
from app.extensions import db
|
||||
from app.models import OrgTeam, TeamMatch
|
||||
|
||||
admin_id = as_role('admin')
|
||||
with app.app_context():
|
||||
team = OrgTeam(name='Test Org', created_by=admin_id)
|
||||
db.session.add(team)
|
||||
db.session.flush()
|
||||
tm = TeamMatch(
|
||||
org_team_id=team.id,
|
||||
title='Semifinal',
|
||||
opponent='Enemy Team',
|
||||
date=date(2030, 6, 15),
|
||||
start_time=time(20, 0),
|
||||
end_time=time(21, 30),
|
||||
location='Main arena',
|
||||
status='scheduled',
|
||||
created_by=admin_id,
|
||||
)
|
||||
db.session.add(tm)
|
||||
db.session.commit()
|
||||
|
||||
payload = client.get('/matches/api/events').get_json()
|
||||
team_events = [e for e in payload if e['type'] == 'team_match']
|
||||
|
||||
assert len(team_events) == 1
|
||||
ev = team_events[0]
|
||||
assert ev['title'] == 'Semifinal'
|
||||
assert ev['start'] == '2030-06-15T20:00:00'
|
||||
assert ev['allDay'] is False
|
||||
assert ev['extendedProps']['org_team'] == 'Test Org'
|
||||
assert ev['extendedProps']['opponent'] == 'Enemy Team'
|
||||
|
||||
Reference in New Issue
Block a user