Skip to content

Commit d66921a

Browse files
Remove Karma flakiness by providing browser shims
1 parent 2d7132a commit d66921a

File tree

11 files changed

+27
-9
lines changed

11 files changed

+27
-9
lines changed

packages/enzyme-test-suite/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
"enzyme-adapter-utils": "^1.0.0-beta.2",
3434
"prop-types": "^15.5.10",
3535
"semver": "^5.4.1",
36-
"sinon": "^2.4.1"
36+
"sinon": "^2.4.1",
37+
"airbnb-browser-shims": "^1.12.0"
3738
},
3839
"peerDependencies": {
3940
"react": "^15.5.0"

packages/enzyme-test-suite/test/Adapter-spec.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import './_helpers/setupAdapters';
1+
import './_helpers/setup';
22
import React from 'react';
33
import { expect } from 'chai';
44

packages/enzyme-test-suite/test/Debug-spec.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import './_helpers/setupAdapters';
1+
import './_helpers/setup';
22
import { expect } from 'chai';
33
import React from 'react';
44
import {

packages/enzyme-test-suite/test/RSTTraversal-spec.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import './_helpers/setupAdapters';
1+
import './_helpers/setup';
22
import React from 'react';
33
import sinon from 'sinon';
44
import { expect } from 'chai';

packages/enzyme-test-suite/test/ReactWrapper-spec.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* globals document */
2-
import './_helpers/setupAdapters';
2+
import './_helpers/setup';
33
import React from 'react';
44
import PropTypes from 'prop-types';
55
import { expect } from 'chai';

packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import './_helpers/setupAdapters';
1+
import './_helpers/setup';
22
import React from 'react';
33
import PropTypes from 'prop-types';
44
import { expect } from 'chai';

packages/enzyme-test-suite/test/Utils-spec.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import './_helpers/setupAdapters';
1+
import './_helpers/setup';
22
import React from 'react';
33
import { expect } from 'chai';
44

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
import './setupShims';
2+
import './setupAdapters';
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/* eslint no-undef: 0, global-require: 0 */
2+
/**
3+
* This file is needed only when karma runs the test suite. We can't guarantee
4+
* what browser travis will actually run karma with, so we need to load in
5+
* browser shims to make sure everything works that we expect. I'd love to
6+
* put this somewhere else (ie, karma.conf.js), but I can't figure out how
7+
* to tell karma to run a file before everything else. This is the next best
8+
* thing I guess...
9+
*/
10+
const isBrowser = typeof window !== 'undefined' &&
11+
Object.prototype.toString.call(window) === '[object Window]';
12+
13+
if (isBrowser) {
14+
require('airbnb-browser-shims');
15+
}

packages/enzyme-test-suite/test/selector-spec.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import './_helpers/setupAdapters';
1+
import './_helpers/setup';
22
import React from 'react';
33
import { expect } from 'chai';
44

0 commit comments

Comments
 (0)