imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3345 from matrix-org/t3chguy/react16_3

Browse source 
Switch from react-addons-test-utils to react-dom/test-utils. React 16 :D
This commit is contained in:
Michael Telatynski 2019-08-26 19:44:51 +01:00 • committed by GitHub
commit bcbd603874
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/components/structures/MessagePanel-test.js
View file

@ -19,7 +19,7 @@ import SettingsStore from "../../../src/settings/SettingsStore";
const React = require('react');
const ReactDOM = require("react-dom");
import PropTypes from "prop-types";
const TestUtils = require('react-addons-test-utils');
const TestUtils = require('react-dom/test-utils');
const expect = require('expect');
import sinon from 'sinon';
import { EventEmitter } from "events";

2
test/components/views/dialogs/InteractiveAuthDialog-test.js
View file

@ -18,7 +18,7 @@ import expect from 'expect';
import Promise from 'bluebird';
import React from 'react';
import ReactDOM from 'react-dom';
import ReactTestUtils from 'react-addons-test-utils';
import ReactTestUtils from 'react-dom/test-utils';
import sinon from 'sinon';
import MatrixReactTestUtils from 'matrix-react-test-utils';

2
test/components/views/elements/MemberEventListSummary-test.js
View file

@ -1,6 +1,6 @@
import expect from 'expect';
import React from 'react';
import ReactTestUtils from 'react-addons-test-utils';
import ReactTestUtils from 'react-dom/test-utils';
import sdk from 'matrix-react-sdk';
import * as languageHandler from '../../../../src/languageHandler';
import * as testUtils from '../../../test-utils';

2
test/components/views/rooms/MemberList-test.js
View file

@ -1,5 +1,5 @@
import React from 'react';
import ReactTestUtils from 'react-addons-test-utils';
import ReactTestUtils from 'react-dom/test-utils';
import ReactDOM from 'react-dom';
import expect from 'expect';
import lolex from 'lolex';

5
test/components/views/rooms/MessageComposerInput-test.js
View file

@ -1,5 +1,5 @@
import React from 'react';
import ReactTestUtils from 'react-addons-test-utils';
import ReactTestUtils from 'react-dom/test-utils';
import ReactDOM from 'react-dom';
import expect from 'expect';
import sinon from 'sinon';
@ -8,7 +8,6 @@ import * as testUtils from '../../../test-utils';
import sdk from 'matrix-react-sdk';
const MessageComposerInput = sdk.getComponent('views.rooms.MessageComposerInput');
import MatrixClientPeg from '../../../../src/MatrixClientPeg';
import RoomMember from 'matrix-js-sdk';
function addTextToDraft(text) {
const components = document.getElementsByClassName('public-DraftEditor-content');
@ -301,4 +300,4 @@ xdescribe('MessageComposerInput', () => {
expect(spy.args[0][1].body).toEqual('[Click here](https://some.lovely.url)');
expect(spy.args[0][1].formatted_body).toEqual('<a href="https://some.lovely.url">Click here</a>');
});
});
});

2
test/components/views/rooms/RoomList-test.js
View file

@ -1,5 +1,5 @@
import React from 'react';
import ReactTestUtils from 'react-addons-test-utils';
import ReactTestUtils from 'react-dom/test-utils';
import ReactDOM from 'react-dom';
import expect from 'expect';
import lolex from 'lolex';