Merge branch 'develop' into staging

rfcx · Sep 13, 2023 · eede634 · eede634
2 parents 026db44 + 4d4909b
commit eede634
Show file tree

Hide file tree

Showing 2 changed files with 14,769 additions and 18,338 deletions.
diff --git a/common/converter/array.unit.test.js b/common/converter/array.unit.test.js
@@ -22,28 +22,44 @@ test('can return items', () => {
     })
 })
 
-test('can detect missing property', () => {
+test('can detect missing property', async () => {
   const source = [
     { a: 'hello', b: '95' },
     { a: 'there' }
   ]
   const converter = new ArrayConverter(source)
   converter.convert('a').toString()
   converter.convert('b').toInt()
-  expect.assertions(1)
-  return converter.validate().catch(e => expect(e).toBeInstanceOf(ValidationError))
+  expect.assertions(2)
+  let err
+  try {
+    await converter.validate()
+  } catch (e) {
+    err = e
+  } finally {
+    expect(err).toBeInstanceOf(ValidationError)
+    expect(err.message).toBe('Validation errors: Parameter \'b\' the parameter is required but was not provided.')
+  }
 })
 
-test('can detect incorrect type (int)', () => {
+test('can detect incorrect type (int)', async () => {
   const source = [
     { a: 'hello', b: '95' },
     { a: 'there', b: 'not an int' }
   ]
   const converter = new ArrayConverter(source)
   converter.convert('a').toString()
   converter.convert('b').toInt()
-  expect.assertions(1)
-  return converter.validate().catch(e => expect(e).toBeInstanceOf(ValidationError))
+  expect.assertions(2)
+  let err
+  try {
+    await converter.validate()
+  } catch (e) {
+    err = e
+  } finally {
+    expect(err).toBeInstanceOf(ValidationError)
+    expect(err.message).toBe('Validation errors: Parameter \'b\' should be an integer.')
+  }
 })
 
 test('can convert string to int', () => {
@@ -61,7 +77,7 @@ test('can convert string to int', () => {
   })
 })
 
-test('can detect multiple type errors', () => {
+test('can detect multiple type errors', async () => {
   const source = [
     { a: 'hello', b: '95' },
     { a: 'there', b: 'not an int' },
@@ -70,8 +86,16 @@ test('can detect multiple type errors', () => {
   const converter = new ArrayConverter(source)
   converter.convert('a').toString()
   converter.convert('b').toInt()
-  expect.assertions(1)
-  return converter.validate().catch(e => expect(e).toBeInstanceOf(ValidationError))
+  expect.assertions(2)
+  let err
+  try {
+    await converter.validate()
+  } catch (e) {
+    err = e
+  } finally {
+    expect(err).toBeInstanceOf(ValidationError)
+    expect(err.message).toBe('Validation errors: Parameter \'b\' should be an integer.')
+  }
 })
 
 test('can camelize', () => {