IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into resolve-websockets-env-problem

Browse Source
This commit is contained in:
Wolfgang Huß 2021-02-15 20:15:30 +01:00
commit 1168d8c10f
12 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
backend/src/db/migrations/examples/20200123150105-merge_duplicate_user_accounts.js → backend/src/db/migrations-examples/20200123150105-merge_duplicate_user_accounts.js
View File

0
backend/src/db/migrations/examples/20200123150110-merge_duplicate_location_nodes.js → backend/src/db/migrations-examples/20200123150110-merge_duplicate_location_nodes.js
View File

0
backend/src/db/migrations/examples/20200127110135-create_muted_relationship_between_existing_blocked_relationships.js → backend/src/db/migrations-examples/20200127110135-create_muted_relationship_between_existing_blocked_relationships.js
View File

0
backend/src/db/migrations/examples/20200206190233-swap_latitude_with_longitude.js → backend/src/db/migrations-examples/20200206190233-swap_latitude_with_longitude.js
View File

0
backend/src/db/migrations/examples/20200207080200-fulltext_index_for_tags.js → backend/src/db/migrations-examples/20200207080200-fulltext_index_for_tags.js
View File

0
backend/src/db/migrations/examples/20200213230248-add_unique_index_to_image_url.js → backend/src/db/migrations-examples/20200213230248-add_unique_index_to_image_url.js
View File

0
backend/src/db/migrations/examples/20200312140328-bulk_upload_to_s3.js → backend/src/db/migrations-examples/20200312140328-bulk_upload_to_s3.js
View File

0
backend/src/db/migrations/examples/20200320200315-refactor_all_images_to_separate_type.js → backend/src/db/migrations-examples/20200320200315-refactor_all_images_to_separate_type.js
View File

0
backend/src/db/migrations/examples/20200323140300-remove_deleted_users_obsolete_attributes.js → backend/src/db/migrations-examples/20200323140300-remove_deleted_users_obsolete_attributes.js
View File

0
backend/src/db/migrations/examples/20200323160336-remove_deleted_posts_obsolete_attributes.js → backend/src/db/migrations-examples/20200323160336-remove_deleted_posts_obsolete_attributes.js
View File

0
backend/src/db/migrations/examples/20200326160326-remove_dangling_image_urls.js → backend/src/db/migrations-examples/20200326160326-remove_dangling_image_urls.js
View File

66
backend/src/schema/resolvers/users/location.spec.js
View File

@ -30,46 +30,46 @@ const newlyCreatedNodesWithLocales = [
city: {
id: expect.stringContaining('place'),
type: 'place',
name: 'Hamburg',
nameEN: 'Hamburg',
nameDE: 'Hamburg',
namePT: 'Hamburg',
nameES: 'Hamburg',
nameFR: 'Hamburg',
nameIT: 'Hamburg',
nameRU: 'Хамбург',
nameNL: 'Hamburg',
namePL: 'Hamburg',
lng: -74.5763,
lat: 41.1534,
name: 'Welzheim',
nameEN: 'Welzheim',
nameDE: 'Welzheim',
namePT: 'Welzheim',
nameES: 'Welzheim',
nameFR: 'Welzheim',
nameIT: 'Welzheim',
nameRU: 'Вельцхайм',
nameNL: 'Welzheim',
namePL: 'Welzheim',
lng: 9.63444,
lat: 48.87472,
},
state: {
id: expect.stringContaining('region'),
type: 'region',
name: 'New Jersey',
nameEN: 'New Jersey',
nameDE: 'New Jersey',
namePT: 'Nova Jérsia',
nameES: 'Nueva Jersey',
nameFR: 'New Jersey',
nameIT: 'New Jersey',
nameRU: 'Нью-Джерси',
nameNL: 'New Jersey',
namePL: 'New Jersey',
name: 'Baden-Württemberg',
nameDE: 'Baden-Württemberg',
nameEN: 'Baden-Württemberg',
nameES: 'Baden-Wurtemberg',
nameFR: 'Bade-Wurtemberg',
nameIT: 'Baden-Württemberg',
nameNL: 'Baden-Württemberg',
namePL: 'Badenia-Wirtembergia',
namePT: 'Baden-Württemberg',
nameRU: 'Баден-Вюртемберг',
},
country: {
id: expect.stringContaining('country'),
type: 'country',
name: 'United States',
nameEN: 'United States',
nameDE: 'Vereinigte Staaten',
namePT: 'Estados Unidos',
nameES: 'Estados Unidos',
nameFR: 'États-Unis',
nameIT: "Stati Uniti d'America",
nameRU: 'Соединённые Штаты Америки',
nameNL: 'Verenigde Staten van Amerika',
namePL: 'Stany Zjednoczone',
name: 'Germany',
nameDE: 'Deutschland',
nameEN: 'Germany',
nameES: 'Alemania',
nameFR: 'Allemagne',
nameIT: 'Germania',
nameNL: 'Duitsland',
namePL: 'Niemcy',
namePT: 'Alemanha',
nameRU: 'Германия',
},
},
]
@ -170,7 +170,7 @@ describe('userMiddleware', () => {
...variables,
id: 'updating-user',
name: 'Updating user',
locationName: 'Hamburg, New Jersey, United States of America',
locationName: 'Welzheim, Baden-Württemberg, Germany',
}
await mutate({ mutation: updateUserMutation, variables })
const locations = await neode.cypher(