Skip to content
This repository was archived by the owner on Aug 8, 2023. It is now read-only.

Commit 041dc2a

Browse files
Brian Stonestonebk
authored andcommitted
Move setup-globals to jest.setup.js
1 parent 417c9a4 commit 041dc2a

File tree

4 files changed

+2
-4
lines changed

4 files changed

+2
-4
lines changed

src/js/createJestConfig.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const createJestConfig = () => ({
1414
testMatch: ['<rootDir>/**/__tests__/**/*.test.js', '<rootDir>/**/*.test.js'],
1515
testEnvironment: 'node',
1616
testPathIgnorePatterns: ['/node_modules/', '<rootDir>/lib/', '<rootDir>/es/'],
17-
setupTestFrameworkScriptFile: '<rootDir>/test-setup/setup-globals.js',
17+
setupTestFrameworkScriptFile: '<rootDir>/jest.setup.js',
1818
});
1919

2020
export default createJestConfig;

templates/emotion-styles/test-setup/setup-globals.js renamed to templates/emotion-styles/jest.setup.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/* global expect */
2-
/* eslint-disable zillow/import/no-extraneous-dependencies */
31
import { createSerializer } from 'jest-emotion';
42
import * as emotion from 'emotion';
53
import Enzyme from 'enzyme';

templates/inline-styles/test-setup/setup-globals.js renamed to templates/inline-styles/jest.setup.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable zillow/import/no-extraneous-dependencies */
21
import Enzyme from 'enzyme';
32
import Adapter from 'enzyme-adapter-react-16';
43

templates/zillow-eslint/_.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
/lib
44
/styleguide
55
jest.config.js
6+
jest.setup.js
67
styleguide.config.js

0 commit comments

Comments
 (0)