refactor: error messages reformatted and moved into own files (#1731)

spec/AccountLockoutPolicy.spec.js

@@ -3,13 +3,14 @@
 const Config = require('../lib/Config');
 const Definitions = require('../lib/Options/Definitions');
 const request = require('../lib/request');
+const { ErrorMessage } = require('../lib/Errors/message');
 
 const loginWithWrongCredentialsShouldFail = function (username, password) {
   return new Promise((resolve, reject) => {
     Parse.User.logIn(username, password)
       .then(() => reject('login should have failed'))
       .catch(err => {
-        if (err.message === 'Invalid username/password.') {
+        if (err.message === ErrorMessage.invalid('username/password')) {
           resolve();
         } else {
           reject(err);
@@ -24,12 +25,7 @@ const isAccountLockoutError = function (username, password, duration, waitTime)
       Parse.User.logIn(username, password)
         .then(() => reject('login should have failed'))
         .catch(err => {
-          if (
-            err.message ===
-            'Your account is locked due to multiple failed login attempts. Please try again after ' +
-              duration +
-              ' minute(s)'
-          ) {
+          if (err.message === ErrorMessage.accountLocked(duration)) {
             resolve();
           } else {
             reject(err);

spec/AuthenticationAdapters.spec.js

@@ -250,7 +250,7 @@ describe('AuthenticationProviders', function () {
       })
       .then(fail, ({ data }) => {
         expect(data.code).toBe(208);
-        expect(data.error).toBe('this auth is already used');
+        expect(data.error).toBe('This auth is already used.');
         done();
       })
       .catch(done.fail);

spec/EmailVerificationToken.spec.js

@@ -2,6 +2,7 @@
 
 const Config = require('../lib/Config');
 const request = require('../lib/request');
+const { ErrorMessage } = require('../lib/Errors/message');
 
 describe('Email Verification Token Expiration: ', () => {
   it('show the invalid verification link page, if the user clicks on the verify email link after the email verify token expires', done => {
@@ -848,7 +849,7 @@ describe('Email Verification Token Expiration: ', () => {
           .then(response => {
             expect(response.status).toBe(400);
             expect(response.data.code).toBe(Parse.Error.EMAIL_MISSING);
-            expect(response.data.error).toBe('you must provide an email');
+            expect(response.data.error).toBe(ErrorMessage.required('email'));
             expect(sendVerificationEmailCallCount).toBe(0);
             expect(sendEmailOptions).not.toBeDefined();
             done();

spec/ParseGraphQLServer.spec.js

@@ -4188,7 +4188,7 @@ describe('ParseGraphQLServer', () => {
                 .slice(0, 3)
                 .map(obj =>
                   expectAsync(getObject(obj.className, obj.id)).toBeRejectedWith(
-                    jasmine.stringMatching('Object not found')
+                    jasmine.stringMatching('Object not found.')
                   )
                 )
             );
@@ -4232,7 +4232,7 @@ describe('ParseGraphQLServer', () => {
               getObject(object2.className, object2.id, {
                 'X-Parse-Session-Token': user3.getSessionToken(),
               })
-            ).toBeRejectedWith(jasmine.stringMatching('Object not found'));
+            ).toBeRejectedWith(jasmine.stringMatching('Object not found.'));
             await Promise.all(
               [object1, object3, object4].map(async obj =>
                 expect(
@@ -4250,7 +4250,7 @@ describe('ParseGraphQLServer', () => {
                   getObject(obj.className, obj.id, {
                     'X-Parse-Session-Token': user4.getSessionToken(),
                   })
-                ).toBeRejectedWith(jasmine.stringMatching('Object not found'))
+                ).toBeRejectedWith(jasmine.stringMatching('Object not found.'))
               )
             );
             expect(
@@ -4266,7 +4266,7 @@ describe('ParseGraphQLServer', () => {
                   getObject(obj.className, obj.id, {
                     'X-Parse-Session-Token': user5.getSessionToken(),
                   })
-                ).toBeRejectedWith(jasmine.stringMatching('Object not found'))
+                ).toBeRejectedWith(jasmine.stringMatching('Object not found.'))
               )
             );
             expect(
@@ -6036,7 +6036,7 @@ describe('ParseGraphQLServer', () => {
                   updateObject(obj.className, obj.id, {
                     someField: 'changedValue1',
                   })
-                ).toBeRejectedWith(jasmine.stringMatching('Object not found'));
+                ).toBeRejectedWith(jasmine.stringMatching('Object not found.'));
                 await obj.fetch({ useMasterKey: true });
                 expect(obj.get('someField')).toEqual(originalFieldValue);
               })
@@ -6122,7 +6122,7 @@ describe('ParseGraphQLServer', () => {
                 { someField: 'changedValue5' },
                 { 'X-Parse-Session-Token': user3.getSessionToken() }
               )
-            ).toBeRejectedWith(jasmine.stringMatching('Object not found'));
+            ).toBeRejectedWith(jasmine.stringMatching('Object not found.'));
             await object2.fetch({ useMasterKey: true });
             expect(object2.get('someField')).toEqual(originalFieldValue);
             await Promise.all(
@@ -6135,7 +6135,7 @@ describe('ParseGraphQLServer', () => {
                     { someField: 'changedValue6' },
                     { 'X-Parse-Session-Token': user4.getSessionToken() }
                   )
-                ).toBeRejectedWith(jasmine.stringMatching('Object not found'));
+                ).toBeRejectedWith(jasmine.stringMatching('Object not found.'));
                 await obj.fetch({ useMasterKey: true });
                 expect(obj.get('someField')).toEqual(originalFieldValue);
               })
@@ -6162,7 +6162,7 @@ describe('ParseGraphQLServer', () => {
                     { someField: 'changedValue7' },
                     { 'X-Parse-Session-Token': user5.getSessionToken() }
                   )
-                ).toBeRejectedWith(jasmine.stringMatching('Object not found'));
+                ).toBeRejectedWith(jasmine.stringMatching('Object not found.'));
                 await obj.fetch({ useMasterKey: true });
                 expect(obj.get('someField')).toEqual(originalFieldValue);
               })
@@ -6234,7 +6234,7 @@ describe('ParseGraphQLServer', () => {
                   updateObject(obj.className, obj.id, {
                     someField: 'changedValue1',
                   })
-                ).toBeRejectedWith(jasmine.stringMatching('Object not found'));
+                ).toBeRejectedWith(jasmine.stringMatching('Object not found.'));
                 await obj.fetch({ useMasterKey: true });
                 expect(obj.get('someField')).toEqual(originalFieldValue);
               })
@@ -6330,7 +6330,7 @@ describe('ParseGraphQLServer', () => {
                 { someField: 'changedValue5' },
                 { 'X-Parse-Session-Token': user3.getSessionToken() }
               )
-            ).toBeRejectedWith(jasmine.stringMatching('Object not found'));
+            ).toBeRejectedWith(jasmine.stringMatching('Object not found.'));
             await object2.fetch({ useMasterKey: true });
             expect(object2.get('someField')).toEqual(originalFieldValue);
             await Promise.all(
@@ -6343,7 +6343,7 @@ describe('ParseGraphQLServer', () => {
                     { someField: 'changedValue6' },
                     { 'X-Parse-Session-Token': user4.getSessionToken() }
                   )
-                ).toBeRejectedWith(jasmine.stringMatching('Object not found'));
+                ).toBeRejectedWith(jasmine.stringMatching('Object not found.'));
                 await obj.fetch({ useMasterKey: true });
                 expect(obj.get('someField')).toEqual(originalFieldValue);
               })
@@ -6372,7 +6372,7 @@ describe('ParseGraphQLServer', () => {
                     { someField: 'changedValue7' },
                     { 'X-Parse-Session-Token': user5.getSessionToken() }
                   )
-                ).toBeRejectedWith(jasmine.stringMatching('Object not found'));
+                ).toBeRejectedWith(jasmine.stringMatching('Object not found.'));
                 await obj.fetch({ useMasterKey: true });
                 expect(obj.get('someField')).toEqual(originalFieldValue);
               })
@@ -6446,7 +6446,7 @@ describe('ParseGraphQLServer', () => {
             expect(result.data.deleteCustomer.customer.someField2).toEqual('someField2Value1');
 
             await expectAsync(obj.fetch({ useMasterKey: true })).toBeRejectedWith(
-              jasmine.stringMatching('Object not found')
+              jasmine.stringMatching('Object not found.')
             );
           });
 
@@ -6482,7 +6482,7 @@ describe('ParseGraphQLServer', () => {
               objects.slice(0, 3).map(async obj => {
                 const originalFieldValue = obj.get('someField');
                 await expectAsync(deleteObject(obj.className, obj.id)).toBeRejectedWith(
-                  jasmine.stringMatching('Object not found')
+                  jasmine.stringMatching('Object not found.')
                 );
                 await obj.fetch({ useMasterKey: true });
                 expect(obj.get('someField')).toEqual(originalFieldValue);
@@ -6495,7 +6495,7 @@ describe('ParseGraphQLServer', () => {
                   deleteObject(obj.className, obj.id, {
                     'X-Parse-Session-Token': user4.getSessionToken(),
                   })
-                ).toBeRejectedWith(jasmine.stringMatching('Object not found'));
+                ).toBeRejectedWith(jasmine.stringMatching('Object not found.'));
                 await obj.fetch({ useMasterKey: true });
                 expect(obj.get('someField')).toEqual(originalFieldValue);
               })
@@ -6506,7 +6506,7 @@ describe('ParseGraphQLServer', () => {
               ]
             ).toEqual({ objectId: object4.id, __typename: 'PublicClass' });
             await expectAsync(object4.fetch({ useMasterKey: true })).toBeRejectedWith(
-              jasmine.stringMatching('Object not found')
+              jasmine.stringMatching('Object not found.')
             );
             expect(
               (
@@ -6516,7 +6516,7 @@ describe('ParseGraphQLServer', () => {
               ).data.delete[object1.className.charAt(0).toLowerCase() + object1.className.slice(1)]
             ).toEqual({ objectId: object1.id, __typename: 'GraphQLClass' });
             await expectAsync(object1.fetch({ useMasterKey: true })).toBeRejectedWith(
-              jasmine.stringMatching('Object not found')
+              jasmine.stringMatching('Object not found.')
             );
             expect(
               (
@@ -6526,7 +6526,7 @@ describe('ParseGraphQLServer', () => {
               ).data.delete[object2.className.charAt(0).toLowerCase() + object2.className.slice(1)]
             ).toEqual({ objectId: object2.id, __typename: 'GraphQLClass' });
             await expectAsync(object2.fetch({ useMasterKey: true })).toBeRejectedWith(
-              jasmine.stringMatching('Object not found')
+              jasmine.stringMatching('Object not found.')
             );
             expect(
               (
@@ -6536,7 +6536,7 @@ describe('ParseGraphQLServer', () => {
               ).data.delete[object3.className.charAt(0).toLowerCase() + object3.className.slice(1)]
             ).toEqual({ objectId: object3.id, __typename: 'GraphQLClass' });
             await expectAsync(object3.fetch({ useMasterKey: true })).toBeRejectedWith(
-              jasmine.stringMatching('Object not found')
+              jasmine.stringMatching('Object not found.')
             );
           });
 
@@ -6572,7 +6572,7 @@ describe('ParseGraphQLServer', () => {
               objects.slice(0, 3).map(async obj => {
                 const originalFieldValue = obj.get('someField');
                 await expectAsync(deleteObject(obj.className, obj.id)).toBeRejectedWith(
-                  jasmine.stringMatching('Object not found')
+                  jasmine.stringMatching('Object not found.')
                 );
                 await obj.fetch({ useMasterKey: true });
                 expect(obj.get('someField')).toEqual(originalFieldValue);
@@ -6585,7 +6585,7 @@ describe('ParseGraphQLServer', () => {
                   deleteObject(obj.className, obj.id, {
                     'X-Parse-Session-Token': user4.getSessionToken(),
                   })
-                ).toBeRejectedWith(jasmine.stringMatching('Object not found'));
+                ).toBeRejectedWith(jasmine.stringMatching('Object not found.'));
                 await obj.fetch({ useMasterKey: true });
                 expect(obj.get('someField')).toEqual(originalFieldValue);
               })
@@ -6596,7 +6596,7 @@ describe('ParseGraphQLServer', () => {
               ][object4.className.charAt(0).toLowerCase() + object4.className.slice(1)].objectId
             ).toEqual(object4.id);
             await expectAsync(object4.fetch({ useMasterKey: true })).toBeRejectedWith(
-              jasmine.stringMatching('Object not found')
+              jasmine.stringMatching('Object not found.')
             );
             expect(
               (
@@ -6608,7 +6608,7 @@ describe('ParseGraphQLServer', () => {
               ].objectId
             ).toEqual(object1.id);
             await expectAsync(object1.fetch({ useMasterKey: true })).toBeRejectedWith(
-              jasmine.stringMatching('Object not found')
+              jasmine.stringMatching('Object not found.')
             );
             expect(
               (
@@ -6632,7 +6632,7 @@ describe('ParseGraphQLServer', () => {
               ].objectId
             ).toEqual(object3.id);
             await expectAsync(object3.fetch({ useMasterKey: true })).toBeRejectedWith(
-              jasmine.stringMatching('Object not found')
+              jasmine.stringMatching('Object not found.')
             );
           });
         });

spec/ParseInstallation.spec.js

@@ -1232,7 +1232,9 @@ describe('Installations', () => {
           },
           err => {
             expect(err.code).toBe(136);
-            expect(err.message).toBe('installationId may not be changed in this operation');
+            expect(err.message).toBe(
+              'The field installationId can not be changed in this operation.'
+            );
             done();
           }
         );

spec/ParseQuery.FullTextSearch.spec.js

@@ -3,6 +3,7 @@
 const Config = require('../lib/Config');
 const Parse = require('parse/node');
 const request = require('../lib/request');
+const { ErrorMessage } = require('../lib/Errors/message');
 let databaseAdapter;
 
 const fullTextHelper = async () => {
@@ -110,7 +111,10 @@ describe('Parse.Query Full Text Search testing', () => {
       }
     };
     await expectAsync(invalidQuery()).toBeRejectedWith(
-      new Parse.Error(Parse.Error.INVALID_JSON, 'bad $text: $search, should be object')
+      new Parse.Error(
+        Parse.Error.INVALID_JSON,
+        ErrorMessage.queryValueTypeInvalid('object', '$text.$search')
+      )
     );
   });
 
@@ -119,7 +123,10 @@ describe('Parse.Query Full Text Search testing', () => {
     const query = new Parse.Query('TestObject');
     query.fullText('subject', 'leche', { language: true });
     await expectAsync(query.find()).toBeRejectedWith(
-      new Parse.Error(Parse.Error.INVALID_JSON, 'bad $text: $language, should be string')
+      new Parse.Error(
+        Parse.Error.INVALID_JSON,
+        ErrorMessage.queryValueTypeInvalid('string', '$text.$language')
+      )
     );
   });
 
@@ -128,7 +135,10 @@ describe('Parse.Query Full Text Search testing', () => {
     const query = new Parse.Query('TestObject');
     query.fullText('subject', 'leche', { caseSensitive: 'string' });
     await expectAsync(query.find()).toBeRejectedWith(
-      new Parse.Error(Parse.Error.INVALID_JSON, 'bad $text: $caseSensitive, should be boolean')
+      new Parse.Error(
+        Parse.Error.INVALID_JSON,
+        ErrorMessage.queryValueTypeInvalid('boolean', '$text.$caseSensitive')
+      )
     );
   });
 
@@ -137,7 +147,10 @@ describe('Parse.Query Full Text Search testing', () => {
     const query = new Parse.Query('TestObject');
     query.fullText('subject', 'leche', { diacriticSensitive: 'string' });
     await expectAsync(query.find()).toBeRejectedWith(
-      new Parse.Error(Parse.Error.INVALID_JSON, 'bad $text: $diacriticSensitive, should be boolean')
+      new Parse.Error(
+        Parse.Error.INVALID_JSON,
+        ErrorMessage.queryValueTypeInvalid('boolean', '$text.$diacriticSensitive')
+      )
     );
   });
 });

spec/ParseQuery.spec.js

@@ -5,6 +5,7 @@
 'use strict';
 
 const Parse = require('parse/node');
+const { ErrorMessage } = require('../lib/Errors/message');
 const request = require('../lib/request');
 
 const masterKeyHeaders = {
@@ -980,7 +981,7 @@ describe('Parse.Query testing', () => {
       .then(done.fail)
       .catch(response => {
         equal(response.data.code, Parse.Error.INVALID_JSON);
-        equal(response.data.error, 'bad $containedBy: should be an array');
+        equal(response.data.error, ErrorMessage.queryValueTypeInvalid('an array', '$containedBy'));
         done();
       });
   });
@@ -1319,7 +1320,7 @@ describe('Parse.Query testing', () => {
       .then(done.fail)
       .catch(error => {
         equal(error.code, Parse.Error.INVALID_JSON);
-        equal(error.message, 'bad $in value');
+        equal(error.message, ErrorMessage.objectFieldValueInvalid('$in'));
         done();
       });
   });
@@ -1339,7 +1340,7 @@ describe('Parse.Query testing', () => {
       .then(done.fail)
       .catch(error => {
         equal(error.code, Parse.Error.INVALID_JSON);
-        equal(error.message, 'bad $nin value');
+        equal(error.message, ErrorMessage.objectFieldValueInvalid('$nin'));
         done();
       });
   });

spec/ParseServerRESTController.spec.js

@@ -4,6 +4,7 @@ const ParseServer = require('../lib/ParseServer').default;
 const Parse = require('parse/node').Parse;
 const semver = require('semver');
 const TestUtils = require('../lib/TestUtils');
+const { ErrorMessage } = require('../lib/Errors/message');
 
 let RESTController;
 
@@ -569,7 +570,7 @@ describe('ParseServerRESTController', () => {
       fail('Success callback should not be called when passing an empty username.');
     } catch (err) {
       expect(err.code).toBe(Parse.Error.USERNAME_MISSING);
-      expect(err.message).toBe('bad or missing username');
+      expect(err.message).toBe(ErrorMessage.required('username', ''));
     }
   });
 
@@ -582,7 +583,7 @@ describe('ParseServerRESTController', () => {
       fail('Success callback should not be called when passing an empty password.');
     } catch (err) {
       expect(err.code).toBe(Parse.Error.PASSWORD_MISSING);
-      expect(err.message).toBe('password is required');
+      expect(err.message).toBe(ErrorMessage.required('password', ''));
     }
   });