7 Commits

Author SHA1 Message Date
79a6b00401 removed print 2025-07-07 10:27:54 +02:00
0370de60e0 added ok and nok on points 2025-07-03 11:41:17 +02:00
813b7849fe test Ok on soup 2025-07-02 17:27:06 +02:00
9705789809 works better with init 2025-07-02 15:07:28 +02:00
b34382c46c first try to get session cookie 2025-07-02 15:06:46 +02:00
90cae5ffc9 first try with fixture for login 2025-07-02 11:36:51 +02:00
d3e9eda937 let this fix for issue6 2025-06-30 10:32:46 +02:00
7 changed files with 14 additions and 40 deletions

BIN
.DS_Store vendored Normal file

Binary file not shown.

View File

@@ -1,5 +1,5 @@
import json import json
from flask import Flask,render_template,request,redirect,flash,url_for,session from flask import Flask,render_template,request,redirect,flash,url_for
def loadClubs(): def loadClubs():
@@ -48,26 +48,17 @@ def purchasePlaces():
competition = [c for c in competitions if c['name'] == request.form['competition']][0] competition = [c for c in competitions if c['name'] == request.form['competition']][0]
club = [c for c in clubs if c['name'] == request.form['club']][0] club = [c for c in clubs if c['name'] == request.form['club']][0]
placesRequired = int(request.form['places']) placesRequired = int(request.form['places'])
if competition['name'] in session:
places = {competition['name']: session[competition['name']] + placesRequired}
else:
places = {competition['name']: placesRequired}
points = int(club['points']) points = int(club['points'])
if placesRequired <= 12:
if places[competition['name']] <= 12:
if placesRequired <= points: if placesRequired <= points:
competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - placesRequired competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - placesRequired
if not competition['name'] in session: if competition['numberOfPlaces'] < 0:
session[competition['name']] = placesRequired 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")
else: return render_template('welcome.html', club=club, competitions=competitions)
flash(f"You already booked 12 places for {competition['name']}")
else:
flash("You can't book more than 12 places")
return render_template('welcome.html', club=club,
competitions=competitions)
# TODO: Add route for points display # TODO: Add route for points display
@@ -75,6 +66,3 @@ def purchasePlaces():
@app.route('/logout') @app.route('/logout')
def logout(): def logout():
return redirect(url_for('index')) return redirect(url_for('index'))
if (__name__ == "__main__"):
app.run(debug=True)

View File

@@ -5,8 +5,6 @@ from bs4 import BeautifulSoup
EMAIL1 = "admin@irontemple.com" EMAIL1 = "admin@irontemple.com"
EMAIL2 = "john@simplylift.co" EMAIL2 = "john@simplylift.co"
@pytest.fixture @pytest.fixture
def club1(): def club1():
data = {"competition": "Spring Festival", "club": "Iron Temple"} data = {"competition": "Spring Festival", "club": "Iron Temple"}

View File

@@ -10,7 +10,6 @@ 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")]
@@ -18,9 +17,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

View File

@@ -13,16 +13,7 @@ class TestPoints:
def test_should_ok_when_enough_points(self, client, connect, club1): def test_should_ok_when_enough_points(self, client, connect, club1):
points = int(connect.span.text) points = int(connect.span.text)
club1.update({"places": points-1}) data = club1.update({"places": points-1})
response = client.post('/purchasePlaces', data=club1) response = client.post('/purchasePlaces', data=club1)
soup = BeautifulSoup(response.data, "html.parser") soup = BeautifulSoup(response.data, "html.parser")
assert "Great-booking complete!" == soup.li.text 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('/purchasePlaces', data=club1)
soup = BeautifulSoup(response.data, "html.parser")
assert "You can't book more than 12 places" == soup.li.text