PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Don't include src in the test resolve root

Browse source 
Don't include src in resolve root for the karma test, as otherwise
modules from react sdk get pulled in instead of npm libraries like
'extend' which breaks everything in really subtle ways.
This commit is contained in:
David Baker 2017-05-25 23:13:49 +01:00
parent 46bb29a3af
commit ba8e37a84e
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
karma.conf.js
View file

@ -166,7 +166,6 @@ module.exports = function (config) {
'sinon': 'sinon/pkg/sinon.js', 'sinon': 'sinon/pkg/sinon.js',
}, },
root: [ root: [
path.resolve('./src'),
path.resolve('./test'), path.resolve('./test'),
], ],
}, },

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

@ -22,7 +22,7 @@ import ReactTestUtils from 'react-addons-test-utils';
import sinon from 'sinon'; import sinon from 'sinon';
import sdk from 'matrix-react-sdk'; import sdk from 'matrix-react-sdk';
import MatrixClientPeg from 'MatrixClientPeg'; import MatrixClientPeg from '../../../../src/MatrixClientPeg';
import * as test_utils from '../../../test-utils'; import * as test_utils from '../../../test-utils';

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

@ -8,7 +8,7 @@ import * as testUtils from '../../../test-utils';
import sdk from 'matrix-react-sdk'; import sdk from 'matrix-react-sdk';
import UserSettingsStore from '../../../../src/UserSettingsStore'; import UserSettingsStore from '../../../../src/UserSettingsStore';
const MessageComposerInput = sdk.getComponent('views.rooms.MessageComposerInput'); const MessageComposerInput = sdk.getComponent('views.rooms.MessageComposerInput');
import MatrixClientPeg from 'MatrixClientPeg'; import MatrixClientPeg from '../../../../src/MatrixClientPeg';
function addTextToDraft(text) { function addTextToDraft(text) {
const components = document.getElementsByClassName('public-DraftEditor-content'); const components = document.getElementsByClassName('public-DraftEditor-content');

2
test/utils/MegolmExportEncryption-test.js
View file

@ -16,7 +16,7 @@ limitations under the License.
"use strict"; "use strict";
import * as MegolmExportEncryption from 'utils/MegolmExportEncryption'; import * as MegolmExportEncryption from '../../src/utils/MegolmExportEncryption';
import * as testUtils from '../test-utils'; import * as testUtils from '../test-utils';
import expect from 'expect'; import expect from 'expect';