From 0345e8e8df5bc1da04a305433e06748512d26286 Mon Sep 17 00:00:00 2001 From: yann Date: Thu, 26 Jun 2025 11:13:38 +0200 Subject: [PATCH 01/11] added filter on date in view --- server.py | 5 ++++- templates/welcome.html | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server.py b/server.py index 1818b65..5cd6648 100644 --- a/server.py +++ b/server.py @@ -1,5 +1,6 @@ import json from flask import Flask,render_template,request,redirect,flash,url_for,session +from datetime import datetime def loadClubs(): @@ -27,8 +28,10 @@ def index(): @app.route('/showSummary',methods=['POST']) def showSummary(): club = [club for club in clubs if club['email'] == request.form['email']] + current_compet = [compet for compet in competitions if datetime.strptime(compet['date'], '%Y-%m-%d %H:%M:%S') > datetime.now()] + print(current_compet) if club: - return render_template('welcome.html', club=club[0], competitions=competitions) + return render_template('welcome.html', club=club[0], competitions=current_compet) flash("The email isn't found") return redirect(url_for('index')) diff --git a/templates/welcome.html b/templates/welcome.html index 223f4b2..efb2c7e 100644 --- a/templates/welcome.html +++ b/templates/welcome.html @@ -27,7 +27,7 @@ Book Places {%endif%} -
+
jinja {% endfor %} {%endwith%} From 364bdb3d9f6e84534b94f4fdc48c88b839d3676e Mon Sep 17 00:00:00 2001 From: yann Date: Thu, 26 Jun 2025 11:26:57 +0200 Subject: [PATCH 02/11] past comp is displayed; condition on link and route --- server.py | 13 +++++++++---- templates/welcome.html | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/server.py b/server.py index 5cd6648..2fa57b6 100644 --- a/server.py +++ b/server.py @@ -28,10 +28,9 @@ def index(): @app.route('/showSummary',methods=['POST']) def showSummary(): club = [club for club in clubs if club['email'] == request.form['email']] - current_compet = [compet for compet in competitions if datetime.strptime(compet['date'], '%Y-%m-%d %H:%M:%S') > datetime.now()] - print(current_compet) + now = datetime.strftime(datetime.now(), "%Y-%m-%d %H:%M:%S") if club: - return render_template('welcome.html', club=club[0], competitions=current_compet) + return render_template('welcome.html', club=club[0], competitions=competitions, now=now) flash("The email isn't found") return redirect(url_for('index')) @@ -39,8 +38,14 @@ def showSummary(): def book(competition,club): foundClub = [c for c in clubs if c['name'] == club][0] foundCompetition = [c for c in competitions if c['name'] == competition][0] + now = datetime.strftime(datetime.now(), "%Y-%m-%d %H:%M:%S") if foundClub and foundCompetition: - return render_template('booking.html',club=foundClub,competition=foundCompetition) + if competition['date'] > now: + return render_template('booking.html',club=foundClub,competition=foundCompetition) + else: + flash("You cannot book for a past competition") + return render_template('welcome.html', club=club, + competitions=competitions) else: flash("Something went wrong-please try again") return render_template('welcome.html', club=club, competitions=competitions) diff --git a/templates/welcome.html b/templates/welcome.html index efb2c7e..642c93e 100644 --- a/templates/welcome.html +++ b/templates/welcome.html @@ -23,11 +23,11 @@ {{comp['name']}}
Date: {{comp['date']}}
Number of Places: {{comp['numberOfPlaces']}} - {%if comp['numberOfPlaces']|int >0%} + {%if comp['numberOfPlaces']|int >0 and comp['date'] > now%} Book Places {%endif%} -
jinja +
{% endfor %} {%endwith%} From 7521a05db9d568a4b880cef0f066b18890e81ec5 Mon Sep 17 00:00:00 2001 From: yann Date: Thu, 26 Jun 2025 11:37:02 +0200 Subject: [PATCH 03/11] added now to every welcome template call --- server.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/server.py b/server.py index 2fa57b6..7cd5485 100644 --- a/server.py +++ b/server.py @@ -20,6 +20,8 @@ app.secret_key = 'something_special' competitions = loadCompetitions() clubs = loadClubs() +now = datetime.strftime(datetime.now(), "%Y-%m-%d %H:%M:%S") + @app.route('/') def index(): @@ -28,7 +30,6 @@ def index(): @app.route('/showSummary',methods=['POST']) def showSummary(): club = [club for club in clubs if club['email'] == request.form['email']] - now = datetime.strftime(datetime.now(), "%Y-%m-%d %H:%M:%S") if club: return render_template('welcome.html', club=club[0], competitions=competitions, now=now) flash("The email isn't found") @@ -38,17 +39,16 @@ def showSummary(): def book(competition,club): foundClub = [c for c in clubs if c['name'] == club][0] foundCompetition = [c for c in competitions if c['name'] == competition][0] - now = datetime.strftime(datetime.now(), "%Y-%m-%d %H:%M:%S") if foundClub and foundCompetition: - if competition['date'] > now: + if foundCompetition['date'] > now: return render_template('booking.html',club=foundClub,competition=foundCompetition) else: flash("You cannot book for a past competition") return render_template('welcome.html', club=club, - competitions=competitions) + competitions=competitions, now=now) else: flash("Something went wrong-please try again") - return render_template('welcome.html', club=club, competitions=competitions) + return render_template('welcome.html', club=club, competitions=competitions, now=now) @app.route('/purchasePlaces',methods=['POST']) @@ -69,7 +69,7 @@ def purchasePlaces(): club['points'] = int(club['points']) - placesRequired if not competition['name'] in session: session[competition['name']] = placesRequired - flash('Great-booking complete!') + flash(f"Great ! {placesRequired} places booked for {competition['name']}") else: flash("You don't have enough points") else: @@ -77,7 +77,7 @@ def purchasePlaces(): else: flash("You can't book more than 12 places") return render_template('welcome.html', club=club, - competitions=competitions) + competitions=competitions, now=now) # TODO: Add route for points display From 1009e35d170ebd879cee87c60669c2f7512ad6a0 Mon Sep 17 00:00:00 2001 From: yann Date: Thu, 26 Jun 2025 12:07:42 +0200 Subject: [PATCH 04/11] cleaned an unused print --- server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server.py b/server.py index 7cd5485..45dc6be 100644 --- a/server.py +++ b/server.py @@ -44,7 +44,7 @@ def book(competition,club): return render_template('booking.html',club=foundClub,competition=foundCompetition) else: flash("You cannot book for a past competition") - return render_template('welcome.html', club=club, + return render_template('welcome.html', club=foundClub, competitions=competitions, now=now) else: flash("Something went wrong-please try again") @@ -61,12 +61,12 @@ def purchasePlaces(): else: places = {competition['name']: placesRequired} points = int(club['points']) - print("booked", places) if placesRequired <= 12: if places[competition['name']] <= 12: if placesRequired <= points: competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - placesRequired club['points'] = int(club['points']) - placesRequired + print(club['points']) if not competition['name'] in session: session[competition['name']] = placesRequired flash(f"Great ! {placesRequired} places booked for {competition['name']}") From e089e78fc5ff6df4656371576b02dbc61f7bbc4a Mon Sep 17 00:00:00 2001 From: yann Date: Mon, 30 Jun 2025 10:36:15 +0200 Subject: [PATCH 05/11] let this fix for issue6 --- server.py | 1 - 1 file changed, 1 deletion(-) diff --git a/server.py b/server.py index 45dc6be..bc1b2d7 100644 --- a/server.py +++ b/server.py @@ -65,7 +65,6 @@ def purchasePlaces(): if places[competition['name']] <= 12: if placesRequired <= points: competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - placesRequired - club['points'] = int(club['points']) - placesRequired print(club['points']) if not competition['name'] in session: session[competition['name']] = placesRequired From ada3a5cc761ef98f3a7dcf5954c8b189f6df17d9 Mon Sep 17 00:00:00 2001 From: yann Date: Fri, 4 Jul 2025 15:38:55 +0200 Subject: [PATCH 06/11] test old competition hasn`t link to book --- clubs.json | 4 ++-- competitions.json | 2 +- server.py | 5 ++-- templates/welcome.html | 6 ++--- tests/__init__.py | 0 tests/conftest.py | 31 +++++++++++++++++++++++++ tests/test_connection.py | 27 ++++++++++++++++++++++ tests/test_purchase.py | 49 ++++++++++++++++++++++++++++++++++++++++ 8 files changed, 116 insertions(+), 8 deletions(-) create mode 100644 tests/__init__.py create mode 100644 tests/conftest.py create mode 100644 tests/test_connection.py create mode 100644 tests/test_purchase.py diff --git a/clubs.json b/clubs.json index 46bed31..b3800e6 100644 --- a/clubs.json +++ b/clubs.json @@ -7,10 +7,10 @@ { "name":"Iron Temple", "email": "admin@irontemple.com", - "points":"47" + "points":"4" }, { "name":"She Lifts", "email": "kate@shelifts.co.uk", "points":"12" } -]} \ No newline at end of file +]} diff --git a/competitions.json b/competitions.json index 039fc61..ea636df 100644 --- a/competitions.json +++ b/competitions.json @@ -7,7 +7,7 @@ }, { "name": "Fall Classic", - "date": "2020-10-22 13:30:00", + "date": "2025-10-22 13:30:00", "numberOfPlaces": "13" } ] diff --git a/server.py b/server.py index bc1b2d7..fa42478 100644 --- a/server.py +++ b/server.py @@ -32,7 +32,7 @@ def showSummary(): club = [club for club in clubs if club['email'] == request.form['email']] if club: return render_template('welcome.html', club=club[0], competitions=competitions, now=now) - flash("The email isn't found") + flash("Sorry, that email wasn't found") return redirect(url_for('index')) @app.route('/book//') @@ -65,10 +65,11 @@ def purchasePlaces(): if places[competition['name']] <= 12: if placesRequired <= points: competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - placesRequired - print(club['points']) if not competition['name'] in session: session[competition['name']] = placesRequired flash(f"Great ! {placesRequired} places booked for {competition['name']}") + # flash('Great-booking complete!') + else: flash("You don't have enough points") else: diff --git a/templates/welcome.html b/templates/welcome.html index 642c93e..2116d89 100644 --- a/templates/welcome.html +++ b/templates/welcome.html @@ -5,7 +5,7 @@ Summary | GUDLFT Registration -

