Fixes the whitenoise warning in the test suite

This commit is contained in:
Trenton Holmes 2022-06-13 09:39:26 -07:00
parent 53baed0389
commit cbe567069f
3 changed files with 19 additions and 12 deletions

View File

@ -585,10 +585,6 @@ class UiSettingsViewSerializer(serializers.ModelSerializer):
"settings", "settings",
] ]
def update(self, instance, validated_data):
super().update(instance, validated_data)
return instance
def create(self, validated_data): def create(self, validated_data):
ui_settings = UiSettings.objects.update_or_create( ui_settings = UiSettings.objects.update_or_create(
user=validated_data.get("user"), user=validated_data.get("user"),

View File

@ -1432,17 +1432,25 @@ class TestDocumentApiV2(DirectoriesMixin, APITestCase):
"#000000", "#000000",
) )
def test_ui_settings(self):
test_user = User.objects.create_superuser(username="test")
self.client.force_authenticate(user=test_user)
response = self.client.get("/api/ui_settings/", format="json") class TestApiUiSettings(DirectoriesMixin, APITestCase):
ENDPOINT = "/api/ui_settings/"
def setUp(self):
super().setUp()
self.test_user = User.objects.create_superuser(username="test")
self.client.force_authenticate(user=self.test_user)
def test_api_get_ui_settings(self):
response = self.client.get(self.ENDPOINT, format="json")
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertDictEqual( self.assertDictEqual(
response.data["settings"], response.data["settings"],
{}, {},
) )
def test_api_set_ui_settings(self):
settings = { settings = {
"settings": { "settings": {
"dark_mode": { "dark_mode": {
@ -1452,14 +1460,14 @@ class TestDocumentApiV2(DirectoriesMixin, APITestCase):
} }
response = self.client.post( response = self.client.post(
"/api/ui_settings/", self.ENDPOINT,
json.dumps(settings), json.dumps(settings),
content_type="application/json", content_type="application/json",
) )
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
response = self.client.get("/api/ui_settings/", format="json") response = self.client.get(self.ENDPOINT, format="json")
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertDictEqual( self.assertDictEqual(
@ -2362,7 +2370,7 @@ class TestBulkDownload(DirectoriesMixin, APITestCase):
) )
class TestApiAuth(APITestCase): class TestApiAuth(DirectoriesMixin, APITestCase):
def test_auth_required(self): def test_auth_required(self):
d = Document.objects.create(title="Test") d = Document.objects.create(title="Test")
@ -2415,7 +2423,7 @@ class TestApiAuth(APITestCase):
self.assertIn("X-Version", response) self.assertIn("X-Version", response)
class TestRemoteVersion(APITestCase): class TestRemoteVersion(DirectoriesMixin, APITestCase):
ENDPOINT = "/api/remote_version/" ENDPOINT = "/api/remote_version/"
def setUp(self): def setUp(self):

View File

@ -19,6 +19,7 @@ def setup_directories():
dirs.scratch_dir = tempfile.mkdtemp() dirs.scratch_dir = tempfile.mkdtemp()
dirs.media_dir = tempfile.mkdtemp() dirs.media_dir = tempfile.mkdtemp()
dirs.consumption_dir = tempfile.mkdtemp() dirs.consumption_dir = tempfile.mkdtemp()
dirs.static_dir = tempfile.mkdtemp()
dirs.index_dir = os.path.join(dirs.data_dir, "index") dirs.index_dir = os.path.join(dirs.data_dir, "index")
dirs.originals_dir = os.path.join(dirs.media_dir, "documents", "originals") dirs.originals_dir = os.path.join(dirs.media_dir, "documents", "originals")
dirs.thumbnail_dir = os.path.join(dirs.media_dir, "documents", "thumbnails") dirs.thumbnail_dir = os.path.join(dirs.media_dir, "documents", "thumbnails")
@ -42,6 +43,7 @@ def setup_directories():
CONSUMPTION_DIR=dirs.consumption_dir, CONSUMPTION_DIR=dirs.consumption_dir,
LOGGING_DIR=dirs.logging_dir, LOGGING_DIR=dirs.logging_dir,
INDEX_DIR=dirs.index_dir, INDEX_DIR=dirs.index_dir,
STATIC_ROOT=dirs.static_dir,
MODEL_FILE=os.path.join(dirs.data_dir, "classification_model.pickle"), MODEL_FILE=os.path.join(dirs.data_dir, "classification_model.pickle"),
MEDIA_LOCK=os.path.join(dirs.media_dir, "media.lock"), MEDIA_LOCK=os.path.join(dirs.media_dir, "media.lock"),
) )
@ -55,6 +57,7 @@ def remove_dirs(dirs):
shutil.rmtree(dirs.data_dir, ignore_errors=True) shutil.rmtree(dirs.data_dir, ignore_errors=True)
shutil.rmtree(dirs.scratch_dir, ignore_errors=True) shutil.rmtree(dirs.scratch_dir, ignore_errors=True)
shutil.rmtree(dirs.consumption_dir, ignore_errors=True) shutil.rmtree(dirs.consumption_dir, ignore_errors=True)
shutil.rmtree(dirs.static_dir, ignore_errors=True)
dirs.settings_override.disable() dirs.settings_override.disable()