server.py

@@ -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("Sorry, that email wasn't found")
+    flash("The email isn't found")
     return redirect(url_for('index'))
 
 @app.route('/book/<competition>/<club>')
@@ -53,10 +53,11 @@ def purchasePlaces():
         competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - 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)
 
 
 

templates/welcome.html

@@ -15,7 +15,7 @@
         {% endfor %}
        </ul>
     {% endif%}
-    <b id="points">Points available: </b><span>{{club['points']}}</span>
+    Points available: {{club['points']}}
     <h3>Competitions:</h3>
     <ul>
         {% for comp in competitions%}

tests/conftest.py

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

tests/test_connection.py

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

tests/test_purchase.py

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