mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-06 09:48:24 -04:00
Merge conflicts and test fixes
This commit is contained in:
@@ -9,7 +9,8 @@ def test_get_should_render_add_service_template(app_,
|
||||
db_session,
|
||||
active_user,
|
||||
mock_get_service,
|
||||
mock_get_services):
|
||||
mock_get_services,
|
||||
mock_user_loader):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
client.login(active_user)
|
||||
@@ -22,7 +23,8 @@ def test_should_add_service_and_redirect_to_next_page(app_,
|
||||
db_,
|
||||
db_session,
|
||||
mock_create_service,
|
||||
mock_get_services):
|
||||
mock_get_services,
|
||||
mock_user_loader):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
user = User.query.first()
|
||||
@@ -41,7 +43,8 @@ def test_should_return_form_errors_when_service_name_is_empty(app_,
|
||||
db_session,
|
||||
active_user,
|
||||
mock_get_service,
|
||||
mock_get_services):
|
||||
mock_get_services,
|
||||
mock_user_loader):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
client.login(active_user)
|
||||
@@ -53,7 +56,8 @@ def test_should_return_form_errors_when_service_name_is_empty(app_,
|
||||
def test_should_return_form_errors_with_duplicate_service_name(app_,
|
||||
db_,
|
||||
db_session,
|
||||
mock_get_services):
|
||||
mock_get_services,
|
||||
mock_user_loader):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
user = User.query.first()
|
||||
|
||||
Reference in New Issue
Block a user