Move setup-globals to jest.setup.js

zillow · Jul 31, 2018 · 041dc2a · 041dc2a
1 parent 417c9a4
commit 041dc2a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/src/js/createJestConfig.js b/src/js/createJestConfig.js
@@ -14,7 +14,7 @@ const createJestConfig = () => ({
     testMatch: ['<rootDir>/**/__tests__/**/*.test.js', '<rootDir>/**/*.test.js'],
     testEnvironment: 'node',
     testPathIgnorePatterns: ['/node_modules/', '<rootDir>/lib/', '<rootDir>/es/'],
-    setupTestFrameworkScriptFile: '<rootDir>/test-setup/setup-globals.js',
+    setupTestFrameworkScriptFile: '<rootDir>/jest.setup.js',
 });
 
 export default createJestConfig;
diff --git a/...motion-styles/test-setup/setup-globals.js → templates/emotion-styles/jest.setup.js b/...motion-styles/test-setup/setup-globals.js → templates/emotion-styles/jest.setup.js
@@ -1,5 +1,3 @@
-/* global expect */
-/* eslint-disable zillow/import/no-extraneous-dependencies */
 import { createSerializer } from 'jest-emotion';
 import * as emotion from 'emotion';
 import Enzyme from 'enzyme';

diff --git a/...inline-styles/test-setup/setup-globals.js → templates/inline-styles/jest.setup.js b/...inline-styles/test-setup/setup-globals.js → templates/inline-styles/jest.setup.js
@@ -1,4 +1,3 @@
-/* eslint-disable zillow/import/no-extraneous-dependencies */
 import Enzyme from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 

diff --git a/templates/zillow-eslint/_.eslintignore b/templates/zillow-eslint/_.eslintignore
@@ -3,4 +3,5 @@
 /lib
 /styleguide
 jest.config.js
+jest.setup.js
 styleguide.config.js