~homeworkprod/byceps

b59412c576d3ba852dab267de1cf4431050d9744 — Jochen Kupperschmidt a month ago 2b1a56e
Make site ID a required argument to `create_site` test helper
M tests/conftest.py => tests/conftest.py +1 -1
@@ 174,7 174,7 @@ def email_config(make_email_config):

@pytest.fixture(scope='module')
def site(email_config, party):
    site = create_site(party_id=party.id)
    site = create_site('acmecon-2014-website', party_id=party.id)
    yield site
    site_service.delete_site(site.id)


M tests/helpers.py => tests/helpers.py +1 -1
@@ 101,8 101,8 @@ def create_party(brand_id, party_id='acmecon-2014', title='ACMECon 2014'):


def create_site(
    site_id,
    *,
    site_id='acmecon-2014-website',
    title='Website',
    server_name='www.acmecon.test',
    email_config_id=DEFAULT_EMAIL_CONFIG_ID,

M tests/integration/blueprints/site/shop/orders/test_views.py => tests/integration/blueprints/site/shop/orders/test_views.py +2 -2
@@ 95,14 95,14 @@ def storefront2(shop2, order_number_sequence_id2) -> None:

@pytest.fixture
def site1(storefront1):
    site = create_site(site_id='site1', storefront_id=storefront1.id)
    site = create_site('site1', storefront_id=storefront1.id)
    yield site
    site_service.delete_site(site.id)


@pytest.fixture
def site2(storefront2):
    site = create_site(site_id='site2', storefront_id=storefront2.id)
    site = create_site('site2', storefront_id=storefront2.id)
    yield site
    site_service.delete_site(site.id)


M tests/integration/blueprints/site/user_message/test_send.py => tests/integration/blueprints/site/user_message/test_send.py +2 -2
@@ 20,7 20,7 @@ def site1(make_email_config):
        sender_name='ACME Entertainment Convention',
    )
    site = create_site(
        site_id='acmecon-website-1',
        'acmecon-website-1',
        title='ACMECon Website #1',
        server_name='www1.acmecon.test',
        email_config_id=email_config.id,


@@ 38,7 38,7 @@ def site2(make_email_config):
        contact_address='help@acmecon.test',
    )
    site = create_site(
        site_id='acmecon-website-2',
        'acmecon-website-2',
        title='ACMECon Website #2',
        server_name='www2.acmecon.test',
        email_config_id=email_config.id,

M tests/integration/services/site/test_settings_service.py => tests/integration/services/site/test_settings_service.py +1 -1
@@ 17,7 17,7 @@ SITE_ID = 'favorite-site'
@pytest.fixture(scope='module')
def site(admin_app, email_config):
    site = create_site(
        site_id=SITE_ID,
        SITE_ID,
        title='My favorite site!',
        server_name='www.favorite-site.test',
    )