Merge branch 'QA' of github.com:ylxdre/OCR-P11-Testing into feature/issue7

branch created earlier : retrieve base code

Pipfile

@@ -10,8 +10,12 @@ itsdangerous = "==1.1.0"
 jinja2 = "==2.11.2"
 markupsafe = "==1.1.1"
 werkzeug = "==1.0.1"
+ward = "*"
 coverage = "*"
 pytest-cov = "*"
+pytest = "*"
+pytest-flask = "*"
+bs4 = "*"
 
 [dev-packages]
 

Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "394008e670736a575d6abfd91a80fe12ddae3e60b47951316967976a24d7a8e7"
+            "sha256": "42b0dc67898b0101df0af5ed2bd8ab0d6d7eb8f54964fb0a4a0a22ac504db2e5"
         },
         "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",
@@ -26,8 +42,28 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==7.1.2"
         },
+        "click-completion": {
+            "hashes": [
+                "sha256:5bf816b81367e638a190b6e91b50779007d14301b3f9f3145d68e3cade7bce86"
+            ],
+            "version": "==0.5.2"
+        },
+        "click-default-group": {
+            "hashes": [
+                "sha256:9b60486923720e7fc61731bdb32b617039aba820e22e1c88766b1125592eaa5f",
+                "sha256:eb3f3c99ec0d456ca6cd2a7f08f7d4e91771bef51b01bdd9580cc6450fe1251e"
+            ],
+            "markers": "python_version >= '2.7'",
+            "version": "==1.2.4"
+        },
+        "cucumber-tag-expressions": {
+            "hashes": [
+                "sha256:e314d5fed6eebb2f90380271f562248fb15e18636764faf40f4dde4b28b1f960"
+            ],
+            "markers": "python_version >= '2.7'",
+            "version": "==4.1.0"
         "coverage": {
-            "extras": [
+            "extras": 
                 "toml"
             ],
             "hashes": [
@@ -138,6 +174,14 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==2.11.2"
         },
+        "markdown-it-py": {
+            "hashes": [
+                "sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1",
+                "sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb"
+            ],
+            "markers": "python_version >= '3.8'",
+            "version": "==3.0.0"
+        },
         "markupsafe": {
             "hashes": [
                 "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473",
@@ -197,6 +241,13 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.1.1"
         },
+        "mdurl": {
+            "hashes": [
+                "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8",
+                "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==0.1.2"
         "packaging": {
             "hashes": [
                 "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484",
@@ -213,6 +264,13 @@
             "markers": "python_version >= '3.9'",
             "version": "==1.6.0"
         },
+        "pprintpp": {
+            "hashes": [
+                "sha256:b6b4dcdd0c0c0d75e4d7b2f21a9e933e5b2ce62b26e1a54537f9651ae5a5c01d",
+                "sha256:ea826108e2c7f49dc6d66c752973c3fc9749142a798d6b254e1e301cfdbc6403"
+            ],
+            "version": "==0.4.0"
+        },
         "pygments": {
             "hashes": [
                 "sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887",
@@ -221,6 +279,76 @@
             "markers": "python_version >= '3.8'",
             "version": "==2.19.2"
         },
+        "rich": {
+            "hashes": [
+                "sha256:1c9491e1951aac09caffd42f448ee3d04e58923ffe14993f6e83068dc395d7e0",
+                "sha256:82f1bc23a6a21ebca4ae0c45af9bdbc492ed20231dcb63f297d6d1021a9d5725"
+            ],
+            "markers": "python_full_version >= '3.8.0'",
+            "version": "==14.0.0"
+        },
+        "shellingham": {
+            "hashes": [
+                "sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686",
+                "sha256:8dbca0739d487e5bd35ab3ca4b36e11c4078f3a234bfce294b0a0291363404de"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==1.5.4"
+        },
+        "six": {
+            "hashes": [
+                "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274",
+                "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
+            "version": "==1.17.0"
+        },
+        "tomli": {
+            "hashes": [
+                "sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6",
+                "sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd",
+                "sha256:286f0ca2ffeeb5b9bd4fcc8d6c330534323ec51b2f52da063b11c502da16f30c",
+                "sha256:2d0f2fdd22b02c6d81637a3c95f8cd77f995846af7414c5c4b8d0545afa1bc4b",
+                "sha256:33580bccab0338d00994d7f16f4c4ec25b776af3ffaac1ed74e0b3fc95e885a8",
+                "sha256:400e720fe168c0f8521520190686ef8ef033fb19fc493da09779e592861b78c6",
+                "sha256:40741994320b232529c802f8bc86da4e1aa9f413db394617b9a256ae0f9a7f77",
+                "sha256:465af0e0875402f1d226519c9904f37254b3045fc5084697cefb9bdde1ff99ff",
+                "sha256:4a8f6e44de52d5e6c657c9fe83b562f5f4256d8ebbfe4ff922c495620a7f6cea",
+                "sha256:4e340144ad7ae1533cb897d406382b4b6fede8890a03738ff1683af800d54192",
+                "sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249",
+                "sha256:6972ca9c9cc9f0acaa56a8ca1ff51e7af152a9f87fb64623e31d5c83700080ee",
+                "sha256:7fc04e92e1d624a4a63c76474610238576942d6b8950a2d7f908a340494e67e4",
+                "sha256:889f80ef92701b9dbb224e49ec87c645ce5df3fa2cc548664eb8a25e03127a98",
+                "sha256:8d57ca8095a641b8237d5b079147646153d22552f1c637fd3ba7f4b0b29167a8",
+                "sha256:8dd28b3e155b80f4d54beb40a441d366adcfe740969820caf156c019fb5c7ec4",
+                "sha256:9316dc65bed1684c9a98ee68759ceaed29d229e985297003e494aa825ebb0281",
+                "sha256:a198f10c4d1b1375d7687bc25294306e551bf1abfa4eace6650070a5c1ae2744",
+                "sha256:a38aa0308e754b0e3c67e344754dff64999ff9b513e691d0e786265c93583c69",
+                "sha256:a92ef1a44547e894e2a17d24e7557a5e85a9e1d0048b0b5e7541f76c5032cb13",
+                "sha256:ac065718db92ca818f8d6141b5f66369833d4a80a9d74435a268c52bdfa73140",
+                "sha256:b82ebccc8c8a36f2094e969560a1b836758481f3dc360ce9a3277c65f374285e",
+                "sha256:c954d2250168d28797dd4e3ac5cf812a406cd5a92674ee4c8f123c889786aa8e",
+                "sha256:cb55c73c5f4408779d0cf3eef9f762b9c9f147a77de7b258bef0a5628adc85cc",
+                "sha256:cd45e1dc79c835ce60f7404ec8119f2eb06d38b1deba146f07ced3bbc44505ff",
+                "sha256:d3f5614314d758649ab2ab3a62d4f2004c825922f9e370b29416484086b264ec",
+                "sha256:d920f33822747519673ee656a4b6ac33e382eca9d331c87770faa3eef562aeb2",
+                "sha256:db2b95f9de79181805df90bedc5a5ab4c165e6ec3fe99f970d0e302f384ad222",
+                "sha256:e59e304978767a54663af13c07b3d1af22ddee3bb2fb0618ca1593e4f593a106",
+                "sha256:e85e99945e688e32d5a35c1ff38ed0b3f41f43fad8df0bdf79f72b2ba7bc5272",
+                "sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a",
+                "sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7"
+            ],
+            "markers": "python_version >= '3.8'",
+            "version": "==2.2.1"
+        },
+        "ward": {
+            "hashes": [
+                "sha256:0847e6b95db9d2b83c7d1b9cea9bcb7ac3b8e8f6d341b8dc8920d6afb05458b1",
+                "sha256:d8aafa4ddb81f4d5787d95bdb2f7ba69a2e89f183feec78d8afcc64b2cd19ee9"
+            ],
+            "index": "pypi",
+            "markers": "python_full_version >= '3.7.8' and python_full_version < '4.0.0'",
+            "version": "==0.68.0b0"
         "pytest": {
             "hashes": [
                 "sha256:539c70ba6fcead8e78eebbf1115e8b589e7565830d7d006a8723f19ac8a0afb7",
@@ -238,6 +366,31 @@
             "markers": "python_version >= '3.9'",
             "version": "==6.2.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",

competitions.json

@@ -7,7 +7,7 @@
         },
         {
             "name": "Fall Classic",
-            "date": "2020-10-22 13:30:00",
+            "date": "2025-10-22 13:30:00",
             "numberOfPlaces": "13"
         }
     ]

server.py

@@ -1,5 +1,6 @@
 import json
 from flask import Flask,render_template,request,redirect,flash,url_for,session
+from datetime import datetime
 
 
 def loadClubs():
@@ -19,6 +20,8 @@ app.secret_key = 'something_special'
 
 competitions = loadCompetitions()
 clubs = loadClubs()
+now = datetime.strftime(datetime.now(), "%Y-%m-%d %H:%M:%S")
+
 
 @app.route('/')
 def index():
@@ -26,21 +29,27 @@ def index():
 
 @app.route('/showSummary',methods=['POST'])
 def showSummary():
-    club = [club for club in clubs if club['email'] == request.form['email']]
+    try:
-    if club:
+        club = [club for club in clubs if club['email'] == request.form['email']][0]
-        return render_template('welcome.html', club=club[0], competitions=competitions)
+        return render_template('welcome.html', club=club, competitions=competitions, now=now)
-    flash("Sorry, that email wasn't found")
+    except IndexError:
-    return redirect(url_for('index'))
+        flash("Sorry, that email wasn't found")
+        return redirect(url_for('index'))
 
 @app.route('/book/<competition>/<club>')
 def book(competition,club):
     foundClub = [c for c in clubs if c['name'] == club][0]
     foundCompetition = [c for c in competitions if c['name'] == competition][0]
     if foundClub and foundCompetition:
-        return render_template('booking.html',club=foundClub,competition=foundCompetition)
+        if foundCompetition['date'] > now:
+            return render_template('booking.html',club=foundClub,competition=foundCompetition)
+        else:
+            flash("You cannot book for a past competition")
+            return render_template('welcome.html', club=foundClub,
+                                   competitions=competitions, now=now)
     else:
         flash("Something went wrong-please try again")
-        return render_template('welcome.html', club=club, competitions=competitions)
+        return render_template('welcome.html', club=club, competitions=competitions, now=now)
 
 
 @app.route('/purchasePlaces',methods=['POST'])
@@ -48,15 +57,20 @@ def purchasePlaces():
     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]
     placesRequired = int(request.form['places'])
+    # check if that's the first book, and update session
     if competition['name'] in session:
         places = {competition['name']: session[competition['name']] + placesRequired}
     else:
         places = {competition['name']: placesRequired}
     points = int(club['points'])
+    # prevent to book more than 12 places
     if placesRequired <= 12:
         if places[competition['name']] <= 12:
+            # prevent to book more than available points
             if placesRequired <= points:
                 competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - placesRequired
+                club['points'] = int(club['points']) - placesRequired
+                # set the session if that's the first book for this competition
                 if not competition['name'] in session:
                     session[competition['name']] = placesRequired
                 flash(f"Great ! {placesRequired} places booked for {competition['name']}")
@@ -67,14 +81,14 @@ def purchasePlaces():
     else:
         flash("You can't book more than 12 places")
     return render_template('welcome.html', club=club,
-                           competitions=competitions)
+                           competitions=competitions, now=now)
 
 # TODO: Add route for points display
-
+@app.route('/points')
+def displayPoints():
+    return render_template('points.html', clubs=clubs)
 
 @app.route('/logout')
 def logout():
     return redirect(url_for('index'))
 
-if (__name__ == "__main__"):
-    app.run(debug=True)

templates/index.html

@@ -22,5 +22,6 @@
         <input type="email" name="email" id=""/>
         <button type="submit">Enter</button>
     </form>
+    <a href="{{ url_for('displayPoints') }}">Board of points</a>
 </body>
 </html>

templates/points.html

@@ -0,0 +1,18 @@
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Board of clubs and points || GUDLFT</title>
+</head>
+<body>
+    <h2>Current points</h2>
+    <ul>
+    {% for club in clubs %}
+        <li><strong>club : </strong> {{club['name']}} </br>
+        <strong>Points : </strong>{{club['points']}}</br>
+        </br>
+        {% endfor %}
+    </ul>
+    <a href="{{ url_for('index') }}"> Back </a>
+</body>
+</html>

templates/welcome.html

@@ -23,7 +23,7 @@
             {{comp['name']}}<br />
             Date: {{comp['date']}}</br>
             Number of Places: {{comp['numberOfPlaces']}}
-            {%if comp['numberOfPlaces']|int >0%}
+            {%if comp['numberOfPlaces']|int >0 and comp['date'] > now%}
             <a href="{{ url_for('book',competition=comp['name'],club=club['name']) }}">Book Places</a>
             {%endif%}
         </li>

tests/conftest.py

@@ -27,4 +27,3 @@ def connect(client):
     response = client.post('/showSummary', data={"email": EMAIL1})
     soup = BeautifulSoup(response.data, 'html.parser')
     return soup
-

tests/test_book_old.py

@@ -0,0 +1,28 @@
+from ward import fixture, test, using
+from server import app
+from bs4 import BeautifulSoup
+
+
+@fixture(scope="global")
+def test_client():
+    app.config['TESTING'] = True
+    with app.test_client() as client:
+        yield client
+
+
+@fixture(scope="global")
+def connect(co=test_client):
+    response = co.post('/showSummary', data={"email": "admin@irontemple.com"})
+    soup = BeautifulSoup(response.data, "html.parser")
+    return soup
+
+
+@test("authentication is ok, welcome well displayed")
+def _(client=connect):
+    assert client.h2.text == "Welcome, admin@irontemple.com"
+   
+@test("should be no book link for old competition")
+def _(client=connect):
+    li = client.find_all("li")
+    assert not li[0].a
+    assert li[1].a

tests/test_connection.py

@@ -18,6 +18,5 @@ 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
+    welcome = "Welcome, "+email
-
+    assert welcome in response.data.decode()
-

tests/test_purchase.py

@@ -3,36 +3,78 @@ from flask import session
 
 
 class TestPoints:
+    '''
+    testing both case, book with and without enough points
+    '''
 
-    def test_should_nok_when_too_much_points(self, client, connect, club1):
+    def test_should_nok_when_too_much_points(self, client, connect, club2):
+        '''
+        test booking an amount of places greater than the available points
+        '''
         points = int(connect.span.text)
-        club1.update({"places": points+1})
+        club2.update({"places": points+1})
-        response = client.post('/purchasePlaces', data=club1)
+        response = client.post('/purchasePlaces', data=club2)
         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):
+    def test_should_ok_when_enough_points(self, client, connect, club2):
+        '''
+        test booking with enough points
+        '''
         points = int(connect.span.text)
-        club1.update({"places": points-1})
+        # One remaining point after that :
-        response = client.post('/purchasePlaces', data=club1)
+        club2.update({"places": points-1})
+        response = client.post('/purchasePlaces', data=club2)
         soup = BeautifulSoup(response.data, "html.parser")
-        assert f"Great ! "+str(points-1)+" places booked for "+club1['competition'] == soup.li.text
+        assert f"Great ! "+str(points-1)+" places booked for "+club2['competition'] == soup.li.text
 
 
 class TestPlaces:
+    '''
+    test the booking limit of 12 places
+    '''
 
-    def test_should_refuse_more_than_12_once(self, client, club1):
+    def test_should_refuse_more_12_once(self, client, club2):
-        club1.update({"places": 13})
+        '''
-        response = client.post('/purchasePlaces', data=club1)
+        test to book more than 12 places in one shot
+        '''
+        club2.update({"places": 13})
+        response = client.post('/purchasePlaces', data=club2)
         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):
+    def test_should_refuse_more_12_total(self, client, club2):
-        club1.update({"places": 2})
+        '''
-        response = client.post('/purchasePlaces', data=club1)
+        test to book more than 12 places in a two-part reservation
+        '''
+        club2.update({"places": 1})
+        response = client.post('/purchasePlaces', data=club2)
         soup = BeautifulSoup(response.data, "html.parser")
-        assert "Great ! 2 places booked for "+club1['competition'] == soup.li.text
+        assert "Great ! 1 places booked for "+club2['competition'] == soup.li.text 
-        club1.update({"places": 12})
+        club2.update({"places": 12})
-        response = client.post('/purchasePlaces', data=club1)
+        response = client.post('/purchasePlaces', data=club2)
         soup = BeautifulSoup(response.data, "html.parser")
-        assert "You already booked 12 places for "+club1['competition'] == soup.li.text
+        assert "You already booked 12 places for "+club2['competition'] == soup.li.text
+
+        
+class TestDate:
+    '''
+    test the booking for the past competitions 
+    '''
+
+    def test_should_not_display_book_link_for_past_competitions(self, connect):
+        '''
+        test that the booking link isn't displayed when competition date is older than today
+        '''
+        li = connect.find_all("li")
+        assert not li[0].a
+        assert li[1].a
+
+    def test_forged_url_on_past_competition_should_raise_flash(self, client):
+        '''
+        test that a flash warning occur when trying to connect to an URL on an old competition
+        '''
+        url = '/book/Spring Festival/Iron Temple'
+        response = client.get(url)
+        assert "You cannot book for a past competition" in response.data.decode()
+

tests/test_update.py

@@ -0,0 +1,12 @@
+
+class TestPointsUpdate:
+
+    def test_should_not_be_ok_the_second_time(self, connect, client, club2):
+        '''
+        this books an amount of points-1 places
+        then test if 1 points remains displayed on page
+        '''
+        points = int(connect.span.text)
+        club2.update({"places": points-1})
+        response = client.post('/purchasePlaces', data=club2)
+        assert f"Great ! {points-1} places booked for {club2['competition']}" in response.data.decode()