Get tests passing again

code-dot-org · Aug 7, 2017 · d7b9546 · d7b9546
1 parent 962dd59
commit d7b9546
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 22 deletions.
diff --git a/apps/package.json b/apps/package.json
@@ -165,6 +165,7 @@
     "react-select": "^1.0.0-rc.1",
     "react-sticky": "5.0.5",
     "react-storybook-addon-add-stories-group": "0.1.0",
+    "react-test-renderer": "~15.5.4",
     "react-tether": "^0.5.2",
     "react-tooltip": "^3.2.7",
     "react-virtualized": "^9.7.3",

diff --git a/apps/test/integration/levelSolutions/applab/ec_data_browser.js b/apps/test/integration/levelSolutions/applab/ec_data_browser.js
@@ -1,6 +1,6 @@
 import tickWrapper from '../../util/tickWrapper';
 import { TestResults } from '@cdo/apps/constants';
-import ReactTestUtils from 'react-addons-test-utils';
+import ReactTestUtils from 'react-dom/test-utils';
 
 const enterKeyEvent = {key: "Enter", keyCode: 13, which: 13};
 

diff --git a/apps/test/integration/levelSolutions/applab/ec_design.js b/apps/test/integration/levelSolutions/applab/ec_design.js
@@ -2,7 +2,7 @@ var testUtils = require('../../../util/testUtils');
 var tickWrapper = require('../../util/tickWrapper');
 var TestResults = require('@cdo/apps/constants').TestResults;
 var $ = require('jquery');
-var ReactTestUtils = require('react-addons-test-utils');
+var ReactTestUtils = require('react-dom/test-utils');
 
 // i'd like this test to not run through level tests, which has a lot of hacks,
 // but this is the easiest approach for now. hopefully at some point in the

diff --git a/apps/test/integration/levelSolutions/applab/ec_screens.js b/apps/test/integration/levelSolutions/applab/ec_screens.js
@@ -2,7 +2,7 @@ var testUtils = require('../../../util/testUtils');
 var tickWrapper = require('../../util/tickWrapper');
 var TestResults = require('@cdo/apps/constants').TestResults;
 var $ = require('jquery');
-var ReactTestUtils = require('react-addons-test-utils');
+var ReactTestUtils = require('react-dom/test-utils');
 
 // i'd like this test to not run through level tests, which has a lot of hacks,
 // but this is the easiest approach for now. hopefully at some point in the

diff --git a/apps/test/integration/levelSolutions/maze/2_1.js b/apps/test/integration/levelSolutions/maze/2_1.js
@@ -1,5 +1,5 @@
 var TestResults = require('@cdo/apps/constants.js').TestResults;
-import ReactTestUtils from 'react-addons-test-utils';
+import ReactTestUtils from 'react-dom/test-utils';
 import {singleton as studioApp} from '@cdo/apps/StudioApp';
 import LegacyDialog from '@cdo/apps/code-studio/LegacyDialog';
 

diff --git a/apps/test/unit/applab/AppLabCrosshairOverlayTest.js b/apps/test/unit/applab/AppLabCrosshairOverlayTest.js
@@ -1,7 +1,7 @@
 import {expect} from '../../util/configuredChai';
 import sinon from 'sinon';
 import React from 'react';
-import ReactTestUtils from 'react-addons-test-utils';
+import ReactTestUtils from 'react-dom/test-utils';
 import AppLabCrosshairOverlay from '@cdo/apps/applab/AppLabCrosshairOverlay';
 import CrosshairOverlay from '@cdo/apps/templates/CrosshairOverlay';
 // ES5-style require necessary to stub gridUtils.draggedElementDropPoint

diff --git a/apps/test/unit/applab/AppLabTooltipOverlayTest.js b/apps/test/unit/applab/AppLabTooltipOverlayTest.js
@@ -1,7 +1,7 @@
 import {expect} from '../../util/configuredChai';
 import sinon from 'sinon';
 import React from 'react';
-import ReactTestUtils from 'react-addons-test-utils';
+import ReactTestUtils from 'react-dom/test-utils';
 import { AppLabTooltipOverlay } from '@cdo/apps/applab/AppLabTooltipOverlay';
 import TooltipOverlay from '@cdo/apps/templates/TooltipOverlay';
 // ES5-style require necessary to stub gridUtils.draggedElementDropPoint

diff --git a/apps/test/unit/applab/CompletionButtonTest.js b/apps/test/unit/applab/CompletionButtonTest.js
@@ -2,7 +2,7 @@ import {assert} from '../../util/configuredChai';
 var testUtils = require('../../util/testUtils');
 var CompletionButton = require('@cdo/apps/templates/CompletionButton').__TestInterface__.UnconnectedCompletionButton;
 import React from 'react';
