test old competition hasn`t link to book
This commit is contained in:
parent
e089e78fc5
commit
ada3a5cc76
@ -7,10 +7,10 @@
|
|||||||
{
|
{
|
||||||
"name":"Iron Temple",
|
"name":"Iron Temple",
|
||||||
"email": "admin@irontemple.com",
|
"email": "admin@irontemple.com",
|
||||||
"points":"47"
|
"points":"4"
|
||||||
},
|
},
|
||||||
{ "name":"She Lifts",
|
{ "name":"She Lifts",
|
||||||
"email": "kate@shelifts.co.uk",
|
"email": "kate@shelifts.co.uk",
|
||||||
"points":"12"
|
"points":"12"
|
||||||
}
|
}
|
||||||
]}
|
]}
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Fall Classic",
|
"name": "Fall Classic",
|
||||||
"date": "2020-10-22 13:30:00",
|
"date": "2025-10-22 13:30:00",
|
||||||
"numberOfPlaces": "13"
|
"numberOfPlaces": "13"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
@ -32,7 +32,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, now=now)
|
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'))
|
return redirect(url_for('index'))
|
||||||
|
|
||||||
@app.route('/book/<competition>/<club>')
|
@app.route('/book/<competition>/<club>')
|
||||||
@ -65,10 +65,11 @@ def purchasePlaces():
|
|||||||
if places[competition['name']] <= 12:
|
if places[competition['name']] <= 12:
|
||||||
if placesRequired <= points:
|
if placesRequired <= points:
|
||||||
competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - placesRequired
|
competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - placesRequired
|
||||||
print(club['points'])
|
|
||||||
if not competition['name'] in session:
|
if not competition['name'] in session:
|
||||||
session[competition['name']] = placesRequired
|
session[competition['name']] = placesRequired
|
||||||
flash(f"Great ! {placesRequired} places booked for {competition['name']}")
|
flash(f"Great ! {placesRequired} places booked for {competition['name']}")
|
||||||
|
# flash('Great-booking complete!')
|
||||||
|
|
||||||
else:
|
else:
|
||||||
flash("You don't have enough points")
|
flash("You don't have enough points")
|
||||||
else:
|
else:
|
||||||
|
@ -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%}
|
||||||
@ -33,4 +33,4 @@
|
|||||||
{%endwith%}
|
{%endwith%}
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
0
tests/__init__.py
Normal file
0
tests/__init__.py
Normal file
31
tests/conftest.py
Normal file
31
tests/conftest.py
Normal file
@ -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
|
||||||
|
|
||||||
|
|
27
tests/test_connection.py
Normal file
27
tests/test_connection.py
Normal file
@ -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
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
49
tests/test_purchase.py
Normal file
49
tests/test_purchase.py
Normal file
@ -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
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user