Move user/group setup into new generateSampleUserData command

This commit is contained in:
2021-02-04 15:44:07 +00:00
parent 6cb3d1855a
commit 462a16ec42
20 changed files with 300 additions and 253 deletions

View File

@@ -86,14 +86,14 @@ def screenshot_failure_cls(cls):
return cls
def assert_times_equal(first_time, second_time):
def assert_times_almost_equal(first_time, second_time):
assert first_time.replace(microsecond=0, second=0) == second_time.replace(microsecond=0, second=0)
def assert_oembed(alt_event_embed_url, alt_oembed_url, client, event_embed_url, event_url, oembed_url):
# Test the meta tag is in place
response = client.get(event_url, follow=True, HTTP_HOST='example.com')
assertContains(response, '<link rel="alternate" type="application/json+oembed"')
assertContains(response, 'application/json+oembed')
assertContains(response, oembed_url)
# Test that the JSON exists
response = client.get(oembed_url, follow=True, HTTP_HOST='example.com')
@@ -108,7 +108,8 @@ def assert_oembed(alt_event_embed_url, alt_oembed_url, client, event_embed_url,
def login(client, django_user_model):
pwd = 'testuser'
usr = 'TestUser'
user = django_user_model.objects.create_user(username=usr, email="TestUser@test.com", password=pwd, is_superuser=True,
is_active=True, is_staff=True)
user = django_user_model.objects.create_user(username=usr, email="TestUser@test.com", password=pwd,
is_superuser=True,
is_active=True, is_staff=True)
assert client.login(username=usr, password=pwd)
return user

View File

@@ -34,14 +34,12 @@ def get_request_url(url):
print("Couldn't test url " + pattern)
@pytest.fixture(scope='session')
def django_db_setup(django_db_setup, django_db_blocker):
with django_db_blocker.unblock():
with django_db_blocker.unblock():
from django.conf import settings
settings.DEBUG = True
call_command('generateSampleRIGSData') # We need stuff setup so we don't get 404 errors everywhere
create_asset_one()
call_command('generateSampleData') # We need stuff setup so we don't get 404 errors everywhere
settings.DEBUG = False
@@ -68,7 +66,17 @@ def test_page_titles(admin_client):
if hasattr(response, "context_data") and "page_title" in response.context_data:
expected_title = striptags(response.context_data["page_title"])
# try:
assertInHTML('<title>{} | Rig Information Gathering System'.format(expected_title), response.content.decode())
assertInHTML('<title>{} | Rig Information Gathering System'.format(expected_title),
response.content.decode())
print("{} | {}".format(request_url, expected_title)) # If test fails, tell me where!
# except:
# print(response.content.decode(), file=open('output.html', 'w'))
@pytest.mark.django_db(transaction=True)
def test_delete_sample_data(settings):
settings.DEBUG = True
call_command('deleteSampleData')
assert models.Asset.objects.all().count() == 0
assert models.Supplier.objects.all().count() == 0