test: update validation functions test

Author: kamilmysliwiec

test/functional/validation-functions-and-decorators.spec.ts

@@ -184,6 +184,7 @@ import {
   isUUID,
   isUppercase,
   isVariableWidth,
+  length,
   matches,
   max,
   maxDate,
@@ -318,7 +319,7 @@ describe('IsDefined', () => {
   it('should return error object with proper data', () => {
     const validationType = 'isDefined';
     const message = 'someProperty should not be null or undefined';
-    return checkReturnedError(new MyClass(), invalidValues, validationType, message);
+    checkReturnedError(new MyClass(), invalidValues, validationType, message);
   });
 });
 
@@ -1780,7 +1781,7 @@ describe('IsEthereumAddress', () => {
   it('should return error object with proper data', () => {
     const validationType = 'isEthereumAddress';
     const message = 'someProperty must be an Ethereum address';
-    return checkReturnedError(new MyClass(), invalidValues, validationType, message);
+    checkReturnedError(new MyClass(), invalidValues, validationType, message);
   });
 });
 
@@ -1813,7 +1814,7 @@ describe('IsBtcAddress', () => {
   it('should return error object with proper data', () => {
     const validationType = 'isBtcAddress';
     const message = 'someProperty must be a BTC address';
-    return checkReturnedError(new MyClass(), invalidValues, validationType, message);
+    checkReturnedError(new MyClass(), invalidValues, validationType, message);
   });
 });
 
@@ -1846,7 +1847,7 @@ describe('IsDataURI', () => {
   it('should return error object with proper data', () => {
     const validationType = 'isDataURI';
     const message = 'someProperty must be a data uri format';
-    return checkReturnedError(new MyClass(), invalidValues, validationType, message);
+    checkReturnedError(new MyClass(), invalidValues, validationType, message);
   });
 });
 
@@ -1879,7 +1880,7 @@ describe('IsHSL', () => {
   it('should return error object with proper data', () => {
     const validationType = 'isHSL';
     const message = 'someProperty must be a HSL color';
-    return checkReturnedError(new MyClass(), invalidValues, validationType, message);
+    checkReturnedError(new MyClass(), invalidValues, validationType, message);
   });
 });
 
@@ -1912,7 +1913,7 @@ describe('IsRgbColor', () => {
   it('should return error object with proper data', () => {
     const validationType = 'isRgbColor';
     const message = 'someProperty must be RGB color';
-    return checkReturnedError(new MyClass(), invalidValues, validationType, message);
+    checkReturnedError(new MyClass(), invalidValues, validationType, message);
   });
 });
 
@@ -1945,7 +1946,7 @@ describe('IsIdentityCard', () => {
   it('should return error object with proper data', () => {
     const validationType = 'isIdentityCard';
     const message = 'someProperty must be a identity card number';
-    return checkReturnedError(new MyClass(), invalidValues, validationType, message);
+    checkReturnedError(new MyClass(), invalidValues, validationType, message);
   });
 });
 
@@ -1978,7 +1979,7 @@ describe('IsEAN', () => {
   it('should return error object with proper data', () => {
     const validationType = 'isEAN';
     const message = 'someProperty must be an EAN (European Article Number)';
-    return checkReturnedError(new MyClass(), invalidValues, validationType, message);
+    checkReturnedError(new MyClass(), invalidValues, validationType, message);
   });
 });
 
@@ -2011,7 +2012,7 @@ describe('IsISRC', () => {
   it('should return error object with proper data', () => {
     const validationType = 'isISRC';
     const message = 'someProperty must be an ISRC';
-    return checkReturnedError(new MyClass(), invalidValues, validationType, message);
+    checkReturnedError(new MyClass(), invalidValues, validationType, message);
   });
 });
 
@@ -2044,7 +2045,7 @@ describe('IsRFC3339', () => {
   it('should return error object with proper data', () => {
     const validationType = 'isRFC3339';
     const message = 'someProperty must be RFC 3339 date';
-    return checkReturnedError(new MyClass(), invalidValues, validationType, message);
+    checkReturnedError(new MyClass(), invalidValues, validationType, message);
   });
 });
 
@@ -2077,7 +2078,7 @@ describe('IsLocale', () => {
   it('should return error object with proper data', () => {
     const validationType = 'isLocale';
     const message = 'someProperty must be locale';
-    return checkReturnedError(new MyClass(), invalidValues, validationType, message);
+    checkReturnedError(new MyClass(), invalidValues, validationType, message);
   });
 });
 
@@ -2114,7 +2115,7 @@ describe('IsMagnetURI', () => {
   it('should return error object with proper data', () => {
     const validationType = 'isMagnetURI';
     const message = 'someProperty must be magnet uri format';
-    return checkReturnedError(new MyClass(), invalidValues, validationType, message);
+    checkReturnedError(new MyClass(), invalidValues, validationType, message);
   });
 });
 
@@ -2147,7 +2148,7 @@ describe('IsMimeType', () => {
   it('should return error object with proper data', () => {
     const validationType = 'isMimeType';
     const message = 'someProperty must be MIME type format';
-    return checkReturnedError(new MyClass(), invalidValues, validationType, message);
+    checkReturnedError(new MyClass(), invalidValues, validationType, message);
   });
 });
 
@@ -3195,61 +3196,81 @@ describe('IsNotEmptyObject', () => {
     [],
     [{ key: 'value' }],
   ];
-  const nullableValidValues = [{ key: 'value' }, { key: 'value' }];
-  const nullableInvalidValues = [
-    null,
-    undefined,
-    '{ key: "value" }',
-    "{ 'key': 'value' }",
-    'string',
-    1234,
-    false,
-    {},
-    { key: undefined },
-    { key: null },
-    [],
-    [{ key: 'value' }],
-  ];
 
   class MyClass {
     @IsNotEmptyObject()
     someProperty: object;
   }
 
-  class NullableMyClass {
-    @IsNotEmptyObject({ nullable: true })
-    someProperty: object;
-  }
-
-  it.each([
-    [new MyClass(), validValues],
-    [new NullableMyClass(), nullableValidValues],
-  ])('should not fail if validator.validate said that its valid', (validationObject, values) => {
-    return checkValidValues(validationObject, values);
+  it('should not fail if validator.validate said that its valid', () => {
+    return checkValidValues(new MyClass(), validValues);
   });
 
-  it.each([
-    [new MyClass(), invalidValues],
-    [new NullableMyClass(), nullableInvalidValues],
-  ])('should fail if validator.validate said that its invalid', (validationObject, values) => {
-    return checkInvalidValues(validationObject, values);
+  it('should fail if validator.validate said that its invalid', () => {
+    return checkInvalidValues(new MyClass(), invalidValues);
   });
 
   it('should not fail if method in validator said that its valid', () => {
     validValues.forEach(value => expect(isNotEmptyObject(value)).toBeTruthy());
-    nullableValidValues.forEach(value => expect(isNotEmptyObject(value, { nullable: true })).toBeTruthy());
   });
 
   it('should fail if method in validator said that its invalid', () => {
     invalidValues.forEach(value => expect(isNotEmptyObject(value)).toBeFalsy());
-    nullableInvalidValues.forEach(value => expect(isNotEmptyObject(value, { nullable: true })).toBeFalsy());
   });
 
   it('should return error object with proper data', () => {
     const validationType = 'isNotEmptyObject';
     const message = 'someProperty must be a non-empty object';
     return checkReturnedError(new MyClass(), invalidValues, validationType, message);
   });
+
+  describe('with `nullable` option', () => {
+    const nullableValidValues = validValues;
+    const nullableInvalidValues = invalidValues;
+    const nonNullableValidValues = [{ key: 'value' }, { key: 'value' }];
+    const nonNullableInvalidValues = [
+      null,
+      undefined,
+      '{ key: "value" }',
+      "{ 'key': 'value' }",
+      'string',
+      1234,
+      false,
+      {},
+      { key: undefined },
+      { key: null },
+      [],
+      [{ key: 'value' }],
+    ];
+    class NullableMyClass {
+      @IsNotEmptyObject({ nullable: true })
+      someProperty: object;
+    }
+    class NonNullableMyClass {
+      @IsNotEmptyObject({ nullable: false })
+      someProperty: object;
+    }
+
+    it('should not fail if validator.validate said that its valid', async () => {
+      await checkValidValues(new NullableMyClass(), nullableValidValues);
+      await checkValidValues(new NonNullableMyClass(), nonNullableValidValues);
+    });
+
+    it('should fail if validator.validate said that its valid', async () => {
+      await checkInvalidValues(new NullableMyClass(), nullableInvalidValues);
+      await checkInvalidValues(new NonNullableMyClass(), nonNullableInvalidValues);
+    });
+
+    it('should not fail if method in validator said that its valid', () => {
+      nullableValidValues.forEach(value => expect(isNotEmptyObject(value, { nullable: true })).toBeTruthy());
+      nonNullableValidValues.forEach(value => expect(isNotEmptyObject(value, { nullable: false })).toBeTruthy());
+    });
+
+    it('should fail if method in validator said that its invalid', () => {
+      nullableInvalidValues.forEach(value => expect(isNotEmptyObject(value, { nullable: true })).toBeFalsy());
+      nonNullableInvalidValues.forEach(value => expect(isNotEmptyObject(value, { nullable: false })).toBeFalsy());
+    });
+  });
 });
 
 describe('IsLowercase', () => {
@@ -3979,10 +4000,6 @@ describe('IsTimeZone', () => {
 describe('isPhoneNumber', () => {
   describe('with region', () => {
     const validValues = [
-      '0311111111',
-      '031 633 60 01',
-      '079 4 666 666',
-      '075 416 20 30',
       '+41 311111111',
       '+41 31 633 60 01',
       '+41 79 4 666 666',
@@ -3991,7 +4008,6 @@ describe('isPhoneNumber', () => {
       '+41 (0)31 633 60 01',
       '+41 (0)79 4 666 666',
       '+41 (0)75 416 20 30',
-      '+49 9072 1111',
     ];
     const invalidValues = [undefined, null, 'asdf', '1'];