Extend test cases

JedWatson · Apr 10, 2022 · dc12a0c · dc12a0c
1 parent 470e922
commit dc12a0c
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 15 deletions.
diff --git a/packages/react-select/src/__tests__/Select.test.tsx b/packages/react-select/src/__tests__/Select.test.tsx
@@ -3120,20 +3120,42 @@ test('renders with custom theme', () => {
   ).toEqual(primary);
 });
 
-test('form validation with `required` prop', () => {
-  const components = (value?: Option) => (
-    <form id="formTest">
-      <Select {...BASIC_PROPS} required value={value || null} />
-    </form>
-  );
+cases(
+  '`required` prop',
+  ({ props = BASIC_PROPS }) => {
+    const components = (value: Option | null | undefined = null) => (
+      <form id="formTest">
+        <Select {...props} required value={value} />
+      </form>
+    );
 
-  const { container, rerender } = render(components());
+    const { container, rerender } = render(components());
 
-  expect(
-    container.querySelector<HTMLFormElement>('#formTest')?.checkValidity()
-  ).toEqual(false);
-  rerender(components(BASIC_PROPS.options[0]));
-  expect(
-    container.querySelector<HTMLFormElement>('#formTest')?.checkValidity()
-  ).toEqual(true);
-});
+    expect(
+      container.querySelector<HTMLFormElement>('#formTest')?.checkValidity()
+    ).toEqual(false);
+    rerender(components(props.options[0]));
+    expect(
+      container.querySelector<HTMLFormElement>('#formTest')?.checkValidity()
+    ).toEqual(true);
+  },
+  {
+    'single select > should validate with value': {
+      props: {
+        ...BASIC_PROPS,
+      },
+    },
+    'single select (isSearchable is false) > should validate with value': {
+      props: {
+        ...BASIC_PROPS,
+        isSearchable: false,
+      },
+    },
+    'multi select > should validate with value': {
+      props: {
+        ...BASIC_PROPS,
+        isMulti: true,
+      },
+    },
+  }
+);
diff --git a/packages/react-select/src/__tests__/StateManaged.test.tsx b/packages/react-select/src/__tests__/StateManaged.test.tsx
@@ -475,3 +475,23 @@ cases<KeyboardInteractionOpts>(
       },
   }
 );
+
+test('`required` prop > should validate', () => {
+  const { container } = render(
+    <form id="formTest">
+      <Select {...BASIC_PROPS} menuIsOpen required />
+    </form>
+  );
+
+  expect(
+    container.querySelector<HTMLFormElement>('#formTest')?.checkValidity()
+  ).toEqual(false);
+
+  let selectOption = container.querySelectorAll('div.react-select__option')[3];
+
+  userEvent.click(selectOption);
+
+  expect(
+    container.querySelector<HTMLFormElement>('#formTest')?.checkValidity()
+  ).toEqual(true);
+});