Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Werkzeug import error #167

Merged
merged 1 commit into from
Aug 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion OpenOversight/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import pytest
from faker import Faker
from flask import current_app
from flask import current_app, g
from PIL import Image as Pimage
from selenium import webdriver
from xvfbwrapper import Xvfb
Expand Down Expand Up @@ -236,6 +236,12 @@ def teardown():
connection.close()
session.remove()

# Since Flask-Login now records the logged in user on the Flask `g` object and we persist the app context
# (in the app fixture) for the entire testing session, we need to reset this value manually.
#
# Relevant PR: https://github.com/maxcountryman/flask-login/pull/691
g.pop("_login_user", None)

request.addfinalizer(teardown)
return session

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Fabric3==1.14.post1
Flask==2.1.2
Flask-Bootstrap==3.3.7.1
Flask-Limiter==1.4
Flask-Login==0.6.1
Flask-Login==0.6.2
Flask-Mail==0.9.1
Flask-Migrate==3.0.1
Flask-Sitemap==0.4.0
Expand Down