-var ReactTestUtils = require('react-addons-test-utils');
+var ReactTestUtils = require('react-dom/test-utils');
 
 describe('CompletionButton', function () {
   testUtils.throwOnConsoleErrors();

diff --git a/apps/test/unit/code-studio/pairingTest.js b/apps/test/unit/code-studio/pairingTest.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import TestUtils from 'react-addons-test-utils';
+import TestUtils from 'react-dom/test-utils';
 import assert from 'assert';
 import sinon from 'sinon';
 

diff --git a/apps/test/unit/instructionsComponentsTest.js b/apps/test/unit/instructionsComponentsTest.js
@@ -1,7 +1,7 @@
 import {assert} from '../util/configuredChai';
 var testUtils = require('./../util/testUtils');
 import React from 'react';
-var ReactTestUtils = require('react-addons-test-utils');
+var ReactTestUtils = require('react-dom/test-utils');
 
 import { StatelessMarkdownInstructions } from '@cdo/apps/templates/instructions/MarkdownInstructions';
 import NonMarkdownInstructions from '@cdo/apps/templates/instructions/NonMarkdownInstructions';

diff --git a/apps/test/unit/shareWarningsDialogTest.js b/apps/test/unit/shareWarningsDialogTest.js
@@ -1,7 +1,7 @@
 import {assert} from '../util/configuredChai';
 var testUtils = require('./../util/testUtils');
 var React = require('react');
-var ReactTestUtils = require('react-addons-test-utils');
+var ReactTestUtils = require('react-dom/test-utils');
 var ShareWarningsDialog = require('@cdo/apps/templates/ShareWarningsDialog');
 var ShareWarnings = require('@cdo/apps/templates/ShareWarnings');
 var AgeDropdown = require('@cdo/apps/templates/AgeDropdown');

diff --git a/apps/test/unit/templates/CrosshairOverlayTest.js b/apps/test/unit/templates/CrosshairOverlayTest.js
@@ -1,6 +1,6 @@
 import {expect} from '../../util/configuredChai';
 import React from 'react';
-import ReactTestUtils from 'react-addons-test-utils';
+import ReactTestUtils from 'react-dom/test-utils';
 import CrosshairOverlay, { CROSSHAIR_MARGIN, styles } from '@cdo/apps/templates/CrosshairOverlay';
 
 describe('CrosshairOverlay', () => {

diff --git a/apps/test/unit/templates/ToggleButtonTest.js b/apps/test/unit/templates/ToggleButtonTest.js
@@ -1,7 +1,7 @@
 import {assert} from '../../util/configuredChai';
 var testUtils = require('./../../util/testUtils');
 var React = require('react');
-var ReactTestUtils = require('react-addons-test-utils');
+var ReactTestUtils = require('react-dom/test-utils');
 
 describe('ToggleButton', function () {
 

diff --git a/apps/test/unit/templates/TooltipOverlayTest.js b/apps/test/unit/templates/TooltipOverlayTest.js
@@ -1,6 +1,6 @@
 import {expect} from '../../util/configuredChai';
 import React from 'react';
-import ReactTestUtils from 'react-addons-test-utils';
+import ReactTestUtils from 'react-dom/test-utils';
 import TooltipOverlay, {
     textProvider,
     coordinatesProvider,

diff --git a/apps/test/unit/templates/VisualizationOverlayTest.js b/apps/test/unit/templates/VisualizationOverlayTest.js
@@ -1,6 +1,6 @@
 import {expect} from '../../util/configuredChai';
 import React from 'react';
-import ReactTestUtils from 'react-addons-test-utils';
+import ReactTestUtils from 'react-dom/test-utils';
 import { VisualizationOverlay } from '@cdo/apps/templates/VisualizationOverlay';
 import CrosshairOverlay from '@cdo/apps/templates/CrosshairOverlay';
 

diff --git a/apps/test/unit/watchers/AutocompleteSelectorTest.js b/apps/test/unit/watchers/AutocompleteSelectorTest.js
@@ -2,7 +2,7 @@ import {expect} from '../../util/configuredChai';
 import sinon from 'sinon';
 import React from 'react';
 import {mount} from 'enzyme';
-import ReactTestUtils from 'react-addons-test-utils';
+import ReactTestUtils from 'react-dom/test-utils';
 import AutocompleteSelector from '@cdo/apps/templates/watchers/AutocompleteSelector';
 
 describe('AutocompleteSelector', () => {

diff --git a/apps/yarn.lock b/apps/yarn.lock
@@ -5804,18 +5804,12 @@ longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
 
-loose-envify@^1.0.0, loose-envify@^1.3.1:
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.0, loose-envify@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
   dependencies:
     js-tokens "^3.0.0"
 
-loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.0.tgz#6b26248c42f6d4fa4b0d8542f78edfcde35642a8"
-  dependencies:
-    js-tokens "^2.0.0"
-
 loud-rejection@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
@@ -7596,6 +7590,13 @@ react-stubber@^1.0.0:
   dependencies:
     babel-runtime "^6.5.0"
 
+react-test-renderer@~15.5.4:
+  version "15.5.4"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-15.5.4.tgz#d4ebb23f613d685ea8f5390109c2d20fbf7c83bc"
+  dependencies:
+    fbjs "^0.8.9"
+    object-assign "^4.1.0"
+
 react-tether@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/react-tether/-/react-tether-0.5.2.tgz#d12ba064534cd9db62b1aaf960b366ca059880e9"