Merge pull request #30804 from code-dot-org/revert-30759-upgrade-reac…

…t-final

Revert "Upgraded react to 15.6"

apps/Gruntfile.js

@@ -35,7 +35,7 @@ module.exports = function(grunt) {
 // Auto-generated from Gruntfile.js
 import 'babel-polyfill';
 import 'whatwg-fetch';
-import Adapter from 'enzyme-adapter-react-15';
+import Adapter from 'enzyme-adapter-react-15.4';
 import enzyme from 'enzyme';
 enzyme.configure({adapter: new Adapter()});
 import { throwOnConsoleErrorsEverywhere, throwOnConsoleWarningsEverywhere } from './util/throwOnConsole';

apps/package.json

@@ -91,7 +91,7 @@
     "ejs": "^2.6.1",
     "ejs-webpack-loader": "^2.2.2",
     "enzyme": "^3.9.0",
-    "enzyme-adapter-react-15": "^1.4.0",
+    "enzyme-adapter-react-15.4": "^1.3.1",
     "eslint": "^4.19.1",
     "eslint-config-prettier": "^3.6.0",
     "eslint-plugin-babel": "^4.1.2",
@@ -159,11 +159,12 @@
     "qtip2": "2.2.0",
     "radium": "^0.25.2",
     "raw-loader": "^0.5.1",
-    "react": "~15.6",
+    "react": "~15.4.0",
+    "react-addons-test-utils": "~15.4.0",
     "react-bootstrap": "^0.32.4",
     "react-color": "^2.17.3",
     "react-datepicker": "1.6.0",
-    "react-dom": "~15.6",
+    "react-dom": "~15.4.0",
     "react-google-charts": "2",
     "react-idle-timer": "^4.2.7",
     "react-inspector": "2.3.1",
@@ -176,7 +177,6 @@
     "react-router": "^3.2.3",
     "react-select": "^1.2.1",
     "react-sticky": "^6.0.3",
-    "react-test-renderer": "~15.6",
     "react-tether": "^1.0.4",
     "react-tooltip": "^3.2.7",
     "react-virtualized": "^9.18.5",

apps/test/integration/levelSolutions/applab1/ec_data_browser.js

@@ -1,6 +1,6 @@
 import tickWrapper from '../../util/tickWrapper';
 import {TestResults} from '@cdo/apps/constants';
-import ReactTestUtils from 'react-dom/test-utils';
+import ReactTestUtils from 'react-addons-test-utils';
 
 const enterKeyEvent = {key: 'Enter', keyCode: 13, which: 13};
 
@@ -706,7 +706,7 @@ module.exports = {
         onRecordEvent('mytable', function(record, eventType) {
           if (eventType === 'create') {
             console.log('created record ' + record.id);
-          }
+          } 
         });`,
 
       runBeforeClick: function(assert) {

apps/test/integration/levelSolutions/applab1/ec_design.js

@@ -2,7 +2,7 @@ var testUtils = require('../../../util/testUtils');
 var tickWrapper = require('../../util/tickWrapper');
 import {TestResults} from '@cdo/apps/constants';
 var $ = require('jquery');
-var ReactTestUtils = require('react-dom/test-utils');
+var ReactTestUtils = require('react-addons-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

apps/test/integration/levelSolutions/applab2/ec_screens.js

@@ -2,7 +2,7 @@ var testUtils = require('../../../util/testUtils');
 var tickWrapper = require('../../util/tickWrapper');
 import {TestResults} from '@cdo/apps/constants';
 var $ = require('jquery');
-var ReactTestUtils = require('react-dom/test-utils');
+var ReactTestUtils = require('react-addons-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

apps/test/integration/levelSolutions/maze/2_1.js

@@ -1,5 +1,5 @@
 import {TestResults} from '@cdo/apps/constants';
-import ReactTestUtils from 'react-dom/test-utils';
+import ReactTestUtils from 'react-addons-test-utils';
 import {singleton as studioApp} from '@cdo/apps/StudioApp';
 import LegacyDialog from '@cdo/apps/code-studio/LegacyDialog';
 

apps/test/storybook/renderStoriesTest.js

@@ -7,7 +7,7 @@ import {
 } from '../util/testUtils';
 import testStorybook from './util/testStorybook';
 import $ from 'jquery';
-import Adapter from 'enzyme-adapter-react-15';
+import Adapter from 'enzyme-adapter-react-15.4';
 import enzyme from 'enzyme';
 enzyme.configure({adapter: new Adapter()});
 

apps/test/unit-tests.js

@@ -6,7 +6,7 @@ import {
   throwOnConsoleWarningsEverywhere
 } from './util/throwOnConsole';
 import {clearTimeoutsBetweenTests} from './util/clearTimeoutsBetweenTests';
-import Adapter from 'enzyme-adapter-react-15';
+import Adapter from 'enzyme-adapter-react-15.4';
 import enzyme from 'enzyme';
 enzyme.configure({adapter: new Adapter()});