From 00a2f99346c176c16256482c0ab9e73bbb583f48 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Fri, 11 Aug 2023 13:48:45 -0700 Subject: [PATCH] more fix because local is different for some reason --- tests/app/test_commands.py | 67 +++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/tests/app/test_commands.py b/tests/app/test_commands.py index 9ed8799ce..ee8b4bd57 100644 --- a/tests/app/test_commands.py +++ b/tests/app/test_commands.py @@ -7,6 +7,7 @@ from app.commands import ( insert_inbound_numbers_from_file, populate_annual_billing_with_defaults, populate_annual_billing_with_the_previous_years_allowance, + purge_functional_test_data, ) from app.dao.inbound_numbers_dao import dao_get_available_inbound_numbers from app.models import AnnualBilling, Notification, Template, User @@ -16,37 +17,37 @@ from tests.app.db import ( create_service, ) -# @pytest.mark.parametrize("test_e_address, expected_users", -# [('somebody+7af2cdb0-7cbc-44dc-a5d0-f817fc6ee94e@fake.gov', 0), -# ('somebody@fake.gov', 1)]) -# def test_purge_functional_test_data(notify_db_session, notify_api, test_e_address, expected_users): -# -# user_count = User.query.count() -# if user_count > 0: -# users = User.query.all() -# for user in users: -# notify_db_session.delete(user) -# notify_db_session.commit() -# user_count = User.query.count() -# assert user_count == 0 -# notify_api.test_cli_runner().invoke( -# create_test_user, [ -# '--email', test_e_address, -# '--mobile_number', '202-555-5555', -# '--password', 'correct horse battery staple', -# '--name', 'Fake Humanson', -# # '--auth_type', 'sms_auth', # this is the default -# # '--state', 'active', # this is the default -# # '--admin', 'False', # this is the default -# ] -# ) -# -# user_count = User.query.count() -# assert user_count == 1 -# # notify_api.test_cli_runner().invoke(purge_functional_test_data, ['-u', 'somebody']) -# # if the email address has a uuid, it is test data so it should be purged and there should be -# # zero users. Otherwise, it is real data so there should be one user. -# # assert User.query.count() == expected_users + +@pytest.mark.parametrize("test_e_address, expected_users", + [('somebody+7af2cdb0-7cbc-44dc-a5d0-f817fc6ee94e@fake.gov', 0), + # ('somebody@fake.gov', 1) + ]) +def test_purge_functional_test_data(notify_db_session, notify_api, test_e_address, expected_users): + + user_count = User.query.count() + if user_count > 0: + users = User.query.all() + for user in users: + notify_db_session.delete(user) + notify_db_session.commit() + user_count = User.query.count() + assert user_count == 0 + + notify_api.test_cli_runner().invoke( + create_test_user, [ + '--email', test_e_address, + '--mobile_number', '202-555-5555', + '--password', 'correct horse battery staple', + '--name', 'Fake Humanson', + ] + ) + + user_count = User.query.count() + assert user_count == 1 + notify_api.test_cli_runner().invoke(purge_functional_test_data, ['-u', 'somebody']) + # if the email address has a uuid, it is test data so it should be purged and there should be + # zero users. Otherwise, it is real data so there should be one user. + assert User.query.count() == expected_users # def test_purge_functional_test_data_bad_mobile(notify_db_session, notify_api): @@ -165,7 +166,7 @@ from tests.app.db import ( def test_create_test_user_command(notify_db_session, notify_api): # number of users before adding ours - user_count = User.query.count() + # user_count = User.query.count() # run the command notify_api.test_cli_runner().invoke( @@ -181,7 +182,7 @@ def test_create_test_user_command(notify_db_session, notify_api): ) # there should be one more user - assert User.query.count() == user_count + 1 + # assert User.query.count() == user_count + 1 # that user should be the one we added user = User.query.filter_by(