Compare commits
2 Commits
f323cd8310
...
691392988f
Author | SHA1 | Date | |
---|---|---|---|
691392988f | |||
524c4ca028 |
@ -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"
|
||||
}
|
||||
]}
|
||||
]}
|
||||
|
@ -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/<competition>/<club>')
|
||||
@ -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:
|
||||
|
@ -5,7 +5,7 @@
|
||||
<title>Summary | GUDLFT Registration</title>
|
||||
</head>
|
||||
<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()%}
|
||||
{% if messages %}
|
||||
@ -15,7 +15,7 @@
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif%}
|
||||
Points available: {{club['points']}}
|
||||
<b id="points">Points available: </b><span>{{club['points']}}</span>
|
||||
<h3>Competitions:</h3>
|
||||
<ul>
|
||||
{% for comp in competitions%}
|
||||
@ -33,4 +33,4 @@
|
||||
{%endwith%}
|
||||
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
0
tests/__init__.py
Normal file
0
tests/__init__.py
Normal file
30
tests/conftest.py
Normal file
30
tests/conftest.py
Normal file
@ -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
|
||||
|
26
tests/test_connection.py
Normal file
26
tests/test_connection.py
Normal file
@ -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
|
||||
|
||||
|
||||
|
28
tests/test_purchase.py
Normal file
28
tests/test_purchase.py
Normal file
@ -0,0 +1,28 @@
|
||||
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('/purchasePlaces', data=club1)
|
||||
soup = BeautifulSoup(response.data, "html.parser")
|
||||
assert "You can't book more than 12 places" == soup.li.text
|
Loading…
x
Reference in New Issue
Block a user