Merge pull request 'bug/issue1' (#3) from bug/issue1 into QA

Reviewed-on: #3

server.py

@@ -28,7 +28,10 @@ def index():
 def showSummary():
     try:
         club = [club for club in clubs if club['email'] == request.form['email']][0]
+    # if club:
         return render_template('welcome.html', club=club, competitions=competitions)
+    # flash("Sorry, that email wasn't found")
+    # return redirect(url_for('index'))
     except IndexError:
         flash("Sorry, that email wasn't found")
         return redirect(url_for('index'))
@@ -49,18 +52,11 @@ 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'])
-    points = int(club['points'])
+    competition['numberOfPlaces'] = int(competition['numberOfPlaces'])-placesRequired
-    if placesRequired <= points:
+    flash('Great-booking complete!')
-        competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - placesRequired
-        if competition['numberOfPlaces'] < 0:
-            competition['numberOfPlaces'] = 0
-        flash("Great-booking complete!")
-    else:
-        flash("You don't have enough points")
     return render_template('welcome.html', club=club, competitions=competitions)
 
 
-
 # TODO: Add route for points display
 
 

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