[OpenClassrooms-Student-Center#2] - user use more points than availab…

…le - Tests Improvement - tests: conftest.py: config fixture to avoid repetition in test_server.py - UI: welcome.html: added a span to localize more efficiently the 'club_points_left'
RafaRemote · Dec 23, 2021 · 9ae5a14 · 9ae5a14
1 parent 3820986
commit 9ae5a14
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 58 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,4 @@ lib
 .envrc
 __pycache__
 env/
-x.py
+x.py
diff --git a/templates/booking.html b/templates/booking.html
@@ -3,6 +3,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Booking for {{competition['name']}} || GUDLFT</title>
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon"> 
 </head>
 <body>
     <h2>{{competition['name']}}</h2>
@@ -16,7 +17,7 @@ <h2>{{competition['name']}}</h2>
        </ul>
     {% endif%}
     {% endwith %}
-    <form action="/purchase-places" method="post">
+    <form action="/purchase-places" method="POST">
         <input type="hidden" name="club_name" value="{{club['name']}}">
         <input type="hidden" name="competition_name" value="{{competition['name']}}">
         <label for="places">How many places?</label><input type="number" name="places" id="" min="1" max="{{club["points"]}}"/>

diff --git a/templates/index.html b/templates/index.html
@@ -3,6 +3,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>GUDLFT Registration</title>
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon"> 
 </head>
 <body>
     <h1>Welcome to the GUDLFT Registration Portal!</h1>

diff --git a/templates/not_found_404.html b/templates/not_found_404.html
@@ -3,6 +3,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Not found</title>
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon"> 
 </head>
 <body>
     <h2>Not found</h2>

diff --git a/templates/welcome.html b/templates/welcome.html
@@ -3,6 +3,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Summary | GUDLFT Registration</title>
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon"> 
 </head>
 <body>
     <h2>Welcome, {{club['email']}} </h2><a href="{{url_for('logout')}}">Logout</a>
@@ -14,8 +15,8 @@ <h2>Welcome, {{club['email']}} </h2><a href="{{url_for('logout')}}">Logout</a>
             <li>{{message}}</li>
         {% endfor %}
        </ul>
-    {% endif%}
-    Points Available: {{club['points']}}
+    {% endif %}
+    Points Available: <span id="club_points_left">{{club['points']}}</span>
     <h3>Competitions:</h3>
     <ul>
         {% for comp in competitions%}

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,5 +1,4 @@
 import pytest
-import datetime as dt
 import server
 
 
@@ -9,6 +8,22 @@ def client():
         yield client
 
 
+@pytest.fixture
+def club():
+    club = {"name": "test club 1", "email": "test1@test.com", "points": "100"}
+    return club
+
+
+@pytest.fixture
+def clubs():
+    clubs = [
+        {"name": "test club 1", "email": "test1@test.com", "points": "100"},
+        {"name": "test club 2", "email": "test2@test.com", "points": "20"},
+        {"name": "test club 3", "email": "test3@test.com", "points": "30"},
+    ]
+    return clubs
+
+
 @pytest.fixture
 def competition():
     competition = {
@@ -41,25 +56,6 @@ def competitions():
     return competitions
 
 
-@pytest.fixture
-def past_competition():
-    last_year = str(int(dt.datetime.now().strftime("%Y")) - 1)
-    competition = [
-        {
-            "name": "test future competition",
-            "date": dt.datetime.now().strftime(f"%{last_year}-%m-%d %H:%M:%S"),
-            "numberOfPlaces": "100",
-        }
-    ]
-    return competition
-
-
-@pytest.fixture
-def club():
-    club = {"name": "test club 1", "email": "test1@test.com", "points": "100"}
-    return club
-
-
 @pytest.fixture
 def unlisted_club():
     unlisted_club = {
@@ -71,10 +67,6 @@ def unlisted_club():
 
 
 @pytest.fixture
-def clubs():
-    clubs = [
-        {"name": "test club 1", "email": "test1@test.com", "points": "100"},
-        {"name": "test club 2", "email": "test2@test.com", "points": "20"},
-        {"name": "test club 3", "email": "test3@test.com", "points": "30"},
-    ]
-    return clubs
+def config(mocker, clubs, competitions):
+    mocker.patch.object(server, "clubs", clubs)
+    mocker.patch.object(server, "competitions", competitions)
diff --git a/tests/unit/test_server.py b/tests/unit/test_server.py
@@ -1,5 +1,4 @@
 import random
-import server
 import pytest
 
 
@@ -22,12 +21,8 @@ def test_access_unauthenticated_user_should_405(
 
 
 class TestLogin:
-    def test_login_listed_email_should_200(
-        self, client, mocker, club, clubs, competitions
-    ):
+    def test_login_listed_email_should_200(self, client, club, config):
         """Checks response when authenticated user request"""
-        mocker.patch.object(server, "clubs", clubs)
-        mocker.patch.object(server, "competitions", competitions)
         data = {"email": club["email"]}
         response = client.post("/show-summary", data=data, follow_redirects=True)
         assert response.status_code == 200
@@ -40,47 +35,34 @@ def test_login_listed_email_should_200(
             ({"email": "$%^"}, 404),
         ],
     )
-    def test_login_unlisted_mails_should_404(
-        self, client, mocker, email, status_code, clubs, competitions
-    ):
+    def test_login_unlisted_mails_should_404(self, client, email, status_code, config):
         """Checks response when unauthenticated user request"""
-        mocker.patch.object(server, "clubs", clubs)
-        mocker.patch.object(server, "competitions", competitions)
         response = client.post("/show-summary", data=email, follow_redirects=True)
         assert response.status_code == status_code
 
     def test_login_bad_request(self, client, mocker, club, clubs, competitions):
         """Checks response when bad request"""
-        mocker.patch.object(server, "clubs", clubs)
-        mocker.patch.object(server, "competitions", competitions)
         data = {"address": club["email"]}
         response = client.post("/show-summary", data=data, follow_redirects=True)
         assert response.status_code == 400
 
 
 class TestPurchase:
     def test_should_not_use_more_points_than_have(
-        self, client, mocker, club, competition, clubs, competitions
+        self, client, club, competition, config
     ):
         """Checks response when user try to use more points than his club has"""
-        mocker.patch.object(server, "clubs", clubs)
-        mocker.patch.object(server, "competitions", competitions)
-        places = int(competition["numberOfPlaces"]) + 1
         data = {
             "club_name": club["name"],
             "competition_name": competition["name"],
-            "places": str(places),
+            "places": str(int(club["points"]) + 1),
         }
         response = client.post("/purchase-places", data=data, follow_redirects=True)
-        data = response.data.decode("utf-8").split()
+        data = response.data.decode()
         assert "cannot" in data
 
-    def test_should_deduct_points_from_club(
-        self, client, mocker, club, competition, clubs, competitions
-    ):
+    def test_should_deduct_points_from_club(self, client, club, competition, config):
         """Check club points in response after user book places"""
-        mocker.patch.object(server, "clubs", clubs)
-        mocker.patch.object(server, "competitions", competitions)
         places = int(competition["numberOfPlaces"])
         club_points = int(club["points"])
         if places > 0:
@@ -95,6 +77,7 @@ def test_should_deduct_points_from_club(
             "places": str(places_required),
         }
         response = client.post("/purchase-places", data=data, follow_redirects=True)
-        data = response.data.decode("utf-8").split()
-        club_points_left = int(data[(data.index("Available:") + 1)])
-        assert club_points_left == club_points - places_required
+        data = response.data.decode().split()
+        chunk = [i for i in data if "club_points_left" in i][0]
+        points_left = int("".join([i for i in chunk if i.isdigit()]))
+        assert points_left == club_points - places_required