From d3e9eda937fffd6834b3a641dfb1297dd7367c31 Mon Sep 17 00:00:00 2001 From: yann Date: Mon, 30 Jun 2025 10:32:46 +0200 Subject: [PATCH 01/18] let this fix for issue6 --- server.py | 1 - 1 file changed, 1 deletion(-) diff --git a/server.py b/server.py index 0a12660..b0d68c3 100644 --- a/server.py +++ b/server.py @@ -51,7 +51,6 @@ def purchasePlaces(): points = int(club['points']) if placesRequired <= points: competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - placesRequired - club['points'] = int(club['points']) - placesRequired if competition['numberOfPlaces'] < 0: competition['numberOfPlaces'] = 0 flash('Great-booking complete!') From f323cd8310d495c58e6f6cf737391e7e24728f8c Mon Sep 17 00:00:00 2001 From: yann Date: Mon, 30 Jun 2025 10:35:17 +0200 Subject: [PATCH 02/18] let this fix for issue6 --- server.py | 1 - 1 file changed, 1 deletion(-) diff --git a/server.py b/server.py index 1818b65..ff0ca7b 100644 --- a/server.py +++ b/server.py @@ -58,7 +58,6 @@ def purchasePlaces(): if places[competition['name']] <= 12: if placesRequired <= points: competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - placesRequired - club['points'] = int(club['points']) - placesRequired if not competition['name'] in session: session[competition['name']] = placesRequired flash('Great-booking complete!') From 1009ebfc1edf39e7066c9d046e437a971281bd6b Mon Sep 17 00:00:00 2001 From: yann Date: Mon, 30 Jun 2025 14:02:22 +0200 Subject: [PATCH 03/18] added 3 login tests --- Pipfile | 3 ++ Pipfile.lock | 84 +++++++++++++++++++++++++++++++++++++++- server.py | 14 ++++--- templates/welcome.html | 4 +- tests/__init__.py | 0 tests/conftest.py | 7 ++++ tests/test_connection.py | 23 +++++++++++ 7 files changed, 127 insertions(+), 8 deletions(-) create mode 100644 tests/__init__.py create mode 100644 tests/conftest.py create mode 100644 tests/test_connection.py diff --git a/Pipfile b/Pipfile index 9581dc9..02375d7 100644 --- a/Pipfile +++ b/Pipfile @@ -10,6 +10,9 @@ itsdangerous = "==1.1.0" jinja2 = "==2.11.2" markupsafe = "==1.1.1" werkzeug = "==1.0.1" +pytest = "*" +pytest-flask = "*" +bs4 = "*" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index ae1d86f..11b225f 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "55e68c2c6e7fb3f1685b9dfe66180ae537a367985700c08a86ccd664d56ccad7" + "sha256": "4d7a66df30afcd7f894d943098d49a686eaad5e68b7b19762f763bcb22c05499" }, "pipfile-spec": 6, "requires": { @@ -17,6 +17,22 @@ ] }, "default": { + "beautifulsoup4": { + "hashes": [ + "sha256:9bbbb14bfde9d79f38b8cd5f8c7c85f4b8f2523190ebed90e950a8dea4cb1c4b", + "sha256:dbb3c4e1ceae6aefebdaf2423247260cd062430a410e38c66f2baa50a8437195" + ], + "markers": "python_full_version >= '3.7.0'", + "version": "==4.13.4" + }, + "bs4": { + "hashes": [ + "sha256:a48685c58f50fe127722417bae83fe6badf500d54b55f7e39ffe43b798653925", + "sha256:abf8742c0805ef7f662dce4b51cca104cffe52b835238afc169142ab9b3fbccc" + ], + "index": "pypi", + "version": "==0.0.2" + }, "click": { "hashes": [ "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a", @@ -35,6 +51,14 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==1.1.2" }, + "iniconfig": { + "hashes": [ + "sha256:3abbd2e30b36733fee78f9c7f7308f2d0050e88f0087fd25c2645f63c773e1c7", + "sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760" + ], + "markers": "python_version >= '3.8'", + "version": "==2.1.0" + }, "itsdangerous": { "hashes": [ "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19", @@ -112,6 +136,64 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.1.1" }, + "packaging": { + "hashes": [ + "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484", + "sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f" + ], + "markers": "python_version >= '3.8'", + "version": "==25.0" + }, + "pluggy": { + "hashes": [ + "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3", + "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746" + ], + "markers": "python_version >= '3.9'", + "version": "==1.6.0" + }, + "pygments": { + "hashes": [ + "sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887", + "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b" + ], + "markers": "python_version >= '3.8'", + "version": "==2.19.2" + }, + "pytest": { + "hashes": [ + "sha256:539c70ba6fcead8e78eebbf1115e8b589e7565830d7d006a8723f19ac8a0afb7", + "sha256:7c67fd69174877359ed9371ec3af8a3d2b04741818c51e5e99cc1742251fa93c" + ], + "index": "pypi", + "markers": "python_version >= '3.9'", + "version": "==8.4.1" + }, + "pytest-flask": { + "hashes": [ + "sha256:58be1c97b21ba3c4d47e0a7691eb41007748506c36bf51004f78df10691fa95e", + "sha256:c0e36e6b0fddc3b91c4362661db83fa694d1feb91fa505475be6732b5bc8c253" + ], + "index": "pypi", + "markers": "python_version >= '3.7'", + "version": "==1.3.0" + }, + "soupsieve": { + "hashes": [ + "sha256:6e60cc5c1ffaf1cebcc12e8188320b72071e922c2e897f737cadce79ad5d30c4", + "sha256:ad282f9b6926286d2ead4750552c8a6142bc4c783fd66b0293547c8fe6ae126a" + ], + "markers": "python_version >= '3.8'", + "version": "==2.7" + }, + "typing-extensions": { + "hashes": [ + "sha256:8676b788e32f02ab42d9e7c61324048ae4c6d844a399eebace3d4979d75ceef4", + "sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af" + ], + "markers": "python_version >= '3.9'", + "version": "==4.14.0" + }, "werkzeug": { "hashes": [ "sha256:2de2a5db0baeae7b2d2664949077c2ac63fbd16d98da0ff71837f7d1dea3fd43", diff --git a/server.py b/server.py index 4112082..4b7168b 100644 --- a/server.py +++ b/server.py @@ -26,11 +26,15 @@ 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) - flash("The email isn't found") - return redirect(url_for('index')) + try: + club = [club for club in clubs if club['email'] == request.form['email']][0] + # if club: + return render_template('welcome.html', club=club, competitions=competitions) + # flash("Sorry, that email wasn't found") + # return redirect(url_for('index')) + except IndexError: + flash("Sorry, that email wasn't found") + return redirect(url_for('index')) @app.route('/book//') def book(competition,club): diff --git a/templates/welcome.html b/templates/welcome.html index ff6b261..d9e8d2f 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 %} @@ -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..dde30f7 --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,7 @@ +import pytest +from server import app + +@pytest.fixture +def client(): + with app.test_client() as client: + yield client diff --git a/tests/test_connection.py b/tests/test_connection.py new file mode 100644 index 0000000..7b6d106 --- /dev/null +++ b/tests/test_connection.py @@ -0,0 +1,23 @@ +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}) + data = response.data.decode() + 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}) + soup = BeautifulSoup(response.data, 'html.parser') + assert soup.h2.text == "Welcome, admin@irontemple.com" + From 40226a45a64b0b79c71124644728c0ef8d56ca3e Mon Sep 17 00:00:00 2001 From: yann Date: Tue, 1 Jul 2025 09:52:24 +0200 Subject: [PATCH 04/18] removed print, unused decode --- tests/test_connection.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/test_connection.py b/tests/test_connection.py index 7b6d106..b5e20ed 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}) - data = response.data.decode() assert "_flashes" in session assert session["_flashes"] == [("message", "Sorry, that email wasn't found")] @@ -19,5 +18,5 @@ def test_shoul_display_page_on_known_email(client): email = "admin@irontemple.com" response = client.post('/showSummary', data={"email": email}) soup = BeautifulSoup(response.data, 'html.parser') - assert soup.h2.text == "Welcome, admin@irontemple.com" + assert soup.h2.text == "Welcome, "+email From 90cae5ffc98b3922e91d37b7d4cc8cef188ceec1 Mon Sep 17 00:00:00 2001 From: yann Date: Wed, 2 Jul 2025 11:36:51 +0200 Subject: [PATCH 05/18] first try with fixture for login --- tests/conftest.py | 17 +++++++++++++++++ tests/test_connection.py | 23 +++++++++++++++++++++++ tests/test_purchase.py | 5 +++++ 3 files changed, 45 insertions(+) create mode 100644 tests/conftest.py create mode 100644 tests/test_connection.py create mode 100644 tests/test_purchase.py diff --git a/tests/conftest.py b/tests/conftest.py new file mode 100644 index 0000000..50e7972 --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,17 @@ +import pytest +from server import app + +EMAIL1 = "admin@irontemple.com" +EMAIL2 = "john@simplylift.co" + +@pytest.fixture +def client(): + with app.test_client() as client: + yield client + + +@pytest.fixture +def connect(client): + response = client.post('/showSummary', data={"email": EMAIL}) + soup = BeautifulSoup(response.data, 'html.parser') + diff --git a/tests/test_connection.py b/tests/test_connection.py new file mode 100644 index 0000000..22b664f --- /dev/null +++ b/tests/test_connection.py @@ -0,0 +1,23 @@ +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}) + 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}) + 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..abb03e3 --- /dev/null +++ b/tests/test_purchase.py @@ -0,0 +1,5 @@ +from bs4 import BeautifulSoup + + +def test_should_not_when_try_more_points_than_available(connect): + print(response.data) From b34382c46c8f4781e0ba130786f7a3217b168a51 Mon Sep 17 00:00:00 2001 From: yann Date: Wed, 2 Jul 2025 15:06:46 +0200 Subject: [PATCH 06/18] first try to get session cookie --- tests/conftest.py | 5 ++++- tests/test_purchase.py | 12 ++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 50e7972..50ec543 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,5 +1,7 @@ import pytest from server import app +from bs4 import BeautifulSoup + EMAIL1 = "admin@irontemple.com" EMAIL2 = "john@simplylift.co" @@ -12,6 +14,7 @@ def client(): @pytest.fixture def connect(client): - response = client.post('/showSummary', data={"email": EMAIL}) + response = client.post('/showSummary', data={"email": EMAIL1}) soup = BeautifulSoup(response.data, 'html.parser') + return soup diff --git a/tests/test_purchase.py b/tests/test_purchase.py index abb03e3..15b0926 100644 --- a/tests/test_purchase.py +++ b/tests/test_purchase.py @@ -1,5 +1,13 @@ from bs4 import BeautifulSoup +from flask import session -def test_should_not_when_try_more_points_than_available(connect): - print(response.data) +def test_should_not_when_try_more_points_than_available(client): + data = {"competition": "Spring Festival", "club": "Iron Temple", "places": "5"} + + # response = client.post('/book/Spring%20Festival/Iron%20Temple', data=data) + response = client.post('/purchasePlaces', data=data) + # print(BeautifulSoup(response.data, "html.parser")) + print(session) + #assert "_flashes" in session + #assert session["_flashes"] == [("message", "You don't have enough points")] From 9705789809020189069ea1aa9e861b2249f4e860 Mon Sep 17 00:00:00 2001 From: yann Date: Wed, 2 Jul 2025 15:07:28 +0200 Subject: [PATCH 07/18] works better with init --- tests/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/__init__.py diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29 From 813b7849fe65be24b29b9ba01a7cb2726d68fb2e Mon Sep 17 00:00:00 2001 From: yann Date: Wed, 2 Jul 2025 17:27:06 +0200 Subject: [PATCH 08/18] test Ok on soup --- tests/test_purchase.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/test_purchase.py b/tests/test_purchase.py index 15b0926..350b7a4 100644 --- a/tests/test_purchase.py +++ b/tests/test_purchase.py @@ -3,11 +3,9 @@ from flask import session def test_should_not_when_try_more_points_than_available(client): - data = {"competition": "Spring Festival", "club": "Iron Temple", "places": "5"} - - # response = client.post('/book/Spring%20Festival/Iron%20Temple', data=data) + data = {"competition": "Spring Festival", "club": "Iron Temple", "places": "6"} response = client.post('/purchasePlaces', data=data) - # print(BeautifulSoup(response.data, "html.parser")) - print(session) - #assert "_flashes" in session - #assert session["_flashes"] == [("message", "You don't have enough points")] + soup = BeautifulSoup(response.data, "html.parser") + print(soup.li.text) + assert "You don't have enough points" == soup.li.text + From 0370de60e0a7c27ada0c27202d91c01d2873f448 Mon Sep 17 00:00:00 2001 From: yann Date: Thu, 3 Jul 2025 11:41:17 +0200 Subject: [PATCH 09/18] added ok and nok on points --- server.py | 7 +++---- templates/welcome.html | 6 +++--- tests/conftest.py | 10 +++++++++- tests/test_connection.py | 2 ++ tests/test_purchase.py | 20 ++++++++++++++------ 5 files changed, 31 insertions(+), 14 deletions(-) diff --git a/server.py b/server.py index b0d68c3..f9c76cd 100644 --- a/server.py +++ b/server.py @@ -29,7 +29,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) - flash("The email isn't found") + flash("Sorry, that email wasn't found") return redirect(url_for('index')) @app.route('/book//') @@ -53,11 +53,10 @@ def purchasePlaces(): competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - placesRequired if competition['numberOfPlaces'] < 0: competition['numberOfPlaces'] = 0 - flash('Great-booking complete!') + flash("Great-booking complete!") else: flash("You don't have enough points") - return render_template('welcome.html', club=club, - competitions=competitions) + return render_template('welcome.html', club=club, competitions=competitions) diff --git a/templates/welcome.html b/templates/welcome.html index ff6b261..da2841d 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/conftest.py b/tests/conftest.py index 50ec543..ab309ae 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -5,13 +5,21 @@ 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}) diff --git a/tests/test_connection.py b/tests/test_connection.py index 22b664f..50c2f9b 100644 --- a/tests/test_connection.py +++ b/tests/test_connection.py @@ -10,6 +10,7 @@ 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")] @@ -17,6 +18,7 @@ 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 diff --git a/tests/test_purchase.py b/tests/test_purchase.py index 350b7a4..3dbca62 100644 --- a/tests/test_purchase.py +++ b/tests/test_purchase.py @@ -2,10 +2,18 @@ from bs4 import BeautifulSoup from flask import session -def test_should_not_when_try_more_points_than_available(client): - data = {"competition": "Spring Festival", "club": "Iron Temple", "places": "6"} - response = client.post('/purchasePlaces', data=data) - soup = BeautifulSoup(response.data, "html.parser") - print(soup.li.text) - assert "You don't have enough points" == soup.li.text +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) + data = club1.update({"places": points-1}) + response = client.post('/purchasePlaces', data=club1) + soup = BeautifulSoup(response.data, "html.parser") + assert "Great-booking complete!" == soup.li.text From 524c4ca028a1a5eba030868dc25e062c33d63b50 Mon Sep 17 00:00:00 2001 From: yann Date: Thu, 3 Jul 2025 15:08:11 +0200 Subject: [PATCH 10/18] test on 12, but error and fails --- server.py | 2 +- templates/welcome.html | 4 ++-- tests/__init__.py | 0 tests/conftest.py | 30 ++++++++++++++++++++++++++++++ tests/test_connection.py | 26 ++++++++++++++++++++++++++ tests/test_purchase.py | 29 +++++++++++++++++++++++++++++ 6 files changed, 88 insertions(+), 3 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/server.py b/server.py index ff0ca7b..771887f 100644 --- a/server.py +++ b/server.py @@ -29,7 +29,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) - flash("The email isn't found") + flash("Sorry, that email wasn't found") return redirect(url_for('index')) @app.route('/book//') diff --git a/templates/welcome.html b/templates/welcome.html index 223f4b2..8289e70 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 %} @@ -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..2c757bd --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,30 @@ +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..8f91968 --- /dev/null +++ b/tests/test_connection.py @@ -0,0 +1,26 @@ +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..27733f3 --- /dev/null +++ b/tests/test_purchase.py @@ -0,0 +1,29 @@ +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 + + +class TestPlaces: + + def test_should_refuse_more_than_12(self, client, club1): + club1.update({"places": 13}) + response = client.post('/puchasePlaces', data=club1) + print(response.data) + soup = BeautifulSoup(response.data, "html.parser") + assert "You can't book more than 12 places" == soup.li.text From 691392988f7b0d9cf0b0fa56ab75f42b5b1725d2 Mon Sep 17 00:00:00 2001 From: yann Date: Thu, 3 Jul 2025 15:25:21 +0200 Subject: [PATCH 11/18] more than 12 test ok --- clubs.json | 4 ++-- server.py | 1 - templates/welcome.html | 2 +- tests/conftest.py | 2 +- tests/test_purchase.py | 3 +-- 5 files changed, 5 insertions(+), 7 deletions(-) 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/server.py b/server.py index 771887f..96efd7c 100644 --- a/server.py +++ b/server.py @@ -53,7 +53,6 @@ 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: diff --git a/templates/welcome.html b/templates/welcome.html index 8289e70..bfecda3 100644 --- a/templates/welcome.html +++ b/templates/welcome.html @@ -15,7 +15,7 @@ {% endfor %}
{% endif%} - Points available: {{club['points']}} + Points available: {{club['points']}}

Competitions:

    {% for comp in competitions%} diff --git a/tests/conftest.py b/tests/conftest.py index 2c757bd..356d5f4 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -6,6 +6,7 @@ from bs4 import BeautifulSoup EMAIL1 = "admin@irontemple.com" EMAIL2 = "john@simplylift.co" + @pytest.fixture def club1(): data = {"competition": "Spring Festival", "club": "Iron Temple"} @@ -27,4 +28,3 @@ def connect(client): soup = BeautifulSoup(response.data, 'html.parser') return soup - diff --git a/tests/test_purchase.py b/tests/test_purchase.py index 27733f3..8fbe211 100644 --- a/tests/test_purchase.py +++ b/tests/test_purchase.py @@ -23,7 +23,6 @@ class TestPlaces: def test_should_refuse_more_than_12(self, client, club1): club1.update({"places": 13}) - response = client.post('/puchasePlaces', data=club1) - print(response.data) + response = client.post('/purchasePlaces', data=club1) soup = BeautifulSoup(response.data, "html.parser") assert "You can't book more than 12 places" == soup.li.text From df7a0836ba5f55862ce6dfdfb0c26bd02618fd25 Mon Sep 17 00:00:00 2001 From: yann Date: Thu, 3 Jul 2025 15:26:11 +0200 Subject: [PATCH 12/18] coverage installed --- Pipfile | 2 + Pipfile.lock | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 129 insertions(+), 1 deletion(-) diff --git a/Pipfile b/Pipfile index 9581dc9..7910ce2 100644 --- a/Pipfile +++ b/Pipfile @@ -10,6 +10,8 @@ itsdangerous = "==1.1.0" jinja2 = "==2.11.2" markupsafe = "==1.1.1" werkzeug = "==1.0.1" +coverage = "*" +pytest-cov = "*" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index ae1d86f..9c45fda 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "55e68c2c6e7fb3f1685b9dfe66180ae537a367985700c08a86ccd664d56ccad7" + "sha256": "394008e670736a575d6abfd91a80fe12ddae3e60b47951316967976a24d7a8e7" }, "pipfile-spec": 6, "requires": { @@ -26,6 +26,83 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==7.1.2" }, + "coverage": { + "extras": [ + "toml" + ], + "hashes": [ + "sha256:0a07757de9feb1dfafd16ab651e0f628fd7ce551604d1bf23e47e1ddca93f08a", + "sha256:0a17eaf46f56ae0f870f14a3cbc2e4632fe3771eab7f687eda1ee59b73d09fe4", + "sha256:0b4a4cb73b9f2b891c1788711408ef9707666501ba23684387277ededab1097c", + "sha256:0c0378ba787681ab1897f7c89b415bd56b0b2d9a47e5a3d8dc0ea55aac118d6c", + "sha256:115db3d1f4d3f35f5bb021e270edd85011934ff97c8797216b62f461dd69374b", + "sha256:123d589f32c11d9be7fe2e66d823a236fe759b0096f5db3fb1b75b2fa414a4fa", + "sha256:14fa8d3da147f5fdf9d298cacc18791818f3f1a9f542c8958b80c228320e90c6", + "sha256:19e7be4cfec248df38ce40968c95d3952fbffd57b400d4b9bb580f28179556d2", + "sha256:1df6b76e737c6a92210eebcb2390af59a141f9e9430210595251fbaf02d46926", + "sha256:1e2f097eae0e5991e7623958a24ced3282676c93c013dde41399ff63e230fcf2", + "sha256:256ea87cb2a1ed992bcdfc349d8042dcea1b80436f4ddf6e246d6bee4b5d73b6", + "sha256:28dc1f67e83a14e7079b6cea4d314bc8b24d1aed42d3582ff89c0295f09b181e", + "sha256:2c8937fa16c8c9fbbd9f118588756e7bcdc7e16a470766a9aef912dd3f117dbd", + "sha256:2d0d4f6ecdf37fcc19c88fec3e2277d5dee740fb51ffdd69b9579b8c31e4232e", + "sha256:2f3da12e0ccbcb348969221d29441ac714bbddc4d74e13923d3d5a7a0bebef7a", + "sha256:31991156251ec202c798501e0a42bbdf2169dcb0f137b1f5c0f4267f3fc68ef9", + "sha256:326802760da234baf9f2f85a39e4a4b5861b94f6c8d95251f699e4f73b1835dc", + "sha256:333b2e0ca576a7dbd66e85ab402e35c03b0b22f525eed82681c4b866e2e2653a", + "sha256:42da2280c4d30c57a9b578bafd1d4494fa6c056d4c419d9689e66d775539be74", + "sha256:48f82f889c80af8b2a7bb6e158d95a3fbec6a3453a1004d04e4f3b5945a02694", + "sha256:49b752a2858b10580969ec6af6f090a9a440a64a301ac1528d7ca5f7ed497f4d", + "sha256:4b1c2d8363247b46bd51f393f86c94096e64a1cf6906803fa8d5a9d03784bdbf", + "sha256:4e01d138540ef34fcf35c1aa24d06c3de2a4cffa349e29a10056544f35cca15f", + "sha256:4e2c058aef613e79df00e86b6d42a641c877211384ce5bd07585ed7ba71ab31b", + "sha256:549cab4892fc82004f9739963163fd3aac7a7b0df430669b75b86d293d2df2a7", + "sha256:55a28954545f9d2f96870b40f6c3386a59ba8ed50caf2d949676dac3ecab99f5", + "sha256:619317bb86de4193debc712b9e59d5cffd91dc1d178627ab2a77b9870deb2868", + "sha256:6406cff19880aaaadc932152242523e892faff224da29e241ce2fca329866584", + "sha256:66283a192a14a3854b2e7f3418d7db05cdf411012ab7ff5db98ff3b181e1f912", + "sha256:669135a9d25df55d1ed56a11bf555f37c922cf08d80799d4f65d77d7d6123fcf", + "sha256:71ae8b53855644a0b1579d4041304ddc9995c7b21c8a1f16753c4d8903b4dfed", + "sha256:82c3939264a76d44fde7f213924021ed31f55ef28111a19649fec90c0f109e6d", + "sha256:82d76ad87c932935417a19b10cfe7abb15fd3f923cfe47dbdaa74ef4e503752d", + "sha256:88d7598b8ee130f32f8a43198ee02edd16d7f77692fa056cb779616bbea1b355", + "sha256:8a1166db2fb62473285bcb092f586e081e92656c7dfa8e9f62b4d39d7e6b5050", + "sha256:9303aed20872d7a3c9cb39c5d2b9bdbe44e3a9a1aecb52920f7e7495410dfab8", + "sha256:985abe7f242e0d7bba228ab01070fde1d6c8fa12f142e43debe9ed1dde686038", + "sha256:997024fa51e3290264ffd7492ec97d0690293ccd2b45a6cd7d82d945a4a80c8b", + "sha256:9ce85551f9a1119f02adc46d3014b5ee3f765deac166acf20dbb851ceb79b6f3", + "sha256:9d3a700304d01a627df9db4322dc082a0ce1e8fc74ac238e2af39ced4c083193", + "sha256:9dfb070f830739ee49d7c83e4941cc767e503e4394fdecb3b54bfdac1d7662c0", + "sha256:a535c0c7364acd55229749c2b3e5eebf141865de3a8f697076a3291985f02d30", + "sha256:a7a56a2964a9687b6aba5b5ced6971af308ef6f79a91043c05dd4ee3ebc3e9ba", + "sha256:ae5d563e970dbe04382f736ec214ef48103d1b875967c89d83c6e3f21706d5b3", + "sha256:ae9eb07f1cfacd9cfe8eaee6f4ff4b8a289a668c39c165cd0c8548484920ffc0", + "sha256:bc18ea9e417a04d1920a9a76fe9ebd2f43ca505b81994598482f938d5c315f46", + "sha256:bcd5ebe66c7a97273d5d2ddd4ad0ed2e706b39630ed4b53e713d360626c3dbb3", + "sha256:bdd612e59baed2a93c8843c9a7cb902260f181370f1d772f4842987535071d14", + "sha256:bf7d773da6af9e10dbddacbf4e5cab13d06d0ed93561d44dae0188a42c65be7e", + "sha256:c10c882b114faf82dbd33e876d0cbd5e1d1ebc0d2a74ceef642c6152f3f4d547", + "sha256:c2667a2b913e307f06aa4e5677f01a9746cd08e4b35e14ebcde6420a9ebb4c62", + "sha256:c33624f50cf8de418ab2b4d6ca9eda96dc45b2c4231336bac91454520e8d1fac", + "sha256:c48c2375287108c887ee87d13b4070a381c6537d30e8487b24ec721bf2a781cb", + "sha256:cdef6504637731a63c133bb2e6f0f0214e2748495ec15fe42d1e219d1b133f0b", + "sha256:d0d67963f9cbfc7c7f96d4ac74ed60ecbebd2ea6eeb51887af0f8dce205e545f", + "sha256:dd7a57b33b5cf27acb491e890720af45db05589a80c1ffc798462a765be6d4d7", + "sha256:ddc39510ac922a5c4c27849b739f875d3e1d9e590d1e7b64c98dadf037a16cce", + "sha256:de3c0378bdf7066c3988d66cd5232d161e933b87103b014ab1b0b4676098fa45", + "sha256:df0f9ef28e0f20c767ccdccfc5ae5f83a6f4a2fbdfbcbcc8487a8a78771168c8", + "sha256:e425cd5b00f6fc0ed7cdbd766c70be8baab4b7839e4d4fe5fac48581dd968ea4", + "sha256:f22627c1fe2745ee98d3ab87679ca73a97e75ca75eb5faee48660d060875465f", + "sha256:f44ae036b63c8ea432f610534a2668b0c3aee810e7037ab9d8ff6883de480f5b", + "sha256:f5fd54310b92741ebe00d9c0d1d7b2b27463952c022da6d47c175d246a98d1bd", + "sha256:f65bb452e579d5540c8b37ec105dd54d8b9307b07bcaa186818c104ffda22441", + "sha256:f8f6389ac977c5fb322e0e38885fbbf901743f79d47f50db706e7644dcdcb6e1", + "sha256:fae939811e14e53ed8a9818dad51d434a41ee09df9305663735f2e2d2d7d959b", + "sha256:ff0d9eae8cdfcd58fe7893b88993723583a6ce4dfbfd9f29e001922544f95615" + ], + "index": "pypi", + "markers": "python_version >= '3.9'", + "version": "==7.9.2" + }, "flask": { "hashes": [ "sha256:4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060", @@ -35,6 +112,14 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==1.1.2" }, + "iniconfig": { + "hashes": [ + "sha256:3abbd2e30b36733fee78f9c7f7308f2d0050e88f0087fd25c2645f63c773e1c7", + "sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760" + ], + "markers": "python_version >= '3.8'", + "version": "==2.1.0" + }, "itsdangerous": { "hashes": [ "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19", @@ -112,6 +197,47 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.1.1" }, + "packaging": { + "hashes": [ + "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484", + "sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f" + ], + "markers": "python_version >= '3.8'", + "version": "==25.0" + }, + "pluggy": { + "hashes": [ + "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3", + "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746" + ], + "markers": "python_version >= '3.9'", + "version": "==1.6.0" + }, + "pygments": { + "hashes": [ + "sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887", + "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b" + ], + "markers": "python_version >= '3.8'", + "version": "==2.19.2" + }, + "pytest": { + "hashes": [ + "sha256:539c70ba6fcead8e78eebbf1115e8b589e7565830d7d006a8723f19ac8a0afb7", + "sha256:7c67fd69174877359ed9371ec3af8a3d2b04741818c51e5e99cc1742251fa93c" + ], + "markers": "python_version >= '3.9'", + "version": "==8.4.1" + }, + "pytest-cov": { + "hashes": [ + "sha256:25cc6cc0a5358204b8108ecedc51a9b57b34cc6b8c967cc2c01a4e00d8a67da2", + "sha256:f5bc4c23f42f1cdd23c70b1dab1bbaef4fc505ba950d53e0081d0730dd7e86d5" + ], + "index": "pypi", + "markers": "python_version >= '3.9'", + "version": "==6.2.1" + }, "werkzeug": { "hashes": [ "sha256:2de2a5db0baeae7b2d2664949077c2ac63fbd16d98da0ff71837f7d1dea3fd43", From 5a799ccd7ad4f1ce86af115a5f4ebe79caa1c6f7 Mon Sep 17 00:00:00 2001 From: yann Date: Thu, 3 Jul 2025 15:35:51 +0200 Subject: [PATCH 13/18] added/setup coverage --- .coveragerc | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .coveragerc diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000..c712d25 --- /dev/null +++ b/.coveragerc @@ -0,0 +1,2 @@ +[run] +omit = tests/* From 79a6b00401c599d1ce4cb7b5ea5c5d8ede3c7310 Mon Sep 17 00:00:00 2001 From: yann Date: Mon, 7 Jul 2025 10:27:54 +0200 Subject: [PATCH 14/18] removed print --- tests/test_connection.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/test_connection.py b/tests/test_connection.py index 50c2f9b..22b664f 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,7 +17,6 @@ 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 From 798a9a0d9181232ada3bb2ad5849aa052df24b01 Mon Sep 17 00:00:00 2001 From: yann Date: Mon, 7 Jul 2025 10:59:30 +0200 Subject: [PATCH 15/18] add coverage config --- .coveragerc | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .coveragerc diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000..c712d25 --- /dev/null +++ b/.coveragerc @@ -0,0 +1,2 @@ +[run] +omit = tests/* From 5f861f968de42130c2ee19fa52f29f4788cbfe55 Mon Sep 17 00:00:00 2001 From: yann Date: Mon, 7 Jul 2025 11:01:54 +0200 Subject: [PATCH 16/18] removed unused print --- tests/test_connection.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/test_connection.py b/tests/test_connection.py index 8f91968..22b664f 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,7 @@ 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 - From 185744ff7bcf04b9e5c3ab178d88e8d1cbdf6795 Mon Sep 17 00:00:00 2001 From: yann Date: Mon, 7 Jul 2025 11:06:55 +0200 Subject: [PATCH 17/18] added test for multiple book --- tests/test_purchase.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/test_purchase.py b/tests/test_purchase.py index 8fbe211..ae7257c 100644 --- a/tests/test_purchase.py +++ b/tests/test_purchase.py @@ -21,8 +21,18 @@ class TestPoints: class TestPlaces: - def test_should_refuse_more_than_12(self, client, club1): + def test_should_refuse_more_than_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 From 65a05e73b7911d8bd8b76a656d1ede4f42b611d4 Mon Sep 17 00:00:00 2001 From: yann Date: Mon, 7 Jul 2025 11:12:45 +0200 Subject: [PATCH 18/18] fixed booking confirmation message --- server.py | 2 +- tests/test_purchase.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server.py b/server.py index 96efd7c..10f30c7 100644 --- a/server.py +++ b/server.py @@ -59,7 +59,7 @@ def purchasePlaces(): competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - 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: diff --git a/tests/test_purchase.py b/tests/test_purchase.py index ae7257c..abf1a39 100644 --- a/tests/test_purchase.py +++ b/tests/test_purchase.py @@ -16,7 +16,7 @@ class TestPoints: 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: