Skip to content

Commit

Permalink
added back overwritten code
Browse files Browse the repository at this point in the history
  • Loading branch information
sd-20 committed Nov 17, 2022
2 parents 8df46f3 + 0cb4779 commit 386bf9d
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 14 deletions.
4 changes: 2 additions & 2 deletions src/backend/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ def userpage():

@app.route("/logout")
def logout():
session.pop("username", None) # session object is None if pop fails
return "redirect", 201
res = session.pop("username", None) # session object is None if pop fails
return res, 201


@app.route("/", methods=["GET", "POST"])
Expand Down
Binary file modified src/backend/database/database_test.db
Binary file not shown.
51 changes: 41 additions & 10 deletions src/backend/tests/test_app.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""Test app.py"""
import sqlite3
import pytest
from app import app, userpage
from app import app, userpage, logout
from tests.mainpage_staging import MainPageStaging
from decorators import use_test
from flask import session
Expand Down Expand Up @@ -280,9 +280,12 @@ def test_mainpage_post_invalid(client):

@use_test
def test_userpage_not_logged_in(client):
"""Tests userpage is inaccessible to logged out user"""
"""Tests userpage is inaccessible to a logged out user"""
res = client.get("/user/")
assert res.status_code == 404
with app.test_request_context("/user/"):
res = userpage()
assert res[1] == 404


@use_test
Expand Down Expand Up @@ -311,19 +314,47 @@ def test_userpage_post_request():
"password": "1234",
"phone": "0003335555",
}
post_json = {"is_phone": "True", "phone": "0111115555"}
with app.test_request_context("/register", method="POST", json=reg_info):
with app.test_request_context("/user/", method="POST", json=post_json):
with app.test_request_context(
"/user/", method="POST", json={"is_phone": "True", "phone": "0111115555"}
):
session["username"] = "Mike"
res = userpage()
assert res[1] == 201
with app.test_request_context("/register", method="POST", json=reg_info):
with app.test_request_context(
"/user/", method="POST", json={"is_password": "True", "password": "123415"}
):
session["username"] = "Mike"
res = userpage()
assert res[1] == 201
post_json = {
"is_password": "True",
"password": "123415",
"is_phone": "False",
}
with app.test_request_context("/register", method="POST", json=reg_info):
with app.test_request_context("/user/", method="POST", json=post_json):
with app.test_request_context(
"/user/",
method="POST",
json={"is_email": "True", "email": "[email protected]"},
):
session["username"] = "Mike"
res = userpage()
assert res[1] == 201
with app.test_request_context("/register", method="POST", json=reg_info):
with app.test_request_context(
"/user/", method="POST", json={"is_get_liked": "True", "user_id": "12345"}
):
session["username"] = "Mike"
res = userpage()
assert res[1] == 201
with app.test_request_context("/register", method="POST", json=reg_info):
with app.test_request_context("/user/", method="POST", json={"hello": "hi"}):
session["username"] = "Mike"
res = userpage()
assert res[1] == 400


@use_test
def test_logout():
"""Test session object is removed"""
with app.test_request_context("/logout"):
session["username"] = "Mike"
res = logout()
assert res is not None
2 changes: 0 additions & 2 deletions src/frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@ function App() {
<Route index element={<Login />} />
</Route>
<Route path="/">

<Route index element={<MainPage />} />
</Route>
<Route path="/user">

<Route index element={<UserPage />} />
</Route>
</Routes>
Expand Down
Empty file added src/pytest-coverage.txt
Empty file.

3 comments on commit 386bf9d

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage

Coverage Report
FileStmtsMissCoverMissing
app.py131596%71, 74–76, 78
config.py10100% 
decorators.py270100% 
dataholders
   apt.py90100% 
   mainpage_get.py150100% 
   review.py70100% 
   user.py80100% 
pages
   login.py350100% 
   mainpage.py1000100% 
   userpage.py502158%29–30, 37–45, 50–67, 72–94
TOTAL3832693% 

Tests Skipped Failures Errors Time
43 0 💤 1 ❌ 0 🔥 0.793s ⏱️

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage

Coverage Report
FileStmtsMissCoverMissing
app.py131596%71, 74–76, 78
config.py10100% 
decorators.py270100% 
dataholders
   apt.py90100% 
   mainpage_get.py150100% 
   review.py70100% 
   user.py80100% 
pages
   login.py350100% 
   mainpage.py1000100% 
   userpage.py502158%29–30, 37–45, 50–67, 72–94
TOTAL3832693% 

Tests Skipped Failures Errors Time
43 0 💤 1 ❌ 0 🔥 1.071s ⏱️

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage

Coverage Report
FileStmtsMissCoverMissing
app.py131596%71, 74–76, 78
config.py10100% 
decorators.py270100% 
dataholders
   apt.py90100% 
   mainpage_get.py150100% 
   review.py70100% 
   user.py80100% 
pages
   login.py350100% 
   mainpage.py1000100% 
   userpage.py502158%29–30, 37–45, 50–67, 72–94
TOTAL3832693% 

Tests Skipped Failures Errors Time
43 0 💤 1 ❌ 0 🔥 1.022s ⏱️

Please sign in to comment.