fix merge conflict goof

formio · Oct 16, 2024 · 027563e · 027563e
1 parent 8183e37
commit 027563e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/.eslintcache b/.eslintcache
diff --git a/src/process/validation/__tests__/Validator.test.ts b/src/process/validation/__tests__/Validator.test.ts
@@ -16,6 +16,7 @@ describe('Validator', function () {
       email: 'brendanb',
       url: 'htpigoogle',
       inputMask: 'hello, world',
+      time: ['12:00:00', '11:00'], // one of the values is provided in incorrect format (format instead dataFormat)
       submit: false,
     };
     for (const component of simpleForm.components) {

diff --git a/src/process/validation/__tests__/fixtures/forms.ts b/src/process/validation/__tests__/fixtures/forms.ts
@@ -2286,6 +2286,15 @@ export const simpleForm = {
       id: 'e8vls3a',
       keyModified: true,
     },
+    {
+      label: 'Time',
+      type: 'time',
+      key: 'time',
+      input: true,
+      dataFormat: 'HH:mm:ss',
+      format: 'HH:mm',
+      multiple: true,
+    },
     {
       type: 'button',
       label: 'Submit',