Merge branch 'drone-io-dess' into move_views_to_diesel_drone

[lemmy.git] / api_tests / src / user.spec.ts

diff --git a/api_tests/src/user.spec.ts b/api_tests/src/user.spec.ts
index 3a327c2a1d3a6c33ac7e1d4d7a04b744a5fb3020..7886f8eb42003275cd1fce6e679508824c48d930 100644 (file)
--- a/api_tests/src/user.spec.ts
+++ b/api_tests/src/user.spec.ts
@@ -8,23 +8,23 @@ import {
   getSite,
 } from './shared';
 import {
-  UserView,
-  UserSettingsForm,
+  UserViewSafe,
+  SaveUserSettings,
+  SortType,
+  ListingType,
 } from 'lemmy-js-client';
 
 let auth: string;
 let apShortname: string;
 
-function assertUserFederation(
-  userOne: UserView,
-  userTwo: UserView) {
-  expect(userOne.name).toBe(userTwo.name);
-  expect(userOne.preferred_username).toBe(userTwo.preferred_username);
-  expect(userOne.bio).toBe(userTwo.bio);
-  expect(userOne.actor_id).toBe(userTwo.actor_id);
-  expect(userOne.avatar).toBe(userTwo.avatar);
-  expect(userOne.banner).toBe(userTwo.banner);
-  expect(userOne.published).toBe(userTwo.published);
+function assertUserFederation(userOne: UserViewSafe, userTwo: UserViewSafe) {
+  expect(userOne.user.name).toBe(userTwo.user.name);
+  expect(userOne.user.preferred_username).toBe(userTwo.user.preferred_username);
+  expect(userOne.user.bio).toBe(userTwo.user.bio);
+  expect(userOne.user.actor_id).toBe(userTwo.user.actor_id);
+  expect(userOne.user.avatar).toBe(userTwo.user.avatar);
+  expect(userOne.user.banner).toBe(userTwo.user.banner);
+  expect(userOne.user.published).toBe(userTwo.user.published);
 }
 
 test('Create user', async () => {
@@ -41,20 +41,20 @@ test('Set some user settings, check that they are federated', async () => {
   let avatar = 'https://image.flaticon.com/icons/png/512/35/35896.png';
   let banner = 'https://image.flaticon.com/icons/png/512/36/35896.png';
   let bio = 'a changed bio';
-  let form: UserSettingsForm = {
+  let form: SaveUserSettings = {
     show_nsfw: false,
-    theme: "",
-    default_sort_type: 0,
-    default_listing_type: 0,
-    lang: "",
+    theme: '',
+    default_sort_type: SortType.Hot,
+    default_listing_type: ListingType.All,
+    lang: '',
     avatar,
     banner,
-    preferred_username: "user321",
+    preferred_username: 'user321',
     show_avatars: false,
     send_notifications_to_email: false,
     bio,
     auth,
-  }
+  };
   await saveUserSettings(alpha, form);
 
   let searchAlpha = await searchForUser(alpha, apShortname);