Edward Betts
89a536dfd3
- Eurostar scraper now fetches both Standard and Plus (PLUS class code) prices/seats in a single API call; each service dict gains plus_price and plus_seats fields - GWR fares scraper gains fetch_advance() which makes two sets of paginated calls (standard advance + first-class advance) and returns cheapest per departure; shared _run_pages() generator reduces duplication in fetch() - New /api/advance_fares/<station_crs>/<travel_date> endpoint returns advance fares as JSON, cached for 24 hours - Results page gains NR ticket selector (Walk-on / Std Advance / 1st Advance) and Eurostar selector (Standard / Plus); total column is JS-computed from the selected combination with cheapest/priciest highlighting - Load advance prices button fetches the API lazily; if advance fares are already cached they are embedded in the page and applied on load so the button is hidden automatically Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
337 lines
14 KiB
Python
337 lines
14 KiB
Python
import app as app_module
|
|
|
|
|
|
def _client():
|
|
app_module.app.config['TESTING'] = True
|
|
return app_module.app.test_client()
|
|
|
|
|
|
def _stub_data(monkeypatch, prices=None, gwr_fares=None):
|
|
monkeypatch.setattr(app_module, 'get_cached', lambda key, ttl=None: None)
|
|
monkeypatch.setattr(app_module, 'set_cached', lambda key, data: None)
|
|
monkeypatch.setattr(
|
|
app_module.rtt_scraper,
|
|
'fetch',
|
|
lambda travel_date, user_agent, station_crs='BRI': [
|
|
{'depart_bristol': '07:00', 'arrive_paddington': '08:45', 'headcode': '1A23'},
|
|
],
|
|
)
|
|
monkeypatch.setattr(
|
|
app_module.gwr_fares_scraper,
|
|
'fetch',
|
|
lambda station_crs, travel_date: gwr_fares or {'07:00': {'ticket': 'Anytime Day Single', 'price': 138.70, 'code': 'SDS'}},
|
|
)
|
|
p = (prices or {}).get('10:01', {})
|
|
monkeypatch.setattr(
|
|
app_module.eurostar_scraper,
|
|
'fetch',
|
|
lambda destination, travel_date: [
|
|
{
|
|
'depart_st_pancras': '10:01',
|
|
'arrive_destination': '13:34',
|
|
'destination': destination,
|
|
'train_number': 'ES 9014',
|
|
'price': p.get('price') if isinstance(p, dict) else None,
|
|
'seats': p.get('seats') if isinstance(p, dict) else None,
|
|
'plus_price': p.get('plus_price') if isinstance(p, dict) else None,
|
|
'plus_seats': p.get('plus_seats') if isinstance(p, dict) else None,
|
|
},
|
|
],
|
|
)
|
|
|
|
|
|
def test_index_shows_station_dropdown_and_destination_radios():
|
|
client = _client()
|
|
|
|
resp = client.get('/')
|
|
html = resp.get_data(as_text=True)
|
|
|
|
assert resp.status_code == 200
|
|
assert 'Departure point' in html
|
|
assert 'Bristol Temple Meads' in html
|
|
assert 'name="station_crs"' in html
|
|
assert html.count('type="radio"') == len(app_module.DESTINATIONS)
|
|
assert 'destination-rotterdam' in html
|
|
|
|
|
|
def test_search_redirects_to_results_with_selected_params():
|
|
client = _client()
|
|
|
|
resp = client.get('/search?destination=rotterdam&travel_date=2026-04-10&min_connection=60&max_connection=120&station_crs=BRI')
|
|
|
|
assert resp.status_code == 302
|
|
assert resp.headers['Location'].endswith(
|
|
'/results/BRI/rotterdam/2026-04-10?min_connection=60&max_connection=120'
|
|
)
|
|
|
|
|
|
def test_results_shows_same_day_destination_switcher(monkeypatch):
|
|
_stub_data(monkeypatch)
|
|
client = _client()
|
|
|
|
resp = client.get('/results/BRI/paris/2026-04-10?min_connection=60&max_connection=120')
|
|
html = resp.get_data(as_text=True)
|
|
|
|
assert resp.status_code == 200
|
|
assert 'Switch destination for Friday 10 April 2026' in html
|
|
assert '<span class="chip-current">Paris Gare du Nord</span>' in html
|
|
assert '/results/BRI/brussels/2026-04-10?min_connection=60&max_connection=120' in html
|
|
assert '/results/BRI/rotterdam/2026-04-10?min_connection=60&max_connection=120' in html
|
|
assert 'ES 9014' in html
|
|
|
|
|
|
def test_results_title_and_social_meta_include_destination(monkeypatch):
|
|
_stub_data(monkeypatch)
|
|
client = _client()
|
|
|
|
resp = client.get('/results/BRI/lille/2026-04-10?min_connection=60&max_connection=120')
|
|
html = resp.get_data(as_text=True)
|
|
|
|
assert resp.status_code == 200
|
|
assert '<title>Bristol Temple Meads to Lille Europe via Eurostar</title>' in html
|
|
assert '<meta property="og:title" content="Bristol Temple Meads to Lille Europe via Eurostar">' in html
|
|
assert (
|
|
'<meta property="og:description" content="Train options from Bristol Temple Meads '
|
|
'to Lille Europe on Friday 10 April 2026 via Paddington, St Pancras, and Eurostar.">'
|
|
) in html
|
|
assert '<meta property="og:url" content="http://localhost/results/BRI/lille/2026-04-10?min_connection=60&max_connection=120">' in html
|
|
|
|
|
|
def test_results_marks_trips_within_five_minutes_of_fastest_and_slowest(monkeypatch):
|
|
monkeypatch.setattr(app_module, 'get_cached', lambda key, ttl=None: None)
|
|
monkeypatch.setattr(app_module, 'set_cached', lambda key, data: None)
|
|
monkeypatch.setattr(app_module.gwr_fares_scraper, 'fetch', lambda s, d: {})
|
|
monkeypatch.setattr(
|
|
app_module.rtt_scraper,
|
|
'fetch',
|
|
lambda travel_date, user_agent, station_crs='BRI': [
|
|
{'depart_bristol': '07:00', 'arrive_paddington': '08:30', 'headcode': '1A01'},
|
|
{'depart_bristol': '07:05', 'arrive_paddington': '08:36', 'headcode': '1A02'},
|
|
{'depart_bristol': '07:10', 'arrive_paddington': '08:46', 'headcode': '1A03'},
|
|
{'depart_bristol': '07:15', 'arrive_paddington': '08:56', 'headcode': '1A04'},
|
|
{'depart_bristol': '07:20', 'arrive_paddington': '09:06', 'headcode': '1A05'},
|
|
],
|
|
)
|
|
monkeypatch.setattr(
|
|
app_module.eurostar_scraper,
|
|
'fetch',
|
|
lambda destination, travel_date: [
|
|
{'depart_st_pancras': '09:30', 'arrive_destination': '11:50', 'destination': destination, 'train_number': 'ES 1001', 'price': None, 'seats': None},
|
|
{'depart_st_pancras': '09:40', 'arrive_destination': '12:00', 'destination': destination, 'train_number': 'ES 1002', 'price': None, 'seats': None},
|
|
{'depart_st_pancras': '09:50', 'arrive_destination': '12:20', 'destination': destination, 'train_number': 'ES 1003', 'price': None, 'seats': None},
|
|
{'depart_st_pancras': '10:00', 'arrive_destination': '12:35', 'destination': destination, 'train_number': 'ES 1004', 'price': None, 'seats': None},
|
|
{'depart_st_pancras': '10:10', 'arrive_destination': '12:45', 'destination': destination, 'train_number': 'ES 1005', 'price': None, 'seats': None},
|
|
],
|
|
)
|
|
client = _client()
|
|
|
|
resp = client.get('/results/BRI/paris/2026-04-10?min_connection=60&max_connection=120')
|
|
html = resp.get_data(as_text=True)
|
|
|
|
assert resp.status_code == 200
|
|
assert html.count('title="Fastest journey"') == 2
|
|
assert html.count('title="Slowest journey"') == 2
|
|
assert '4h 50m ⚡' in html
|
|
assert '4h 55m ⚡' in html
|
|
assert '5h 20m 🐢' in html
|
|
assert '5h 25m 🐢' in html
|
|
assert '5h 10m ⚡' not in html
|
|
assert '5h 10m 🐢' not in html
|
|
|
|
|
|
def test_results_shows_only_pre_first_reachable_unreachable_services(monkeypatch):
|
|
# GWR arrives 08:45; min=60 → earliest viable Eurostar 09:45; max=120 → latest 10:45.
|
|
# 09:30 too early → shown as "Too early"
|
|
# 10:15 reachable → shown as a trip (needs circle line XML, so not tested here)
|
|
# 12:30 after first reachable → hidden
|
|
monkeypatch.setattr(app_module, 'get_cached', lambda key, ttl=None: None)
|
|
monkeypatch.setattr(app_module, 'set_cached', lambda key, data: None)
|
|
monkeypatch.setattr(app_module.gwr_fares_scraper, 'fetch', lambda s, d: {})
|
|
monkeypatch.setattr(
|
|
app_module.rtt_scraper,
|
|
'fetch',
|
|
lambda travel_date, user_agent, station_crs='BRI': [
|
|
{'depart_bristol': '07:00', 'arrive_paddington': '08:45', 'headcode': '1A23'},
|
|
],
|
|
)
|
|
monkeypatch.setattr(
|
|
app_module.eurostar_scraper,
|
|
'fetch',
|
|
lambda destination, travel_date: [
|
|
{'depart_st_pancras': '09:30', 'arrive_destination': '12:00', 'destination': destination, 'train_number': 'ES 9001', 'price': None, 'seats': None},
|
|
{'depart_st_pancras': '10:15', 'arrive_destination': '13:40', 'destination': destination, 'train_number': 'ES 9002', 'price': None, 'seats': None},
|
|
{'depart_st_pancras': '12:30', 'arrive_destination': '15:55', 'destination': destination, 'train_number': 'ES 9003', 'price': None, 'seats': None},
|
|
],
|
|
)
|
|
client = _client()
|
|
|
|
resp = client.get('/results/BRI/paris/2026-04-10?min_connection=60&max_connection=120')
|
|
html = resp.get_data(as_text=True)
|
|
|
|
assert resp.status_code == 200
|
|
assert 'ES 9001' in html # before first reachable → shown
|
|
assert 'Too early' in html
|
|
assert 'ES 9003' not in html # after first reachable → hidden
|
|
|
|
|
|
def test_results_shows_eurostar_price_and_total(monkeypatch):
|
|
# 07:00 on Friday 2026-04-10 → Anytime £138.70 walk-on + ES £59.00
|
|
_stub_data(monkeypatch, prices={'10:01': {'price': 59, 'seats': 42}})
|
|
client = _client()
|
|
|
|
resp = client.get('/results/BRI/paris/2026-04-10?min_connection=60&max_connection=120')
|
|
html = resp.get_data(as_text=True)
|
|
|
|
assert resp.status_code == 200
|
|
assert '£59' in html # Eurostar Standard price
|
|
assert '£138.70' in html # Walk-on price shown in NR cell
|
|
# Total (£197.70) is computed client-side; verify data attributes carry the right values
|
|
assert 'data-walkon="138.7"' in html
|
|
assert 'data-es-std="59"' in html
|
|
|
|
|
|
def test_results_shows_unreachable_service_when_no_trips(monkeypatch):
|
|
# Only one Eurostar at 09:30; GWR arrives 08:45 with min=60 → unreachable.
|
|
# No trips at all, so the unreachable service is shown as "Too early".
|
|
monkeypatch.setattr(app_module, 'get_cached', lambda key, ttl=None: None)
|
|
monkeypatch.setattr(app_module, 'set_cached', lambda key, data: None)
|
|
monkeypatch.setattr(app_module.gwr_fares_scraper, 'fetch', lambda s, d: {})
|
|
monkeypatch.setattr(
|
|
app_module.rtt_scraper,
|
|
'fetch',
|
|
lambda travel_date, user_agent, station_crs='BRI': [
|
|
{'depart_bristol': '07:00', 'arrive_paddington': '08:45', 'headcode': '1A23'},
|
|
],
|
|
)
|
|
monkeypatch.setattr(
|
|
app_module.eurostar_scraper,
|
|
'fetch',
|
|
lambda destination, travel_date: [
|
|
{'depart_st_pancras': '09:30', 'arrive_destination': '12:00', 'destination': destination, 'train_number': 'ES 9001', 'price': None, 'seats': None},
|
|
],
|
|
)
|
|
client = _client()
|
|
|
|
resp = client.get('/results/BRI/paris/2026-04-10?min_connection=60&max_connection=120')
|
|
html = resp.get_data(as_text=True)
|
|
|
|
assert resp.status_code == 200
|
|
assert 'ES 9001' in html
|
|
assert 'Too early' in html
|
|
assert 'No valid journeys found.' not in html
|
|
|
|
|
|
def test_results_shows_eurostar_plus_price(monkeypatch):
|
|
_stub_data(monkeypatch, prices={'10:01': {'price': 59, 'seats': 42, 'plus_price': 89, 'plus_seats': 5}})
|
|
client = _client()
|
|
|
|
resp = client.get('/results/BRI/paris/2026-04-10?min_connection=60&max_connection=120')
|
|
html = resp.get_data(as_text=True)
|
|
|
|
assert resp.status_code == 200
|
|
assert '£59' in html # Standard price
|
|
assert '£89' in html # Plus price
|
|
assert 'Plus' in html # Plus label
|
|
|
|
|
|
def test_results_selectors_present(monkeypatch):
|
|
_stub_data(monkeypatch)
|
|
client = _client()
|
|
|
|
resp = client.get('/results/BRI/paris/2026-04-10?min_connection=60&max_connection=120')
|
|
html = resp.get_data(as_text=True)
|
|
|
|
assert resp.status_code == 200
|
|
assert 'nr-type-select' in html
|
|
assert 'es-type-select' in html
|
|
assert 'Load advance prices' in html
|
|
assert 'Plus' in html
|
|
|
|
|
|
def test_results_preloads_cached_advance_fares(monkeypatch):
|
|
advance_data = {
|
|
'07:00': {
|
|
'advance_std': {'ticket': 'Advance Single', 'price': 45.0, 'code': 'ADV'},
|
|
'advance_1st': None,
|
|
}
|
|
}
|
|
def fake_get_cached(key, ttl=None):
|
|
if 'gwr_advance' in key:
|
|
return advance_data
|
|
return None
|
|
monkeypatch.setattr(app_module, 'get_cached', fake_get_cached)
|
|
monkeypatch.setattr(app_module, 'set_cached', lambda key, data: None)
|
|
monkeypatch.setattr(
|
|
app_module.rtt_scraper, 'fetch',
|
|
lambda travel_date, user_agent, station_crs='BRI': [
|
|
{'depart_bristol': '07:00', 'arrive_paddington': '08:45', 'headcode': '1A23'},
|
|
],
|
|
)
|
|
monkeypatch.setattr(app_module.gwr_fares_scraper, 'fetch', lambda s, d: {})
|
|
monkeypatch.setattr(
|
|
app_module.eurostar_scraper, 'fetch',
|
|
lambda destination, travel_date: [
|
|
{'depart_st_pancras': '10:01', 'arrive_destination': '13:34',
|
|
'destination': destination, 'train_number': 'ES 9014',
|
|
'price': None, 'seats': None, 'plus_price': None, 'plus_seats': None},
|
|
],
|
|
)
|
|
client = _client()
|
|
|
|
resp = client.get('/results/BRI/paris/2026-04-10?min_connection=60&max_connection=120')
|
|
html = resp.get_data(as_text=True)
|
|
|
|
assert resp.status_code == 200
|
|
# Cached advance fares are embedded in the page JS
|
|
assert '"advance_std"' in html
|
|
assert '45.0' in html
|
|
# Button is absent (hidden via cachedAdvanceFares check in JS)
|
|
# The JS will hide it on load; the data is present for applyAdvanceFares()
|
|
assert 'cachedAdvanceFares' in html
|
|
|
|
|
|
def test_api_advance_fares_returns_json(monkeypatch):
|
|
monkeypatch.setattr(app_module, 'get_cached', lambda key, ttl=None: None)
|
|
monkeypatch.setattr(app_module, 'set_cached', lambda key, data: None)
|
|
monkeypatch.setattr(
|
|
app_module.gwr_fares_scraper,
|
|
'fetch_advance',
|
|
lambda station_crs, travel_date: {
|
|
'07:00': {
|
|
'advance_std': {'ticket': 'Advance Single', 'price': 45.0, 'code': 'ADV'},
|
|
'advance_1st': {'ticket': '1st Advance', 'price': 65.0, 'code': 'AFA'},
|
|
}
|
|
},
|
|
)
|
|
client = _client()
|
|
|
|
resp = client.get('/api/advance_fares/BRI/2026-04-10')
|
|
data = resp.get_json()
|
|
|
|
assert resp.status_code == 200
|
|
assert '07:00' in data
|
|
assert data['07:00']['advance_std']['price'] == 45.0
|
|
assert data['07:00']['advance_1st']['price'] == 65.0
|
|
|
|
|
|
def test_api_advance_fares_404_for_unknown_station(monkeypatch):
|
|
client = _client()
|
|
resp = client.get('/api/advance_fares/XYZ/2026-04-10')
|
|
assert resp.status_code == 404
|
|
|
|
|
|
def test_api_advance_fares_returns_error_on_scraper_failure(monkeypatch):
|
|
monkeypatch.setattr(app_module, 'get_cached', lambda key, ttl=None: None)
|
|
monkeypatch.setattr(app_module, 'set_cached', lambda key, data: None)
|
|
monkeypatch.setattr(
|
|
app_module.gwr_fares_scraper,
|
|
'fetch_advance',
|
|
lambda s, d: (_ for _ in ()).throw(Exception('network error')),
|
|
)
|
|
client = _client()
|
|
|
|
resp = client.get('/api/advance_fares/BRI/2026-04-10')
|
|
data = resp.get_json()
|
|
|
|
assert resp.status_code == 500
|
|
assert 'error' in data
|