Update required tests

packages/keystone/src/fields/types/decimal/tests/non-null/test-fixtures.ts

@@ -6,7 +6,6 @@ export const exampleValue = () => '6.28';
 export const exampleValue2 = () => '6.45';
 export const supportsGraphQLIsNonNull = true;
 export const supportsUnique = true;
-export const skipRequiredTest = true;
 export const fieldName = 'price';
 export const unSupportedAdapterList = ['sqlite'];
 

packages/keystone/src/fields/types/decimal/tests/test-fixtures.ts

@@ -7,7 +7,6 @@ export const exampleValue = () => '6.28';
 export const exampleValue2 = () => '6.45';
 export const supportsNullInput = true;
 export const supportsUnique = true;
-export const skipRequiredTest = true;
 export const fieldName = 'price';
 export const unSupportedAdapterList = ['sqlite'];
 

packages/keystone/src/fields/types/float/tests/non-null/test-fixtures.ts

@@ -6,7 +6,6 @@ export const exampleValue = () => 6.28;
 export const exampleValue2 = () => 6.283;
 export const supportsUnique = true;
 export const fieldName = 'testField';
-export const skipRequiredTest = true;
 export const supportsGraphQLIsNonNull = true;
 
 export const getTestFields = () => ({

packages/keystone/src/fields/types/float/tests/test-fixtures.ts

@@ -7,7 +7,6 @@ export const exampleValue2 = () => 6.283;
 export const supportsNullInput = true;
 export const supportsUnique = true;
 export const fieldName = 'testField';
-export const skipRequiredTest = true;
 
 export const getTestFields = () => ({ testField: float({ isFilterable: true }) });
 

packages/keystone/src/fields/types/integer/tests/autoincrement-default/test-fixtures.ts

@@ -9,7 +9,6 @@ export const exampleValue2 = () => 36;
 export const supportsUnique = true;
 export const fieldName = 'orderNumber';
 export const supportsGraphQLIsNonNull = true;
-export const skipRequiredTest = true;
 export const skipCreateTest = false;
 export const skipUpdateTest = true;
 

packages/keystone/src/fields/types/integer/tests/non-null/test-fixtures.ts

@@ -6,7 +6,6 @@ export const exampleValue = () => 37;
 export const exampleValue2 = () => 38;
 export const supportsGraphQLIsNonNull = true;
 export const supportsUnique = true;
-export const skipRequiredTest = true;
 export const fieldName = 'testField';
 
 export const getTestFields = () => ({

packages/keystone/src/fields/types/integer/tests/test-fixtures.ts

@@ -6,7 +6,6 @@ export const exampleValue = () => 37;
 export const exampleValue2 = () => 38;
 export const supportsNullInput = true;
 export const supportsUnique = true;
-export const skipRequiredTest = true;
 export const fieldName = 'testField';
 
 export const getTestFields = () => ({ testField: integer({ isFilterable: true }) });

packages/keystone/src/fields/types/password/tests/non-null/test-fixtures.ts

@@ -7,7 +7,6 @@ export const exampleValue2 = () => 'password2';
 export const supportsUnique = false;
 export const fieldName = 'password';
 export const subfieldName = 'isSet';
-export const skipRequiredTest = true;
 export const skipCreateTest = true;
 export const skipUpdateTest = true;
 

packages/keystone/src/fields/types/password/tests/test-fixtures.ts

@@ -8,7 +8,6 @@ export const supportsUnique = false;
 export const supportsNullInput = true;
 export const fieldName = 'password';
 export const subfieldName = 'isSet';
-export const skipRequiredTest = true;
 export const skipCreateTest = true;
 export const skipUpdateTest = true;
 

packages/keystone/src/fields/types/select/tests/non-null/test-fixtures.ts

@@ -7,7 +7,6 @@ export {
   supportsUnique,
   fieldConfig,
   fieldName,
-  skipRequiredTest,
 } from '../test-fixtures';
 
 type MatrixValue = typeof testMatrix[number];

packages/keystone/src/fields/types/select/tests/test-fixtures.ts

@@ -10,7 +10,6 @@ export const exampleValue2 = (matrixValue: MatrixValue) =>
   matrixValue === 'enum' ? 'atlassian' : matrixValue === 'string' ? '1number' : 2;
 export const supportsNullInput = true;
 export const supportsUnique = true;
-export const skipRequiredTest = true;
 export const fieldConfig = (matrixValue: MatrixValue) => {
   if (matrixValue === 'enum' || matrixValue === 'string') {
     return {

packages/keystone/src/fields/types/text/tests/nullable/test-fixtures.ts

@@ -7,7 +7,6 @@ export const exampleValue = () => 'foo';
 export const exampleValue2 = () => 'bar';
 export const supportsNullInput = true;
 export const supportsUnique = true;
-export const skipRequiredTest = true;
 export const fieldName = 'testField';
 
 export const getTestFields = () => ({

packages/keystone/src/fields/types/text/tests/test-fixtures.ts

@@ -6,7 +6,6 @@ export const exampleValue = () => 'foo';
 export const exampleValue2 = () => 'bar';
 export const supportsNullInput = false;
 export const supportsUnique = true;
-export const skipRequiredTest = true;
 export const supportsGraphQLIsNonNull = true;
 export const fieldName = 'testField';
 

packages/keystone/src/fields/types/timestamp/tests/test-fixtures.ts

@@ -7,6 +7,7 @@ export const exampleValue = () => '1990-12-31T12:34:56.789Z';
 export const exampleValue2 = () => '2000-01-20T00:08:00.000Z';
 export const supportsNullInput = true;
 export const supportsUnique = true;
+export const skipRequiredTest = true;
 export const fieldName = 'lastOnline';
 
 export const getTestFields = () => ({

tests/api-tests/fields/required.test.ts

@@ -2,6 +2,7 @@ import globby from 'globby';
 import { list } from '@keystone-next/keystone';
 import { text } from '@keystone-next/keystone/fields';
 import { setupTestRunner } from '@keystone-next/keystone/testing';
+import { humanize } from '@keystone-next/keystone/src/lib/utils';
 import { apiTestConfig, expectValidationError } from '../utils';
 
 const testModules = globby.sync(`packages/**/src/**/test-fixtures.{js,ts}`, {
@@ -44,7 +45,7 @@ testModules
                 fields: {
                   name: text(),
                   testField: mod.typeFunction({
-                    isRequired: true,
+                    validation: { isRequired: true },
                     ...(mod.fieldConfig ? mod.fieldConfig(matrixValue) : {}),
                   }),
                 },
@@ -55,6 +56,8 @@ testModules
           }),
         });
 
+        const messages = [`Test.testField: ${humanize('testField')} is required`];
+
         test(
           'Create an object without the required field',
           runner(async ({ context }) => {
@@ -68,7 +71,27 @@ testModules
             expectValidationError(errors, [
               {
                 path: ['createTest'],
-                messages: ['Test.testField: Required field "testField" is null or undefined.'],
+                messages:
+                  mod.name === 'Text' ? ['Test.testField: Test Field must not be empty'] : messages,
+              },
+            ]);
+          })
+        );
+
+        test(
+          'Create an object with an explicit null value',
+          runner(async ({ context }) => {
+            const { data, errors } = await context.graphql.raw({
+              query: `
+                  mutation {
+                    createTest(data: { name: "test entry", testField: null } ) { id }
+                  }`,
+            });
+            expect(data).toEqual({ createTest: null });
+            expectValidationError(errors, [
+              {
+                path: ['createTest'],
+                messages,
               },
             ]);
           })
@@ -93,7 +116,7 @@ testModules
             expectValidationError(errors, [
               {
                 path: ['updateTest'],
-                messages: ['Test.testField: Required field "testField" is null or undefined.'],
+                messages,
               },
             ]);
           })