#224 remove crown (#228)

Co-authored-by: Kenneth Kehl <@kkehl@flexion.us>
This commit is contained in:
Kenneth Kehl
2023-04-11 13:29:37 -07:00
committed by GitHub
parent 25a89458c8
commit 27d86c949a
16 changed files with 46 additions and 88 deletions

View File

@@ -289,7 +289,7 @@ def test_get_rate_chooses_right_rate_depending_on_date(notify_db_session, date,
create_rate(start_date=datetime(2018, 9, 30, 23, 0), value=2.2, notification_type='sms')
rates = get_rates_for_billing()
rate = get_rate(rates, "sms", date, True)
rate = get_rate(rates, "sms", date)
assert rate == expected_rate

View File

@@ -62,7 +62,6 @@ def test_update_organisation(notify_db_session):
data = {
'name': 'new name',
"crown": True,
"organisation_type": 'state',
"agreement_signed": True,
"agreement_signed_at": datetime.datetime.utcnow(),
@@ -193,26 +192,11 @@ def test_update_organisation_does_not_override_service_branding(
assert sample_service.email_branding == custom_email_branding
def test_update_organisation_updates_services_with_new_crown_type(
sample_service,
sample_organisation
):
sample_organisation.services.append(sample_service)
db.session.commit()
assert Service.query.get(sample_service.id).crown
dao_update_organisation(sample_organisation.id, crown=False)
assert not Service.query.get(sample_service.id).crown
def test_add_service_to_organisation(sample_service, sample_organisation):
assert sample_organisation.services == []
sample_service.organisation_type = "federal"
sample_organisation.organisation_type = "state"
sample_organisation.crown = False
dao_add_service_to_organisation(sample_service, sample_organisation.id)
@@ -220,7 +204,6 @@ def test_add_service_to_organisation(sample_service, sample_organisation):
assert sample_organisation.services[0].id == sample_service.id
assert sample_service.organisation_type == sample_organisation.organisation_type
assert sample_service.crown == sample_organisation.crown
assert Service.get_history_model().query.filter_by(
id=sample_service.id,
version=2

View File

@@ -102,7 +102,6 @@ def test_create_service(notify_db_session):
assert service.active is True
assert user in service_db.users
assert service_db.organisation_type == 'federal'
assert service_db.crown is None
assert not service.organisation_id
@@ -129,7 +128,6 @@ def test_create_service_with_organisation(notify_db_session):
assert service.active is True
assert user in service_db.users
assert service_db.organisation_type == 'state'
assert service_db.crown is None
assert service.organisation_id == organisation.id
assert service.organisation == organisation