Yann/Projet11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added ok and nok on points

Browse Source
This commit is contained in:
yann 2025-07-03 11:41:17 +02:00
parent 813b7849fe
commit 0370de60e0
5 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server.py
View File

@ -29,7 +29,7 @@ def showSummary():
club = [club for club in clubs if club['email'] == request.form['email']] club = [club for club in clubs if club['email'] == request.form['email']]
if club: if club:
return render_template('welcome.html', club=club[0], competitions=competitions) 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')) return redirect(url_for('index'))
@app.route('/book/<competition>/<club>') @app.route('/book/<competition>/<club>')
@ -53,11 +53,10 @@ def purchasePlaces():
competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - placesRequired competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - placesRequired
if competition['numberOfPlaces'] < 0: if competition['numberOfPlaces'] < 0:
competition['numberOfPlaces'] = 0 competition['numberOfPlaces'] = 0
flash('Great-booking complete!') flash("Great-booking complete!")
else: else:
flash("You don't have enough points") flash("You don't have enough points")
return render_template('welcome.html', club=club, return render_template('welcome.html', club=club, competitions=competitions)
competitions=competitions)

4
templates/welcome.html
View File

@ -5,7 +5,7 @@
<title>Summary | GUDLFT Registration</title> <title>Summary | GUDLFT Registration</title>
</head> </head>
<body> <body>
<h2>Welcome, {{club['email']}} </h2><a href="{{url_for('logout')}}">Logout</a> <h2>Welcome, {{club['email']}}</h2><a href="{{url_for('logout')}}">Logout</a>
{% with messages = get_flashed_messages()%} {% with messages = get_flashed_messages()%}
{% if messages %} {% if messages %}
@ -15,7 +15,7 @@
{% endfor %} {% endfor %}
</ul> </ul>
{% endif%} {% endif%}
Points available: {{club['points']}} <b id="points">Points available: </b><span>{{club['points']}}</span>
<h3>Competitions:</h3> <h3>Competitions:</h3>
<ul> <ul>
{% for comp in competitions%} {% for comp in competitions%}

10
tests/conftest.py
View File

@ -5,13 +5,21 @@ from bs4 import BeautifulSoup
EMAIL1 = "admin@irontemple.com" EMAIL1 = "admin@irontemple.com"
EMAIL2 = "john@simplylift.co" 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 @pytest.fixture
def client(): def client():
with app.test_client() as client: with app.test_client() as client:
yield client yield client
@pytest.fixture @pytest.fixture
def connect(client): def connect(client):
response = client.post('/showSummary', data={"email": EMAIL1}) response = client.post('/showSummary', data={"email": EMAIL1})

2
tests/test_connection.py
View File

@ -10,6 +10,7 @@ def test_should_status_code_ok(client):
def test_should_display_sorry_with_unknown_email(client): def test_should_display_sorry_with_unknown_email(client):
email = "test@test.com" email = "test@test.com"
response = client.post('/showSummary', data={"email": email}) response = client.post('/showSummary', data={"email": email})
print(session)
assert "_flashes" in session assert "_flashes" in session
assert session["_flashes"] == [("message", "Sorry, that email wasn't found")] 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): def test_shoul_display_page_on_known_email(client):
email = "admin@irontemple.com" email = "admin@irontemple.com"
response = client.post('/showSummary', data={"email": email}) response = client.post('/showSummary', data={"email": email})
print(session)
soup = BeautifulSoup(response.data, 'html.parser') soup = BeautifulSoup(response.data, 'html.parser')
assert soup.h2.text == "Welcome, "+email assert soup.h2.text == "Welcome, "+email

16
tests/test_purchase.py
View File

@ -2,10 +2,18 @@ from bs4 import BeautifulSoup
from flask import session from flask import session
def test_should_not_when_try_more_points_than_available(client): class TestPoints:
data = {"competition": "Spring Festival", "club": "Iron Temple", "places": "6"}
response = client.post('/purchasePlaces', data=data) 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") soup = BeautifulSoup(response.data, "html.parser")
print(soup.li.text)
assert "You don't have enough points" == soup.li.text 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