From a30af83eb26e025c0830b73f2a8763e6c2990fd0 Mon Sep 17 00:00:00 2001 From: Nuno Campos Date: Tue, 29 Aug 2017 19:36:13 +0100 Subject: [PATCH 1/2] Remove travis allowed failure --- .travis.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index de2e37637..ec2b7c2a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,16 +35,6 @@ matrix: - node_js: "6" env: KARMA=true REACT=16 allow_failures: - - node_js: "6" - env: KARMA=true REACT=0.13 - - node_js: "6" - env: KARMA=true REACT=0.14 - - node_js: "6" - env: KARMA=true REACT=15.4 - - node_js: "6" - env: KARMA=true REACT=15 - - node_js: "6" - env: KARMA=true REACT=16 env: - REACT=16 - REACT=16.2 From 11d153e66ab26bf4b38de5f2396536e421efe891 Mon Sep 17 00:00:00 2001 From: Leland Richardson Date: Sat, 16 Sep 2017 11:42:30 -0700 Subject: [PATCH 2/2] Remove Karma flakiness by providing browser shims --- packages/enzyme-test-suite/package.json | 1 + packages/enzyme-test-suite/test/Adapter-spec.jsx | 1 + packages/enzyme-test-suite/test/Debug-spec.jsx | 1 + .../enzyme-test-suite/test/RSTTraversal-spec.jsx | 1 + .../enzyme-test-suite/test/ReactWrapper-spec.jsx | 1 + .../enzyme-test-suite/test/ShallowWrapper-spec.jsx | 1 + packages/enzyme-test-suite/test/Utils-spec.jsx | 1 + packages/enzyme-test-suite/test/_helpers/setup.js | 2 ++ .../enzyme-test-suite/test/_helpers/setupShims.js | 14 ++++++++++++++ packages/enzyme-test-suite/test/selector-spec.jsx | 1 + .../enzyme-test-suite/test/staticRender-spec.jsx | 1 + 11 files changed, 25 insertions(+) create mode 100644 packages/enzyme-test-suite/test/_helpers/setup.js create mode 100644 packages/enzyme-test-suite/test/_helpers/setupShims.js diff --git a/packages/enzyme-test-suite/package.json b/packages/enzyme-test-suite/package.json index 15715e252..790efa355 100644 --- a/packages/enzyme-test-suite/package.json +++ b/packages/enzyme-test-suite/package.json @@ -29,6 +29,7 @@ "author": "Leland Richardson ", "license": "MIT", "dependencies": { + "airbnb-browser-shims": "^3.0.0", "chai": "^4.1.2", "enzyme": "^3.3.0", "enzyme-adapter-utils": "^1.5.0", diff --git a/packages/enzyme-test-suite/test/Adapter-spec.jsx b/packages/enzyme-test-suite/test/Adapter-spec.jsx index c6da4c920..01cdfd53d 100644 --- a/packages/enzyme-test-suite/test/Adapter-spec.jsx +++ b/packages/enzyme-test-suite/test/Adapter-spec.jsx @@ -1,3 +1,4 @@ +import './_helpers/setup'; import React from 'react'; import { expect } from 'chai'; import jsdom from 'jsdom'; diff --git a/packages/enzyme-test-suite/test/Debug-spec.jsx b/packages/enzyme-test-suite/test/Debug-spec.jsx index 5de2c84a6..2ddd7df44 100644 --- a/packages/enzyme-test-suite/test/Debug-spec.jsx +++ b/packages/enzyme-test-suite/test/Debug-spec.jsx @@ -1,3 +1,4 @@ +import './_helpers/setup'; import { expect } from 'chai'; import React from 'react'; import wrap from 'mocha-wrap'; diff --git a/packages/enzyme-test-suite/test/RSTTraversal-spec.jsx b/packages/enzyme-test-suite/test/RSTTraversal-spec.jsx index b0ff2682f..676adf853 100644 --- a/packages/enzyme-test-suite/test/RSTTraversal-spec.jsx +++ b/packages/enzyme-test-suite/test/RSTTraversal-spec.jsx @@ -1,3 +1,4 @@ +import './_helpers/setup'; import React from 'react'; import sinon from 'sinon'; import { expect } from 'chai'; diff --git a/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx b/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx index dafe4dd20..e91bcaff1 100644 --- a/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx +++ b/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx @@ -1,4 +1,5 @@ /* globals document */ +import './_helpers/setup'; import React from 'react'; import PropTypes from 'prop-types'; import { expect } from 'chai'; diff --git a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx index 5167a51b4..8f47f1da5 100644 --- a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx +++ b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx @@ -1,3 +1,4 @@ +import './_helpers/setup'; import React from 'react'; import PropTypes from 'prop-types'; import { expect } from 'chai'; diff --git a/packages/enzyme-test-suite/test/Utils-spec.jsx b/packages/enzyme-test-suite/test/Utils-spec.jsx index 94fac9b45..253c34a4b 100644 --- a/packages/enzyme-test-suite/test/Utils-spec.jsx +++ b/packages/enzyme-test-suite/test/Utils-spec.jsx @@ -1,3 +1,4 @@ +import './_helpers/setup'; import React from 'react'; import { expect } from 'chai'; import wrap from 'mocha-wrap'; diff --git a/packages/enzyme-test-suite/test/_helpers/setup.js b/packages/enzyme-test-suite/test/_helpers/setup.js new file mode 100644 index 000000000..f396930eb --- /dev/null +++ b/packages/enzyme-test-suite/test/_helpers/setup.js @@ -0,0 +1,2 @@ +import './setupShims'; +import './setupAdapters'; diff --git a/packages/enzyme-test-suite/test/_helpers/setupShims.js b/packages/enzyme-test-suite/test/_helpers/setupShims.js new file mode 100644 index 000000000..5f381af14 --- /dev/null +++ b/packages/enzyme-test-suite/test/_helpers/setupShims.js @@ -0,0 +1,14 @@ +/* eslint no-undef: 0, global-require: 0 */ +/** + * This file is needed only when karma runs the test suite. We can't guarantee + * what browser travis will actually run karma with, so we need to load in + * browser shims to make sure everything works that we expect. I'd love to + * put this somewhere else (ie, karma.conf.js), but I can't figure out how + * to tell karma to run a file before everything else. This is the next best + * thing I guess... + */ +const isBrowser = typeof window !== 'undefined' && Object.prototype.toString.call(window) === '[object Window]'; + +if (isBrowser) { + require('airbnb-browser-shims'); +} diff --git a/packages/enzyme-test-suite/test/selector-spec.jsx b/packages/enzyme-test-suite/test/selector-spec.jsx index 05f1f7c78..0d3f2dba7 100644 --- a/packages/enzyme-test-suite/test/selector-spec.jsx +++ b/packages/enzyme-test-suite/test/selector-spec.jsx @@ -1,3 +1,4 @@ +import './_helpers/setup'; import React from 'react'; import { expect } from 'chai'; import { diff --git a/packages/enzyme-test-suite/test/staticRender-spec.jsx b/packages/enzyme-test-suite/test/staticRender-spec.jsx index f3f4aa33d..703bbf07d 100644 --- a/packages/enzyme-test-suite/test/staticRender-spec.jsx +++ b/packages/enzyme-test-suite/test/staticRender-spec.jsx @@ -1,3 +1,4 @@ +import './_helpers/setup'; import React from 'react'; import PropTypes from 'prop-types'; import { expect } from 'chai';