Merge pull request #342 from cofacts/strict-schema

Disable dynamic ES mapping and fix test fixtures

src/__fixtures__/auth.js

@@ -1,6 +1,5 @@
 export default {
   '/users/doc/test-user': {
-    id: 'test-user',
     name: 'test user',
     email: '[email protected]',
     facebookId: 'secret-fb-id',

src/graphql/dataLoaders/__fixtures__/userLoaderFactory.js

@@ -1,12 +1,10 @@
 export default {
   '/users/doc/test-user': {
-    id: 'test-user',
     slug: 'abc123',
     name: 'test user',
     email: '[email protected]',
   },
   '/users/doc/test-user2': {
-    id: 'test-user2',
     slug: 'def456',
     name: 'test user2',
     email: '[email protected]',

src/graphql/mutations/CreateArticle.js

@@ -76,7 +76,6 @@ async function createNewArticle({ text, reference: originalReference, user }) {
         normalArticleReplyCount: 0,
         normalArticleCategoryCount: 0,
         replyRequestCount: 0,
-        tags: [],
         hyperlinks: [],
         articleType: 'TEXT',
         attachmentUrl: '',

src/graphql/mutations/CreateMediaArticle.js

@@ -158,7 +158,6 @@ async function createNewMediaArticle({
       normalArticleReplyCount: 0,
       normalArticleCategoryCount: 0,
       replyRequestCount: 0,
-      tags: [],
       hyperlinks: [],
       articleType,
       attachmentHash,
@@ -288,7 +287,12 @@ export default {
         })
         // It's OK to fail this promise, just log as warning
         .catch((e) =>
-          console.warn(`[CreateMediaArticle] ${mediaEntry.id}:`, e)
+          console.warn(
+            `[CreateMediaArticle] ${mediaEntry.id}:`,
+
+            // `meta` is provided by elasticsearch error response
+            'meta' in e ? e.meta : e
+          )
         ),
     ]);
 

src/graphql/mutations/__fixtures__/UpdateUser.js

@@ -1,29 +1,19 @@
 export default {
   '/users/doc/error': {
-    users: [
-      {
-        name: 'Bill',
-        updatedAt: 0,
-      },
-    ],
+    name: 'Bill',
+    updatedAt: 0,
   },
   '/users/doc/normal': {
-    users: [
-      {
-        name: 'Bill',
-        updatedAt: 0,
-      },
-    ],
+    name: 'Bill',
+    updatedAt: 0,
   },
   '/users/doc/testUser1': {
-    id: 'testUser1',
     name: 'test user 1',
     facebookId: 'fbid123',
     githubId: 'githubId123',
     email: '[email protected]',
   },
   '/users/doc/testUser2': {
-    id: 'testUser2',
     name: 'test user 2',
     githubId: 'githubId456',
     email: '[email protected]',

src/graphql/mutations/__tests__/CreateMediaArticle.js

@@ -112,7 +112,6 @@ describe('creation', () => {
         ],
         "replyRequestCount": 1,
         "status": "NORMAL",
-        "tags": Array [],
         "text": "OCR result of output image",
         "updatedAt": "2017-01-28T08:45:57.011Z",
         "userId": "test",

src/graphql/mutations/__tests__/UpdateUser.js

@@ -4,7 +4,6 @@ import client from 'util/client';
 import MockDate from 'mockdate';
 import fixtures from '../__fixtures__/UpdateUser';
 
-const testUser1 = fixtures['/users/doc/testUser1'];
 const testUser2 = fixtures['/users/doc/testUser2'];
 
 const updateUser = (variableString, userId) =>
@@ -75,77 +74,77 @@ describe('UpdateUser', () => {
   it('should set user slug field correctly', async () => {
     const { data, errors } = await updateUser(
       `slug: "test-user-1"`,
-      testUser1.id
+      'testUser1'
     );
 
     expect(errors).toBe(undefined);
     expect(data).toMatchSnapshot();
 
-    expect(await getUser(testUser1.id)).toMatchSnapshot();
+    expect(await getUser('testUser1')).toMatchSnapshot();
   });
 
   it('cannot set duplicated slug', async () => {
     const { errors } = await updateUser(
       `slug: "${testUser2.slug}"`,
-      testUser1.id
+      'testUser1'
     );
 
     expect(errors).toMatchSnapshot();
 
-    expect(await getUser(testUser1.id)).toMatchSnapshot();
+    expect(await getUser('testUser1')).toMatchSnapshot();
   });
 
   it('should set all provided fields correctly', async () => {
     const { data, errors } = await updateUser(
       `slug: "test-user-3", name: "new name", avatarType: Gravatar, bio: "blahblahblah"`,
-      testUser1.id
+      'testUser1'
     );
 
     expect(errors).toBe(undefined);
     expect(data).toMatchSnapshot();
 
-    expect(await getUser(testUser1.id)).toMatchSnapshot();
+    expect(await getUser('testUser1')).toMatchSnapshot();
   });
 
   it('should not set unsupported fields', async () => {
     const { errors } = await updateUser(
       `email: "[email protected]"`,
-      testUser1.id
+      'testUser1'
     );
 
     expect(errors).toMatchSnapshot();
 
-    expect(await getUser(testUser1.id)).toMatchSnapshot();
+    expect(await getUser('testUser1')).toMatchSnapshot();
   });
 
   it('should not unset fields', async () => {
-    const { errors } = await updateUser(`slug: "", name: null`, testUser1.id);
+    const { errors } = await updateUser(`slug: "", name: null`, 'testUser1');
 
     expect(errors).toMatchSnapshot();
 
-    expect(await getUser(testUser1.id)).toMatchSnapshot();
+    expect(await getUser('testUser1')).toMatchSnapshot();
   });
 
   it('should preserve avatarData field for non openpeeps avatar', async () => {
     let { data, errors } = await updateUser(
       `avatarData:"""{"key":"value"}""", avatarType: OpenPeeps`,
-      testUser1.id
+      'testUser1'
     );
     expect(errors).toBe(undefined);
     expect(data).toMatchSnapshot('openpeeps');
 
-    ({ data, errors } = await updateUser(`avatarType: Facebook`, testUser1.id));
+    ({ data, errors } = await updateUser(`avatarType: Facebook`, 'testUser1'));
     expect(errors).toBe(undefined);
     expect(data).toMatchSnapshot('facebook');
 
     ({ data, errors } = await updateUser(
       `avatarType: Github, avatarData:"""{"key":"123"}"""`,
-      testUser1.id
+      'testUser1'
     ));
     expect(errors).toBe(undefined);
     expect(data).toMatchSnapshot('github');
 
-    expect(await getUser(testUser1.id)).toMatchSnapshot();
+    expect(await getUser('testUser1')).toMatchSnapshot();
   });
 
   afterAll(() => {

src/graphql/mutations/__tests__/__snapshots__/CreateArticle.js.snap

@@ -51,7 +51,6 @@ Object {
   ],
   "replyRequestCount": 1,
   "status": "NORMAL",
-  "tags": Array [],
   "text": "FOO FOO http://foo.com/article/1",
   "updatedAt": "2017-01-28T08:45:57.011Z",
   "userId": "test",

src/graphql/mutations/__tests__/__snapshots__/UpdateUser.js.snap

@@ -11,7 +11,6 @@ Object {
   "email": "[email protected]",
   "facebookId": "fbid123",
   "githubId": "githubId123",
-  "id": "testUser1",
   "name": "test user 1",
   "slug": "test-user-1",
   "updatedAt": "2020-01-01T00:00:10.000Z",
@@ -31,7 +30,6 @@ Object {
   "email": "[email protected]",
   "facebookId": "fbid123",
   "githubId": "githubId123",
-  "id": "testUser1",
   "name": "new name",
   "slug": "test-user-3",
   "updatedAt": "2020-01-01T00:00:30.000Z",
@@ -51,7 +49,6 @@ Object {
   "email": "[email protected]",
   "facebookId": "fbid123",
   "githubId": "githubId123",
-  "id": "testUser1",
   "name": "new name",
   "slug": "test-user-3",
   "updatedAt": "2020-01-01T00:00:30.000Z",
@@ -66,7 +63,6 @@ Object {
   "email": "[email protected]",
   "facebookId": "fbid123",
   "githubId": "githubId123",
-  "id": "testUser1",
   "name": "new name",
   "slug": "test-user-3",
   "updatedAt": "2020-01-01T00:01:00.000Z",
@@ -140,7 +136,6 @@ Object {
   "email": "[email protected]",
   "facebookId": "fbid123",
   "githubId": "githubId123",
-  "id": "testUser1",
   "name": "new name",
   "slug": "test-user-3",
   "updatedAt": "2020-01-01T00:00:30.000Z",
@@ -161,12 +156,6 @@ exports[`UpdateUser should set user name field correctly 2`] = `
 Object {
   "name": "Mark",
   "updatedAt": "2020-01-01T00:00:00.000Z",
-  "users": Array [
-    Object {
-      "name": "Bill",
-      "updatedAt": 0,
-    },
-  ],
 }
 `;
 
@@ -190,7 +179,6 @@ Object {
   "email": "[email protected]",
   "facebookId": "fbid123",
   "githubId": "githubId123",
-  "id": "testUser1",
   "name": "test user 1",
   "slug": "test-user-1",
   "updatedAt": "2020-01-01T00:00:10.000Z",

src/graphql/queries/__fixtures__/GetUser.js

@@ -1,28 +1,24 @@
 export default {
   '/users/doc/test-user': {
-    id: 'test-user',
     slug: 'abc123',
     name: 'test user',
     email: '[email protected]',
     avatarType: 'Facebook',
     facebookId: 123456,
   },
   '/users/doc/current-user': {
-    id: 'current-user',
     slug: 'def456',
     name: 'current user',
     email: '[email protected]',
     avatarType: 'Github',
     githubId: 654321,
   },
   '/users/doc/test-email-user': {
-    id: 'test-email-user',
     slug: 'ghi789',
     name: 'test email user',
     email: '[email protected]',
   },
   '/users/doc/another-user': {
-    id: 'another-user',
     name: 'open peeps user',
     email: '[email protected]',
     avatarType: 'OpenPeeps',

src/graphql/queries/__fixtures__/ListReplyRequests.js

@@ -94,12 +94,10 @@ export default {
     updatedAt: '2020-01-01T00:00:00.000Z',
   },
   '/users/doc/user1': {
-    id: 'user1',
     appId: 'WEBSITE',
     name: 'user 1',
   },
   '/users/doc/user2': {
-    id: 'user2',
     appId: 'WEBSITE',
     name: 'user 2',
   },

src/graphql/queries/__fixtures__/ValidateSlug.js

@@ -1,6 +1,5 @@
 export default {
   '/users/doc/test-user': {
-    id: 'test-user',
     slug: 'taken',
     name: 'test user',
     email: '[email protected]',

src/graphql/queries/__tests__/GetUser.js

@@ -2,8 +2,14 @@ import gql from 'util/GraphQL';
 import { loadFixtures, unloadFixtures } from 'util/fixtures';
 import fixtures from '../__fixtures__/GetUser';
 
-const currentUser = fixtures['/users/doc/current-user'];
-const testEmailUser = fixtures['/users/doc/test-email-user'];
+const currentUser = {
+  ...fixtures['/users/doc/current-user'],
+  id: 'current-user',
+};
+const testEmailUser = {
+  ...fixtures['/users/doc/test-email-user'],
+  id: 'test-email-user',
+};
 describe('GetUser', () => {
   beforeAll(() => loadFixtures(fixtures));