Welcome, {{club['email']}}

Logout +

Welcome, {{club['email']}}

Logout {% with messages = get_flashed_messages()%} {% if messages %} @@ -15,7 +15,7 @@ {% endfor %} {% endif%} - Points available: {{club['points']}} + Points available: {{club['points']}}

Competitions:

    {% for comp in competitions%} @@ -33,4 +33,4 @@ {%endwith%} - \ No newline at end of file + diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/conftest.py b/tests/conftest.py new file mode 100644 index 0000000..b06c74b --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,31 @@ +import pytest +from server import app +from bs4 import BeautifulSoup + + +EMAIL1 = "admin@irontemple.com" +EMAIL2 = "john@simplylift.co" + + +@pytest.fixture +def club1(): + data = {"competition": "Spring Festival", "club": "Iron Temple"} + return data + +@pytest.fixture +def club2(): + data = {"competition": "Fall Classic", "club": "Iron Temple"} + return data + +@pytest.fixture +def client(): + with app.test_client() as client: + yield client + +@pytest.fixture +def connect(client): + response = client.post('/showSummary', data={"email": EMAIL1}) + soup = BeautifulSoup(response.data, 'html.parser') + return soup + + diff --git a/tests/test_connection.py b/tests/test_connection.py new file mode 100644 index 0000000..5db9bfd --- /dev/null +++ b/tests/test_connection.py @@ -0,0 +1,27 @@ +from flask import session +from bs4 import BeautifulSoup + + +def test_should_status_code_ok(client): + response = client.get('/') + assert response.status_code == 200 + + +def test_should_display_sorry_with_unknown_email(client): + email = "test@test.com" + response = client.post('/showSummary', data={"email": email}) + print(session) + assert "_flashes" in session + assert session["_flashes"] == [("message", "Sorry, that email wasn't found")] + + +def test_shoul_display_page_on_known_email(client): + email = "admin@irontemple.com" + response = client.post('/showSummary', data={"email": email}) + print(session) + soup = BeautifulSoup(response.data, 'html.parser') + assert soup.h2.text == "Welcome, "+email + + + + diff --git a/tests/test_purchase.py b/tests/test_purchase.py new file mode 100644 index 0000000..7002b79 --- /dev/null +++ b/tests/test_purchase.py @@ -0,0 +1,49 @@ +from bs4 import BeautifulSoup +from flask import session + + +class TestPoints: + + def test_should_nok_when_too_much_points(self, client, connect, club1): + points = int(connect.span.text) + club1.update({"places": points+1}) + response = client.post('/purchasePlaces', data=club1) + soup = BeautifulSoup(response.data, "html.parser") + assert "You don't have enough points" == soup.li.text + + def test_should_ok_when_enough_points(self, client, connect, club1): + points = int(connect.span.text) + club1.update({"places": points-1}) + response = client.post('/purchasePlaces', data=club1) + soup = BeautifulSoup(response.data, "html.parser") + # assert "Great-booking complete!" == soup.li.text + assert f"Great ! "+str(points-1)+" places booked for "+club1['competition'] == soup.li.text + + +class TestPlaces: + + def test_should_refuse_more_12_once(self, client, club1): + club1.update({"places": 13}) + response = client.post('/purchasePlaces', data=club1) + soup = BeautifulSoup(response.data, "html.parser") + assert "You can't book more than 12 places" == soup.li.text + + + def test_should_refuse_more_12_total(self, client, club1): + club1.update({"places": 2}) + response = client.post('/purchasePlaces', data=club1) + soup = BeautifulSoup(response.data, "html.parser") + assert "Great ! 2 places booked for "+club1['competition'] == soup.li.text + club1.update({"places": 12}) + response = client.post('/purchasePlaces', data=club1) + soup = BeautifulSoup(response.data, "html.parser") + assert "You already booked 12 places for "+club1['competition'] == soup.li.text + + +class TestDate: + + def test_should_not_display_book_link_for_past_competitions(self, connect): + li = connect.find_all("li") + assert not li[0].a + assert li[1].a + From 5ed18c0c3ce048e2d828b2150633e6479042565d Mon Sep 17 00:00:00 2001 From: yann Date: Mon, 7 Jul 2025 10:02:55 +0200 Subject: [PATCH 07/11] first test on link displayed based on date --- Pipfile | 1 + Pipfile.lock | 133 ++++++++++++++++++++++++++++++++++++++- tests/test_connection.py | 6 +- tests/test_purchase.py | 3 +- 4 files changed, 137 insertions(+), 6 deletions(-) diff --git a/Pipfile b/Pipfile index 9581dc9..5583a8c 100644 --- a/Pipfile +++ b/Pipfile @@ -10,6 +10,7 @@ itsdangerous = "==1.1.0" jinja2 = "==2.11.2" markupsafe = "==1.1.1" werkzeug = "==1.0.1" +ward = "*" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index ae1d86f..d3f2943 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "55e68c2c6e7fb3f1685b9dfe66180ae537a367985700c08a86ccd664d56ccad7" + "sha256": "42b0dc67898b0101df0af5ed2bd8ab0d6d7eb8f54964fb0a4a0a22ac504db2e5" }, "pipfile-spec": 6, "requires": { @@ -26,6 +26,27 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==7.1.2" }, + "click-completion": { + "hashes": [ + "sha256:5bf816b81367e638a190b6e91b50779007d14301b3f9f3145d68e3cade7bce86" + ], + "version": "==0.5.2" + }, + "click-default-group": { + "hashes": [ + "sha256:9b60486923720e7fc61731bdb32b617039aba820e22e1c88766b1125592eaa5f", + "sha256:eb3f3c99ec0d456ca6cd2a7f08f7d4e91771bef51b01bdd9580cc6450fe1251e" + ], + "markers": "python_version >= '2.7'", + "version": "==1.2.4" + }, + "cucumber-tag-expressions": { + "hashes": [ + "sha256:e314d5fed6eebb2f90380271f562248fb15e18636764faf40f4dde4b28b1f960" + ], + "markers": "python_version >= '2.7'", + "version": "==4.1.0" + }, "flask": { "hashes": [ "sha256:4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060", @@ -53,6 +74,14 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==2.11.2" }, + "markdown-it-py": { + "hashes": [ + "sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1", + "sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb" + ], + "markers": "python_version >= '3.8'", + "version": "==3.0.0" + }, "markupsafe": { "hashes": [ "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", @@ -112,6 +141,108 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.1.1" }, + "mdurl": { + "hashes": [ + "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8", + "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba" + ], + "markers": "python_version >= '3.7'", + "version": "==0.1.2" + }, + "pluggy": { + "hashes": [ + "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3", + "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746" + ], + "markers": "python_version >= '3.9'", + "version": "==1.6.0" + }, + "pprintpp": { + "hashes": [ + "sha256:b6b4dcdd0c0c0d75e4d7b2f21a9e933e5b2ce62b26e1a54537f9651ae5a5c01d", + "sha256:ea826108e2c7f49dc6d66c752973c3fc9749142a798d6b254e1e301cfdbc6403" + ], + "version": "==0.4.0" + }, + "pygments": { + "hashes": [ + "sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887", + "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b" + ], + "markers": "python_version >= '3.8'", + "version": "==2.19.2" + }, + "rich": { + "hashes": [ + "sha256:1c9491e1951aac09caffd42f448ee3d04e58923ffe14993f6e83068dc395d7e0", + "sha256:82f1bc23a6a21ebca4ae0c45af9bdbc492ed20231dcb63f297d6d1021a9d5725" + ], + "markers": "python_full_version >= '3.8.0'", + "version": "==14.0.0" + }, + "shellingham": { + "hashes": [ + "sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686", + "sha256:8dbca0739d487e5bd35ab3ca4b36e11c4078f3a234bfce294b0a0291363404de" + ], + "markers": "python_version >= '3.7'", + "version": "==1.5.4" + }, + "six": { + "hashes": [ + "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", + "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", + "version": "==1.17.0" + }, + "tomli": { + "hashes": [ + "sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6", + "sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd", + "sha256:286f0ca2ffeeb5b9bd4fcc8d6c330534323ec51b2f52da063b11c502da16f30c", + "sha256:2d0f2fdd22b02c6d81637a3c95f8cd77f995846af7414c5c4b8d0545afa1bc4b", + "sha256:33580bccab0338d00994d7f16f4c4ec25b776af3ffaac1ed74e0b3fc95e885a8", + "sha256:400e720fe168c0f8521520190686ef8ef033fb19fc493da09779e592861b78c6", + "sha256:40741994320b232529c802f8bc86da4e1aa9f413db394617b9a256ae0f9a7f77", + "sha256:465af0e0875402f1d226519c9904f37254b3045fc5084697cefb9bdde1ff99ff", + "sha256:4a8f6e44de52d5e6c657c9fe83b562f5f4256d8ebbfe4ff922c495620a7f6cea", + "sha256:4e340144ad7ae1533cb897d406382b4b6fede8890a03738ff1683af800d54192", + "sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249", + "sha256:6972ca9c9cc9f0acaa56a8ca1ff51e7af152a9f87fb64623e31d5c83700080ee", + "sha256:7fc04e92e1d624a4a63c76474610238576942d6b8950a2d7f908a340494e67e4", + "sha256:889f80ef92701b9dbb224e49ec87c645ce5df3fa2cc548664eb8a25e03127a98", + "sha256:8d57ca8095a641b8237d5b079147646153d22552f1c637fd3ba7f4b0b29167a8", + "sha256:8dd28b3e155b80f4d54beb40a441d366adcfe740969820caf156c019fb5c7ec4", + "sha256:9316dc65bed1684c9a98ee68759ceaed29d229e985297003e494aa825ebb0281", + "sha256:a198f10c4d1b1375d7687bc25294306e551bf1abfa4eace6650070a5c1ae2744", + "sha256:a38aa0308e754b0e3c67e344754dff64999ff9b513e691d0e786265c93583c69", + "sha256:a92ef1a44547e894e2a17d24e7557a5e85a9e1d0048b0b5e7541f76c5032cb13", + "sha256:ac065718db92ca818f8d6141b5f66369833d4a80a9d74435a268c52bdfa73140", + "sha256:b82ebccc8c8a36f2094e969560a1b836758481f3dc360ce9a3277c65f374285e", + "sha256:c954d2250168d28797dd4e3ac5cf812a406cd5a92674ee4c8f123c889786aa8e", + "sha256:cb55c73c5f4408779d0cf3eef9f762b9c9f147a77de7b258bef0a5628adc85cc", + "sha256:cd45e1dc79c835ce60f7404ec8119f2eb06d38b1deba146f07ced3bbc44505ff", + "sha256:d3f5614314d758649ab2ab3a62d4f2004c825922f9e370b29416484086b264ec", + "sha256:d920f33822747519673ee656a4b6ac33e382eca9d331c87770faa3eef562aeb2", + "sha256:db2b95f9de79181805df90bedc5a5ab4c165e6ec3fe99f970d0e302f384ad222", + "sha256:e59e304978767a54663af13c07b3d1af22ddee3bb2fb0618ca1593e4f593a106", + "sha256:e85e99945e688e32d5a35c1ff38ed0b3f41f43fad8df0bdf79f72b2ba7bc5272", + "sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a", + "sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7" + ], + "markers": "python_version >= '3.8'", + "version": "==2.2.1" + }, + "ward": { + "hashes": [ + "sha256:0847e6b95db9d2b83c7d1b9cea9bcb7ac3b8e8f6d341b8dc8920d6afb05458b1", + "sha256:d8aafa4ddb81f4d5787d95bdb2f7ba69a2e89f183feec78d8afcc64b2cd19ee9" + ], + "index": "pypi", + "markers": "python_full_version >= '3.7.8' and python_full_version < '4.0.0'", + "version": "==0.68.0b0" + }, "werkzeug": { "hashes": [ "sha256:2de2a5db0baeae7b2d2664949077c2ac63fbd16d98da0ff71837f7d1dea3fd43", diff --git a/tests/test_connection.py b/tests/test_connection.py index 5db9bfd..b06bb20 100644 --- a/tests/test_connection.py +++ b/tests/test_connection.py @@ -10,7 +10,6 @@ def test_should_status_code_ok(client): def test_should_display_sorry_with_unknown_email(client): email = "test@test.com" response = client.post('/showSummary', data={"email": email}) - print(session) assert "_flashes" in session assert session["_flashes"] == [("message", "Sorry, that email wasn't found")] @@ -18,9 +17,10 @@ def test_should_display_sorry_with_unknown_email(client): def test_shoul_display_page_on_known_email(client): email = "admin@irontemple.com" response = client.post('/showSummary', data={"email": email}) - print(session) soup = BeautifulSoup(response.data, 'html.parser') - assert soup.h2.text == "Welcome, "+email + #assert soup.h2.text == "Welcome, "+email + welcome = "Welcome, "+email + assert welcome in response.data.decode() diff --git a/tests/test_purchase.py b/tests/test_purchase.py index 7002b79..f2f1ac1 100644 --- a/tests/test_purchase.py +++ b/tests/test_purchase.py @@ -39,11 +39,10 @@ class TestPlaces: soup = BeautifulSoup(response.data, "html.parser") assert "You already booked 12 places for "+club1['competition'] == soup.li.text - class TestDate: def test_should_not_display_book_link_for_past_competitions(self, connect): li = connect.find_all("li") assert not li[0].a assert li[1].a - + From 8ae40652702a055ffa2a39a6864a2ae5cd5fe049 Mon Sep 17 00:00:00 2001 From: yann Date: Mon, 7 Jul 2025 10:08:03 +0200 Subject: [PATCH 08/11] test on forged URL for past competition --- tests/test_purchase.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/test_purchase.py b/tests/test_purchase.py index f2f1ac1..0419417 100644 --- a/tests/test_purchase.py +++ b/tests/test_purchase.py @@ -46,3 +46,8 @@ class TestDate: assert not li[0].a assert li[1].a + + def test_forged_url_on_past_competition_should_raise_flash(self, client): + url = '/book/Spring Festival/Iron Temple' + response = client.get(url) + assert "You cannot book for a past competition" in response.data.decode() From 7ba1a440cef979ee1e892e9291946af2e7f0fd3e Mon Sep 17 00:00:00 2001 From: yann Date: Mon, 7 Jul 2025 14:09:59 +0200 Subject: [PATCH 09/11] fixed test on mail --- server.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/server.py b/server.py index fa42478..0b82b0b 100644 --- a/server.py +++ b/server.py @@ -29,11 +29,12 @@ def index(): @app.route('/showSummary',methods=['POST']) def showSummary(): - club = [club for club in clubs if club['email'] == request.form['email']] - if club: - return render_template('welcome.html', club=club[0], competitions=competitions, now=now) - flash("Sorry, that email wasn't found") - return redirect(url_for('index')) + try: + club = [club for club in clubs if club['email'] == request.form['email']][0] + return render_template('welcome.html', club=club, competitions=competitions) + except IndexError: + flash("Sorry, that email wasn't found") + return redirect(url_for('index')) @app.route('/book//') def book(competition,club): From ff0baa26b1bfc0d06081355afdd1dcaf6ff1f399 Mon Sep 17 00:00:00 2001 From: yann Date: Mon, 7 Jul 2025 14:20:09 +0200 Subject: [PATCH 10/11] fixed first date check --- .coveragerc | 3 +++ server.py | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 .coveragerc diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000..6d4ee03 --- /dev/null +++ b/.coveragerc @@ -0,0 +1,3 @@ +[run] +omit = tests/* + diff --git a/server.py b/server.py index 0b82b0b..c399c9b 100644 --- a/server.py +++ b/server.py @@ -31,7 +31,7 @@ def index(): def showSummary(): try: club = [club for club in clubs if club['email'] == request.form['email']][0] - return render_template('welcome.html', club=club, competitions=competitions) + return render_template('welcome.html', club=club, competitions=competitions, now=now) except IndexError: flash("Sorry, that email wasn't found") return redirect(url_for('index')) @@ -69,8 +69,6 @@ def purchasePlaces(): if not competition['name'] in session: session[competition['name']] = placesRequired flash(f"Great ! {placesRequired} places booked for {competition['name']}") - # flash('Great-booking complete!') - else: flash("You don't have enough points") else: From 394f584f08a9f9959a7972e59c0dab740e3d941d Mon Sep 17 00:00:00 2001 From: yann Date: Mon, 7 Jul 2025 14:25:00 +0200 Subject: [PATCH 11/11] date test with ward --- tests/test_book_old.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 tests/test_book_old.py diff --git a/tests/test_book_old.py b/tests/test_book_old.py new file mode 100644 index 0000000..22b8daa --- /dev/null +++ b/tests/test_book_old.py @@ -0,0 +1,28 @@ +from ward import fixture, test, using +from server import app +from bs4 import BeautifulSoup + + +@fixture(scope="global") +def test_client(): + app.config['TESTING'] = True + with app.test_client() as client: + yield client + + +@fixture(scope="global") +def connect(co=test_client): + response = co.post('/showSummary', data={"email": "admin@irontemple.com"}) + soup = BeautifulSoup(response.data, "html.parser") + return soup + + +@test("authentication is ok, welcome well displayed") +def _(client=connect): + assert client.h2.text == "Welcome, admin@irontemple.com" + +@test("should be no book link for old competition") +def _(client=connect): + li = client.find_all("li") + assert not li[0].a + assert li[1].a