Skip to content

Commit f7af925

Browse files
authored
Merge branch 'main' into active-descendant-refinements
2 parents 0a6057c + 01c3167 commit f7af925

File tree

5 files changed

+6
-4
lines changed

5 files changed

+6
-4
lines changed

jest.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ module.exports = {
44
cacheDirectory: '.test',
55
collectCoverage: true,
66
collectCoverageFrom: ['src/**/*.{js,jsx,ts,tsx}', '!src/stories/**'],
7-
setupFilesAfterEnv: ['<rootDir>/src/utils/test-matchers.tsx', '<rootDir>/src/utils/test-deprecations.tsx']
7+
setupFilesAfterEnv: ['<rootDir>/src/utils/test-matchers.tsx', '<rootDir>/src/utils/test-deprecations.tsx'],
8+
testRegex: '/src/__tests__/.*\\.[jt]sx?$'
89
}

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
"copy-esm-types": "copyfiles -u 1 \"./lib/**/*.d.ts\" ./lib-esm",
1818
"lint": "eslint '**/*.{js,ts,tsx}'",
1919
"lint:fix": "eslint '**/*.{js,ts,tsx}' --fix",
20-
"test": "jest -- src",
21-
"update-snapshots": "jest -u -- src",
20+
"test": "jest",
2221
"watch": "jest --watch --no-coverage",
2322
"playroom:start": "playroom start",
2423
"playroom:build": "playroom build",

src/DropdownMenu/DropdownButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export type DropdownButtonProps = ButtonProps
77

88
export const DropdownButton = React.forwardRef<HTMLElement, React.PropsWithChildren<DropdownButtonProps>>(
99
({children, ...props}: React.PropsWithChildren<DropdownButtonProps>, ref): JSX.Element => (
10-
<Button ref={ref} {...props}>
10+
<Button ref={ref} type="button" {...props}>
1111
{children}
1212
<StyledOcticon icon={TriangleDownIcon} ml={1} />
1313
</Button>

src/__tests__/__snapshots__/DropdownMenu.tsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ exports[`DropdownMenu renders consistently 1`] = `
7979
onClick={[Function]}
8080
onKeyDown={[Function]}
8181
tabIndex={0}
82+
type="button"
8283
>
8384
<svg
8485
aria-hidden="true"

src/__tests__/__snapshots__/SelectPanel.tsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ exports[`SelectPanel renders consistently 1`] = `
9191
onClick={[Function]}
9292
onKeyDown={[Function]}
9393
tabIndex={0}
94+
type="button"
9495
>
9596
Select Items
9697
<svg

0 commit comments

Comments
 (0)