13 Commits

Author SHA1 Message Date
798a9a0d91 add coverage config 2025-07-07 10:59:30 +02:00
f79c92e8c3 Merge pull request #4 from ylxdre/bug/issue2
Bug/issue2
2025-07-07 10:44:53 +02:00
4565f2a16a Merge branch 'QA' into bug/issue2 2025-07-07 10:43:56 +02:00
fe4e2143a7 Merge pull request #3 from ylxdre/bug/issue1
Bug/issue1
2025-07-07 10:40:04 +02:00
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
40226a45a6 removed print, unused decode 2025-07-01 09:52:24 +02:00
1009ebfc1e added 3 login tests 2025-06-30 14:02:22 +02:00
d3e9eda937 let this fix for issue6 2025-06-30 10:32:46 +02:00
9 changed files with 169 additions and 13 deletions

2
.coveragerc Normal file
View File

@@ -0,0 +1,2 @@
[run]
omit = tests/*

View File

@@ -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]

84
Pipfile.lock generated
View File

@@ -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",

View File

@@ -26,11 +26,12 @@ 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]
return render_template('welcome.html', club=club, competitions=competitions)
except IndexError:
flash("Sorry, that email wasn't found")
return redirect(url_for('index'))
@app.route('/book/<competition>/<club>')
def book(competition,club):
@@ -51,14 +52,12 @@ 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!')
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)

View File

@@ -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
View File

29
tests/conftest.py Normal file
View File

@@ -0,0 +1,29 @@
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

22
tests/test_connection.py Normal file
View File

@@ -0,0 +1,22 @@
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

19
tests/test_purchase.py Normal file
View File

@@ -0,0 +1,19 @@
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)
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