Fix failing tests, upgrade testing environment

wojtekmaj · Dec 10, 2017 · a8a8b7a · a8a8b7a
1 parent 235b830
commit a8a8b7a
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 36 deletions.
diff --git a/jest.setup.js b/jest.setup.js
@@ -0,0 +1,4 @@
+import Enzyme from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+Enzyme.configure({ adapter: new Adapter() });
diff --git a/jest.shim.js b/jest.shim.js
@@ -0,0 +1,5 @@
+if (!global.requestAnimationFrame) {
+  global.requestAnimationFrame = function(callback) {
+    setTimeout(callback, 0);
+  };
+}
diff --git a/package.json b/package.json
@@ -17,6 +17,10 @@
     "test-jest-coverage": "jest --coverage"
   },
   "jest": {
+    "setupFiles": [
+      "<rootDir>/jest.shim.js",
+      "<rootDir>/jest.setup.js"
+    ],
     "collectCoverageFrom": [
       "**/src/**.{js,jsx}",
       "!**/src/entry.js"

diff --git a/src/Calendar/__tests__/Navigation.jsx b/src/Calendar/__tests__/Navigation.jsx
@@ -1,11 +1,8 @@
 import React from 'react';
-import { configure, shallow } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import { shallow } from 'enzyme';
 
 import Navigation from '../Navigation';
 
-configure({ adapter: new Adapter() });
-
 const allViews = ['century', 'decade', 'year', 'month'];
 
 /* eslint-disable comma-dangle */

diff --git a/src/MonthView/__tests__/WeekNumbers.jsx b/src/MonthView/__tests__/WeekNumbers.jsx
@@ -1,11 +1,8 @@
 import React from 'react';
-import { configure, shallow } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import { shallow } from 'enzyme';
 
 import WeekNumbers from '../WeekNumbers';
 
-configure({ adapter: new Adapter() });
-
 /* eslint-disable comma-dangle */
 
 describe('WeekNumbers', () => {

diff --git a/src/__tests__/Calendar.jsx b/src/__tests__/Calendar.jsx
@@ -1,15 +1,12 @@
 import React from 'react';
-import { configure, mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import { mount } from 'enzyme';
 
 import Calendar from '../Calendar';
 import {
   getBeginOfMonth,
   getISOLocalDate,
 } from '../shared/dates';
 
-configure({ adapter: new Adapter() });
-
 /* eslint-disable comma-dangle */
 
 const midnightTimestamp = 'T00:00:00.000';

diff --git a/src/__tests__/CenturyView.jsx b/src/__tests__/CenturyView.jsx
@@ -1,11 +1,8 @@
 import React from 'react';
-import { configure, mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import { mount } from 'enzyme';
 
 import CenturyView from '../CenturyView';
 
-configure({ adapter: new Adapter() });
-
 /* eslint-disable comma-dangle */
 
 const midnightTimestamp = 'T00:00:00.000';

diff --git a/src/__tests__/DecadeView.jsx b/src/__tests__/DecadeView.jsx
@@ -1,11 +1,8 @@
 import React from 'react';
-import { configure, mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import { mount } from 'enzyme';
 
 import DecadeView from '../DecadeView';
 
-configure({ adapter: new Adapter() });
-
 /* eslint-disable comma-dangle */
 
 const midnightTimestamp = 'T00:00:00.000';

diff --git a/src/__tests__/Flex.jsx b/src/__tests__/Flex.jsx
@@ -1,11 +1,8 @@
 import React from 'react';
-import { configure, shallow } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import { shallow } from 'enzyme';
 
 import Flex from '../Flex';
 
-configure({ adapter: new Adapter() });
-
 /* eslint-disable comma-dangle */
 
 describe('Flex', () => {

diff --git a/src/__tests__/MonthView.jsx b/src/__tests__/MonthView.jsx
@@ -1,14 +1,11 @@
 import React from 'react';
-import { configure, mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import { mount } from 'enzyme';
 
 import MonthView from '../MonthView';
 import {
   getISOLocalDate,
 } from '../shared/dates';
 
-configure({ adapter: new Adapter() });
-
 /* eslint-disable comma-dangle */
 
 const midnightTimestamp = 'T00:00:00.000';

diff --git a/src/__tests__/YearView.jsx b/src/__tests__/YearView.jsx
@@ -1,14 +1,11 @@
 import React from 'react';
-import { configure, mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import { mount } from 'enzyme';
 
 import YearView from '../YearView';
 import {
   getISOLocalMonth,
 } from '../shared/dates';
 
-configure({ adapter: new Adapter() });
-
 /* eslint-disable comma-dangle */
 
 const midnightTimestamp = 'T00:00:00.000';

diff --git a/src/shared/__tests__/dates.js b/src/shared/__tests__/dates.js
@@ -1097,10 +1097,10 @@ describe('getISOLocalMonth', () => {
 
   it('throws an error when given nonsense data', () => {
     const text = 'wololo';
-    const flag = true;
+    const fn = () => {};
 
     expect(() => getISOLocalMonth(text)).toThrow();
-    expect(() => getISOLocalMonth(flag)).toThrow();
+    expect(() => getISOLocalMonth(fn)).toThrow();
   });
 });
 
@@ -1119,9 +1119,9 @@ describe('getISOLocalDate', () => {
 
   it('throws an error when given nonsense data', () => {
     const text = 'wololo';
-    const flag = true;
+    const fn = () => {};
 
     expect(() => getISOLocalDate(text)).toThrow();
-    expect(() => getISOLocalDate(flag)).toThrow();
+    expect(() => getISOLocalDate(fn)).toThrow();
   });
 });