fix(test): Fix non-deterministic order of created Assets

server/src/api/resolvers/asset.resolver.ts

@@ -39,6 +39,13 @@ export class AssetResolver {
     @Mutation()
     @Allow(Permission.CreateCatalog)
     async createAssets(@Args() args: CreateAssetsMutationArgs): Promise<Asset[]> {
-        return Promise.all(args.input.map(asset => this.assetService.create(asset)));
+        // TODO: Is there some way to parellelize this while still preserving
+        // the order of files in the upload? Non-deterministic IDs mess up the e2e test snapshots.
+        const assets: Asset[] = [];
+        for (const input of args.input) {
+            const asset = await this.assetService.create(input);
+            assets.push(asset);
+        }
+        return assets;
     }
 }

server/src/service/services/global-settings.service.ts

@@ -5,7 +5,7 @@ import { Connection } from 'typeorm';
 import { UpdateGlobalSettingsInput } from '../../../../shared/generated-types';
 import { DEFAULT_LANGUAGE_CODE } from '../../common/constants';
 import { InternalServerError } from '../../common/error/errors';
-import { GlobalSettings } from '../../entity';
+import { GlobalSettings } from '../../entity/global-settings/global-settings.entity';
 import { patchEntity } from '../helpers/utils/patch-entity';
 
 @Injectable()